igb: PCIe devices do not need to unset MANC_ARP_ENA
Subsystems (2)
PATCH 1/2 igb: PCIe devices do not need to unset MANC_ARP_ENA
From: David Graham <[email protected]>
Users reported that ARP's were lost with igb. The problem is fixed by not enabling this manageability configuration bit.
None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically.
---
drivers/net/igb/igb_main.c | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-)
drivers/net/igb/igb_main.c +0 -28
@@ -606,9 +606,6 @@ static void igb_init_manageability(struct igb_adapter *adapter)u32 manc2h =rd32 (E1000_MANC2H );u32 manc =rd32 (E1000_MANC ); -/* disable hardware interception of ARP */ - manc &= ~(E1000_MANC_ARP_EN ); -/* enable receiving management packets to the host */ /* this will probably generate destination unreachable messages * from the host OS, but the packets will be handled on SMBUS */
@@ -623,25 +620,6 @@ static void igb_init_manageability(struct igb_adapter *adapter) } } -static void igb_release_manageability (struct igb_adapter *adapter) -{ -struct e1000_hw *hw = &adapter->hw; - -if (adapter->en_mng_pt) { -u32 manc =rd32 (E1000_MANC ); - -/* re-enable hardware interception of ARP */ - manc |=E1000_MANC_ARP_EN ; - manc &= ~E1000_MANC_EN_MNG2HOST ; - -/* don't explicitly have to mess with MANC2H since -* MANC has an enable disable that gates MANC2H */ - -/* XXX stop the hardware watchdog ? */ -wr32 (E1000_MANC , manc); - } -} -/** * igb_configure - configure the hardware for RX and TX * @adapter: private board structure
@@ -844,7 +822,6 @@ void igb_reset(struct igb_adapter *adapter)igb_reset_adaptive (&adapter->hw); adapter->hw.phy.ops.get_phy_info (&adapter->hw); -igb_release_manageability (adapter); }/**
@@ -1178,9 +1155,6 @@ static void __devexit igb_remove(struct pci_dev *pdev)flush_scheduled_work (); - -igb_release_manageability (adapter); -/* Release control of h/w to f/w. If f/w is AMT enabled, this * would have already happened in close and is redundant. */ igb_release_hw_control (adapter);
@@ -3955,8 +3929,6 @@ static int igb_suspend(struct pci_dev *pdev, pm_message_t state)pci_enable_wake (pdev, PCI_D3cold,0 ); } -igb_release_manageability (adapter); -/* make sure adapter isn't asleep if manageability is enabled */ if (adapter->en_mng_pt) {pci_enable_wake (pdev, PCI_D3hot,1 );
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 2/2 e1000e: PCIe devices do not need to unset MANC_ARP_ENA
From: David Graham <[email protected]>
Users reported that ARP's were lost with e1000e. The problem is fixed by not enabling this manageability configuration bit.
None of the release_manageability code is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically.
---
drivers/net/e1000e/netdev.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-)
drivers/net/e1000e/netdev.c +0 -26
@@ -1055,23 +1055,6 @@ static void e1000_release_hw_control(struct e1000_adapter *adapter) } } -static void e1000_release_manageability (struct e1000_adapter *adapter) -{ -if (adapter->flags &FLAG_MNG_PT_ENABLED ) { -struct e1000_hw *hw = &adapter->hw; - -u32 manc =er32 (MANC ); - -/* re-enable hardware interception of ARP */ - manc |=E1000_MANC_ARP_EN ; - manc &= ~E1000_MANC_EN_MNG2HOST ; - -/* don't explicitly have to mess with MANC2H since -* MANC has an enable disable that gates MANC2H */ -ew32 (MANC , manc); - } -} -/** * @e1000_alloc_ring - allocate memory for a ring structure **/
@@ -1561,9 +1544,6 @@ static void e1000_init_manageability(struct e1000_adapter *adapter) manc =er32 (MANC ); -/* disable hardware interception of ARP */ - manc &= ~(E1000_MANC_ARP_EN ); -/* enable receiving management packets to the host. this will probably * generate destination unreachable messages from the host OS, but * the packets will be handled on SMBUS */
@@ -2140,8 +2120,6 @@ void e1000e_reset(struct e1000_adapter *adapter) phy_data &= ~IGP02E1000_PM_SPD ;e1e_wphy (hw,IGP02E1000_PHY_POWER_MGMT , phy_data); } - -e1000_release_manageability (adapter); }int e1000e_up (struct e1000_adapter *adapter)
@@ -3487,8 +3465,6 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)pci_enable_wake (pdev, PCI_D3cold,0 ); } -e1000_release_manageability (adapter); -/* make sure adapter isn't asleep if manageability is enabled */ if (adapter->flags &FLAG_MNG_PT_ENABLED ) {pci_enable_wake (pdev, PCI_D3hot,1 );
@@ -4054,8 +4030,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev)flush_scheduled_work (); -e1000_release_manageability (adapter); -/* Release control of h/w to f/w. If f/w is AMT enabled, this * would have already happened in close and is redundant. */ e1000_release_hw_control (adapter);
Re: [PATCH 2/2] e1000e: PCIe devices do not need to unset MANC_ARP_ENA
Quoted 10 lines · Auke Kok
From: David Graham <[email protected]>
Users reported that ARP's were lost with e1000e. The problem is fixed by not enabling this manageability configuration bit.
None of the
release_manageabilitycode is actually needed as the normal device reset during a shutdown returns everthing to the right condition automatically.
Quoted 6 lines
Signed-off-by David Graham <[email protected]>Signed-off-by Auke Kok <[email protected]>---
drivers/net/e1000e/netdev.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-)
applied 1-2
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/