From: Wenli Looi <wlooi@ucalgary.ca>
To: "Toke Høiland-Jørgensen" <toke@toke.dk>
Cc: Kalle Valo <kvalo@kernel.org>,
linux-wireless@vger.kernel.org, ath9k-devel@qca.qualcomm.com,
Wenli Looi <wlooi@ucalgary.ca>
Subject: [PATCH 5/6] ath9k: refactor ar9003_hw_spur_mitigate_ofdm
Date: Sun, 20 Mar 2022 17:30:09 -0600 [thread overview]
Message-ID: <20220320233010.123106-6-wlooi@ucalgary.ca> (raw)
In-Reply-To: <20220320233010.123106-1-wlooi@ucalgary.ca>
Similar to ar9003_hw_spur_mitigate_mrc_cck, simplify the code by using
ar9003_get_spur_chan_ptr. This may also be required for QCN550x support,
to provide an abstraction over the underlying EEPROM format.
Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
---
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 25 +++++++--------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index daf30f994..dc0e5ea25 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -523,21 +523,10 @@ static void ar9003_hw_spur_mitigate_ofdm(struct ath_hw *ah,
int synth_freq;
int range = 10;
int freq_offset = 0;
- int mode;
- u8* spurChansPtr;
+ u8 *spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah, IS_CHAN_2GHZ(chan));
unsigned int i;
- struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-
- if (IS_CHAN_5GHZ(chan)) {
- spurChansPtr = &(eep->modalHeader5G.spurChans[0]);
- mode = 0;
- }
- else {
- spurChansPtr = &(eep->modalHeader2G.spurChans[0]);
- mode = 1;
- }
- if (spurChansPtr[0] == 0)
+ if (spur_fbin_ptr[0] == 0)
return; /* No spur in the mode */
if (IS_CHAN_HT40(chan)) {
@@ -554,16 +543,18 @@ static void ar9003_hw_spur_mitigate_ofdm(struct ath_hw *ah,
ar9003_hw_spur_ofdm_clear(ah);
- for (i = 0; i < AR_EEPROM_MODAL_SPURS && spurChansPtr[i]; i++) {
- freq_offset = ath9k_hw_fbin2freq(spurChansPtr[i], mode);
+ for (i = 0; i < AR_EEPROM_MODAL_SPURS && spur_fbin_ptr[i]; i++) {
+ freq_offset = ath9k_hw_fbin2freq(spur_fbin_ptr[i],
+ IS_CHAN_2GHZ(chan));
freq_offset -= synth_freq;
if (abs(freq_offset) < range) {
ar9003_hw_spur_ofdm_work(ah, chan, freq_offset,
range, synth_freq);
if (AR_SREV_9565(ah) && (i < 4)) {
- freq_offset = ath9k_hw_fbin2freq(spurChansPtr[i + 1],
- mode);
+ freq_offset =
+ ath9k_hw_fbin2freq(spur_fbin_ptr[i + 1],
+ IS_CHAN_2GHZ(chan));
freq_offset -= synth_freq;
if (abs(freq_offset) < range)
ar9003_hw_spur_ofdm_9565(ah, freq_offset);
--
2.25.1
next prev parent reply other threads:[~2022-03-20 23:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-20 23:30 [PATCH 0/6] ath9k: suggested improvements and bugfixes Wenli Looi
2022-03-20 23:30 ` [PATCH 1/6] ath9k: make ATH_SREV macros more consistent Wenli Looi
2022-03-21 16:02 ` Toke Høiland-Jørgensen
2022-03-25 10:34 ` Kalle Valo
2022-03-20 23:30 ` [PATCH 2/6] ath9k: split set11nRateFlags and set11nChainSel Wenli Looi
2022-03-21 16:02 ` Toke Høiland-Jørgensen
2022-03-20 23:30 ` [PATCH 3/6] ath9k: use AR9300_MAX_CHAINS when appropriate Wenli Looi
2022-03-21 16:02 ` Toke Høiland-Jørgensen
2022-03-20 23:30 ` [PATCH 4/6] ath9k: fix ar9003_get_eepmisc Wenli Looi
2022-03-21 15:51 ` Toke Høiland-Jørgensen
2022-03-21 19:57 ` Wenli Looi
2022-03-21 21:07 ` Toke Høiland-Jørgensen
2022-03-21 21:07 ` Toke Høiland-Jørgensen
2022-03-23 9:30 ` Kalle Valo
2022-03-23 11:15 ` Toke Høiland-Jørgensen
2022-03-23 12:16 ` Kalle Valo
2022-03-23 12:34 ` Toke Høiland-Jørgensen
2022-03-24 15:51 ` Wenli Looi
2022-03-20 23:30 ` Wenli Looi [this message]
2022-03-21 16:03 ` [PATCH 5/6] ath9k: refactor ar9003_hw_spur_mitigate_ofdm Toke Høiland-Jørgensen
2022-03-20 23:30 ` [PATCH 6/6] ath9k: add functions to get paprd rate mask Wenli Looi
2022-03-21 16:03 ` Toke Høiland-Jørgensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220320233010.123106-6-wlooi@ucalgary.ca \
--to=wlooi@ucalgary.ca \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=kvalo@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=toke@toke.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.