qlcnic: Add support to enable/disable FW dump capability

In certain situations, it may be required to not enable FW dump
capability. Add support to turn off/on FW dump capability.

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

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 58d7616eaee2c5b0b22694e8ae008267fb8abc28..0be84bdb55b88b82e2b259a98498ba12c500c709 100644 (file)
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -429,6 +429,7 @@ struct qlcnic_dump_template_hdr {
 
 struct qlcnic_fw_dump {
        u8      clr;    /* flag to indicate if dump is cleared */
+       u8      enable; /* enable/disable dump */
        u32     size;   /* total size of the dump */
        void    *data;  /* dump data area */
        struct  qlcnic_dump_template_hdr *tmpl_hdr;
@@ -1320,6 +1321,8 @@ enum op_codes {
 #define QLCNIC_DUMP_MASK_DEF           0x7f
 #define QLCNIC_DUMP_MASK_MAX           0xff
 #define QLCNIC_FORCE_FW_DUMP_KEY       0xdeadfeed
+#define QLCNIC_ENABLE_FW_DUMP          0xaddfeed
+#define QLCNIC_DISABLE_FW_DUMP         0xbadfeed
 
 struct qlcnic_dump_operations {
        enum op_codes opcode;

diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index be2dee155bd8ea94093134c13526d572d1d2b3bc..33f5c8a8b551c637ff0291ec4d81c6577be990b3 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -150,6 +150,7 @@ int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter)
                tmpl_hdr->drv_cap_mask = tmpl_hdr->cap_mask;
        else
                tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;
+       ahw->fw_dump.enable = 1;
 error:
        dma_free_coherent(&adapter->pdev->dev, temp_size, tmp_addr, tmp_addr_t);
        return err;

diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index e183ed2271b282729721d8c70e8124a68cb7028a..31f5cba622232c5f1b83513672f62261a136bf83 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -1019,8 +1019,27 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
        struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
 
        if (val->flag == QLCNIC_FORCE_FW_DUMP_KEY) {
+               if (!fw_dump->enable) {
+                       netdev_info(netdev, "FW dump not enabled\n");
+                       return ret;
+               }
+               if (fw_dump->clr) {
+                       dev_info(&adapter->pdev->dev,
+                       "Previous dump not cleared, not forcing dump\n");
+                       return ret;
+               }
                netdev_info(netdev, "Forcing a FW dump\n");
                qlcnic_dev_request_reset(adapter);
+       } else if (val->flag == QLCNIC_DISABLE_FW_DUMP) {
+               if (fw_dump->enable) {
+                       netdev_info(netdev, "Disabling FW dump\n");
+                       fw_dump->enable = 0;
+               }
+       } else if (val->flag == QLCNIC_ENABLE_FW_DUMP) {
+               if (!fw_dump->enable && fw_dump->tmpl_hdr) {
+                       netdev_info(netdev, "Enabling FW dump\n");
+                       fw_dump->enable = 1;
+               }
        } else {
                if (val->flag > QLCNIC_DUMP_MASK_MAX ||
                        val->flag < QLCNIC_DUMP_MASK_MIN) {

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 5dcb853224c996a74f0cc80ea696fdabffc57262..ac7f8a2f7d9caff4c10ddb1e7414fb4a8612be9e 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -2849,9 +2849,11 @@ skip_ack_check:
                qlcnic_api_unlock(adapter);
 
                rtnl_lock();
-               QLCDB(adapter, DRV, "Take FW dump\n");
-               qlcnic_dump_fw(adapter);
-               adapter->flags &= ~QLCNIC_FW_RESET_OWNER;
+               if (adapter->ahw->fw_dump.enable) {
+                       QLCDB(adapter, DRV, "Take FW dump\n");
+                       qlcnic_dump_fw(adapter);
+                       adapter->flags &= ~QLCNIC_FW_RESET_OWNER;
+               }
                rtnl_unlock();
                if (!adapter->nic_ops->start_firmware(adapter)) {
                        qlcnic_schedule_work(adapter, qlcnic_attach_work, 0);