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

Commit ac65591d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: clear PAL_UNIT_ICR part of device reset"

parents cdfeb183 8b16b3ab

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

+2 −0
Original line number Diff line number Diff line
@@ -947,6 +947,8 @@ static void wil_pre_fw_config(struct wil6210_priv *wil) 
	/* it is W1C, clear by writing back same value */

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

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

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

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



	if (wil->fw_calib_result > 0) {

		__le32 val = cpu_to_le32(wil->fw_calib_result |

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

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ struct RGF_ICR { 
	#define BIT_DMA_PSEUDO_CAUSE_MISC	BIT(2)



#define RGF_HP_CTRL			(0x88265c)

#define RGF_PAL_UNIT_ICR		(0x88266c) /* struct RGF_ICR */

#define RGF_PCIE_LOS_COUNTER_CTL	(0x882dc4)



/* MAC timer, usec, for packet lifetime */