From: Alan Brady Date: Wed, 27 Dec 2017 13:19:19 +0000 (-0500) Subject: i40e: fix FW_LLDP flag on init X-Git-Tag: Ubuntu-5.2.0-15.16~5092^2~32^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=64e1dcbb581d31e411e10fa95d8963fb89d34bf2;p=mirror_ubuntu-eoan-kernel.git i40e: fix FW_LLDP flag on init Using ethtool --set-priv-flags disable-fw-lldp is persistent across reboots/reloads so we need some mechanism in the driver to detect if it's on or off on init so we can set the ethtool private flag appropriately. Without this, every time the driver is reloaded the flag will default to off regardless of whether it's on or off in FW. We detect this by first attempting to program DCB and if AQ fails returning I40E_AQ_RC_EPERM, we know that LLDP is disabled in FW. Signed-off-by: Alan Brady Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index fdeaeb9d44e2..ed0870ff4be2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -6351,6 +6351,9 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) dev_dbg(&pf->pdev->dev, "DCBX offload is supported for this PF.\n"); } + } else if (pf->hw.aq.asq_last_status == I40E_AQ_RC_EPERM) { + dev_info(&pf->pdev->dev, "FW LLDP disabled for this PF.\n"); + pf->flags |= I40E_FLAG_DISABLE_FW_LLDP; } else { dev_info(&pf->pdev->dev, "Query for DCB configuration failed, err %s aq_err %s\n",