lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

igb: do not re-register DCA requester on device reset

Browse Source 
The current driver is re-registering the DCA requester after every reset.
Instead of doing this we should only be updating the on board DCA registers
and not unregistering/re-registering our requester.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck
2009-05-21 13:06:56 +00:00
committed by David S. Miller
parent 0d63cbb535
commit 7e0e99ef43
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/igb/igb_main.c
View File

@@ -996,6 +996,11 @@ void igb_down(struct igb_adapter *adapter)
igb_reset(adapter); igb_reset(adapter);
igb_clean_all_tx_rings(adapter); igb_clean_all_tx_rings(adapter);
igb_clean_all_rx_rings(adapter); igb_clean_all_rx_rings(adapter);
#ifdef CONFIG_IGB_DCA
/* since we reset the hardware DCA settings were cleared */
igb_setup_dca(adapter);
#endif
} }
void igb_reinit_locked(struct igb_adapter *adapter) void igb_reinit_locked(struct igb_adapter *adapter)
@@ -1457,9 +1462,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
if (dca_add_requester(&pdev->dev) == 0) { if (dca_add_requester(&pdev->dev) == 0) {
adapter->flags |= IGB_FLAG_DCA_ENABLED; adapter->flags |= IGB_FLAG_DCA_ENABLED;
dev_info(&pdev->dev, "DCA enabled\n"); dev_info(&pdev->dev, "DCA enabled\n");
/* Always use CB2 mode, difference is masked
* in the CB driver. */
wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_CB2);
igb_setup_dca(adapter); igb_setup_dca(adapter);
} }
#endif #endif
@@ -3771,11 +3773,15 @@ static void igb_update_tx_dca(struct igb_ring *tx_ring)
static void igb_setup_dca(struct igb_adapter *adapter) static void igb_setup_dca(struct igb_adapter *adapter)
{ {
struct e1000_hw *hw = &adapter->hw;
int i; int i;
if (!(adapter->flags & IGB_FLAG_DCA_ENABLED)) if (!(adapter->flags & IGB_FLAG_DCA_ENABLED))
return; return;
/* Always use CB2 mode, difference is masked in the CB driver. */
wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_CB2);
for (i = 0; i < adapter->num_tx_queues; i++) { for (i = 0; i < adapter->num_tx_queues; i++) {
adapter->tx_ring[i].cpu = -1; adapter->tx_ring[i].cpu = -1;
igb_update_tx_dca(&adapter->tx_ring[i]); igb_update_tx_dca(&adapter->tx_ring[i]);