Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6bd5577 authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

e1000e: Driver workaround for IPv6 Header Extension Erratum. 



Previously, IPv6 extension header parsing was disabled for all devices
supported by e1000e when using packet split mode. However, as per a
silicon errata, only certain devices need this restriction and will need
to disable IPv6 extension header parsing for all modes.

Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 885fe7be

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+8 −0
Original line number Diff line number Diff line
@@ -944,6 +944,14 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw) 
	else

		reg |= (1 << 28);

	ew32(TARC(1), reg);



	/*

	 * Disable IPv6 extension header parsing because some malformed

	 * IPv6 headers can hang the Rx.

	 */

	reg = er32(RFCTL);

	reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);

	ew32(RFCTL, reg);

}



/**

drivers/net/ethernet/intel/e1000e/82571.c

+10 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,16 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw) 
		ew32(CTRL_EXT, reg);

	}



	/*

	 * Disable IPv6 extension header parsing because some malformed

	 * IPv6 headers can hang the Rx.

	 */

	if (hw->mac.type <= e1000_82573) {

		reg = er32(RFCTL);

		reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);

		ew32(RFCTL, reg);

	}



	/* PCI-Ex Control Registers */

	switch (hw->mac.type) {

	case e1000_82574:

drivers/net/ethernet/intel/e1000e/ich8lan.c

+7 −0
Original line number Diff line number Diff line
@@ -3468,6 +3468,13 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw) 
	 */

	reg = er32(RFCTL);

	reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);



	/*

	 * Disable IPv6 extension header parsing because some malformed

	 * IPv6 headers can hang the Rx.

	 */

	if (hw->mac.type == e1000_ich8lan)

		reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);

	ew32(RFCTL, reg);

}

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −8
Original line number Diff line number Diff line
@@ -2939,6 +2939,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
	/* Enable Extended Status in all Receive Descriptors */

	rfctl = er32(RFCTL);

	rfctl |= E1000_RFCTL_EXTEN;

	ew32(RFCTL, rfctl);



	/*

	 * 82571 and greater support packet-split where the protocol
@@ -2964,13 +2965,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
	if (adapter->rx_ps_pages) {

		u32 psrctl = 0;



		/*

		 * disable packet split support for IPv6 extension headers,

		 * because some malformed IPv6 headers can hang the Rx

		 */

		rfctl |= (E1000_RFCTL_IPV6_EX_DIS |

			  E1000_RFCTL_NEW_IPV6_EXT_DIS);



		/* Enable Packet split descriptors */

		rctl |= E1000_RCTL_DTYP_PS;
@@ -3009,7 +3003,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) 
		 */

	}



	ew32(RFCTL, rfctl);

	ew32(RCTL, rctl);

	/* just started the receive unit, no need to restart */

	adapter->flags &= ~FLAG_RX_RESTART_NOW;