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

Commit 19e6cda0 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: move hw related defines to separate file 



Multiple iwlagn based devices shared the same hw definitions.
Move device hardware related defines from iwl-5000-hw.h to iwl-agn-hw.h
file.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent b305a080

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

+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "iwl-sta.h"

#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-5000-hw.h"

#include "iwl-agn-hw.h"

#include "iwl-agn-led.h"



/* Highest firmware API version supported */
@@ -118,7 +118,7 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = { 
static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWL50_NUM_QUEUES)

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

			priv->cfg->mod_params->num_of_queues;
@@ -126,13 +126,13 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			sizeof(struct iwl5000_scd_bc_tbl);

			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 = IWL50_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL50_RTC_INST_SIZE;

	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) |
@@ -235,8 +235,8 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,
@@ -265,8 +265,8 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

drivers/net/wireless/iwlwifi/iwl-5000-hw.h

+0 −33
Original line number Diff line number Diff line
@@ -68,25 +68,6 @@ 
#ifndef __iwl_5000_hw_h__

#define __iwl_5000_hw_h__



#define IWL50_RTC_INST_LOWER_BOUND		(0x000000)

#define IWL50_RTC_INST_UPPER_BOUND		(0x020000)



#define IWL50_RTC_DATA_LOWER_BOUND		(0x800000)

#define IWL50_RTC_DATA_UPPER_BOUND		(0x80C000)



#define IWL50_RTC_INST_SIZE (IWL50_RTC_INST_UPPER_BOUND - \

				IWL50_RTC_INST_LOWER_BOUND)

#define IWL50_RTC_DATA_SIZE (IWL50_RTC_DATA_UPPER_BOUND - \

				IWL50_RTC_DATA_LOWER_BOUND)



/* EEPROM */

#define IWL_5000_EEPROM_IMG_SIZE			2048



#define IWL50_CMD_FIFO_NUM                 7

#define IWL50_NUM_QUEUES                  20

#define IWL50_NUM_AMPDU_QUEUES		  10

#define IWL50_FIRST_AMPDU_QUEUE		  10



/* 5150 only */

#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)
@@ -103,19 +84,5 @@ static inline s32 iwl_temp_calib_to_offset(struct iwl_priv *priv) 
	return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);

}



/* Fixed (non-configurable) rx data from phy */



/**

 * struct iwl5000_schedq_bc_tbl scheduler byte count table

 * 	base physical address of iwl5000_shared

 * 	is provided to SCD_DRAM_BASE_ADDR

 * @tfd_offset  0-12 - tx command byte count

 *	       12-16 - station index

 */

struct iwl5000_scd_bc_tbl {

	__le16 tfd_offset[TFD_QUEUE_BC_SIZE];

} __attribute__ ((packed));





#endif /* __iwl_5000_hw_h__ */

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

+29 −28
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "iwl-helpers.h"

#include "iwl-agn.h"

#include "iwl-agn-led.h"

#include "iwl-agn-hw.h"

#include "iwl-5000-hw.h"

#include "iwl-6000-hw.h"
@@ -69,7 +70,7 @@ static const s8 iwl5000_default_queue_to_tx_fifo[] = { 
	IWL_TX_FIFO_VI,

	IWL_TX_FIFO_BE,

	IWL_TX_FIFO_BK,

	IWL50_CMD_FIFO_NUM,

	IWLAGN_CMD_FIFO_NUM,

	IWL_TX_FIFO_UNUSED,

	IWL_TX_FIFO_UNUSED,

	IWL_TX_FIFO_UNUSED,
@@ -456,7 +457,7 @@ int iwl5000_alive_notify(struct iwl_priv *priv) 
int iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWL50_NUM_QUEUES)

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

			priv->cfg->mod_params->num_of_queues;
@@ -464,13 +465,13 @@ int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			sizeof(struct iwl5000_scd_bc_tbl);

			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 = IWL50_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL50_RTC_INST_SIZE;

	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) |
@@ -741,8 +742,8 @@ void iwl5000_rx_handler_setup(struct iwl_priv *priv) 


int iwl5000_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= IWL50_RTC_DATA_LOWER_BOUND) &&

		(addr < IWL50_RTC_DATA_UPPER_BOUND);

	return (addr >= IWLAGN_RTC_DATA_LOWER_BOUND) &&

		(addr < IWLAGN_RTC_DATA_UPPER_BOUND);

}



int  iwl5000_send_tx_power(struct iwl_priv *priv)
@@ -977,11 +978,11 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,
@@ -1004,11 +1005,11 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,
@@ -1031,11 +1032,11 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,
@@ -1056,11 +1057,11 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,
@@ -1083,11 +1084,11 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,
@@ -1110,11 +1111,11 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5150_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,
@@ -1137,11 +1138,11 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl5150_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

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

+15 −15
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "iwl-sta.h"

#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-5000-hw.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-agn-led.h"
@@ -137,7 +137,7 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = { 
static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWL50_NUM_QUEUES)

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

			priv->cfg->mod_params->num_of_queues;
@@ -145,7 +145,7 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			sizeof(struct iwl5000_scd_bc_tbl);

			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;
@@ -372,8 +372,8 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,
@@ -405,8 +405,8 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,
@@ -437,8 +437,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,
@@ -469,8 +469,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,
@@ -502,8 +502,8 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,
@@ -534,8 +534,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

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

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-5000-hw.h"



static int iwlagn_send_rxon_assoc(struct iwl_priv *priv)

{