diff options
| author | Piotr Marczak | 2019-04-24 14:20:52 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2019-06-14 22:03:08 +0200 |
| commit | c1041d07043748460f215386b760f3943f6890bb (patch) | |
| tree | f035c7963098d7dd0ad1a3c9dbf0d38025bb4fde /drivers/net/ethernet/intel/i40e | |
| parent | i40e: add input validation for virtchnl handlers (diff) | |
| download | kernel-qcow2-linux-c1041d07043748460f215386b760f3943f6890bb.tar.gz kernel-qcow2-linux-c1041d07043748460f215386b760f3943f6890bb.tar.xz kernel-qcow2-linux-c1041d07043748460f215386b760f3943f6890bb.zip | |
i40e: Missing response checks in driver when starting/stopping FW LLDP
Driver did not check response on LLDP flag change and always returned
SUCCESS.
This patch now checks for an error and returns an error code and has
additional information in the log.
Signed-off-by: Piotr Marczak <piotr.marczak@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index 7f7d04ab1515..e9ae95161ce4 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c @@ -4852,9 +4852,11 @@ static u32 i40e_get_priv_flags(struct net_device *dev) static int i40e_set_priv_flags(struct net_device *dev, u32 flags) { struct i40e_netdev_priv *np = netdev_priv(dev); + u64 orig_flags, new_flags, changed_flags; + enum i40e_admin_queue_err adq_err; struct i40e_vsi *vsi = np->vsi; struct i40e_pf *pf = vsi->back; - u64 orig_flags, new_flags, changed_flags; + i40e_status status; u32 i, j; orig_flags = READ_ONCE(pf->flags); @@ -5013,7 +5015,28 @@ flags_complete: dcbcfg->pfc.willing = 1; dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS; } else { - i40e_aq_start_lldp(&pf->hw, false, NULL); + status = i40e_aq_start_lldp(&pf->hw, false, NULL); + if (status) { + adq_err = pf->hw.aq.asq_last_status; + switch (adq_err) { + case I40E_AQ_RC_EEXIST: + dev_warn(&pf->pdev->dev, + "FW LLDP agent is already running\n"); + return 0; + case I40E_AQ_RC_EPERM: + dev_warn(&pf->pdev->dev, + "Device configuration forbids SW from starting the LLDP agent.\n"); + return -EINVAL; + default: + dev_warn(&pf->pdev->dev, + "Starting FW LLDP agent failed: error: %s, %s\n", + i40e_stat_str(&pf->hw, + status), + i40e_aq_str(&pf->hw, + adq_err)); + return -EINVAL; + } + } } } |