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

Commit fa3d2fee authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Add new field on ath5k_hw to track bandwidth modes 



 * Prepare for half/quarter/turbo support, introduce a new
 ah_bwmode parameter and get rid of ah_turbo. Bwmode stands
 for "bandwidth mode" and can have 4 values, default (20MHz),
 turbo (40MHz), half rate (10MHz), and quarter rate (5MHz).

 Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 14fae2d4

drivers/net/wireless/ath/ath5k/ath5k.h

+7 −1
Original line number Diff line number Diff line
@@ -424,6 +424,12 @@ enum ath5k_ant_mode { 
	AR5K_ANTMODE_MAX,

};



enum ath5k_bw_mode {

	AR5K_BWMODE_DEFAULT	= 0,	/* 20MHz, default operation */

	AR5K_BWMODE_5MHZ	= 1,	/* Quarter rate */

	AR5K_BWMODE_10MHZ	= 2,	/* Half rate */

	AR5K_BWMODE_40MHZ	= 3	/* Turbo */

};



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

  TX DEFINITIONS
@@ -1026,7 +1032,6 @@ struct ath5k_hw { 
	enum ath5k_int		ah_imr;



	struct ieee80211_channel *ah_current_channel;

	bool			ah_turbo;

	bool			ah_calibration;

	bool			ah_single_chip;
@@ -1044,6 +1049,7 @@ struct ath5k_hw { 


	u32			ah_limit_tx_retries;

	u8			ah_coverage_class;

	u8			ah_bwmode;



	/* Antenna Control */

	u32			ah_ant_ctl[AR5K_EEPROM_N_MODES][AR5K_ANT_MAX];

drivers/net/wireless/ath/ath5k/attach.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	 * HW information

	 */

	ah->ah_radar.r_enabled = AR5K_TUNE_RADAR_ALERT;

	ah->ah_turbo = false;

	ah->ah_bwmode = AR5K_BWMODE_DEFAULT;

	ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER;

	ah->ah_imr = 0;

	ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY;

drivers/net/wireless/ath/ath5k/phy.c

+0 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,6 @@ static int ath5k_hw_channel(struct ath5k_hw *ah, 
	}



	ah->ah_current_channel = channel;

	ah->ah_turbo = channel->hw_value == CHANNEL_T ? true : false;

	ath5k_hw_set_clockrate(ah);



	return 0;

drivers/net/wireless/ath/ath5k/qcu.c

+8 −8
Original line number Diff line number Diff line
@@ -246,20 +246,20 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) 
			return 0;



		/* Set Slot time */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			AR5K_INIT_SLOT_TIME_TURBO : AR5K_INIT_SLOT_TIME,

			AR5K_SLOT_TIME);

		/* Set ACK_CTS timeout */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			AR5K_INIT_ACK_CTS_TIMEOUT_TURBO :

			AR5K_INIT_ACK_CTS_TIMEOUT, AR5K_SLOT_TIME);

		/* Set Transmit Latency */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			AR5K_INIT_TRANSMIT_LATENCY_TURBO :

			AR5K_INIT_TRANSMIT_LATENCY, AR5K_USEC_5210);



		/* Set IFS0 */

		if (ah->ah_turbo) {

		if (ah->ah_bwmode == AR5K_BWMODE_40MHZ) {

			ath5k_hw_reg_write(ah, ((AR5K_INIT_SIFS_TURBO +

				tq->tqi_aifs * AR5K_INIT_SLOT_TIME_TURBO) <<

				AR5K_IFS0_DIFS_S) | AR5K_INIT_SIFS_TURBO,
@@ -272,18 +272,18 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue) 
		}



		/* Set IFS1 */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			AR5K_INIT_PROTO_TIME_CNTRL_TURBO :

			AR5K_INIT_PROTO_TIME_CNTRL, AR5K_IFS1);

		/* Set AR5K_PHY_SETTLING */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) & ~0x7F)

			| 0x38 :

			(ath5k_hw_reg_read(ah, AR5K_PHY_SETTLING) & ~0x7F)

			| 0x1C,

			AR5K_PHY_SETTLING);

		/* Set Frame Control Register */

		ath5k_hw_reg_write(ah, ah->ah_turbo ?

		ath5k_hw_reg_write(ah, (ah->ah_bwmode == AR5K_BWMODE_40MHZ) ?

			(AR5K_PHY_FRAME_CTL_INI | AR5K_PHY_TURBO_MODE |

			AR5K_PHY_TURBO_SHORT | 0x2020) :

			(AR5K_PHY_FRAME_CTL_INI | 0x1020),