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

Commit f81c1f48 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: enable shadow register 



For 6000 series devices and up, enable automatic update MAC's register
for better power usage in PSP mode

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6fe8efb2

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

+3 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ static struct iwl_base_params iwl6000_base_params = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.shadow_reg_enable = true,

};



static struct iwl_base_params iwl6050_base_params = {
@@ -510,6 +511,7 @@ static struct iwl_base_params iwl6050_base_params = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.shadow_reg_enable = true,

};

static struct iwl_base_params iwl6000_coex_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,
@@ -532,6 +534,7 @@ static struct iwl_base_params iwl6000_coex_base_params = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.shadow_reg_enable = true,

};



static struct iwl_ht_params iwl6000_ht_params = {

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+6 −0
Original line number Diff line number Diff line
@@ -753,6 +753,12 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) 
	} else

		iwlagn_txq_ctx_reset(priv);



	if (priv->cfg->base_params->shadow_reg_enable) {

		/* enable shadow regs in HW */

		iwl_set_bit(priv, CSR_MAC_SHADOW_REG_CTRL,

			0x800FFFFF);

	}



	set_bit(STATUS_INIT, &priv->status);



	return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ struct iwl_mod_params { 
 *	sensitivity calibration operation

 * @chain_noise_calib_by_driver: driver has the capability to perform

 *	chain noise calibration operation

 * @shadow_reg_enable: HW shadhow register bit

*/

struct iwl_base_params {

	int eeprom_size;
@@ -320,6 +321,7 @@ struct iwl_base_params { 
	const bool ucode_tracing;

	const bool sensitivity_calib_by_driver;

	const bool chain_noise_calib_by_driver;

	const bool shadow_reg_enable;

};

/*

 * @advanced_bt_coexist: support advanced bt coexist

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

+2 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ 


#define CSR_LED_REG             (CSR_BASE+0x094)

#define CSR_DRAM_INT_TBL_REG	(CSR_BASE+0x0A0)

#define CSR_MAC_SHADOW_REG_CTRL	(CSR_BASE+0x0A8) /* 6000 and up */





/* GIO Chicken Bits (PCI Express bus link power management) */

#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)

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

+27 −18
Original line number Diff line number Diff line
@@ -134,28 +134,37 @@ void iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q 
	if (q->need_update == 0)

		goto exit_unlock;



	if (priv->cfg->base_params->shadow_reg_enable) {

		/* shadow register enabled */

		/* Device expects a multiple of 8 */

		q->write_actual = (q->write & ~0x7);

		iwl_write32(priv, rx_wrt_ptr_reg, q->write_actual);

	} else {

		/* If power-saving is in use, make sure device is awake */

		if (test_bit(STATUS_POWER_PMI, &priv->status)) {

			reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);



			if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {

			IWL_DEBUG_INFO(priv, "Rx queue requesting wakeup, GP1 = 0x%x\n",

				      reg);

				IWL_DEBUG_INFO(priv,

					"Rx queue requesting wakeup,"

					" GP1 = 0x%x\n", reg);

				iwl_set_bit(priv, CSR_GP_CNTRL,

					CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

				goto exit_unlock;

			}



			q->write_actual = (q->write & ~0x7);

		iwl_write_direct32(priv, rx_wrt_ptr_reg, q->write_actual);

			iwl_write_direct32(priv, rx_wrt_ptr_reg,

					q->write_actual);



		/* Else device is assumed to be awake */

		} else {

			/* Device expects a multiple of 8 */

			q->write_actual = (q->write & ~0x7);

		iwl_write32(priv, rx_wrt_ptr_reg, q->write_actual);

			iwl_write_direct32(priv, rx_wrt_ptr_reg,

				q->write_actual);

		}

	}



	q->need_update = 0;



 exit_unlock: