igb: resolve panic on shutdown when SR-IOV is enabled
Subsystems (2)
PATCH 1/1 igb: resolve panic on shutdown when SR-IOV is enabled
From: Alexander Duyck <[email protected]>
The setup_rctl call was making a call into the ring structure after it had been freed. This was causing a panic on shutdown. This call wasn't necessary since it is possible to get the needed index from adapter->vfs_allocated_count.
Signed-off-by Alexander Duyck <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/igb/igb_main.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
drivers/net/igb/igb_main.c +5 -7
@@ -2006,7 +2006,7 @@ static void igb_setup_rctl(struct igb_adapter *adapter)struct e1000_hw *hw = &adapter->hw;u32 rctl;u32 srrctl =0 ; -int i, j; +int i; rctl =rd32 (E1000_RCTL );
@@ -2071,8 +2071,6 @@ static void igb_setup_rctl(struct igb_adapter *adapter)if (adapter->vfs_allocated_count) {u32 vmolr; - j = adapter->rx_ring[0 ].reg_idx; -/* set all queue drop enable bits */ wr32 (E1000_QDE ,ALL_QUEUES ); srrctl |=E1000_SRRCTL_DROP_EN ;
@@ -2080,16 +2078,16 @@ static void igb_setup_rctl(struct igb_adapter *adapter)/* disable queue 0 to prevent tail write w/o re-config */ wr32 (E1000_RXDCTL (0 ),0 ); - vmolr =rd32 (E1000_VMOLR (j)); + vmolr =rd32 (E1000_VMOLR (adapter->vfs_allocated_count));if (rctl &E1000_RCTL_LPE ) vmolr |=E1000_VMOLR_LPE ; -if (adapter->num_rx_queues >0 ) +if (adapter->num_rx_queues >1 ) vmolr |=E1000_VMOLR_RSSE ; -wr32 (E1000_VMOLR (j), vmolr); +wr32 (E1000_VMOLR (adapter->vfs_allocated_count), vmolr); }for (i =0 ; i < adapter->num_rx_queues; i++) { - j = adapter->rx_ring[i].reg_idx; +int j = adapter->rx_ring[i].reg_idx;wr32 (E1000_SRRCTL (j), srrctl); }
From: Jeff Kirsher <[email protected]>
Date: Wed, 06 May 2009 13:27:51 -0700
Quoted 7 lines
The
setup_rctlcall was making a call into the ring structure after it had been freed. This was causing a panic on shutdown. This call wasn't necessary since it is possible to get the needed index fromadapter->vfs_allocated_count.Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied, thanks!