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

Commit 435c1610 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: clean up register write buffering 



Throughout the code, DISABLE_REGWRITE_BUFFER is always called right after
REGWRITE_BUFFER_FLUSH. Since that's unlikely to change any time soon, that
makes keeping those ops separate rather pointless, as it only increases
code size and line number counts.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9dbebc7f

drivers/net/wireless/ath/ath.h

+1 −3
Original line number Diff line number Diff line
@@ -102,14 +102,12 @@ enum ath_cipher { 
 * @read: Register read

 * @write: Register write

 * @enable_write_buffer: Enable multiple register writes

 * @disable_write_buffer: Disable multiple register writes

 * @write_flush: Flush buffered register writes

 * @write_flush: flush buffered register writes and disable buffering

 */

struct ath_ops {

	unsigned int (*read)(void *, u32 reg_offset);

	void (*write)(void *, u32 val, u32 reg_offset);

	void (*enable_write_buffer)(void *);

	void (*disable_write_buffer)(void *);

	void (*write_flush) (void *);

};

drivers/net/wireless/ath/ath9k/ani.c

+0 −6
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static void ath9k_ani_restart_old(struct ath_hw *ah) 
	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
@@ -215,7 +214,6 @@ static void ath9k_ani_restart_new(struct ath_hw *ah) 
	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
@@ -643,7 +641,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning) 
	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);

}



/*
@@ -737,7 +734,6 @@ static void ath9k_ani_reset_new(struct ath_hw *ah, bool is_scanning) 
	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);

}



static void ath9k_hw_ani_monitor_old(struct ath_hw *ah,
@@ -991,7 +987,6 @@ void ath9k_enable_mib_counters(struct ath_hw *ah) 
	REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);

}



/* Freeze the MIB counters, get the stats and then clear them */
@@ -1261,7 +1256,6 @@ void ath9k_hw_ani_init(struct ath_hw *ah) 
	REG_WRITE(ah, AR_PHY_ERR_2, ah->ani[0].cckPhyErrBase);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	ath9k_enable_mib_counters(ah);

drivers/net/wireless/ath/ath9k/ar5008_phy.c

+2 −7
Original line number Diff line number Diff line
@@ -613,14 +613,11 @@ static void ar5008_hw_init_chain_masks(struct ath_hw *ah) 
	rx_chainmask = ah->rxchainmask;

	tx_chainmask = ah->txchainmask;



	ENABLE_REGWRITE_BUFFER(ah);



	switch (rx_chainmask) {

	case 0x5:

		DISABLE_REGWRITE_BUFFER(ah);

		REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,

			    AR_PHY_SWAP_ALT_CHAIN);

		ENABLE_REGWRITE_BUFFER(ah);

	case 0x3:

		if (ah->hw_version.macVersion == AR_SREV_REVISION_5416_10) {

			REG_WRITE(ah, AR_PHY_RX_CHAINMASK, 0x7);
@@ -630,17 +627,18 @@ static void ar5008_hw_init_chain_masks(struct ath_hw *ah) 
	case 0x1:

	case 0x2:

	case 0x7:

		ENABLE_REGWRITE_BUFFER(ah);

		REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx_chainmask);

		REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx_chainmask);

		break;

	default:

		ENABLE_REGWRITE_BUFFER(ah);

		break;

	}



	REG_WRITE(ah, AR_SELFGEN_MASK, tx_chainmask);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	if (tx_chainmask == 0x5) {

		REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
@@ -726,7 +724,6 @@ static void ar5008_hw_set_channel_regs(struct ath_hw *ah, 
	REG_WRITE(ah, AR_CST, 0xF << AR_CST_TIMEOUT_LIMIT_S);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);

}
@@ -818,7 +815,6 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	}



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	if (AR_SREV_9280(ah) || AR_SREV_9287_11_OR_LATER(ah))

		REG_WRITE_ARRAY(&ah->iniModesRxGain, modesIndex, regWrites);
@@ -849,7 +845,6 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	}



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	if (AR_SREV_9271(ah)) {

		if (ah->eep_ops->get_eeprom(ah, EEP_TXGAIN_TYPE) == 1)

drivers/net/wireless/ath/ath9k/ar9002_calib.c

+0 −1
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ static void ar9271_hw_pa_cal(struct ath_hw *ah, bool is_reset) 
		REG_WRITE(ah, regList[i][0], regList[i][1]);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);

}



static inline void ar9285_hw_pa_cal(struct ath_hw *ah, bool is_reset)

drivers/net/wireless/ath/ath9k/ar9002_hw.c

+0 −4
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, 
			REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);



			REGWRITE_BUFFER_FLUSH(ah);

			DISABLE_REGWRITE_BUFFER(ah);

		}



		udelay(1000);
@@ -468,7 +467,6 @@ static int ar9002_hw_get_radiorev(struct ath_hw *ah) 
		REG_WRITE(ah, AR_PHY(0x20), 0x00010000);



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



	val = (REG_READ(ah, AR_PHY(256)) >> 24) & 0xff;

	val = ((val & 0xf0) >> 4) | ((val & 0x0f) << 4);
@@ -627,6 +625,4 @@ void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan) 
	}



	REGWRITE_BUFFER_FLUSH(ah);

	DISABLE_REGWRITE_BUFFER(ah);



}