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

Commit 250bdd21 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwl3945: Have consistant and not redefined HW constants 



SRAM addresses are different for 3945, 4065, and 5000, let's give them
different names.
Also, the RSSI_OFFSET is different for 3945 and 4965, thus they should be
named differently.

Signed-off-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0f741d99

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

+14 −12
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL_RSSI_OFFSET	95

#define IWL39_RSSI_OFFSET	95



/*

 * EEPROM related constants, enums, and structures.
@@ -276,27 +276,29 @@ struct iwl3945_eeprom { 


/* Sizes and addresses for instruction and data memory (SRAM) in

 * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define RTC_INST_LOWER_BOUND			(0x000000)

#define ALM_RTC_INST_UPPER_BOUND		(0x014000)

#define IWL39_RTC_INST_LOWER_BOUND		(0x000000)

#define IWL39_RTC_INST_UPPER_BOUND		(0x014000)



#define RTC_DATA_LOWER_BOUND			(0x800000)

#define ALM_RTC_DATA_UPPER_BOUND		(0x808000)

#define IWL39_RTC_DATA_LOWER_BOUND		(0x800000)

#define IWL39_RTC_DATA_UPPER_BOUND		(0x808000)



#define ALM_RTC_INST_SIZE (ALM_RTC_INST_UPPER_BOUND - RTC_INST_LOWER_BOUND)

#define ALM_RTC_DATA_SIZE (ALM_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND)

#define IWL39_RTC_INST_SIZE (IWL39_RTC_INST_UPPER_BOUND - \

				IWL39_RTC_INST_LOWER_BOUND)

#define IWL39_RTC_DATA_SIZE (IWL39_RTC_DATA_UPPER_BOUND - \

				IWL39_RTC_DATA_LOWER_BOUND)



#define IWL_MAX_INST_SIZE ALM_RTC_INST_SIZE

#define IWL_MAX_DATA_SIZE ALM_RTC_DATA_SIZE

#define IWL39_MAX_INST_SIZE IWL39_RTC_INST_SIZE

#define IWL39_MAX_DATA_SIZE IWL39_RTC_DATA_SIZE



/* Size of uCode instruction memory in bootstrap state machine */

#define IWL_MAX_BSM_SIZE ALM_RTC_INST_SIZE

#define IWL39_MAX_BSM_SIZE IWL39_RTC_INST_SIZE



#define IWL39_MAX_NUM_QUEUES	8



static inline int iwl3945_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= RTC_DATA_LOWER_BOUND) &&

	       (addr < ALM_RTC_DATA_UPPER_BOUND);

	return (addr >= IWL39_RTC_DATA_LOWER_BOUND) &&

	       (addr < IWL39_RTC_DATA_UPPER_BOUND);

}



/* Base physical address of iwl3945_shared is provided to FH_TSSR_CBB_BASE

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

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, 




	/* Convert 3945's rssi indicator to dBm */

	rx_status.signal = rx_stats->rssi - IWL_RSSI_OFFSET;

	rx_status.signal = rx_stats->rssi - IWL39_RSSI_OFFSET;



	/* Set default noise value to -127 */

	if (priv->last_rx_noise == 0)

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

+11 −9
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL_RSSI_OFFSET	44

#define IWL49_RSSI_OFFSET	44
@@ -129,24 +129,26 @@ 


/* Sizes and addresses for instruction and data memory (SRAM) in

 * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define RTC_INST_LOWER_BOUND			(0x000000)

#define IWL49_RTC_INST_LOWER_BOUND		(0x000000)

#define IWL49_RTC_INST_UPPER_BOUND		(0x018000)



#define RTC_DATA_LOWER_BOUND			(0x800000)

#define IWL49_RTC_DATA_LOWER_BOUND		(0x800000)

#define IWL49_RTC_DATA_UPPER_BOUND		(0x80A000)



#define IWL49_RTC_INST_SIZE  (IWL49_RTC_INST_UPPER_BOUND - RTC_INST_LOWER_BOUND)

#define IWL49_RTC_DATA_SIZE  (IWL49_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND)

#define IWL49_RTC_INST_SIZE  (IWL49_RTC_INST_UPPER_BOUND - \

				IWL49_RTC_INST_LOWER_BOUND)

#define IWL49_RTC_DATA_SIZE  (IWL49_RTC_DATA_UPPER_BOUND - \

				IWL49_RTC_DATA_LOWER_BOUND)



#define IWL_MAX_INST_SIZE IWL49_RTC_INST_SIZE

#define IWL_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE

#define IWL49_MAX_INST_SIZE IWL49_RTC_INST_SIZE

#define IWL49_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE



/* Size of uCode instruction memory in bootstrap state machine */

#define IWL_MAX_BSM_SIZE BSM_SRAM_SIZE

#define IWL49_MAX_BSM_SIZE BSM_SRAM_SIZE



static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= RTC_DATA_LOWER_BOUND) &&

	return (addr >= IWL49_RTC_DATA_LOWER_BOUND) &&

	       (addr < IWL49_RTC_DATA_UPPER_BOUND);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) 
	priv->ucode_type = UCODE_RT;



	/* make sure bootstrap program is no larger than BSM's SRAM size */

	if (len > IWL_MAX_BSM_SIZE)

	if (len > IWL49_MAX_BSM_SIZE)

		return -EINVAL;



	/* Tell bootstrap uCode where to find the "Initialize" uCode
@@ -186,7 +186,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) 


	/* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */

	iwl_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0);

	iwl_write_prph(priv, BSM_WR_MEM_DST_REG, RTC_INST_LOWER_BOUND);

	iwl_write_prph(priv, BSM_WR_MEM_DST_REG, IWL49_RTC_INST_LOWER_BOUND);

	iwl_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32));



	/* Load bootstrap code into instruction SRAM now,
@@ -2246,7 +2246,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv, 


	/* dBm = max_rssi dB - agc dB - constant.

	 * Higher AGC (higher radio gain) means lower signal. */

	return max_rssi - agc - IWL_RSSI_OFFSET;

	return max_rssi - agc - IWL49_RSSI_OFFSET;

}

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

+8 −2
Original line number Diff line number Diff line
@@ -68,10 +68,16 @@ 
#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 - RTC_INST_LOWER_BOUND)

#define IWL50_RTC_DATA_SIZE (IWL50_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND)



#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