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

Commit 6dcc28b9 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

ixgbe: fully disable hardware RSC logic when disabling RSC 



This patch modifies the configure_rx path in order to properly disable RSC
hardware logic when the user disables it. Previously we only disabled RSC in the
queue settings, but this does not fully disable hardware RSC logic which can
lead to some unexpected performance issues.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 38463e2c

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

+8 −1
Original line number Diff line number Diff line
@@ -3571,7 +3571,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
{

	struct ixgbe_hw *hw = &adapter->hw;

	int i;

	u32 rxctrl;

	u32 rxctrl, rfctl;



	/* disable receives while setting up the descriptors */

	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
@@ -3580,6 +3580,13 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
	ixgbe_setup_psrtype(adapter);

	ixgbe_setup_rdrxctl(adapter);



	/* RSC Setup */

	rfctl = IXGBE_READ_REG(hw, IXGBE_RFCTL);

	rfctl &= ~IXGBE_RFCTL_RSC_DIS;

	if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED))

		rfctl |= IXGBE_RFCTL_RSC_DIS;

	IXGBE_WRITE_REG(hw, IXGBE_RFCTL, rfctl);



	/* Program registers for the distribution of queues */

	ixgbe_setup_mrqc(adapter);

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

+1 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,7 @@ enum { 
#define IXGBE_RFCTL_ISCSI_DIS       0x00000001

#define IXGBE_RFCTL_ISCSI_DWC_MASK  0x0000003E

#define IXGBE_RFCTL_ISCSI_DWC_SHIFT 1

#define IXGBE_RFCTL_RSC_DIS		0x00000020

#define IXGBE_RFCTL_NFSW_DIS        0x00000040

#define IXGBE_RFCTL_NFSR_DIS        0x00000080

#define IXGBE_RFCTL_NFS_VER_MASK    0x00000300