Skip to content

L
linux
Commit e517736a authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files
Options

iwlwifi: set hw parameters based on device type 

Separate the hw_set_hw_params() function to per device based; different
devices can have different hardware parameters set, when separate the
function based on device type can avoid mistakes, give more flexibilities and
easier to read.
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent e3a3cd87
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 40 deletions
drivers/net/wireless/iwlwifi/iwl-5000.c
View file @ e517736a
...@@ -200,26 +200,57 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -200,26 +200,57 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
/* Set initial calibration set */ /* Set initial calibration set */
switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) { priv->hw_params.sens = &iwl5000_sensitivity;
case CSR_HW_REV_TYPE_5150: priv->hw_params.calib_init_cfg =
priv->hw_params.sens = &iwl5150_sensitivity; BIT(IWL_CALIB_XTAL) |
priv->hw_params.calib_init_cfg = BIT(IWL_CALIB_LO) |
BIT(IWL_CALIB_DC) | BIT(IWL_CALIB_TX_IQ) |
BIT(IWL_CALIB_LO) | BIT(IWL_CALIB_TX_IQ_PERD) |
BIT(IWL_CALIB_TX_IQ) | BIT(IWL_CALIB_BASE_BAND);
BIT(IWL_CALIB_BASE_BAND);
return 0;
break; }
default:
priv->hw_params.sens = &iwl5000_sensitivity; static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
priv->hw_params.calib_init_cfg = {
BIT(IWL_CALIB_XTAL) | if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&
BIT(IWL_CALIB_LO) | priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)
BIT(IWL_CALIB_TX_IQ) | priv->cfg->num_of_queues =
BIT(IWL_CALIB_TX_IQ_PERD) | priv->cfg->mod_params->num_of_queues;
BIT(IWL_CALIB_BASE_BAND);
break; priv->hw_params.max_txq_num = priv->cfg->num_of_queues;
} priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
priv->hw_params.scd_bc_tbls_size =
priv->cfg->num_of_queues *
sizeof(struct iwlagn_scd_bc_tbl);
priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
priv->hw_params.max_stations = IWL5000_STATION_COUNT;
priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;
priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;
priv->hw_params.max_bsm_size = 0;
priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) |
BIT(IEEE80211_BAND_5GHZ);
priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
if (priv->cfg->ops->lib->temp_ops.set_ct_kill)
priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
/* Set initial sensitivity parameters */
/* Set initial calibration set */
priv->hw_params.sens = &iwl5150_sensitivity;
priv->hw_params.calib_init_cfg =
BIT(IWL_CALIB_DC) |
BIT(IWL_CALIB_LO) |
BIT(IWL_CALIB_TX_IQ) |
BIT(IWL_CALIB_BASE_BAND);
return 0; return 0;
} }
...@@ -332,7 +363,7 @@ static struct iwl_lib_ops iwl5000_lib = { ...@@ -332,7 +363,7 @@ static struct iwl_lib_ops iwl5000_lib = {
}; };
static struct iwl_lib_ops iwl5150_lib = { static struct iwl_lib_ops iwl5150_lib = {
.set_hw_params = iwl5000_hw_set_hw_params, .set_hw_params = iwl5150_hw_set_hw_params,
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
.txq_set_sched = iwlagn_txq_set_sched, .txq_set_sched = iwlagn_txq_set_sched,
......
drivers/net/wireless/iwlwifi/iwl-6000.c
View file @ e517736a
...@@ -176,24 +176,56 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -176,24 +176,56 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
/* Set initial sensitivity parameters */ /* Set initial sensitivity parameters */
/* Set initial calibration set */ /* Set initial calibration set */
priv->hw_params.sens = &iwl6000_sensitivity; priv->hw_params.sens = &iwl6000_sensitivity;
switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) { priv->hw_params.calib_init_cfg =
case CSR_HW_REV_TYPE_6x50: BIT(IWL_CALIB_XTAL) |
priv->hw_params.calib_init_cfg = BIT(IWL_CALIB_LO) |
BIT(IWL_CALIB_XTAL) | BIT(IWL_CALIB_TX_IQ) |
BIT(IWL_CALIB_DC) | BIT(IWL_CALIB_BASE_BAND);
BIT(IWL_CALIB_LO) |
BIT(IWL_CALIB_TX_IQ) | return 0;
BIT(IWL_CALIB_BASE_BAND); }
break; static int iwl6050_hw_set_hw_params(struct iwl_priv *priv)
default: {
priv->hw_params.calib_init_cfg = if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&
BIT(IWL_CALIB_XTAL) | priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)
BIT(IWL_CALIB_LO) | priv->cfg->num_of_queues =
BIT(IWL_CALIB_TX_IQ) | priv->cfg->mod_params->num_of_queues;
BIT(IWL_CALIB_BASE_BAND);
break; priv->hw_params.max_txq_num = priv->cfg->num_of_queues;
} priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
priv->hw_params.scd_bc_tbls_size =
priv->cfg->num_of_queues *
sizeof(struct iwlagn_scd_bc_tbl);
priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
priv->hw_params.max_stations = IWL5000_STATION_COUNT;
priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
priv->hw_params.max_bsm_size = 0;
priv->hw_params.ht40_channel = BIT(IEEE80211_BAND_2GHZ) |
BIT(IEEE80211_BAND_5GHZ);
priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
if (priv->cfg->ops->lib->temp_ops.set_ct_kill)
priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
/* Set initial sensitivity parameters */
/* Set initial calibration set */
priv->hw_params.sens = &iwl6000_sensitivity;
priv->hw_params.calib_init_cfg =
BIT(IWL_CALIB_XTAL) |
BIT(IWL_CALIB_DC) |
BIT(IWL_CALIB_LO) |
BIT(IWL_CALIB_TX_IQ) |
BIT(IWL_CALIB_BASE_BAND);
return 0; return 0;
} }
...@@ -304,7 +336,7 @@ static const struct iwl_ops iwl6000_ops = { ...@@ -304,7 +336,7 @@ static const struct iwl_ops iwl6000_ops = {
}; };
static struct iwl_lib_ops iwl6050_lib = { static struct iwl_lib_ops iwl6050_lib = {
.set_hw_params = iwl6000_hw_set_hw_params, .set_hw_params = iwl6050_hw_set_hw_params,
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
.txq_set_sched = iwlagn_txq_set_sched, .txq_set_sched = iwlagn_txq_set_sched,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7