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

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

ixgbe: Default to 1 pool always being allocated 



We might as well configure the limit to default to 1 pool always for the
interface. This accounts for the fact that the PF counts as 1 pool if
SR-IOV is enabled, and in general we are always running in 1 pool mode when
RSS or DCB is enabled as well, though we don't need to actually evaluate
any of the VMDq features in those cases.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4a2512cf

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

+1 −0
Original line number Diff line number Diff line
@@ -6129,6 +6129,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter, 
	fdir = min_t(int, IXGBE_MAX_FDIR_INDICES, num_online_cpus());

	adapter->ring_feature[RING_F_FDIR].limit = fdir;

	adapter->fdir_pballoc = IXGBE_FDIR_PBALLOC_64K;

	adapter->ring_feature[RING_F_VMDQ].limit = 1;

#ifdef CONFIG_IXGBE_DCA

	adapter->flags |= IXGBE_FLAG_DCA_CAPABLE;

#endif

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

+2 −5
Original line number Diff line number Diff line
@@ -78,12 +78,9 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter, 
	struct ixgbe_hw *hw = &adapter->hw;

	int i;



	adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;



	/* Enable VMDq flag so device will be set in VM mode */

	adapter->flags |= IXGBE_FLAG_VMDQ_ENABLED;

	if (!adapter->ring_feature[RING_F_VMDQ].limit)

		adapter->ring_feature[RING_F_VMDQ].limit = 1;

	adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED |

			  IXGBE_FLAG_VMDQ_ENABLED;



	/* Allocate memory for per VF control structures */

	adapter->vfinfo = kcalloc(num_vfs, sizeof(struct vf_data_storage),