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

Commit ac178ef0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents f3a7c66b 6d08b9b9

drivers/net/wireless/ath5k/ath5k.h

+24 −49
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ 
#define AR5K_INI_VAL_XR			0

#define AR5K_INI_VAL_MAX		5



#define AR5K_RF5111_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS

#define AR5K_RF5112_INI_RF_MAX_BANKS	AR5K_MAX_RF_BANKS



/* Used for BSSID etc manipulation */

#define AR5K_LOW_ID(_a)(				\

(_a)[0] | (_a)[1] << 8 | (_a)[2] << 16 | (_a)[3] << 24	\
@@ -225,6 +222,7 @@ 
#endif



/* Initial values */

#define	AR5K_INIT_CYCRSSI_THR1			2

#define AR5K_INIT_TX_LATENCY			502

#define AR5K_INIT_USEC				39

#define AR5K_INIT_USEC_TURBO			79
@@ -316,7 +314,7 @@ struct ath5k_srev_name { 
#define AR5K_SREV_AR5424	0x90 /* Condor */

#define AR5K_SREV_AR5413	0xa4 /* Eagle lite */

#define AR5K_SREV_AR5414	0xa0 /* Eagle */

#define AR5K_SREV_AR2415	0xb0 /* Cobra */

#define AR5K_SREV_AR2415	0xb0 /* Talon */

#define AR5K_SREV_AR5416	0xc0 /* PCI-E */

#define AR5K_SREV_AR5418	0xca /* PCI-E */

#define AR5K_SREV_AR2425	0xe0 /* Swan */
@@ -334,7 +332,7 @@ struct ath5k_srev_name { 
#define	AR5K_SREV_RAD_2112B	0x46

#define AR5K_SREV_RAD_2413	0x50

#define AR5K_SREV_RAD_5413	0x60

#define AR5K_SREV_RAD_2316	0x70

#define AR5K_SREV_RAD_2316	0x70 /* Cobra SoC */

#define AR5K_SREV_RAD_2317	0x80

#define AR5K_SREV_RAD_5424	0xa0 /* Mostly same as 5413 */

#define AR5K_SREV_RAD_2425	0xa2
@@ -342,7 +340,8 @@ struct ath5k_srev_name { 


#define AR5K_SREV_PHY_5211	0x30

#define AR5K_SREV_PHY_5212	0x41

#define AR5K_SREV_PHY_2112B	0x43

#define	AR5K_SREV_PHY_5212A	0x42

#define AR5K_SREV_PHY_5212B	0x43

#define AR5K_SREV_PHY_2413	0x45

#define AR5K_SREV_PHY_5413	0x61

#define AR5K_SREV_PHY_2425	0x70
@@ -649,49 +648,21 @@ struct ath5k_beacon_state { 


enum ath5k_rfgain {

	AR5K_RFGAIN_INACTIVE = 0,

	AR5K_RFGAIN_ACTIVE,

	AR5K_RFGAIN_READ_REQUESTED,

	AR5K_RFGAIN_NEED_CHANGE,

};



#define AR5K_GAIN_CRN_FIX_BITS_5111		4

#define AR5K_GAIN_CRN_FIX_BITS_5112		7

#define AR5K_GAIN_CRN_MAX_FIX_BITS		AR5K_GAIN_CRN_FIX_BITS_5112

#define AR5K_GAIN_DYN_ADJUST_HI_MARGIN		15

#define AR5K_GAIN_DYN_ADJUST_LO_MARGIN		20

#define AR5K_GAIN_CCK_PROBE_CORR		5

#define AR5K_GAIN_CCK_OFDM_GAIN_DELTA		15

#define AR5K_GAIN_STEP_COUNT			10

#define AR5K_GAIN_PARAM_TX_CLIP			0

#define AR5K_GAIN_PARAM_PD_90			1

#define AR5K_GAIN_PARAM_PD_84			2

#define AR5K_GAIN_PARAM_GAIN_SEL		3

#define AR5K_GAIN_PARAM_MIX_ORN			0

#define AR5K_GAIN_PARAM_PD_138			1

#define AR5K_GAIN_PARAM_PD_137			2

#define AR5K_GAIN_PARAM_PD_136			3

#define AR5K_GAIN_PARAM_PD_132			4

#define AR5K_GAIN_PARAM_PD_131			5

#define AR5K_GAIN_PARAM_PD_130			6

#define AR5K_GAIN_CHECK_ADJUST(_g) 		\

	((_g)->g_current <= (_g)->g_low || (_g)->g_current >= (_g)->g_high)



struct ath5k_gain_opt_step {

	s16				gos_param[AR5K_GAIN_CRN_MAX_FIX_BITS];

	s32				gos_gain;

};



struct ath5k_gain {

	u32			g_step_idx;

	u32			g_current;

	u32			g_target;

	u32			g_low;

	u32			g_high;

	u32			g_f_corr;

	u32			g_active;

	const struct ath5k_gain_opt_step	*g_step;

	u8			g_step_idx;

	u8			g_current;

	u8			g_target;

	u8			g_low;

	u8			g_high;

	u8			g_f_corr;

	u8			g_state;

};





/********************\

  COMMON DEFINITIONS

\********************/
@@ -1053,7 +1024,6 @@ struct ath5k_hw { 
	bool			ah_running;

	bool			ah_single_chip;

	bool			ah_combined_mic;

	enum ath5k_rfgain	ah_rf_gain;



	u32			ah_mac_srev;

	u16			ah_mac_version;
@@ -1061,7 +1031,6 @@ struct ath5k_hw { 
	u16			ah_phy_revision;

	u16			ah_radio_5ghz_revision;

	u16			ah_radio_2ghz_revision;

	u32			ah_phy_spending;



	enum ath5k_version	ah_version;

	enum ath5k_radio	ah_radio;
@@ -1112,8 +1081,9 @@ struct ath5k_hw { 
	u32			ah_txq_isr;

	u32			*ah_rf_banks;

	size_t			ah_rf_banks_size;

	size_t			ah_rf_regs_count;

	struct ath5k_gain	ah_gain;

	u32			ah_offset[AR5K_MAX_RF_BANKS];

	u8			ah_offset[AR5K_MAX_RF_BANKS];



	struct {

		u16		txp_pcdac[AR5K_EEPROM_POWER_TABLE_SIZE];
@@ -1186,6 +1156,7 @@ extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ieee80211_l 
/* EEPROM access functions */

extern int ath5k_eeprom_init(struct ath5k_hw *ah);

extern int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac);

extern bool ath5k_eeprom_is_hb63(struct ath5k_hw *ah);



/* Protocol Control Unit Functions */

extern int ath5k_hw_set_opmode(struct ath5k_hw *ah);
@@ -1261,10 +1232,12 @@ extern int ath5k_hw_disable_pspoll(struct ath5k_hw *ah); 
extern int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel);



/* Initialize RF */

extern int ath5k_hw_rfregs(struct ath5k_hw *ah, struct ieee80211_channel *channel, unsigned int mode);

extern int ath5k_hw_rfgain(struct ath5k_hw *ah, unsigned int freq);

extern enum ath5k_rfgain ath5k_hw_get_rf_gain(struct ath5k_hw *ah);

extern int ath5k_hw_set_rfgain_opt(struct ath5k_hw *ah);

extern int ath5k_hw_rfregs_init(struct ath5k_hw *ah,

				struct ieee80211_channel *channel,

				unsigned int mode);

extern int ath5k_hw_rfgain_init(struct ath5k_hw *ah, unsigned int freq);

extern enum ath5k_rfgain ath5k_hw_gainf_calibrate(struct ath5k_hw *ah);

extern int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah);

/* PHY/RF channel functions */

extern bool ath5k_channel_ok(struct ath5k_hw *ah, u16 freq, unsigned int flags);

extern int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel);
@@ -1286,6 +1259,7 @@ extern int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, unsigned int power); 


/*

 * Translate usec to hw clock units

 * TODO: Half/quarter rate

 */

static inline unsigned int ath5k_hw_htoclock(unsigned int usec, bool turbo)

{
@@ -1294,6 +1268,7 @@ static inline unsigned int ath5k_hw_htoclock(unsigned int usec, bool turbo) 


/*

 * Translate hw clock units to usec

 * TODO: Half/quarter rate

 */

static inline unsigned int ath5k_hw_clocktoh(unsigned int clock, bool turbo)

{

drivers/net/wireless/ath5k/attach.c

+3 −15
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) 
		ah->ah_single_chip = false;

		ah->ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,

							CHANNEL_2GHZ);

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5111;

		break;

	case AR5K_SREV_RAD_5112:

	case AR5K_SREV_RAD_2112:
@@ -177,38 +176,31 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) 
		ah->ah_single_chip = false;

		ah->ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,

							CHANNEL_2GHZ);

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112;

		break;

	case AR5K_SREV_RAD_2413:

		ah->ah_radio = AR5K_RF2413;

		ah->ah_single_chip = true;

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2413;

		break;

	case AR5K_SREV_RAD_5413:

		ah->ah_radio = AR5K_RF5413;

		ah->ah_single_chip = true;

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;

		break;

	case AR5K_SREV_RAD_2316:

		ah->ah_radio = AR5K_RF2316;

		ah->ah_single_chip = true;

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2316;

		break;

	case AR5K_SREV_RAD_2317:

		ah->ah_radio = AR5K_RF2317;

		ah->ah_single_chip = true;

		ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2317;

		break;

	case AR5K_SREV_RAD_5424:

		if (ah->ah_mac_version == AR5K_SREV_AR2425 ||

		ah->ah_mac_version == AR5K_SREV_AR2417){

			ah->ah_radio = AR5K_RF2425;

			ah->ah_single_chip = true;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2425;

		} else {

			ah->ah_radio = AR5K_RF5413;

			ah->ah_single_chip = true;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;

		}

		break;

	default:
@@ -227,29 +219,25 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) 
			ah->ah_radio = AR5K_RF2425;

			ah->ah_single_chip = true;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2425;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2425;

		} else if (srev == AR5K_SREV_AR5213A &&

		ah->ah_phy_revision == AR5K_SREV_PHY_2112B) {

		ah->ah_phy_revision == AR5K_SREV_PHY_5212B) {

			ah->ah_radio = AR5K_RF5112;

			ah->ah_single_chip = false;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2112B;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_5112B;

		} else if (ah->ah_mac_version == (AR5K_SREV_AR2415 >> 4)) {

			ah->ah_radio = AR5K_RF2316;

			ah->ah_single_chip = true;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2316;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2316;

		} else if (ah->ah_mac_version == (AR5K_SREV_AR5414 >> 4) ||

		ah->ah_phy_revision == AR5K_SREV_PHY_5413) {

			ah->ah_radio = AR5K_RF5413;

			ah->ah_single_chip = true;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_5413;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;

		} else if (ah->ah_mac_version == (AR5K_SREV_AR2414 >> 4) ||

		ah->ah_phy_revision == AR5K_SREV_PHY_2413) {

			ah->ah_radio = AR5K_RF2413;

			ah->ah_single_chip = true;

			ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2413;

			ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2413;

		} else {

			ATH5K_ERR(sc, "Couldn't identify radio revision.\n");

			ret = -ENODEV;
@@ -331,7 +319,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) 
	ath5k_hw_set_associd(ah, ah->ah_bssid, 0);

	ath5k_hw_set_opmode(ah);



	ath5k_hw_set_rfgain_opt(ah);

	ath5k_hw_rfgain_opt_init(ah);



	return ah;

err_free:

drivers/net/wireless/ath5k/base.c

+4 −11
Original line number Diff line number Diff line
@@ -2209,10 +2209,6 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf) 
 *

 * @sc: struct ath5k_softc pointer we are operating on

 *

 * When operating in station mode we want to receive a BMISS interrupt when we

 * stop seeing beacons from the AP we've associated with so we can look for

 * another AP to associate with.

 *

 * In IBSS mode we use a self-linked tx descriptor if possible. We enable SWBA

 * interrupts to detect TSF updates only.

 */
@@ -2225,9 +2221,7 @@ ath5k_beacon_config(struct ath5k_softc *sc) 
	sc->bmisscount = 0;

	sc->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);



	if (sc->opmode == NL80211_IFTYPE_STATION) {

		sc->imask |= AR5K_INT_BMISS;

	} else if (sc->opmode == NL80211_IFTYPE_ADHOC ||

	if (sc->opmode == NL80211_IFTYPE_ADHOC ||

			sc->opmode == NL80211_IFTYPE_MESH_POINT ||

			sc->opmode == NL80211_IFTYPE_AP) {

		/*
@@ -2479,6 +2473,7 @@ ath5k_intr(int irq, void *dev_id) 
					| AR5K_INT_TXERR | AR5K_INT_TXEOL))

				tasklet_schedule(&sc->txtq);

			if (status & AR5K_INT_BMISS) {

				/* TODO */

			}

			if (status & AR5K_INT_MIB) {

				/*
@@ -2518,7 +2513,7 @@ ath5k_calibrate(unsigned long data) 
		ieee80211_frequency_to_channel(sc->curchan->center_freq),

		sc->curchan->hw_value);



	if (ath5k_hw_get_rf_gain(ah) == AR5K_RFGAIN_NEED_CHANGE) {

	if (ath5k_hw_gainf_calibrate(ah) == AR5K_RFGAIN_NEED_CHANGE) {

		/*

		 * Rfgain is out of bounds, reset the chip

		 * to load new gain values.
@@ -2889,7 +2884,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
{

	struct ath5k_softc *sc = hw->priv;

	struct ath5k_hw *ah = sc->ah;

	int ret;

	int ret = 0;



	mutex_lock(&sc->lock);

	if (sc->vif != vif) {
@@ -2915,9 +2910,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		}

		ath5k_beacon_update(sc, beacon);

	}

	mutex_unlock(&sc->lock);



	return ath5k_reset_wake(sc);

unlock:

	mutex_unlock(&sc->lock);

	return ret;

drivers/net/wireless/ath5k/eeprom.c

+15 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int ath5k_eeprom_read_ants(struct ath5k_hw *ah, u32 *offset, 


	/* Get antenna modes */

	ah->ah_antenna[mode][0] =

	    (ee->ee_ant_control[mode][0] << 4) | 0x1;

	    (ee->ee_ant_control[mode][0] << 4);

	ah->ah_antenna[mode][AR5K_ANT_FIXED_A] =

	     ee->ee_ant_control[mode][1] 	|

	    (ee->ee_ant_control[mode][2] << 6) 	|
@@ -517,9 +517,9 @@ ath5k_eeprom_init_modes(struct ath5k_hw *ah) 
static inline void

ath5k_get_pcdac_intercepts(struct ath5k_hw *ah, u8 min, u8 max, u8 *vp)

{

	const static u16 intercepts3[] =

	static const u16 intercepts3[] =

		{ 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 };

	const static u16 intercepts3_2[] =

	static const u16 intercepts3_2[] =

		{ 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 };

	const u16 *ip;

	int i;
@@ -1412,6 +1412,7 @@ ath5k_eeprom_init(struct ath5k_hw *ah) 


	return 0;

}



/*

 * Read the MAC address from eeprom

 */
@@ -1448,3 +1449,14 @@ int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) 
	return 0;

}



bool ath5k_eeprom_is_hb63(struct ath5k_hw *ah)

{

	u16 data;



	ath5k_hw_eeprom_read(ah, AR5K_EEPROM_IS_HB63, &data);



	if ((ah->ah_mac_version == (AR5K_SREV_AR2425 >> 4)) && data)

		return true;

	else

		return false;

}

drivers/net/wireless/ath5k/eeprom.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define AR5K_EEPROM_MAGIC_5211		0x0000145b /* 5211 */

#define AR5K_EEPROM_MAGIC_5210		0x0000145a /* 5210 */



#define	AR5K_EEPROM_IS_HB63		0x000b	/* Talon detect */

#define AR5K_EEPROM_REG_DOMAIN		0x00bf	/* EEPROM regdom */

#define AR5K_EEPROM_CHECKSUM		0x00c0	/* EEPROM checksum */

#define AR5K_EEPROM_INFO_BASE		0x00c0	/* EEPROM header */