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

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

Merge "wil6210: add oob_mode for AP certification" into msm-4.9

parents cc603308 42ce0aa2

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

+18 −6
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ bool debug_fw; /* = false; */ 
module_param(debug_fw, bool, 0444);

MODULE_PARM_DESC(debug_fw, " do not perform card reset. For FW debug");



static bool oob_mode;

module_param(oob_mode, bool, 0444);

static u8 oob_mode;

module_param(oob_mode, byte, 0444);

MODULE_PARM_DESC(oob_mode,

		 " enable out of the box (OOB) mode in FW, for diagnostics and certification");
@@ -628,13 +628,25 @@ static inline void wil_release_cpu(struct wil6210_priv *wil) 
	wil_w(wil, RGF_USER_USER_CPU_0, 1);

}



static void wil_set_oob_mode(struct wil6210_priv *wil, bool enable)

static void wil_set_oob_mode(struct wil6210_priv *wil, u8 mode)

{

	wil_info(wil, "enable=%d\n", enable);

	if (enable)

	wil_info(wil, "oob_mode to %d\n", mode);

	switch (mode) {

	case 0:

		wil_c(wil, RGF_USER_USAGE_6, BIT_USER_OOB_MODE |

		      BIT_USER_OOB_R2_MODE);

		break;

	case 1:

		wil_c(wil, RGF_USER_USAGE_6, BIT_USER_OOB_R2_MODE);

		wil_s(wil, RGF_USER_USAGE_6, BIT_USER_OOB_MODE);

	else

		break;

	case 2:

		wil_c(wil, RGF_USER_USAGE_6, BIT_USER_OOB_MODE);

		wil_s(wil, RGF_USER_USAGE_6, BIT_USER_OOB_R2_MODE);

		break;

	default:

		wil_err(wil, "invalid oob_mode: %d\n", mode);

	}

}



static int wil_target_reset(struct wil6210_priv *wil)

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

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct RGF_ICR { 
#define RGF_USER_USAGE_1		(0x880004)

#define RGF_USER_USAGE_6		(0x880018)

	#define BIT_USER_OOB_MODE		BIT(31)

	#define BIT_USER_OOB_R2_MODE		BIT(30)

#define RGF_USER_USAGE_8		(0x880020)

	#define BIT_USER_PREVENT_DEEP_SLEEP	BIT(0)

	#define BIT_USER_SUPPORT_T_POWER_ON_0	BIT(1)