diff mbox

ath9k: add phy.c

Message ID 1431693340-8861-1-git-send-email-linux@rempel-privat.de (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Oleksij Rempel May 15, 2015, 12:35 p.m. UTC 
... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
---
 drivers/net/wireless/ath/ath9k/Makefile     |   1 +
 drivers/net/wireless/ath/ath9k/ar5008_phy.c | 144 +----------------------
 drivers/net/wireless/ath/ath9k/ar9002_phy.c | 144 +----------------------
 drivers/net/wireless/ath/ath9k/phy.c        | 170 ++++++++++++++++++++++++++++
 drivers/net/wireless/ath/ath9k/phy.h        |   3 +
 5 files changed, 178 insertions(+), 284 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath9k/phy.c

Comments

Julian Calaby May 15, 2015, 2:38 p.m. UTC | #1 
Hi Oleksij,

On Fri, May 15, 2015 at 10:35 PM, Oleksij Rempel <linux@rempel-privat.de> wrote:
> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c

A better subject might be:

ath9k: consolidate common phy functions

"phy.c" doesn't really mean anything to people outside the developers
of this particular driver.

Thanks,
Sedat Dilek May 15, 2015, 2:44 p.m. UTC | #2 
On Fri, May 15, 2015 at 4:38 PM, Julian Calaby <julian.calaby@gmail.com> wrote:
> Hi Oleksij,
>
> On Fri, May 15, 2015 at 10:35 PM, Oleksij Rempel <linux@rempel-privat.de> wrote:
>> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
>
> A better subject might be:
>
> ath9k: consolidate common phy functions
>
> "phy.c" doesn't really mean anything to people outside the developers
> of this particular driver.
>

Jupp.

Is a consolidation also possible/wise/doable also for phy.h?
( I see this snippet in your new phy.c file... )
...
+#include "phy.h"
+#include "ar9002_phy.h"
...

IOW, can ar9002_phy.h move into phy.h?

- sed@ -
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Joe Perches May 15, 2015, 6:35 p.m. UTC | #3 
On Fri, 2015-05-15 at 14:35 +0200, Oleksij Rempel wrote:
> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
[]
> diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c

> +void phy_hw_spur_mitigate(struct ath_hw *ah,
> +			  struct ath9k_channel *chan, int bin)
> +{
> +	int cur_bin;
> +	int upper, lower, cur_vit_mask;
> +	int i;
> +	int8_t mask_m[123];
> +	int8_t mask_p[123];

Looking at this code, I'm not sure if mask_m and mask_p
are always completely initialized by the loop below.

Perhaps use {} on declaration.

> +	int8_t mask_amt;

These int8_t could be s8

> +	int tmp_mask;
> +	static int pilot_mask_reg[4] = {
> +		AR_PHY_TIMING7, AR_PHY_TIMING8,
> +		AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
> +	};
> +	static int chan_mask_reg[4] = {
> +		AR_PHY_TIMING9, AR_PHY_TIMING10,
> +		AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
> +	};
> +	static int inc[4] = { 0, 100, 0, 0 };

static const

> +	cur_vit_mask = 6100;
> +	upper = bin + 120;
> +	lower = bin - 120;
> +

Is this loop guaranteed to always initialize all the
mask_p and mask_m indexes used in the or statements below it?

The 123 for -61 and 0 and +61 array indexes is a bit obscure.

> +	for (i = 0; i < 123; i++) {
> +		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
> +			/* workaround for gcc bug #37014 */
> +			volatile int tmp_v = abs(cur_vit_mask - bin);
> +
> +			if (tmp_v < 75)
> +				mask_amt = 1;
> +			else
> +				mask_amt = 0;
> +			if (cur_vit_mask < 0)
> +				mask_m[abs(cur_vit_mask / 100)] = mask_amt;
> +			else
> +				mask_p[cur_vit_mask / 100] = mask_amt;
> +		}
> +		cur_vit_mask -= 100;
> +	}
> +
> +	tmp_mask = (mask_m[46] << 30) | (mask_m[47] << 28)
> +		| (mask_m[48] << 26) | (mask_m[49] << 24)
> +		| (mask_m[50] << 22) | (mask_m[51] << 20)
> +		| (mask_m[52] << 18) | (mask_m[53] << 16)
> +		| (mask_m[54] << 14) | (mask_m[55] << 12)
> +		| (mask_m[56] << 10) | (mask_m[57] << 8)
> +		| (mask_m[58] << 6) | (mask_m[59] << 4)
> +		| (mask_m[60] << 2) | (mask_m[61] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK_1, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_VIT_MASK2_M_46_61, tmp_mask);
> +
> +	tmp_mask = (mask_m[31] << 28)
> +		| (mask_m[32] << 26) | (mask_m[33] << 24)
> +		| (mask_m[34] << 22) | (mask_m[35] << 20)
> +		| (mask_m[36] << 18) | (mask_m[37] << 16)
> +		| (mask_m[48] << 14) | (mask_m[39] << 12)
> +		| (mask_m[40] << 10) | (mask_m[41] << 8)
> +		| (mask_m[42] << 6) | (mask_m[43] << 4)
> +		| (mask_m[44] << 2) | (mask_m[45] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK_2, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_M_31_45, tmp_mask);
> +
> +	tmp_mask = (mask_m[16] << 30) | (mask_m[16] << 28)
> +		| (mask_m[18] << 26) | (mask_m[18] << 24)
> +		| (mask_m[20] << 22) | (mask_m[20] << 20)
> +		| (mask_m[22] << 18) | (mask_m[22] << 16)
> +		| (mask_m[24] << 14) | (mask_m[24] << 12)
> +		| (mask_m[25] << 10) | (mask_m[26] << 8)
> +		| (mask_m[27] << 6) | (mask_m[28] << 4)
> +		| (mask_m[29] << 2) | (mask_m[30] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK_3, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_M_16_30, tmp_mask);
> +
> +	tmp_mask = (mask_m[0] << 30) | (mask_m[1] << 28)
> +		| (mask_m[2] << 26) | (mask_m[3] << 24)
> +		| (mask_m[4] << 22) | (mask_m[5] << 20)
> +		| (mask_m[6] << 18) | (mask_m[7] << 16)
> +		| (mask_m[8] << 14) | (mask_m[9] << 12)
> +		| (mask_m[10] << 10) | (mask_m[11] << 8)
> +		| (mask_m[12] << 6) | (mask_m[13] << 4)
> +		| (mask_m[14] << 2) | (mask_m[15] << 0);
> +	REG_WRITE(ah, AR_PHY_MASK_CTL, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_M_00_15, tmp_mask);
> +
> +	tmp_mask = (mask_p[15] << 28)
> +		| (mask_p[14] << 26) | (mask_p[13] << 24)
> +		| (mask_p[12] << 22) | (mask_p[11] << 20)
> +		| (mask_p[10] << 18) | (mask_p[9] << 16)
> +		| (mask_p[8] << 14) | (mask_p[7] << 12)
> +		| (mask_p[6] << 10) | (mask_p[5] << 8)
> +		| (mask_p[4] << 6) | (mask_p[3] << 4)
> +		| (mask_p[2] << 2) | (mask_p[1] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_1, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_P_15_01, tmp_mask);
> +
> +	tmp_mask = (mask_p[30] << 28)
> +		| (mask_p[29] << 26) | (mask_p[28] << 24)
> +		| (mask_p[27] << 22) | (mask_p[26] << 20)
> +		| (mask_p[25] << 18) | (mask_p[24] << 16)
> +		| (mask_p[23] << 14) | (mask_p[22] << 12)
> +		| (mask_p[21] << 10) | (mask_p[20] << 8)
> +		| (mask_p[19] << 6) | (mask_p[18] << 4)
> +		| (mask_p[17] << 2) | (mask_p[16] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_2, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_P_30_16, tmp_mask);
> +
> +	tmp_mask = (mask_p[45] << 28)
> +		| (mask_p[44] << 26) | (mask_p[43] << 24)
> +		| (mask_p[42] << 22) | (mask_p[41] << 20)
> +		| (mask_p[40] << 18) | (mask_p[39] << 16)
> +		| (mask_p[38] << 14) | (mask_p[37] << 12)
> +		| (mask_p[36] << 10) | (mask_p[35] << 8)
> +		| (mask_p[34] << 6) | (mask_p[33] << 4)
> +		| (mask_p[32] << 2) | (mask_p[31] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_3, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_P_45_31, tmp_mask);
> +
> +	tmp_mask = (mask_p[61] << 30) | (mask_p[60] << 28)
> +		| (mask_p[59] << 26) | (mask_p[58] << 24)
> +		| (mask_p[57] << 22) | (mask_p[56] << 20)
> +		| (mask_p[55] << 18) | (mask_p[54] << 16)
> +		| (mask_p[53] << 14) | (mask_p[52] << 12)
> +		| (mask_p[51] << 10) | (mask_p[50] << 8)
> +		| (mask_p[49] << 6) | (mask_p[48] << 4)
> +		| (mask_p[47] << 2) | (mask_p[46] << 0);
> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_4, tmp_mask);
> +	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felix Fietkau May 15, 2015, 7:34 p.m. UTC | #4 
On 2015-05-15 14:35, Oleksij Rempel wrote:
> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
> 
> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
We already have base functionality for AR5008-AR9002 provided in some
ar5008_phy.c, and ar5008_hw_attach_phy_ops is called for those chipsets
as well. Please keep the de-duplicated code there instead of adding a
new phy.c, because AR9003+ uses a completely different codepath.

- Felix
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Oleksij Rempel May 16, 2015, 5:24 a.m. UTC | #5 
Am 15.05.2015 um 21:34 schrieb Felix Fietkau:
> On 2015-05-15 14:35, Oleksij Rempel wrote:
>> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
>>
>> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
> We already have base functionality for AR5008-AR9002 provided in some
> ar5008_phy.c, and ar5008_hw_attach_phy_ops is called for those chipsets
> as well. Please keep the de-duplicated code there instead of adding a
> new phy.c, because AR9003+ uses a completely different codepath.
> 
> - Felix
> 

ok, thanks.
Currently i celled this function phy_hw_spur_mitigate(), is it ok or
there is some better name for this code?
Oleksij Rempel May 16, 2015, 5:27 a.m. UTC | #6 
Am 15.05.2015 um 20:35 schrieb Joe Perches:
> On Fri, 2015-05-15 at 14:35 +0200, Oleksij Rempel wrote:
>> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
> []
>> diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c
> 
>> +void phy_hw_spur_mitigate(struct ath_hw *ah,
>> +			  struct ath9k_channel *chan, int bin)
>> +{
>> +	int cur_bin;
>> +	int upper, lower, cur_vit_mask;
>> +	int i;
>> +	int8_t mask_m[123];
>> +	int8_t mask_p[123];
> 
> Looking at this code, I'm not sure if mask_m and mask_p
> are always completely initialized by the loop below.
> 
> Perhaps use {} on declaration.
> 
>> +	int8_t mask_amt;
> 
> These int8_t could be s8
> 
>> +	int tmp_mask;
>> +	static int pilot_mask_reg[4] = {
>> +		AR_PHY_TIMING7, AR_PHY_TIMING8,
>> +		AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
>> +	};
>> +	static int chan_mask_reg[4] = {
>> +		AR_PHY_TIMING9, AR_PHY_TIMING10,
>> +		AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
>> +	};
>> +	static int inc[4] = { 0, 100, 0, 0 };
> 
> static const
> 
>> +	cur_vit_mask = 6100;
>> +	upper = bin + 120;
>> +	lower = bin - 120;
>> +
> 
> Is this loop guaranteed to always initialize all the
> mask_p and mask_m indexes used in the or statements below it?
> 
> The 123 for -61 and 0 and +61 array indexes is a bit obscure.
> 
>> +	for (i = 0; i < 123; i++) {
>> +		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
>> +			/* workaround for gcc bug #37014 */
>> +			volatile int tmp_v = abs(cur_vit_mask - bin);
>> +
>> +			if (tmp_v < 75)
>> +				mask_amt = 1;
>> +			else
>> +				mask_amt = 0;
>> +			if (cur_vit_mask < 0)
>> +				mask_m[abs(cur_vit_mask / 100)] = mask_amt;
>> +			else
>> +				mask_p[cur_vit_mask / 100] = mask_amt;
>> +		}
>> +		cur_vit_mask -= 100;
>> +	}
>> +
>> +	tmp_mask = (mask_m[46] << 30) | (mask_m[47] << 28)
>> +		| (mask_m[48] << 26) | (mask_m[49] << 24)
>> +		| (mask_m[50] << 22) | (mask_m[51] << 20)
>> +		| (mask_m[52] << 18) | (mask_m[53] << 16)
>> +		| (mask_m[54] << 14) | (mask_m[55] << 12)
>> +		| (mask_m[56] << 10) | (mask_m[57] << 8)
>> +		| (mask_m[58] << 6) | (mask_m[59] << 4)
>> +		| (mask_m[60] << 2) | (mask_m[61] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK_1, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_VIT_MASK2_M_46_61, tmp_mask);
>> +
>> +	tmp_mask = (mask_m[31] << 28)
>> +		| (mask_m[32] << 26) | (mask_m[33] << 24)
>> +		| (mask_m[34] << 22) | (mask_m[35] << 20)
>> +		| (mask_m[36] << 18) | (mask_m[37] << 16)
>> +		| (mask_m[48] << 14) | (mask_m[39] << 12)
>> +		| (mask_m[40] << 10) | (mask_m[41] << 8)
>> +		| (mask_m[42] << 6) | (mask_m[43] << 4)
>> +		| (mask_m[44] << 2) | (mask_m[45] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK_2, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_M_31_45, tmp_mask);
>> +
>> +	tmp_mask = (mask_m[16] << 30) | (mask_m[16] << 28)
>> +		| (mask_m[18] << 26) | (mask_m[18] << 24)
>> +		| (mask_m[20] << 22) | (mask_m[20] << 20)
>> +		| (mask_m[22] << 18) | (mask_m[22] << 16)
>> +		| (mask_m[24] << 14) | (mask_m[24] << 12)
>> +		| (mask_m[25] << 10) | (mask_m[26] << 8)
>> +		| (mask_m[27] << 6) | (mask_m[28] << 4)
>> +		| (mask_m[29] << 2) | (mask_m[30] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK_3, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_M_16_30, tmp_mask);
>> +
>> +	tmp_mask = (mask_m[0] << 30) | (mask_m[1] << 28)
>> +		| (mask_m[2] << 26) | (mask_m[3] << 24)
>> +		| (mask_m[4] << 22) | (mask_m[5] << 20)
>> +		| (mask_m[6] << 18) | (mask_m[7] << 16)
>> +		| (mask_m[8] << 14) | (mask_m[9] << 12)
>> +		| (mask_m[10] << 10) | (mask_m[11] << 8)
>> +		| (mask_m[12] << 6) | (mask_m[13] << 4)
>> +		| (mask_m[14] << 2) | (mask_m[15] << 0);
>> +	REG_WRITE(ah, AR_PHY_MASK_CTL, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_M_00_15, tmp_mask);
>> +
>> +	tmp_mask = (mask_p[15] << 28)
>> +		| (mask_p[14] << 26) | (mask_p[13] << 24)
>> +		| (mask_p[12] << 22) | (mask_p[11] << 20)
>> +		| (mask_p[10] << 18) | (mask_p[9] << 16)
>> +		| (mask_p[8] << 14) | (mask_p[7] << 12)
>> +		| (mask_p[6] << 10) | (mask_p[5] << 8)
>> +		| (mask_p[4] << 6) | (mask_p[3] << 4)
>> +		| (mask_p[2] << 2) | (mask_p[1] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_1, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_P_15_01, tmp_mask);
>> +
>> +	tmp_mask = (mask_p[30] << 28)
>> +		| (mask_p[29] << 26) | (mask_p[28] << 24)
>> +		| (mask_p[27] << 22) | (mask_p[26] << 20)
>> +		| (mask_p[25] << 18) | (mask_p[24] << 16)
>> +		| (mask_p[23] << 14) | (mask_p[22] << 12)
>> +		| (mask_p[21] << 10) | (mask_p[20] << 8)
>> +		| (mask_p[19] << 6) | (mask_p[18] << 4)
>> +		| (mask_p[17] << 2) | (mask_p[16] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_2, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_P_30_16, tmp_mask);
>> +
>> +	tmp_mask = (mask_p[45] << 28)
>> +		| (mask_p[44] << 26) | (mask_p[43] << 24)
>> +		| (mask_p[42] << 22) | (mask_p[41] << 20)
>> +		| (mask_p[40] << 18) | (mask_p[39] << 16)
>> +		| (mask_p[38] << 14) | (mask_p[37] << 12)
>> +		| (mask_p[36] << 10) | (mask_p[35] << 8)
>> +		| (mask_p[34] << 6) | (mask_p[33] << 4)
>> +		| (mask_p[32] << 2) | (mask_p[31] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_3, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_P_45_31, tmp_mask);
>> +
>> +	tmp_mask = (mask_p[61] << 30) | (mask_p[60] << 28)
>> +		| (mask_p[59] << 26) | (mask_p[58] << 24)
>> +		| (mask_p[57] << 22) | (mask_p[56] << 20)
>> +		| (mask_p[55] << 18) | (mask_p[54] << 16)
>> +		| (mask_p[53] << 14) | (mask_p[52] << 12)
>> +		| (mask_p[51] << 10) | (mask_p[50] << 8)
>> +		| (mask_p[49] << 6) | (mask_p[48] << 4)
>> +		| (mask_p[47] << 2) | (mask_p[46] << 0);
>> +	REG_WRITE(ah, AR_PHY_BIN_MASK2_4, tmp_mask);
>> +	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);
> 
> 

Hi Joe,
Thank you for reviewing. This is cleanup patch, no fixes optimisations
or regressions should be introduced. If you see some problems in this
code, you are welcome to provide a patch on top of this one :)
Joe Perches May 16, 2015, 5:36 a.m. UTC | #7 
On Sat, 2015-05-16 at 07:27 +0200, Oleksij Rempel wrote:

> Am 15.05.2015 um 20:35 schrieb Joe Perches:
> > On Fri, 2015-05-15 at 14:35 +0200, Oleksij Rempel wrote:
> >> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
> > []
> >> diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c
> > 
> >> +void phy_hw_spur_mitigate(struct ath_hw *ah,
> >> +			  struct ath9k_channel *chan, int bin)
> >> +{
[]
> >> +	static int inc[4] = { 0, 100, 0, 0 };
> > 
> > static const

> This is cleanup patch, no fixes optimisations
> or regressions should be introduced.

Hello Oleksij.

One of the old compilation units (ar9002_phy.c) had const on
all those arrays, the other did not.

const should be used here.

> If you see some problems in this
> code, you are welcome to provide a patch on top of this one :)

I think you should take comments on the patches you submit.


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Oleksij Rempel May 16, 2015, 5:43 a.m. UTC | #8 
Am 16.05.2015 um 07:36 schrieb Joe Perches:
> On Sat, 2015-05-16 at 07:27 +0200, Oleksij Rempel wrote:
> 
>> Am 15.05.2015 um 20:35 schrieb Joe Perches:
>>> On Fri, 2015-05-15 at 14:35 +0200, Oleksij Rempel wrote:
>>>> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
>>> []
>>>> diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c
>>>
>>>> +void phy_hw_spur_mitigate(struct ath_hw *ah,
>>>> +			  struct ath9k_channel *chan, int bin)
>>>> +{
> []
>>>> +	static int inc[4] = { 0, 100, 0, 0 };
>>>
>>> static const
> 
>> This is cleanup patch, no fixes optimisations
>> or regressions should be introduced.
> 
> Hello Oleksij.
> 
> One of the old compilation units (ar9002_phy.c) had const on
> all those arrays, the other did not.

ok, thanks. changed to const version.

> const should be used here.
> 
>> If you see some problems in this
>> code, you are welcome to provide a patch on top of this one :)
> 
> I think you should take comments on the patches you submit.

What do you mean?
Felix Fietkau May 16, 2015, 5:45 a.m. UTC | #9 
On 2015-05-16 07:24, Oleksij Rempel wrote:
> Am 15.05.2015 um 21:34 schrieb Felix Fietkau:
>> On 2015-05-15 14:35, Oleksij Rempel wrote:
>>> ... and move dup code from ar5008_phy.c and ar9002_phy.c to phy.c
>>>
>>> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
>> We already have base functionality for AR5008-AR9002 provided in some
>> ar5008_phy.c, and ar5008_hw_attach_phy_ops is called for those chipsets
>> as well. Please keep the de-duplicated code there instead of adding a
>> new phy.c, because AR9003+ uses a completely different codepath.
>> 
>> - Felix
>> 
> 
> ok, thanks.
> Currently i celled this function phy_hw_spur_mitigate(), is it ok or
> there is some better name for this code?
Just use the ar5008 prefix like in the other functions.

- Felix
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index ecda613..6e129b9 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -26,6 +26,7 @@  ath9k_hw-y:=	\
 		ar9002_hw.o \
 		ar9003_hw.o \
 		hw.o \
+		phy.o \
 		ar9003_phy.o \
 		ar9002_phy.o \
 		ar5008_phy.o \
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 6c23d27..350506c 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -266,27 +266,15 @@  static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
 				    struct ath9k_channel *chan)
 {
 	int bb_spur = AR_NO_SPUR;
-	int bin, cur_bin;
+	int bin;
 	int spur_freq_sd;
 	int spur_delta_phase;
 	int denominator;
-	int upper, lower, cur_vit_mask;
 	int tmp, new;
 	int i;
-	static int pilot_mask_reg[4] = {
-		AR_PHY_TIMING7, AR_PHY_TIMING8,
-		AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
-	};
-	static int chan_mask_reg[4] = {
-		AR_PHY_TIMING9, AR_PHY_TIMING10,
-		AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
-	};
-	static int inc[4] = { 0, 100, 0, 0 };
 
 	int8_t mask_m[123];
 	int8_t mask_p[123];
-	int8_t mask_amt;
-	int tmp_mask;
 	int cur_bb_spur;
 	bool is2GHz = IS_CHAN_2GHZ(chan);
 
@@ -335,135 +323,7 @@  static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
 	       SM(spur_delta_phase, AR_PHY_TIMING11_SPUR_DELTA_PHASE));
 	REG_WRITE(ah, AR_PHY_TIMING11, new);
 
-	cur_bin = -6000;
-	upper = bin + 100;
-	lower = bin - 100;
-
-	for (i = 0; i < 4; i++) {
-		int pilot_mask = 0;
-		int chan_mask = 0;
-		int bp = 0;
-		for (bp = 0; bp < 30; bp++) {
-			if ((cur_bin > lower) && (cur_bin < upper)) {
-				pilot_mask = pilot_mask | 0x1 << bp;
-				chan_mask = chan_mask | 0x1 << bp;
-			}
-			cur_bin += 100;
-		}
-		cur_bin += inc[i];
-		REG_WRITE(ah, pilot_mask_reg[i], pilot_mask);
-		REG_WRITE(ah, chan_mask_reg[i], chan_mask);
-	}
-
-	cur_vit_mask = 6100;
-	upper = bin + 120;
-	lower = bin - 120;
-
-	for (i = 0; i < 123; i++) {
-		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
-
-			/* workaround for gcc bug #37014 */
-			volatile int tmp_v = abs(cur_vit_mask - bin);
-
-			if (tmp_v < 75)
-				mask_amt = 1;
-			else
-				mask_amt = 0;
-			if (cur_vit_mask < 0)
-				mask_m[abs(cur_vit_mask / 100)] = mask_amt;
-			else
-				mask_p[cur_vit_mask / 100] = mask_amt;
-		}
-		cur_vit_mask -= 100;
-	}
-
-	tmp_mask = (mask_m[46] << 30) | (mask_m[47] << 28)
-		| (mask_m[48] << 26) | (mask_m[49] << 24)
-		| (mask_m[50] << 22) | (mask_m[51] << 20)
-		| (mask_m[52] << 18) | (mask_m[53] << 16)
-		| (mask_m[54] << 14) | (mask_m[55] << 12)
-		| (mask_m[56] << 10) | (mask_m[57] << 8)
-		| (mask_m[58] << 6) | (mask_m[59] << 4)
-		| (mask_m[60] << 2) | (mask_m[61] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_1, tmp_mask);
-	REG_WRITE(ah, AR_PHY_VIT_MASK2_M_46_61, tmp_mask);
-
-	tmp_mask = (mask_m[31] << 28)
-		| (mask_m[32] << 26) | (mask_m[33] << 24)
-		| (mask_m[34] << 22) | (mask_m[35] << 20)
-		| (mask_m[36] << 18) | (mask_m[37] << 16)
-		| (mask_m[48] << 14) | (mask_m[39] << 12)
-		| (mask_m[40] << 10) | (mask_m[41] << 8)
-		| (mask_m[42] << 6) | (mask_m[43] << 4)
-		| (mask_m[44] << 2) | (mask_m[45] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_2, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_31_45, tmp_mask);
-
-	tmp_mask = (mask_m[16] << 30) | (mask_m[16] << 28)
-		| (mask_m[18] << 26) | (mask_m[18] << 24)
-		| (mask_m[20] << 22) | (mask_m[20] << 20)
-		| (mask_m[22] << 18) | (mask_m[22] << 16)
-		| (mask_m[24] << 14) | (mask_m[24] << 12)
-		| (mask_m[25] << 10) | (mask_m[26] << 8)
-		| (mask_m[27] << 6) | (mask_m[28] << 4)
-		| (mask_m[29] << 2) | (mask_m[30] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_3, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_16_30, tmp_mask);
-
-	tmp_mask = (mask_m[0] << 30) | (mask_m[1] << 28)
-		| (mask_m[2] << 26) | (mask_m[3] << 24)
-		| (mask_m[4] << 22) | (mask_m[5] << 20)
-		| (mask_m[6] << 18) | (mask_m[7] << 16)
-		| (mask_m[8] << 14) | (mask_m[9] << 12)
-		| (mask_m[10] << 10) | (mask_m[11] << 8)
-		| (mask_m[12] << 6) | (mask_m[13] << 4)
-		| (mask_m[14] << 2) | (mask_m[15] << 0);
-	REG_WRITE(ah, AR_PHY_MASK_CTL, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_00_15, tmp_mask);
-
-	tmp_mask = (mask_p[15] << 28)
-		| (mask_p[14] << 26) | (mask_p[13] << 24)
-		| (mask_p[12] << 22) | (mask_p[11] << 20)
-		| (mask_p[10] << 18) | (mask_p[9] << 16)
-		| (mask_p[8] << 14) | (mask_p[7] << 12)
-		| (mask_p[6] << 10) | (mask_p[5] << 8)
-		| (mask_p[4] << 6) | (mask_p[3] << 4)
-		| (mask_p[2] << 2) | (mask_p[1] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_1, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_15_01, tmp_mask);
-
-	tmp_mask = (mask_p[30] << 28)
-		| (mask_p[29] << 26) | (mask_p[28] << 24)
-		| (mask_p[27] << 22) | (mask_p[26] << 20)
-		| (mask_p[25] << 18) | (mask_p[24] << 16)
-		| (mask_p[23] << 14) | (mask_p[22] << 12)
-		| (mask_p[21] << 10) | (mask_p[20] << 8)
-		| (mask_p[19] << 6) | (mask_p[18] << 4)
-		| (mask_p[17] << 2) | (mask_p[16] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_2, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_30_16, tmp_mask);
-
-	tmp_mask = (mask_p[45] << 28)
-		| (mask_p[44] << 26) | (mask_p[43] << 24)
-		| (mask_p[42] << 22) | (mask_p[41] << 20)
-		| (mask_p[40] << 18) | (mask_p[39] << 16)
-		| (mask_p[38] << 14) | (mask_p[37] << 12)
-		| (mask_p[36] << 10) | (mask_p[35] << 8)
-		| (mask_p[34] << 6) | (mask_p[33] << 4)
-		| (mask_p[32] << 2) | (mask_p[31] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_3, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_45_31, tmp_mask);
-
-	tmp_mask = (mask_p[61] << 30) | (mask_p[60] << 28)
-		| (mask_p[59] << 26) | (mask_p[58] << 24)
-		| (mask_p[57] << 22) | (mask_p[56] << 20)
-		| (mask_p[55] << 18) | (mask_p[54] << 16)
-		| (mask_p[53] << 14) | (mask_p[52] << 12)
-		| (mask_p[51] << 10) | (mask_p[50] << 8)
-		| (mask_p[49] << 6) | (mask_p[48] << 4)
-		| (mask_p[47] << 2) | (mask_p[46] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_4, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);
+	phy_hw_spur_mitigate(ah, chan, bin);
 }
 
 /**
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index fc08162..daf52c6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -169,29 +169,17 @@  static void ar9002_hw_spur_mitigate(struct ath_hw *ah,
 {
 	int bb_spur = AR_NO_SPUR;
 	int freq;
-	int bin, cur_bin;
+	int bin;
 	int bb_spur_off, spur_subchannel_sd;
 	int spur_freq_sd;
 	int spur_delta_phase;
 	int denominator;
-	int upper, lower, cur_vit_mask;
 	int tmp, newVal;
 	int i;
-	static const int pilot_mask_reg[4] = {
-		AR_PHY_TIMING7, AR_PHY_TIMING8,
-		AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
-	};
-	static const int chan_mask_reg[4] = {
-		AR_PHY_TIMING9, AR_PHY_TIMING10,
-		AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
-	};
-	static const int inc[4] = { 0, 100, 0, 0 };
 	struct chan_centers centers;
 
 	int8_t mask_m[123];
 	int8_t mask_p[123];
-	int8_t mask_amt;
-	int tmp_mask;
 	int cur_bb_spur;
 	bool is2GHz = IS_CHAN_2GHZ(chan);
 
@@ -288,135 +276,7 @@  static void ar9002_hw_spur_mitigate(struct ath_hw *ah,
 	newVal = spur_subchannel_sd << AR_PHY_SFCORR_SPUR_SUBCHNL_SD_S;
 	REG_WRITE(ah, AR_PHY_SFCORR_EXT, newVal);
 
-	cur_bin = -6000;
-	upper = bin + 100;
-	lower = bin - 100;
-
-	for (i = 0; i < 4; i++) {
-		int pilot_mask = 0;
-		int chan_mask = 0;
-		int bp = 0;
-		for (bp = 0; bp < 30; bp++) {
-			if ((cur_bin > lower) && (cur_bin < upper)) {
-				pilot_mask = pilot_mask | 0x1 << bp;
-				chan_mask = chan_mask | 0x1 << bp;
-			}
-			cur_bin += 100;
-		}
-		cur_bin += inc[i];
-		REG_WRITE(ah, pilot_mask_reg[i], pilot_mask);
-		REG_WRITE(ah, chan_mask_reg[i], chan_mask);
-	}
-
-	cur_vit_mask = 6100;
-	upper = bin + 120;
-	lower = bin - 120;
-
-	for (i = 0; i < 123; i++) {
-		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
-
-			/* workaround for gcc bug #37014 */
-			volatile int tmp_v = abs(cur_vit_mask - bin);
-
-			if (tmp_v < 75)
-				mask_amt = 1;
-			else
-				mask_amt = 0;
-			if (cur_vit_mask < 0)
-				mask_m[abs(cur_vit_mask / 100)] = mask_amt;
-			else
-				mask_p[cur_vit_mask / 100] = mask_amt;
-		}
-		cur_vit_mask -= 100;
-	}
-
-	tmp_mask = (mask_m[46] << 30) | (mask_m[47] << 28)
-		| (mask_m[48] << 26) | (mask_m[49] << 24)
-		| (mask_m[50] << 22) | (mask_m[51] << 20)
-		| (mask_m[52] << 18) | (mask_m[53] << 16)
-		| (mask_m[54] << 14) | (mask_m[55] << 12)
-		| (mask_m[56] << 10) | (mask_m[57] << 8)
-		| (mask_m[58] << 6) | (mask_m[59] << 4)
-		| (mask_m[60] << 2) | (mask_m[61] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_1, tmp_mask);
-	REG_WRITE(ah, AR_PHY_VIT_MASK2_M_46_61, tmp_mask);
-
-	tmp_mask = (mask_m[31] << 28)
-		| (mask_m[32] << 26) | (mask_m[33] << 24)
-		| (mask_m[34] << 22) | (mask_m[35] << 20)
-		| (mask_m[36] << 18) | (mask_m[37] << 16)
-		| (mask_m[48] << 14) | (mask_m[39] << 12)
-		| (mask_m[40] << 10) | (mask_m[41] << 8)
-		| (mask_m[42] << 6) | (mask_m[43] << 4)
-		| (mask_m[44] << 2) | (mask_m[45] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_2, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_31_45, tmp_mask);
-
-	tmp_mask = (mask_m[16] << 30) | (mask_m[16] << 28)
-		| (mask_m[18] << 26) | (mask_m[18] << 24)
-		| (mask_m[20] << 22) | (mask_m[20] << 20)
-		| (mask_m[22] << 18) | (mask_m[22] << 16)
-		| (mask_m[24] << 14) | (mask_m[24] << 12)
-		| (mask_m[25] << 10) | (mask_m[26] << 8)
-		| (mask_m[27] << 6) | (mask_m[28] << 4)
-		| (mask_m[29] << 2) | (mask_m[30] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK_3, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_16_30, tmp_mask);
-
-	tmp_mask = (mask_m[0] << 30) | (mask_m[1] << 28)
-		| (mask_m[2] << 26) | (mask_m[3] << 24)
-		| (mask_m[4] << 22) | (mask_m[5] << 20)
-		| (mask_m[6] << 18) | (mask_m[7] << 16)
-		| (mask_m[8] << 14) | (mask_m[9] << 12)
-		| (mask_m[10] << 10) | (mask_m[11] << 8)
-		| (mask_m[12] << 6) | (mask_m[13] << 4)
-		| (mask_m[14] << 2) | (mask_m[15] << 0);
-	REG_WRITE(ah, AR_PHY_MASK_CTL, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_M_00_15, tmp_mask);
-
-	tmp_mask = (mask_p[15] << 28)
-		| (mask_p[14] << 26) | (mask_p[13] << 24)
-		| (mask_p[12] << 22) | (mask_p[11] << 20)
-		| (mask_p[10] << 18) | (mask_p[9] << 16)
-		| (mask_p[8] << 14) | (mask_p[7] << 12)
-		| (mask_p[6] << 10) | (mask_p[5] << 8)
-		| (mask_p[4] << 6) | (mask_p[3] << 4)
-		| (mask_p[2] << 2) | (mask_p[1] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_1, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_15_01, tmp_mask);
-
-	tmp_mask = (mask_p[30] << 28)
-		| (mask_p[29] << 26) | (mask_p[28] << 24)
-		| (mask_p[27] << 22) | (mask_p[26] << 20)
-		| (mask_p[25] << 18) | (mask_p[24] << 16)
-		| (mask_p[23] << 14) | (mask_p[22] << 12)
-		| (mask_p[21] << 10) | (mask_p[20] << 8)
-		| (mask_p[19] << 6) | (mask_p[18] << 4)
-		| (mask_p[17] << 2) | (mask_p[16] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_2, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_30_16, tmp_mask);
-
-	tmp_mask = (mask_p[45] << 28)
-		| (mask_p[44] << 26) | (mask_p[43] << 24)
-		| (mask_p[42] << 22) | (mask_p[41] << 20)
-		| (mask_p[40] << 18) | (mask_p[39] << 16)
-		| (mask_p[38] << 14) | (mask_p[37] << 12)
-		| (mask_p[36] << 10) | (mask_p[35] << 8)
-		| (mask_p[34] << 6) | (mask_p[33] << 4)
-		| (mask_p[32] << 2) | (mask_p[31] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_3, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_45_31, tmp_mask);
-
-	tmp_mask = (mask_p[61] << 30) | (mask_p[60] << 28)
-		| (mask_p[59] << 26) | (mask_p[58] << 24)
-		| (mask_p[57] << 22) | (mask_p[56] << 20)
-		| (mask_p[55] << 18) | (mask_p[54] << 16)
-		| (mask_p[53] << 14) | (mask_p[52] << 12)
-		| (mask_p[51] << 10) | (mask_p[50] << 8)
-		| (mask_p[49] << 6) | (mask_p[48] << 4)
-		| (mask_p[47] << 2) | (mask_p[46] << 0);
-	REG_WRITE(ah, AR_PHY_BIN_MASK2_4, tmp_mask);
-	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);
+	phy_hw_spur_mitigate(ah, chan, bin);
 
 	REGWRITE_BUFFER_FLUSH(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c
new file mode 100644
index 0000000..09cc68d
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/phy.c
@@ -0,0 +1,170 @@ 
+/*
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "hw.h"
+#include "phy.h"
+#include "ar9002_phy.h"
+
+void phy_hw_spur_mitigate(struct ath_hw *ah,
+			  struct ath9k_channel *chan, int bin)
+{
+	int cur_bin;
+	int upper, lower, cur_vit_mask;
+	int i;
+	int8_t mask_m[123];
+	int8_t mask_p[123];
+	int8_t mask_amt;
+	int tmp_mask;
+	static int pilot_mask_reg[4] = {
+		AR_PHY_TIMING7, AR_PHY_TIMING8,
+		AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
+	};
+	static int chan_mask_reg[4] = {
+		AR_PHY_TIMING9, AR_PHY_TIMING10,
+		AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
+	};
+	static int inc[4] = { 0, 100, 0, 0 };
+
+	cur_bin = -6000;
+	upper = bin + 100;
+	lower = bin - 100;
+
+	for (i = 0; i < 4; i++) {
+		int pilot_mask = 0;
+		int chan_mask = 0;
+		int bp = 0;
+
+		for (bp = 0; bp < 30; bp++) {
+			if ((cur_bin > lower) && (cur_bin < upper)) {
+				pilot_mask = pilot_mask | 0x1 << bp;
+				chan_mask = chan_mask | 0x1 << bp;
+			}
+			cur_bin += 100;
+		}
+		cur_bin += inc[i];
+		REG_WRITE(ah, pilot_mask_reg[i], pilot_mask);
+		REG_WRITE(ah, chan_mask_reg[i], chan_mask);
+	}
+
+	cur_vit_mask = 6100;
+	upper = bin + 120;
+	lower = bin - 120;
+
+	for (i = 0; i < 123; i++) {
+		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
+			/* workaround for gcc bug #37014 */
+			volatile int tmp_v = abs(cur_vit_mask - bin);
+
+			if (tmp_v < 75)
+				mask_amt = 1;
+			else
+				mask_amt = 0;
+			if (cur_vit_mask < 0)
+				mask_m[abs(cur_vit_mask / 100)] = mask_amt;
+			else
+				mask_p[cur_vit_mask / 100] = mask_amt;
+		}
+		cur_vit_mask -= 100;
+	}
+
+	tmp_mask = (mask_m[46] << 30) | (mask_m[47] << 28)
+		| (mask_m[48] << 26) | (mask_m[49] << 24)
+		| (mask_m[50] << 22) | (mask_m[51] << 20)
+		| (mask_m[52] << 18) | (mask_m[53] << 16)
+		| (mask_m[54] << 14) | (mask_m[55] << 12)
+		| (mask_m[56] << 10) | (mask_m[57] << 8)
+		| (mask_m[58] << 6) | (mask_m[59] << 4)
+		| (mask_m[60] << 2) | (mask_m[61] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK_1, tmp_mask);
+	REG_WRITE(ah, AR_PHY_VIT_MASK2_M_46_61, tmp_mask);
+
+	tmp_mask = (mask_m[31] << 28)
+		| (mask_m[32] << 26) | (mask_m[33] << 24)
+		| (mask_m[34] << 22) | (mask_m[35] << 20)
+		| (mask_m[36] << 18) | (mask_m[37] << 16)
+		| (mask_m[48] << 14) | (mask_m[39] << 12)
+		| (mask_m[40] << 10) | (mask_m[41] << 8)
+		| (mask_m[42] << 6) | (mask_m[43] << 4)
+		| (mask_m[44] << 2) | (mask_m[45] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK_2, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_M_31_45, tmp_mask);
+
+	tmp_mask = (mask_m[16] << 30) | (mask_m[16] << 28)
+		| (mask_m[18] << 26) | (mask_m[18] << 24)
+		| (mask_m[20] << 22) | (mask_m[20] << 20)
+		| (mask_m[22] << 18) | (mask_m[22] << 16)
+		| (mask_m[24] << 14) | (mask_m[24] << 12)
+		| (mask_m[25] << 10) | (mask_m[26] << 8)
+		| (mask_m[27] << 6) | (mask_m[28] << 4)
+		| (mask_m[29] << 2) | (mask_m[30] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK_3, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_M_16_30, tmp_mask);
+
+	tmp_mask = (mask_m[0] << 30) | (mask_m[1] << 28)
+		| (mask_m[2] << 26) | (mask_m[3] << 24)
+		| (mask_m[4] << 22) | (mask_m[5] << 20)
+		| (mask_m[6] << 18) | (mask_m[7] << 16)
+		| (mask_m[8] << 14) | (mask_m[9] << 12)
+		| (mask_m[10] << 10) | (mask_m[11] << 8)
+		| (mask_m[12] << 6) | (mask_m[13] << 4)
+		| (mask_m[14] << 2) | (mask_m[15] << 0);
+	REG_WRITE(ah, AR_PHY_MASK_CTL, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_M_00_15, tmp_mask);
+
+	tmp_mask = (mask_p[15] << 28)
+		| (mask_p[14] << 26) | (mask_p[13] << 24)
+		| (mask_p[12] << 22) | (mask_p[11] << 20)
+		| (mask_p[10] << 18) | (mask_p[9] << 16)
+		| (mask_p[8] << 14) | (mask_p[7] << 12)
+		| (mask_p[6] << 10) | (mask_p[5] << 8)
+		| (mask_p[4] << 6) | (mask_p[3] << 4)
+		| (mask_p[2] << 2) | (mask_p[1] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK2_1, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_P_15_01, tmp_mask);
+
+	tmp_mask = (mask_p[30] << 28)
+		| (mask_p[29] << 26) | (mask_p[28] << 24)
+		| (mask_p[27] << 22) | (mask_p[26] << 20)
+		| (mask_p[25] << 18) | (mask_p[24] << 16)
+		| (mask_p[23] << 14) | (mask_p[22] << 12)
+		| (mask_p[21] << 10) | (mask_p[20] << 8)
+		| (mask_p[19] << 6) | (mask_p[18] << 4)
+		| (mask_p[17] << 2) | (mask_p[16] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK2_2, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_P_30_16, tmp_mask);
+
+	tmp_mask = (mask_p[45] << 28)
+		| (mask_p[44] << 26) | (mask_p[43] << 24)
+		| (mask_p[42] << 22) | (mask_p[41] << 20)
+		| (mask_p[40] << 18) | (mask_p[39] << 16)
+		| (mask_p[38] << 14) | (mask_p[37] << 12)
+		| (mask_p[36] << 10) | (mask_p[35] << 8)
+		| (mask_p[34] << 6) | (mask_p[33] << 4)
+		| (mask_p[32] << 2) | (mask_p[31] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK2_3, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_P_45_31, tmp_mask);
+
+	tmp_mask = (mask_p[61] << 30) | (mask_p[60] << 28)
+		| (mask_p[59] << 26) | (mask_p[58] << 24)
+		| (mask_p[57] << 22) | (mask_p[56] << 20)
+		| (mask_p[55] << 18) | (mask_p[54] << 16)
+		| (mask_p[53] << 14) | (mask_p[52] << 12)
+		| (mask_p[51] << 10) | (mask_p[50] << 8)
+		| (mask_p[49] << 6) | (mask_p[48] << 4)
+		| (mask_p[47] << 2) | (mask_p[46] << 0);
+	REG_WRITE(ah, AR_PHY_BIN_MASK2_4, tmp_mask);
+	REG_WRITE(ah, AR_PHY_MASK2_P_61_45, tmp_mask);
+}
diff --git a/drivers/net/wireless/ath/ath9k/phy.h b/drivers/net/wireless/ath/ath9k/phy.h
index 4a1b992..0086ad3 100644
--- a/drivers/net/wireless/ath/ath9k/phy.h
+++ b/drivers/net/wireless/ath/ath9k/phy.h
@@ -55,4 +55,7 @@  enum ath9k_ant_div_comb_lna_conf {
 	ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2,
 };
 
+void phy_hw_spur_mitigate(struct ath_hw *ah,
+			  struct ath9k_channel *chan, int bin);
+
 #endif