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

Commit fd656935 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: remove dereferences of priv from transport 



There are still quite a few, but much less.
A few fields have been moved /copied to hw_params which sits in the
shared area:
 * priv->cfg->base_params->num_of_ampdu_queues
 * priv->cfg->base_params->shadow_reg_enable
 * priv->cfg->sku
 * priv->ucode_owner

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f85a789

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

+2 −2
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ static int iwlagn_txq_agg_enable(struct iwl_priv *priv, int txq_id, int sta_id, 
{

	if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWLAGN_FIRST_AMPDU_QUEUE +

		priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {

		hw_params(priv).num_ampdu_queues <= txq_id)) {

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWLAGN_FIRST_AMPDU_QUEUE,

			IWLAGN_FIRST_AMPDU_QUEUE +

			priv->cfg->base_params->num_of_ampdu_queues - 1);

			hw_params(priv).num_ampdu_queues - 1);

		return -EINVAL;

	}

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

+7 −0
Original line number Diff line number Diff line
@@ -3207,6 +3207,13 @@ static int iwl_set_hw_params(struct iwl_priv *priv) 
	if (iwlagn_mod_params.disable_11n)

		priv->cfg->sku &= ~EEPROM_SKU_CAP_11N_ENABLE;



	hw_params(priv).num_ampdu_queues =

		priv->cfg->base_params->num_of_ampdu_queues;

	hw_params(priv).shadow_reg_enable =

		priv->cfg->base_params->shadow_reg_enable;

	hw_params(priv).sku =

		priv->cfg->sku;



	/* Device-specific setup */

	return priv->cfg->lib->set_hw_params(priv);

}

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

+0 −7
Original line number Diff line number Diff line
@@ -1056,10 +1056,6 @@ struct iwl_testmode_trace { 
};

#endif



/* uCode ownership */

#define IWL_OWNERSHIP_DRIVER	0

#define IWL_OWNERSHIP_TM	1



struct iwl_priv {



	/*data shared among all the driver's layers */
@@ -1147,9 +1143,6 @@ struct iwl_priv { 
	u32 ucode_ver;			/* version of ucode, copy of

					   iwl_ucode.ver */



	/* uCode owner: default: IWL_OWNERSHIP_DRIVER */

	u8 ucode_owner;



	struct fw_img ucode_rt;

	struct fw_img ucode_init;

	struct fw_img ucode_wowlan;

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

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, 
	else

		cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;



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

	if (hw_params(priv).shadow_reg_enable)

		cmd->flags |= IWL_POWER_SHADOW_REG_ENA;

	else

		cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
@@ -301,7 +301,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv, 
	if (priv->power_data.bus_pm)

		cmd->flags |= IWL_POWER_PCI_PM_MSK;



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

	if (hw_params(priv).shadow_reg_enable)

		cmd->flags |= IWL_POWER_SHADOW_REG_ENA;

	else

		cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;

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

+15 −6
Original line number Diff line number Diff line
@@ -133,36 +133,41 @@ struct iwl_mod_params { 
/**

 * struct iwl_hw_params

 * @max_txq_num: Max # Tx queues supported

 * @num_ampdu_queues: num of ampdu queues

 * @tx/rx_chains_num: Number of TX/RX chains

 * @valid_tx/rx_ant: usable antennas

 * @rx_page_order: Rx buffer page order

 * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR

 * @max_stations:

 * @ht40_channel: is 40MHz width possible in band 2.4

 * @beacon_time_tsf_bits: number of valid tsf bits for beacon time

 * @sku:

 * @rx_page_order: Rx buffer page order

 * @rx_wrt_ptr_reg: FH{39}_RSCSR_CHNL0_WPTR

 * BIT(IEEE80211_BAND_5GHZ) BIT(IEEE80211_BAND_5GHZ)

 * @sw_crypto: 0 for hw, 1 for sw

 * @max_xxx_size: for ucode uses

 * @ct_kill_threshold: temperature threshold

 * @beacon_time_tsf_bits: number of valid tsf bits for beacon time

 * @calib_init_cfg: setup initial calibrations for the hw

 * @calib_rt_cfg: setup runtime calibrations for the hw

 * @struct iwl_sensitivity_ranges: range of sensitivity values

 */

struct iwl_hw_params {

	u8  max_txq_num;

	u8  num_ampdu_queues;

	u8  tx_chains_num;

	u8  rx_chains_num;

	u8  valid_tx_ant;

	u8  valid_rx_ant;

	u32 rx_page_order;

	u8  max_stations;

	u8  ht40_channel;

	bool shadow_reg_enable;

	u16 beacon_time_tsf_bits;

	u16 sku;

	u32 rx_page_order;

	u32 max_inst_size;

	u32 max_data_size;

	u32 ct_kill_threshold; /* value in hw-dependent units */

	u32 ct_kill_exit_threshold; /* value in hw-dependent units */

				    /* for 1000, 6000 series and up */

	u16 beacon_time_tsf_bits;

	u32 calib_init_cfg;

	u32 calib_rt_cfg;

	const struct iwl_sensitivity_ranges *sens;
@@ -201,6 +206,7 @@ struct iwl_tid_data { 
 *

 * @dbg_level_dev: dbg level set per device. Prevails on

 *	iwlagn_mod_params.debug_level if set (!= 0)

 * @ucode_owner: IWL_OWNERSHIP_*

 * @cmd_queue: command queue number

 * @status: STATUS_*

 * @bus: pointer to the bus layer data
@@ -217,6 +223,9 @@ struct iwl_shared { 
	u32 dbg_level_dev;

#endif /* CONFIG_IWLWIFI_DEBUG */



#define IWL_OWNERSHIP_DRIVER	0

#define IWL_OWNERSHIP_TM	1

	u8 ucode_owner;

	u8 cmd_queue;

	unsigned long status;

	bool wowlan;