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

Commit 8f0bb5ae authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi

parents b9d90578 6fe7dd0d

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

+2 −4
Original line number Diff line number Diff line
@@ -84,13 +84,13 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv) 
static void iwl1000_nic_config(struct iwl_priv *priv)

{

	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(bus(priv), CSR_HW_IF_CONFIG_REG,

	iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);



	/* Setting digital SVR for 1000 card to 1.32V */

	/* locking is acquired in iwl_set_bits_mask_prph() function */

	iwl_set_bits_mask_prph(bus(priv), APMG_DIGITAL_SVR_REG,

	iwl_set_bits_mask_prph(trans(priv), APMG_DIGITAL_SVR_REG,

				APMG_SVR_DIGITAL_VOLTAGE_1_32,

				~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);

}
@@ -128,8 +128,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;

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

+1 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void iwl2000_nic_config(struct iwl_priv *priv) 
	iwl_rf_config(priv);



	if (cfg(priv)->iq_invert)

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

		iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

			    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);

}
@@ -124,8 +124,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;

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

+1 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) 
	 * (PCIe power is lost before PERST# is asserted),

	 * causing ME FW to lose ownership and not being able to obtain it back.

	 */

	iwl_set_bits_mask_prph(bus(priv), APMG_PS_CTRL_REG,

	iwl_set_bits_mask_prph(trans(priv), APMG_PS_CTRL_REG,

				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,

				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
@@ -170,8 +170,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;
@@ -199,8 +197,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;

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

+4 −6
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv) 
{

	/* Indicate calibration version to uCode. */

	if (iwl_eeprom_calib_version(priv->shrd) >= 6)

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

		iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}
@@ -90,9 +90,9 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv) 
{

	/* Indicate calibration version to uCode. */

	if (iwl_eeprom_calib_version(priv->shrd) >= 6)

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

		iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

	iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

		    CSR_GP_DRIVER_REG_BIT_6050_1x2);

}
@@ -104,7 +104,7 @@ static void iwl6000_nic_config(struct iwl_priv *priv) 
	/* no locking required for register write */

	if (cfg(priv)->pa_type == IWL_PA_INTERNAL) {

		/* 2x2 IPA phy type */

		iwl_write32(bus(priv), CSR_GP_DRIVER_REG,

		iwl_write32(trans(priv), CSR_GP_DRIVER_REG,

			     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);

	}

	/* do additional nic configuration if needed */
@@ -145,8 +145,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;

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

+4 −4
Original line number Diff line number Diff line
@@ -628,16 +628,16 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv, 
	if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED |

		     CT_CARD_DISABLED)) {



		iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_SET,

		iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_SET,

			    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);



		iwl_write_direct32(bus(priv), HBUS_TARG_MBX_C,

		iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C,

					HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);



		if (!(flags & RXON_CARD_DISABLED)) {

			iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,

			iwl_write32(trans(priv), CSR_UCODE_DRV_GP1_CLR,

				    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);

			iwl_write_direct32(bus(priv), HBUS_TARG_MBX_C,

			iwl_write_direct32(trans(priv), HBUS_TARG_MBX_C,

					HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);

		}

		if (flags & CT_CARD_DISABLED)