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

Commit 8896934c authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove direct accesses to channel mode flags 



Use wrappers where available. Simplifies code and helps with further
improvements to the channel data structure

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

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

+2 −4
Original line number Diff line number Diff line
@@ -338,10 +338,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
		    aniState->cckNoiseImmunityLevel !=

		    ATH9K_ANI_CCK_DEF_LEVEL) {

			ath_dbg(common, ANI,

				"Restore defaults: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",

				"Restore defaults: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",

				ah->opmode,

				chan->channel,

				chan->channelFlags,

				is_scanning,

				aniState->ofdmNoiseImmunityLevel,

				aniState->cckNoiseImmunityLevel);
@@ -354,10 +353,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
		 * restore historical levels for this channel

		 */

		ath_dbg(common, ANI,

			"Restore history: opmode %u chan %d Mhz/0x%x is_scanning=%d ofdm:%d cck:%d\n",

			"Restore history: opmode %u chan %d Mhz is_scanning=%d ofdm:%d cck:%d\n",

			ah->opmode,

			chan->channel,

			chan->channelFlags,

			is_scanning,

			aniState->ofdmNoiseImmunityLevel,

			aniState->cckNoiseImmunityLevel);

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

+7 −28
Original line number Diff line number Diff line
@@ -666,8 +666,7 @@ static void ar5008_hw_set_channel_regs(struct ath_hw *ah, 
	if (IS_CHAN_HT40(chan)) {

		phymode |= AR_PHY_FC_DYN2040_EN;



		if ((chan->chanmode == CHANNEL_A_HT40PLUS) ||

		    (chan->chanmode == CHANNEL_G_HT40PLUS))

		if (IS_CHAN_HT40PLUS(chan))

			phymode |= AR_PHY_FC_DYN2040_PRI_CH;



	}
@@ -691,31 +690,12 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	int i, regWrites = 0;

	u32 modesIndex, freqIndex;



	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

		modesIndex = 1;

	if (IS_CHAN_5GHZ(chan)) {

		freqIndex = 1;

		break;

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		modesIndex = 2;

		freqIndex = 1;

		break;

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_B:

		modesIndex = 4;

		freqIndex = 2;

		break;

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		modesIndex = 3;

		modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;

	} else {

		freqIndex = 2;

		break;



	default:

		return -EINVAL;

		modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;

	}



	/*
@@ -1218,12 +1198,11 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah) 


	iniDef = &aniState->iniDef;



	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",

	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz\n",

		ah->hw_version.macVersion,

		ah->hw_version.macRev,

		ah->opmode,

		chan->channel,

		chan->channelFlags);

		chan->channel);



	val = REG_READ(ah, AR_PHY_SFCORR);

	iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);

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

+4 −22
Original line number Diff line number Diff line
@@ -419,28 +419,10 @@ void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan) 
	u32 modesIndex;

	int i;



	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

		modesIndex = 1;

		break;

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		modesIndex = 2;

		break;

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_B:

		modesIndex = 4;

		break;

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		modesIndex = 3;

		break;



	default:

		return;

	}

	if (IS_CHAN_5GHZ(chan))

		modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;

	else

		modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;



	ENABLE_REGWRITE_BUFFER(ah);

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

+24 −81
Original line number Diff line number Diff line
@@ -551,8 +551,7 @@ static void ar9003_hw_set_channel_regs(struct ath_hw *ah, 
	if (IS_CHAN_HT40(chan)) {

		phymode |= AR_PHY_GC_DYN2040_EN;

		/* Configure control (primary) channel at +-10MHz */

		if ((chan->chanmode == CHANNEL_A_HT40PLUS) ||

		    (chan->chanmode == CHANNEL_G_HT40PLUS))

		if (IS_CHAN_HT40PLUS(chan))

			phymode |= AR_PHY_GC_DYN2040_PRI_CH;



	}
@@ -682,41 +681,22 @@ static int ar9550_hw_get_modes_txgain_index(struct ath_hw *ah, 
{

	int ret;



	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

	if (IS_CHAN_2GHZ(chan)) {

		if (IS_CHAN_HT40(chan))

			return 7;

		else

			return 8;

	}



	if (chan->channel <= 5350)

		ret = 1;

	else if ((chan->channel > 5350) && (chan->channel <= 5600))

		ret = 3;

	else

		ret = 5;

		break;



	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		if (chan->channel <= 5350)

			ret = 2;

		else if ((chan->channel > 5350) && (chan->channel <= 5600))

			ret = 4;

		else

			ret = 6;

		break;



	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_B:

		ret = 8;

		break;



	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		ret = 7;

		break;



	default:

		ret = -EINVAL;

	}

	if (IS_CHAN_HT40(chan))

		ret++;



	return ret;

}
@@ -727,28 +707,10 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, 
	unsigned int regWrites = 0, i;

	u32 modesIndex;



	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

		modesIndex = 1;

		break;

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		modesIndex = 2;

		break;

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_B:

		modesIndex = 4;

		break;

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		modesIndex = 3;

		break;



	default:

		return -EINVAL;

	}

	if (IS_CHAN_5GHZ(chan))

		modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;

	else

		modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;



	/*

	 * SOC, MAC, BB, RADIO initvals.
@@ -1273,12 +1235,11 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah) 
	aniState = &ah->ani;

	iniDef = &aniState->iniDef;



	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz/0x%x\n",

	ath_dbg(common, ANI, "ver %d.%d opmode %u chan %d Mhz\n",

		ah->hw_version.macVersion,

		ah->hw_version.macRev,

		ah->opmode,

		chan->channel,

		chan->channelFlags);

		chan->channel);



	val = REG_READ(ah, AR_PHY_SFCORR);

	iniDef->m1Thresh = MS(val, AR_PHY_SFCORR_M1_THRESH);
@@ -1536,28 +1497,10 @@ static int ar9003_hw_fast_chan_change(struct ath_hw *ah, 
	unsigned int regWrites = 0;

	u32 modesIndex;



	switch (chan->chanmode) {

	case CHANNEL_A:

	case CHANNEL_A_HT20:

		modesIndex = 1;

		break;

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		modesIndex = 2;

		break;

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_B:

		modesIndex = 4;

		break;

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		modesIndex = 3;

		break;



	default:

		return -EINVAL;

	}

	if (IS_CHAN_5GHZ(chan))

		modesIndex = IS_CHAN_HT40(chan) ? 2 : 1;

	else

		modesIndex = IS_CHAN_HT40(chan) ? 3 : 4;



	if (modesIndex == ah->modes_index) {

		*ini_reloaded = false;

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

+3 −23
Original line number Diff line number Diff line
@@ -24,30 +24,10 @@ 
static enum htc_phymode ath9k_htc_get_curmode(struct ath9k_htc_priv *priv,

					      struct ath9k_channel *ichan)

{

	enum htc_phymode mode;



	mode = -EINVAL;



	switch (ichan->chanmode) {

	case CHANNEL_G:

	case CHANNEL_G_HT20:

	case CHANNEL_G_HT40PLUS:

	case CHANNEL_G_HT40MINUS:

		mode = HTC_MODE_11NG;

		break;

	case CHANNEL_A:

	case CHANNEL_A_HT20:

	case CHANNEL_A_HT40PLUS:

	case CHANNEL_A_HT40MINUS:

		mode = HTC_MODE_11NA;

		break;

	default:

		break;

	}



	WARN_ON(mode < 0);

	if (IS_CHAN_5GHZ(ichan))

		return HTC_MODE_11NA;



	return mode;

	return HTC_MODE_11NG;

}



bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,