bnxt_en: fix ethtool_reset_flags ABI violations

The ethtool ABI specifies that the reset operation should only clear
the flags that were actually reset. Setting the flags to zero after
a chip reset violates this because it does not include resetting the
application processor complex. Similarly, components that are not yet
defined are also not necessarily being reset.

The fact that chip reset does not cover the AP also means that it is
inappropriate to treat these two components exclusively of one another.
The ABI provides a mechanism to report a failure to reset independent
components via the returned bitmask, so it is also wrong to fail hard
if one of a set of independent resets is not possible.

It is incorrect to rely on the passed by reference flags in bnxt_reset(),
which are being updated as components are reset. The initially requested
value should be used instead so that hard errors do not propagate if any
earlier components could have been reset successfully.

Note, AP and chip resets are global in nature. Dedicated resets are
thus not currently supported.

Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index d99da82b6eff25662e64202847de45552a9d16c8..9937c216aa48b7706ed4b1984cf02b1ed7dd62d7 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -2999,7 +2999,10 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,
 static int bnxt_reset(struct net_device *dev, u32 *flags)
 {
        struct bnxt *bp = netdev_priv(dev);
-       int rc = 0;
+       u32 req = *flags;
+
+       if (!req)
+               return -EINVAL;
 
        if (!BNXT_PF(bp)) {
                netdev_err(dev, "Reset is not supported from a VF\n");
@@ -3013,33 +3016,33 @@ static int bnxt_reset(struct net_device *dev, u32 *flags)
                return -EBUSY;
        }
 
-       if (*flags == ETH_RESET_ALL) {
+       if ((req & BNXT_FW_RESET_CHIP) == BNXT_FW_RESET_CHIP) {
                /* This feature is not supported in older firmware versions */
-               if (bp->hwrm_spec_code < 0x10803)
-                       return -EOPNOTSUPP;
-
-               rc = bnxt_firmware_reset_chip(dev);
-               if (!rc) {
-                       netdev_info(dev, "Reset request successful.\n");
-                       if (!(bp->fw_cap & BNXT_FW_CAP_HOT_RESET))
-                               netdev_info(dev, "Reload driver to complete reset\n");
-                       *flags = 0;
+               if (bp->hwrm_spec_code >= 0x10803) {
+                       if (!bnxt_firmware_reset_chip(dev)) {
+                               netdev_info(dev, "Firmware reset request successful.\n");
+                               if (!(bp->fw_cap & BNXT_FW_CAP_HOT_RESET))
+                                       netdev_info(dev, "Reload driver to complete reset\n");
+                               *flags &= ~BNXT_FW_RESET_CHIP;
+                       }
+               } else if (req == BNXT_FW_RESET_CHIP) {
+                       return -EOPNOTSUPP; /* only request, fail hard */
                }
-       } else if (*flags == ETH_RESET_AP) {
-               /* This feature is not supported in older firmware versions */
-               if (bp->hwrm_spec_code < 0x10803)
-                       return -EOPNOTSUPP;
+       }
 
-               rc = bnxt_firmware_reset_ap(dev);
-               if (!rc) {
-                       netdev_info(dev, "Reset Application Processor request successful.\n");
-                       *flags = 0;
+       if (req & BNXT_FW_RESET_AP) {
+               /* This feature is not supported in older firmware versions */
+               if (bp->hwrm_spec_code >= 0x10803) {
+                       if (!bnxt_firmware_reset_ap(dev)) {
+                               netdev_info(dev, "Reset application processor successful.\n");
+                               *flags &= ~BNXT_FW_RESET_AP;
+                       }
+               } else if (req == BNXT_FW_RESET_AP) {
+                       return -EOPNOTSUPP; /* only request, fail hard */
                }
-       } else {
-               rc = -EINVAL;
        }
 
-       return rc;
+       return 0;
 }
 
 static int bnxt_hwrm_dbg_dma_data(struct bnxt *bp, void *msg, int msg_len,

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
index 3576d951727b6ff6986f88d300bfb6a8294aee3b..ce7585ff9e4ddac0a67fe48f168fccc2a1bdf58e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
@@ -77,8 +77,12 @@ struct hwrm_dbg_cmn_output {
 #define BNXT_LED_DFLT_ENABLES(x)                       \
        cpu_to_le32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))
 
-#define BNXT_FW_RESET_AP       0xfffe
-#define BNXT_FW_RESET_CHIP     0xffff
+#define BNXT_FW_RESET_AP       (ETH_RESET_AP << ETH_RESET_SHARED_SHIFT)
+#define BNXT_FW_RESET_CHIP     ((ETH_RESET_MGMT | ETH_RESET_IRQ |      \
+                                 ETH_RESET_DMA | ETH_RESET_FILTER |    \
+                                 ETH_RESET_OFFLOAD | ETH_RESET_MAC |   \
+                                 ETH_RESET_PHY | ETH_RESET_RAM)        \
+                                << ETH_RESET_SHARED_SHIFT)
 
 extern const struct ethtool_ops bnxt_ethtool_ops;