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

Commit 50619ac9 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: do not reload fw if WiMAX own the RF 



For WiFi/WiMAX combo devices, if WiMAX own the RF, WiFi driver
try to access RF and fail. This is the W/A to To avoid WiFi keep
reloading firmware and try to access RF again.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 33c68770

drivers/net/wireless/iwlwifi/iwl-5000.c

+3 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -608,6 +609,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl5150_abg_cfg = {
@@ -622,6 +624,7 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.base_params = &iwl5000_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-6000.c

+3 −0
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl6150_bgn_cfg = {
@@ -797,6 +798,7 @@ struct iwl_cfg iwl6150_bgn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl6050_2abg_cfg = {
@@ -811,6 +813,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.base_params = &iwl6050_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl6000_3agn_cfg = {

drivers/net/wireless/iwlwifi/iwl-core.c

+16 −0
Original line number Diff line number Diff line
@@ -957,6 +957,22 @@ void iwl_irq_handle_error(struct iwl_priv *priv) 
	/* Cancel currently queued command. */

	clear_bit(STATUS_HCMD_ACTIVE, &priv->status);



	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */

	if (priv->cfg->internal_wimax_coex &&

	    (!(iwl_read_prph(priv, APMG_CLK_CTRL_REG) &

			APMS_CLK_VAL_MRB_FUNC_MODE) ||

	     (iwl_read_prph(priv, APMG_PS_CTRL_REG) &

			APMG_PS_CTRL_VAL_RESET_REQ))) {

		wake_up_interruptible(&priv->wait_command_queue);

		/*

		 *Keep the restart process from trying to send host

		 * commands by clearing the INIT status bit

		 */

		clear_bit(STATUS_READY, &priv->status);

		IWL_ERR(priv, "RF is used by WiMAX\n");

		return;

	}



	IWL_ERR(priv, "Loaded firmware version: %s\n",

		priv->hw->wiphy->fw_version);

drivers/net/wireless/iwlwifi/iwl-core.h

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ struct iwl_ht_params { 
 * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)

 * @adv_pm: advance power management

 * @rx_with_siso_diversity: 1x1 device with rx antenna diversity

 * @internal_wimax_coex: internal wifi/wimax combo device

 *

 * We enable the driver to be backward compatible wrt API version. The

 * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -414,6 +415,7 @@ struct iwl_cfg { 
	enum iwl_led_mode led_mode;

	const bool adv_pm;

	const bool rx_with_siso_diversity;

	const bool internal_wimax_coex;

};



/***************************

drivers/net/wireless/iwlwifi/iwl-prph.h

+1 −1
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ 
#define APMG_DIGITAL_SVR_REG		(APMG_BASE + 0x0058)

#define APMG_ANALOG_SVR_REG		(APMG_BASE + 0x006C)



#define APMS_CLK_VAL_MRB_FUNC_MODE	(0x00000001)

#define APMG_CLK_VAL_DMA_CLK_RQT	(0x00000200)

#define APMG_CLK_VAL_BSM_CLK_RQT	(0x00000800)





#define APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS	(0x00400000)

#define APMG_PS_CTRL_VAL_RESET_REQ		(0x04000000)

#define APMG_PS_CTRL_MSK_PWR_SRC		(0x03000000)