On 10/18/2023 2:15 PM, Justin Bronder wrote:
> In Tables 8-12 and 8-22 in the X710/XXV710/XL710 datasheet, the QLEN
> description states that the maximum size of the descriptor queue is 8k
> minus 32, or 8160.
>
> Signed-off-by: Justin Bronder <jsbron...@cold-front.org>
Seems reasonable to me, this matches the limit for E800 series as well.
Curious if anyone remembers any particular reason this wasn't
implemented before?
Reviewed-by: Jacob Keller <jacob.e.kel...@intel.com>
Thanks,
Jake
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 1 +
> .../net/ethernet/intel/i40e/i40e_ethtool.c | 23 +++++++++++++++----
> 2 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h
> b/drivers/net/ethernet/intel/i40e/i40e.h
> index 6e310a539467..ad261fa00d4c 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -50,6 +50,7 @@
> #define I40E_MAX_VEB 16
>
> #define I40E_MAX_NUM_DESCRIPTORS 4096
> +#define I40E_MAX_NUM_DESCRIPTORS_XL710 8160
> #define I40E_MAX_CSR_SPACE (4 * 1024 * 1024 - 64 * 1024)
> #define I40E_DEFAULT_NUM_DESCRIPTORS 512
> #define I40E_REQ_DESCRIPTOR_MULTIPLE 32
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> index afc4fa8c66af..338c8f1acc1a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> @@ -2013,6 +2013,18 @@ static void i40e_get_drvinfo(struct net_device *netdev,
> drvinfo->n_priv_flags += I40E_GL_PRIV_FLAGS_STR_LEN;
> }
>
> +static u32 i40e_get_max_num_descriptors(struct i40e_pf *pf)
> +{
> + struct i40e_hw *hw = &pf->hw;
> +
> + switch (hw->mac.type) {
> + case I40E_MAC_XL710:
> + return I40E_MAX_NUM_DESCRIPTORS_XL710;
> + default:
> + return I40E_MAX_NUM_DESCRIPTORS;
> + }
> +}
> +
> static void i40e_get_ringparam(struct net_device *netdev,
> struct ethtool_ringparam *ring,
> struct kernel_ethtool_ringparam *kernel_ring,
> @@ -2022,8 +2034,8 @@ static void i40e_get_ringparam(struct net_device
> *netdev,
> struct i40e_pf *pf = np->vsi->back;
> struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
>
> - ring->rx_max_pending = I40E_MAX_NUM_DESCRIPTORS;
> - ring->tx_max_pending = I40E_MAX_NUM_DESCRIPTORS;
> + ring->rx_max_pending = i40e_get_max_num_descriptors(pf);
> + ring->tx_max_pending = i40e_get_max_num_descriptors(pf);
> ring->rx_mini_max_pending = 0;
> ring->rx_jumbo_max_pending = 0;
> ring->rx_pending = vsi->rx_rings[0]->count;
> @@ -2057,18 +2069,19 @@ static int i40e_set_ringparam(struct net_device
> *netdev,
> u16 tx_alloc_queue_pairs;
> int timeout = 50;
> int i, err = 0;
> + u32 max_num_descriptors = i40e_get_max_num_descriptors(pf);
>
> if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
> return -EINVAL;
>
> - if (ring->tx_pending > I40E_MAX_NUM_DESCRIPTORS ||
> + if (ring->tx_pending > max_num_descriptors ||
> ring->tx_pending < I40E_MIN_NUM_DESCRIPTORS ||
> - ring->rx_pending > I40E_MAX_NUM_DESCRIPTORS ||
> + ring->rx_pending > max_num_descriptors ||
> ring->rx_pending < I40E_MIN_NUM_DESCRIPTORS) {
> netdev_info(netdev,
> "Descriptors requested (Tx: %d / Rx: %d) out of
> range [%d-%d]\n",
> ring->tx_pending, ring->rx_pending,
> - I40E_MIN_NUM_DESCRIPTORS, I40E_MAX_NUM_DESCRIPTORS);
> + I40E_MIN_NUM_DESCRIPTORS, max_num_descriptors);
> return -EINVAL;
> }
>
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
