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

Commit d0b10249 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by David S. Miller
Browse files

i40e: Change firmware workaround 



Remove a workaround that is no longer necessary and implement
a better understanding of what firmware is returning in the MSI-X
vector count.  This makes it so that the driver ends up with the
right amount of queues when using all available MSI-X vectors.

Change-ID: I34e60cc71dcfb1b5412f37df956fedcc49ade187
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e15c9fa0

drivers/net/ethernet/intel/i40e/i40e.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ 
#define I40E_BASE_VSI_SEID    512

#define I40E_BASE_VSI_SEID    512

#define I40E_BASE_VEB_SEID    288

#define I40E_BASE_VEB_SEID    288

#define I40E_MAX_VEB          16

#define I40E_MAX_VEB          16

#define I40E_MAX_NPAR_QPS     32





#define I40E_MAX_NUM_DESCRIPTORS      4096

#define I40E_MAX_NUM_DESCRIPTORS      4096

#define I40E_MAX_REGISTER     0x800000

#define I40E_MAX_REGISTER     0x800000

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -4704,12 +4704,8 @@ static int i40e_get_capabilities(struct i40e_pf *pf) 
		}

		}

	} while (err);

	} while (err);





	if (pf->hw.revision_id == 0 && (pf->flags & I40E_FLAG_MFP_ENABLED)) {

	/* increment MSI-X count because current FW skips one */

		pf->hw.func_caps.num_msix_vectors += 1;

	pf->hw.func_caps.num_msix_vectors++;

		pf->hw.func_caps.num_tx_qp =

			min_t(int, pf->hw.func_caps.num_tx_qp,

			      I40E_MAX_NPAR_QPS);

	}





	if (pf->hw.debug_mask & I40E_DEBUG_USER)

	if (pf->hw.debug_mask & I40E_DEBUG_USER)

		dev_info(&pf->pdev->dev,

		dev_info(&pf->pdev->dev,