Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d3bb7b authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

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: default avatarAmitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: default avatarSiva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 350fcdb8

drivers/net/wireless/rsi/rsi_91x_usb.c

+7 −0
Original line number Diff line number Diff line
@@ -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)

drivers/net/wireless/rsi/rsi_hal.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/rsi/rsi_usb.h

+1 −0
Original line number Diff line number Diff line
@@ -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