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

Commit 5425e490 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: hw_setting cleanup 



1. This patch renames hw_setting to hw_params
2. Align names of the structure and variables
3. set_hw_params is called from libs_ops

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 49ea8596

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

+25 −24
Original line number Diff line number Diff line
@@ -504,10 +504,10 @@ u8 iwl4965_hw_find_station(struct iwl_priv *priv, const u8 *addr) 
		start = IWL_STA_ID;



	if (is_broadcast_ether_addr(addr))

		return priv->hw_setting.bcast_sta_id;

		return priv->hw_params.bcast_sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	for (i = start; i < priv->hw_setting.max_stations; i++)

	for (i = start; i < priv->hw_params.max_stations; i++)

		if ((priv->stations[i].used) &&

		    (!compare_ether_addr

		     (priv->stations[i].sta.sta.addr, addr))) {
@@ -702,7 +702,7 @@ static int iwl4965_txq_ctx_reset(struct iwl_priv *priv) 


	/* Alloc and init all (default 16) Tx queues,

	 * including the command queue (#4) */

	for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++) {

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ?

					TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS;

		rc = iwl4965_tx_queue_init(priv, &priv->txq[txq_id], slots_num,
@@ -908,7 +908,7 @@ void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv) 
	unsigned long flags;



	/* Stop each Tx DMA channel, and wait for it to be idle */

	for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++) {

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) {

		spin_lock_irqsave(&priv->lock, flags);

		if (iwl_grab_nic_access(priv)) {

			spin_unlock_irqrestore(&priv->lock, flags);
@@ -1954,7 +1954,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 
		iwl_write_targ_mem(priv, a, 0);

	for (; a < priv->scd_base_addr + SCD_TRANSLATE_TBL_OFFSET; a += 4)

		iwl_write_targ_mem(priv, a, 0);

	for (; a < sizeof(u16) * priv->hw_setting.max_txq_num; a += 4)

	for (; a < sizeof(u16) * priv->hw_params.max_txq_num; a += 4)

		iwl_write_targ_mem(priv, a, 0);



	/* Tel 4965 where to find Tx byte count tables */
@@ -1966,7 +1966,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 
	iwl_write_prph(priv, IWL49_SCD_QUEUECHAIN_SEL, 0);



	/* Initialize each Tx queue (including the command queue) */

	for (i = 0; i < priv->hw_setting.max_txq_num; i++) {

	for (i = 0; i < priv->hw_params.max_txq_num; i++) {



		/* TFD circular buffer read/write indexes */

		iwl_write_prph(priv, IWL49_SCD_QUEUE_RDPTR(i), 0);
@@ -1989,7 +1989,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 


	}

	iwl_write_prph(priv, IWL49_SCD_INTERRUPT_MASK,

				 (1 << priv->hw_setting.max_txq_num) - 1);

				 (1 << priv->hw_params.max_txq_num) - 1);



	/* Activate all Tx DMA/FIFO channels */

	iwl_write_prph(priv, IWL49_SCD_TXFACT,
@@ -2014,11 +2014,11 @@ int iwl4965_alive_notify(struct iwl_priv *priv) 
}



/**

 * iwl4965_hw_set_hw_setting

 * iwl4965_hw_set_hw_params

 *

 * Called when initializing driver

 */

int iwl4965_hw_set_hw_setting(struct iwl_priv *priv)

int iwl4965_hw_set_hw_params(struct iwl_priv *priv)

{



	if ((priv->cfg->mod_params->num_of_queues > IWL_MAX_NUM_QUEUES) ||
@@ -2028,19 +2028,19 @@ int iwl4965_hw_set_hw_setting(struct iwl_priv *priv) 
		return -EINVAL;

	}



	priv->hw_setting.max_txq_num = priv->cfg->mod_params->num_of_queues;

	priv->hw_setting.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);

	priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;

	priv->hw_params.max_txq_num = priv->cfg->mod_params->num_of_queues;

	priv->hw_params.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);

	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;

	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;

	if (priv->cfg->mod_params->amsdu_size_8K)

		priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_8K;

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_8K;

	else

		priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_4K;

	priv->hw_setting.max_pkt_size = priv->hw_setting.rx_buf_size - 256;

	priv->hw_setting.max_stations = IWL4965_STATION_COUNT;

	priv->hw_setting.bcast_sta_id = IWL4965_BROADCAST_ID;

		priv->hw_params.rx_buf_size = IWL_RX_BUF_SIZE_4K;

	priv->hw_params.max_pkt_size = priv->hw_params.rx_buf_size - 256;

	priv->hw_params.max_stations = IWL4965_STATION_COUNT;

	priv->hw_params.bcast_sta_id = IWL4965_BROADCAST_ID;



	priv->hw_setting.tx_ant_num = 2;

	priv->hw_params.tx_ant_num = 2;



	return 0;

}
@@ -2055,7 +2055,7 @@ void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv) 
	int txq_id;



	/* Tx queues */

	for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++)

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)

		iwl4965_tx_queue_free(priv, &priv->txq[txq_id]);



	/* Keep-warm buffer */
@@ -3012,7 +3012,7 @@ unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv, 
	tx_beacon_cmd = &frame->u.beacon;

	memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));



	tx_beacon_cmd->tx.sta_id = priv->hw_setting.bcast_sta_id;

	tx_beacon_cmd->tx.sta_id = priv->hw_params.bcast_sta_id;

	tx_beacon_cmd->tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;



	frame_size = iwl4965_fill_beacon_frame(priv,
@@ -3620,7 +3620,7 @@ static void iwl4965_handle_data_packet(struct iwl_priv *priv, int is_data, 
		rx_start->byte_count = amsdu->byte_count;

		rx_end = (__le32 *) (((u8 *) hdr) + len);

	}

	if (len > priv->hw_setting.max_pkt_size || len < 16) {

	if (len > priv->hw_params.max_pkt_size || len < 16) {

		IWL_WARNING("byte count out of range [16,4K] : %d\n", len);

		return;

	}
@@ -4515,7 +4515,7 @@ void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap) 
	link_cmd.agg_params.agg_time_limit = cpu_to_le16(4000);



	/* Update the rate scaling for control frame Tx to AP */

	link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_setting.bcast_sta_id;

	link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_params.bcast_sta_id;



	iwl_send_cmd_pdu_async(priv, REPLY_TX_LINK_QUALITY_CMD,

			       sizeof(link_cmd), &link_cmd, NULL);
@@ -4704,7 +4704,7 @@ static int iwl4965_txq_ctx_activate_free(struct iwl_priv *priv) 
{

	int txq_id;



	for (txq_id = 0; txq_id < priv->hw_setting.max_txq_num; txq_id++)

	for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++)

		if (!test_and_set_bit(txq_id, &priv->txq_ctx_active_msk))

			return txq_id;

	return -1;
@@ -4908,6 +4908,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { 


static struct iwl_lib_ops iwl4965_lib = {

	.init_drv = iwl4965_init_drv,

	.set_hw_params = iwl4965_hw_set_hw_params,

	.txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,

	.hw_nic_init = iwl4965_hw_nic_init,

	.is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,

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

+4 −4
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ struct iwl4965_ibss_seq { 
};



/**

 * struct iwl4965_driver_hw_info

 * struct iwl_hw_params

 * @max_txq_num: Max # Tx queues supported

 * @tx_cmd_len: Size of Tx command (but not including frame itself)

 * @tx_ant_num: Number of TX antennas
@@ -577,7 +577,7 @@ struct iwl4965_ibss_seq { 
 * @max_stations:

 * @bcast_sta_id:

 */

struct iwl4965_driver_hw_info {

struct iwl_hw_params {

	u16 max_txq_num;

	u16 tx_cmd_len;

	u16 tx_ant_num;
@@ -675,7 +675,7 @@ extern void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv); 
extern void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv);

extern void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv);

extern int iwl4965_hw_rxq_stop(struct iwl_priv *priv);

extern int iwl4965_hw_set_hw_setting(struct iwl_priv *priv);

extern int iwl4965_hw_set_hw_params(struct iwl_priv *priv);

extern int iwl4965_hw_nic_init(struct iwl_priv *priv);

extern int iwl4965_hw_nic_stop_master(struct iwl_priv *priv);

extern void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv);
@@ -1144,7 +1144,7 @@ struct iwl_priv { 
	u16 beacon_int;

	struct ieee80211_vif *vif;



	struct iwl4965_driver_hw_info hw_setting;

	struct iwl_hw_params hw_params;

	/* driver/uCode shared Tx Byte Counts and Rx status */

	void *shared_virt;

	/* Physical Pointer to Tx Byte Counts and Rx status */

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

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ struct iwl_hcmd_utils_ops { 
struct iwl_lib_ops {

	/* iwlwifi driver (priv) init */

	int (*init_drv)(struct iwl_priv *priv);

	/* set hw dependant perameters */

	int (*set_hw_params)(struct iwl_priv *priv);



	void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,

					struct iwl4965_tx_queue *txq,

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf, 
{

	struct iwl_priv *priv = (struct iwl_priv *)file->private_data;

	struct iwl4965_station_entry *station;

	int max_sta = priv->hw_setting.max_stations;

	int max_sta = priv->hw_params.max_stations;

	char *buf;

	int i, j, pos = 0;

	ssize_t ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv, 
	if (keyconf->keylen == WEP_KEY_LEN_128)

		key_flags |= STA_KEY_FLG_KEY_SIZE_MSK;



	if (sta_id == priv->hw_setting.bcast_sta_id)

	if (sta_id == priv->hw_params.bcast_sta_id)

		key_flags |= STA_KEY_MULTICAST_MSK;



	spin_lock_irqsave(&priv->sta_lock, flags);
@@ -198,7 +198,7 @@ static int iwl_set_ccmp_dynamic_key_info(struct iwl_priv *priv, 
	key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);

	key_flags &= ~STA_KEY_FLG_INVALID;



	if (sta_id == priv->hw_setting.bcast_sta_id)

	if (sta_id == priv->hw_params.bcast_sta_id)

		key_flags |= STA_KEY_MULTICAST_MSK;



	keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;