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

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

ath9k_hw: simplify spur channel handling 



Remove ah->config.spurmode and ah->config.spurchans, always use EEPROM
data.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ static void ar9002_hw_spur_mitigate(struct ath_hw *ah, 
	ath9k_hw_get_channel_centers(ah, chan, &centers);

	freq = centers.synth_center;



	ah->config.spurmode = SPUR_ENABLE_EEPROM;

	for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {

		cur_bb_spur = ah->eep_ops->get_spur_channel(ah, i, is2GHz);

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

+1 −25
Original line number Diff line number Diff line
@@ -1085,31 +1085,7 @@ static void ath9k_hw_4k_set_board_values(struct ath_hw *ah, 


static u16 ath9k_hw_4k_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)

{

#define EEP_MAP4K_SPURCHAN \

	(ah->eeprom.map4k.modalHeader.spurChans[i].spurChan)

	struct ath_common *common = ath9k_hw_common(ah);



	u16 spur_val = AR_NO_SPUR;



	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",

		i, is2GHz, ah->config.spurchans[i][is2GHz]);



	switch (ah->config.spurmode) {

	case SPUR_DISABLE:

		break;

	case SPUR_ENABLE_IOCTL:

		spur_val = ah->config.spurchans[i][is2GHz];

		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",

			spur_val);

		break;

	case SPUR_ENABLE_EEPROM:

		spur_val = EEP_MAP4K_SPURCHAN;

		break;

	}



	return spur_val;



#undef EEP_MAP4K_SPURCHAN

	return ah->eeprom.map4k.modalHeader.spurChans[i].spurChan;

}



const struct eeprom_ops eep_4k_ops = {

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

+1 −25
Original line number Diff line number Diff line
@@ -1004,31 +1004,7 @@ static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah, 
static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah,

					    u16 i, bool is2GHz)

{

#define EEP_MAP9287_SPURCHAN \

	(ah->eeprom.map9287.modalHeader.spurChans[i].spurChan)



	struct ath_common *common = ath9k_hw_common(ah);

	u16 spur_val = AR_NO_SPUR;



	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",

		i, is2GHz, ah->config.spurchans[i][is2GHz]);



	switch (ah->config.spurmode) {

	case SPUR_DISABLE:

		break;

	case SPUR_ENABLE_IOCTL:

		spur_val = ah->config.spurchans[i][is2GHz];

		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",

			spur_val);

		break;

	case SPUR_ENABLE_EEPROM:

		spur_val = EEP_MAP9287_SPURCHAN;

		break;

	}



	return spur_val;



#undef EEP_MAP9287_SPURCHAN

	return ah->eeprom.map9287.modalHeader.spurChans[i].spurChan;

}



const struct eeprom_ops eep_ar9287_ops = {

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

+1 −25
Original line number Diff line number Diff line
@@ -1348,31 +1348,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah, 


static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)

{

#define EEP_DEF_SPURCHAN \

	(ah->eeprom.def.modalHeader[is2GHz].spurChans[i].spurChan)

	struct ath_common *common = ath9k_hw_common(ah);



	u16 spur_val = AR_NO_SPUR;



	ath_dbg(common, ANI, "Getting spur idx:%d is2Ghz:%d val:%x\n",

		i, is2GHz, ah->config.spurchans[i][is2GHz]);



	switch (ah->config.spurmode) {

	case SPUR_DISABLE:

		break;

	case SPUR_ENABLE_IOCTL:

		spur_val = ah->config.spurchans[i][is2GHz];

		ath_dbg(common, ANI, "Getting spur val from new loc. %d\n",

			spur_val);

		break;

	case SPUR_ENABLE_EEPROM:

		spur_val = EEP_DEF_SPURCHAN;

		break;

	}



	return spur_val;



#undef EEP_DEF_SPURCHAN

	return ah->eeprom.def.modalHeader[is2GHz].spurChans[i].spurChan;

}



const struct eeprom_ops eep_def_ops = {

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

+0 −7
Original line number Diff line number Diff line
@@ -439,8 +439,6 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah) 


static void ath9k_hw_init_config(struct ath_hw *ah)

{

	int i;



	ah->config.dma_beacon_response_time = 1;

	ah->config.sw_beacon_response_time = 6;

	ah->config.additional_swba_backoff = 0;
@@ -448,11 +446,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah) 
	ah->config.cwm_ignore_extcca = 0;

	ah->config.analog_shiftreg = 1;



	for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {

		ah->config.spurchans[i][0] = AR_NO_SPUR;

		ah->config.spurchans[i][1] = AR_NO_SPUR;

	}



	ah->config.rx_intr_mitigation = true;



	/*