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

Commit ccb2390e authored by Maya Erez's avatar Maya Erez Committed by Greg Kroah-Hartman
Browse files

wil6210: fix RGF_CAF_ICR address for Talyn-MB 



[ Upstream commit 7c69709f8ed27197b16aa1c3f9b0744402b2fa02 ]

RGF_CAF_ICR register location has changed in Talyn-MB.
Add RGF_CAF_ICR_TALYN_MB to support the new address.

Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0e1304ae

drivers/net/wireless/ath/wil6210/main.c

+9 −2
Original line number Diff line number Diff line
@@ -1397,8 +1397,15 @@ static void wil_pre_fw_config(struct wil6210_priv *wil) 
	wil6210_clear_irq(wil);

	/* CAF_ICR - clear and mask */

	/* it is W1C, clear by writing back same value */

	if (wil->hw_version < HW_VER_TALYN_MB) {

		wil_s(wil, RGF_CAF_ICR + offsetof(struct RGF_ICR, ICR), 0);

		wil_w(wil, RGF_CAF_ICR + offsetof(struct RGF_ICR, IMV), ~0);

	} else {

		wil_s(wil,

		      RGF_CAF_ICR_TALYN_MB + offsetof(struct RGF_ICR, ICR), 0);

		wil_w(wil, RGF_CAF_ICR_TALYN_MB +

		      offsetof(struct RGF_ICR, IMV), ~0);

	}

	/* clear PAL_UNIT_ICR (potential D0->D3 leftover)

	 * In Talyn-MB host cannot access this register due to

	 * access control, hence PAL_UNIT_ICR is cleared by the FW

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ struct RGF_ICR { 
/* MAC timer, usec, for packet lifetime */

#define RGF_MAC_MTRL_COUNTER_0		(0x886aa8)



#define RGF_CAF_ICR_TALYN_MB		(0x8893d4) /* struct RGF_ICR */

#define RGF_CAF_ICR			(0x88946c) /* struct RGF_ICR */

#define RGF_CAF_OSC_CONTROL		(0x88afa4)

	#define BIT_CAF_OSC_XTAL_EN		BIT(0)