qlcnic: Allow a predefined set of capture masks for FW dump

o 0x3, 0x7, 0xF, 0x1F, 0x3F, 0x7F and 0xFF are the allowed capture masks.
o Updated driver version to 5.0.28

Signed-off-by: Manish chopra <manish.chopra@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index a7e2f7453b90bd1c9724f3fb9163e3bfaef00d64..8680a5dae4a2e175e18dc91cbe4f204f135915a6 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 27
-#define QLCNIC_LINUX_VERSIONID  "5.0.27"
+#define _QLCNIC_LINUX_SUBVERSION 28
+#define QLCNIC_LINUX_VERSIONID  "5.0.28"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                 (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 5f2ad819a5174dd87efa91b7b7e845a91408a0fd..735423f7273f8a92db39c3c91af97c9b064dd5fa 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -1278,7 +1278,7 @@ qlcnic_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 static int
 qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 {
-       int ret = 0;
+       int i;
        struct qlcnic_adapter *adapter = netdev_priv(netdev);
        struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
        u32 state;
@@ -1291,12 +1291,12 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                }
                if (!fw_dump->enable) {
                        netdev_info(netdev, "FW dump not enabled\n");
-                       return ret;
+                       return 0;
                }
                if (fw_dump->clr) {
                        netdev_info(netdev,
                        "Previous dump not cleared, not forcing dump\n");
-                       return ret;
+                       return 0;
                }
                netdev_info(netdev, "Forcing a FW dump\n");
                qlcnic_dev_request_reset(adapter);
@@ -1306,7 +1306,7 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                        netdev_info(netdev, "Disabling FW dump\n");
                        fw_dump->enable = 0;
                }
-               return ret;
+               return 0;
        case QLCNIC_ENABLE_FW_DUMP:
                if (!fw_dump->tmpl_hdr) {
                        netdev_err(netdev, "FW dump not supported\n");
@@ -1316,34 +1316,36 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
                        netdev_info(netdev, "Enabling FW dump\n");
                        fw_dump->enable = 1;
                }
-               return ret;
+               return 0;
        case QLCNIC_FORCE_FW_RESET:
                netdev_info(netdev, "Forcing a FW reset\n");
                qlcnic_dev_request_reset(adapter);
                adapter->flags &= ~QLCNIC_FW_RESET_OWNER;
-               return ret;
+               return 0;
        case QLCNIC_SET_QUIESCENT:
        case QLCNIC_RESET_QUIESCENT:
                state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);
                if (state == QLCNIC_DEV_FAILED || (state == QLCNIC_DEV_BADBAD))
                        netdev_info(netdev, "Device in FAILED state\n");
-               return ret;
+               return 0;
        default:
                if (!fw_dump->tmpl_hdr) {
                        netdev_err(netdev, "FW dump not supported\n");
                        return -ENOTSUPP;
                }
-               if (val->flag > QLCNIC_DUMP_MASK_MAX ||
-                       val->flag < QLCNIC_DUMP_MASK_MIN) {
-                               netdev_info(netdev,
-                               "Invalid dump level: 0x%x\n", val->flag);
-                               return -EINVAL;
+               for (i = 0; i < ARRAY_SIZE(FW_DUMP_LEVELS); i++) {
+                       if (val->flag == FW_DUMP_LEVELS[i]) {
+                               fw_dump->tmpl_hdr->drv_cap_mask =
+                                                       val->flag;
+                               netdev_info(netdev, "Driver mask changed to: 0x%x\n",
+                                       fw_dump->tmpl_hdr->drv_cap_mask);
+                               return 0;
+                       }
                }
-               fw_dump->tmpl_hdr->drv_cap_mask = val->flag & 0xff;
-               netdev_info(netdev, "Driver mask changed to: 0x%x\n",
-                       fw_dump->tmpl_hdr->drv_cap_mask);
+               netdev_info(netdev, "Invalid dump level: 0x%x\n", val->flag);
+               return -EINVAL;
        }
-       return ret;
+       return 0;
 }
 
 const struct ethtool_ops qlcnic_ethtool_ops = {

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index e6a77feeb44a0c80db64aca05dbccc61e5099be2..6ced3195aad3215c0a0033ac56a71aa6c78d3c54 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -778,6 +778,10 @@ struct qlcnic_legacy_intr_set {
 #define FLASH_ROM_WINDOW       0x42110030
 #define FLASH_ROM_DATA         0x42150000
 
+
+static const u32 FW_DUMP_LEVELS[] = {
+       0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
+
 static const u32 MIU_TEST_READ_DATA[] = {
        0x410000A8, 0x410000AC, 0x410000B8, 0x410000BC, };