rsi: disable fw watchdog timer during reset

Firmware's watchdog timer should be disabled as a part of reset
sequence. This change fixes a firmware hang issue observed during
stress tests.

Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 7b8bae313aa9302a02c16109a8f73ec776f9152b..b065438f51b24b991cb21225a4801fcb4e49dc68 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -687,6 +687,13 @@ static int rsi_reset_card(struct rsi_hw *adapter)
         */
        msleep(100);
 
+       if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
+                                    RSI_FW_WDT_DISABLE_REQ,
+                                    RSI_COMMON_REG_SIZE) < 0) {
+               rsi_dbg(ERR_ZONE, "Disabling firmware watchdog timer failed\n");
+               goto fail;
+       }
+
        ret = usb_ulp_read_write(adapter, RSI_WATCH_DOG_TIMER_1,
                                 RSI_ULP_WRITE_2, 32);
        if (ret < 0)

diff --git a/drivers/net/wireless/rsi/rsi_hal.h b/drivers/net/wireless/rsi/rsi_hal.h
index d6c2baa56e9f6602facacd809ea24b699f4d24c9..327638cdd30b1e746d4afe33309480dcaca8b7ca 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_hal.h
+++ b/drivers/net/wireless/rsi/rsi_hal.h
@@ -115,6 +115,7 @@
 #define FW_FLASH_OFFSET                        0x820
 #define LMAC_VER_OFFSET                        (FW_FLASH_OFFSET + 0x200)
 #define MAX_DWORD_ALIGN_BYTES          64
+#define RSI_COMMON_REG_SIZE            2
 
 struct bl_header {
        __le32 flags;

diff --git a/drivers/net/wireless/rsi/rsi_usb.h b/drivers/net/wireless/rsi/rsi_usb.h
index a88d59295a985a764592605fa4904010f5bde0f0..b6fe79f0a513938a2a4757318dc1eaa2dcd28fe0 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_usb.h
+++ b/drivers/net/wireless/rsi/rsi_usb.h
@@ -26,6 +26,7 @@
 #define RSI_USB_READY_MAGIC_NUM      0xab
 #define FW_STATUS_REG                0x41050012
 #define RSI_TA_HOLD_REG              0x22000844
+#define RSI_FW_WDT_DISABLE_REQ      0x69
 
 #define USB_VENDOR_REGISTER_READ     0x15
 #define USB_VENDOR_REGISTER_WRITE    0x16