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

Commit 421d954c authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Fix bit definitions and add support for testing for ipsec support 



This patch addresses two issues. First it adds the correct bit definitions
for the SECTXSTAT and SECRXSTAT registers. Then it makes use of those
definitions to test for if IPsec has been disabled on the part and if so we
do not enable it.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Reported-by: default avatarAndre Tomt <andre@tomt.net>
Acked-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e9f655ee

drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

+13 −1
Original line number Diff line number Diff line
@@ -975,10 +975,22 @@ void ixgbe_ipsec_rx(struct ixgbe_ring *rx_ring, 
 **/

void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_ipsec *ipsec;

	u32 t_dis, r_dis;

	size_t size;



	if (adapter->hw.mac.type == ixgbe_mac_82598EB)

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

		return;



	/* If there is no support for either Tx or Rx offload

	 * we should not be advertising support for IPsec.

	 */

	t_dis = IXGBE_READ_REG(hw, IXGBE_SECTXSTAT) &

		IXGBE_SECTXSTAT_SECTX_OFF_DIS;

	r_dis = IXGBE_READ_REG(hw, IXGBE_SECRXSTAT) &

		IXGBE_SECRXSTAT_SECRX_OFF_DIS;

	if (t_dis || r_dis)

		return;



	ipsec = kzalloc(sizeof(*ipsec), GFP_KERNEL);

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+4 −2
Original line number Diff line number Diff line
@@ -599,13 +599,15 @@ struct ixgbe_nvm_version { 
#define IXGBE_SECTXCTRL_STORE_FORWARD   0x00000004



#define IXGBE_SECTXSTAT_SECTX_RDY       0x00000001

#define IXGBE_SECTXSTAT_ECC_TXERR       0x00000002

#define IXGBE_SECTXSTAT_SECTX_OFF_DIS   0x00000002

#define IXGBE_SECTXSTAT_ECC_TXERR       0x00000004



#define IXGBE_SECRXCTRL_SECRX_DIS       0x00000001

#define IXGBE_SECRXCTRL_RX_DIS          0x00000002



#define IXGBE_SECRXSTAT_SECRX_RDY       0x00000001

#define IXGBE_SECRXSTAT_ECC_RXERR       0x00000002

#define IXGBE_SECRXSTAT_SECRX_OFF_DIS   0x00000002

#define IXGBE_SECRXSTAT_ECC_RXERR       0x00000004



/* LinkSec (MacSec) Registers */

#define IXGBE_LSECTXCAP         0x08A00