Skip to contentSkip to conversation

wifi: ath9k: add support for QCN550x

PATCH In review Wenli Looi 3 participants 18 messages Jun 29, 2023 – Dec 18, 2023 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore

Wenli Looi

author
#0 lore raw

v3 cover wifi: ath9k: add support for QCN550x

This patchset adds support for QCN550x. Compared to previous versions of this patchset:

- Removed hidden dependencies on ah macro
(see commit b3a663f0037d20e77bbafd9271a3d9dd0351059d)
- Done significantly more testing and performance improvements. In my informal testing, the 3x3 performance of this driver generally meets or exceeds the performance of stock firmwares, which was not the case for previous patchsets. The main source of the improvement was enabling the clock doubler.

Notes:

- While QCN5502 is a 4-stream device, ath9k only supports 3 streams, and that is unchanged.
- The QCN550x EEPROM format is different from other AR9003 devices due to the 4th stream. An abstraction layer has been added over the EEPROM to support both formats.
- This driver has been tested on the following devices:
- Asus RT-ACRH12 (FCC ID: MSQ-RTACRH01)
QCN5502 4x4 RX mode 1 (no XLNA) TX mode 1 (no XPA)
- Netgear EX6400v2 (FCC ID: PY318300422)
QCN5502 3x3 RX mode 1 (no XLNA) TX mode 1 (no XPA)
- Netgear EX7300v2 (FCC ID: PY318300422)
QCN5502 4x4 RX mode 1 (no XLNA) TX mode 1 (no XPA)
- TP-Link Archer A9 v6 (FCC ID: TE7A9V6)

    QCN5502 4x4 RX mode 0 (XLNA) TX mode 1 (no XPA)

- Netgear EX7300v1: QCA9558 (no obvious regression observed)
- No device has been tested that uses QCN5502 with XPA or 5GHz. I don't know if such devices exists.

Wenli Looi (11):
wifi: ath9k: group some ar9300 eeprom functions at the top
wifi: ath9k: delete some unused/duplicate macros
wifi: ath9k: add _ah parameter to certain macros
Revert "ath9k_hw: fall back to OTP ROM when platform data has no valid
eeprom data"
wifi: ath9k: add QCN550x device IDs
wifi: ath9k: basic support for QCN550x
wifi: ath9k: add QCN550x initvals
wifi: ath9k: implement QCN550x rx
wifi: ath9k: implement QCN550x tx
wifi: ath9k: add abstractions over ar9300 eeprom
wifi: ath9k: add QCN550x eeprom

 drivers/net/wireless/ath/ath9k/ahb.c          |    4 +
 drivers/net/wireless/ath/ath9k/ani.c          |    2 +-
 .../net/wireless/ath/ath9k/ar550x_initvals.h  | 1539 +++++++++++++++++
 drivers/net/wireless/ath/ath9k/ar9003_aic.c   |   52 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c |   98 +-
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 1069 ++++++++----
 .../net/wireless/ath/ath9k/ar9003_eeprom.h    |  112 ++
 drivers/net/wireless/ath/ath9k/ar9003_hw.c    |   65 +
 drivers/net/wireless/ath/ath9k/ar9003_mac.c   |   92 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.h   |   10 +
 drivers/net/wireless/ath/ath9k/ar9003_mci.c   |    4 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c |  120 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c   |  370 ++--
 drivers/net/wireless/ath/ath9k/ar9003_phy.h   |  598 ++++---
 drivers/net/wireless/ath/ath9k/ar9003_rtt.c   |   32 +-
 drivers/net/wireless/ath/ath9k/hw.c           |   43 +-
 drivers/net/wireless/ath/ath9k/hw.h           |    2 +
 drivers/net/wireless/ath/ath9k/mac.c          |    2 +-
 drivers/net/wireless/ath/ath9k/mac.h          |   13 +
 drivers/net/wireless/ath/ath9k/recv.c         |    2 +-
 drivers/net/wireless/ath/ath9k/reg.h          |   13 +-
 drivers/net/wireless/ath/ath9k/reg_aic.h      |   44 +-
 drivers/net/wireless/ath/ath9k/rng.c          |    4 +-
 23 files changed, 3232 insertions(+), 1058 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath9k/ar550x_initvals.h
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH v3 1/11 wifi: ath9k: group some ar9300 eeprom functions at the top

These functions will be part of an abstraction layer that works with both AR9300 and QCN5502 EEPROM formats.

This change does not appear to affect the final binary.

---
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +45 -45
index 944f46cdf3..58dce556b0 100644
@@ -2970,6 +2970,51 @@ static int interpolate(int x, int xa, int xb, int ya, int yb)
 	return ya + factor + plus;
 }
 
+/* XXX: review hardware docs */
+static int ath9k_hw_ar9300_get_eeprom_ver(struct ath_hw *ah)
+{
+	return ah->eeprom.ar9300_eep.eepromVersion;
+}
+
+/* XXX: could be read from the eepromVersion, not sure yet */
+static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah)
+{
+	return 0;
+}
+
+static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
+							   bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+
+	if (is2ghz)
+		return &eep->modalHeader2G;
+	else
+		return &eep->modalHeader5G;
+}
+
+static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
+					bool is2ghz)
+{
+	__le16 val = ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
+	return le16_to_cpu(val);
+}
+
+u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
+{
+	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
+}
+
+u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
+{
+	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
+}
+
+static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
+{
+	return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
+}
+
 static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
 				      enum eeprom_param param)
 {
@@ -3578,29 +3623,6 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 }
 #endif
 
-/* XXX: review hardware docs */
-static int ath9k_hw_ar9300_get_eeprom_ver(struct ath_hw *ah)
-{
-	return ah->eeprom.ar9300_eep.eepromVersion;
-}
-
-/* XXX: could be read from the eepromVersion, not sure yet */
-static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah)
-{
-	return 0;
-}
-
-static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
-							   bool is2ghz)
-{
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-
-	if (is2ghz)
-		return &eep->modalHeader2G;
-	else
-		return &eep->modalHeader5G;
-}
-
 static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
 {
 	int bias = ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
@@ -3620,28 +3642,6 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
 	}
 }
 
-static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
-{
-	return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
-}
-
-u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
-{
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
-}
-
-u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
-{
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
-}
-
-static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
-					bool is2ghz)
-{
-	__le16 val = ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
-	return le16_to_cpu(val);
-}
-
 static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
 {
 	struct ath_common *common = ath9k_hw_common(ah);
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH v3 2/11 wifi: ath9k: delete some unused/duplicate macros

In reply to Wenli Looi

The rate macros are for AR9002 and not correct for AR9003.

The AGC 3 macros are unused and have incorrect values, at least for QCN5502, where AR_AGC3_BASE should be 0x2de00.

This change does not appear to affect the final binary.

---
 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 9 ---------
 drivers/net/wireless/ath/ath9k/reg_aic.h    | 4 ----
 2 files changed, 13 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_phy.h +0 -9
index 57e2b4c891..ad72a30b67 100644
@@ -851,8 +851,6 @@
 #define AR_PHY_TXGAIN_FORCED_TXBB1DBGAIN  0x0000000e
 #define AR_PHY_TXGAIN_FORCED_TXBB1DBGAIN_S 1
 
-#define AR_PHY_POWER_TX_RATE1   0x9934
-#define AR_PHY_POWER_TX_RATE2   0x9938
 #define AR_PHY_POWER_TX_RATE_MAX    0x993c
 #define AR_PHY_POWER_TX_RATE_MAX_TPC_ENABLE 0x00000040
 #define PHY_AGC_CLR             0x10000000
@@ -1041,13 +1039,6 @@
 
 #define AR_PHY_TX_IQCAL_STATUS_B2_FAILED    0x00000001
 
-/*
- * AGC 3 Register Map
- */
-#define AR_AGC3_BASE	0xce00
-
-#define AR_PHY_RSSI_3            (AR_AGC3_BASE + 0x180)
-
 /* GLB Registers */
 #define AR_GLB_BASE	0x20000
 #define AR_GLB_GPIO_CONTROL	(AR_GLB_BASE)
drivers/net/wireless/ath/ath9k/reg_aic.h +0 -4
index 955147ab48..f50994910e 100644
@@ -17,10 +17,6 @@
 #ifndef REG_AIC_H
 #define REG_AIC_H
 
-#define AR_SM_BASE                              0xa200
-#define AR_SM1_BASE                             0xb200
-#define AR_AGC_BASE                             0x9e00
-
 #define AR_PHY_AIC_CTRL_0_B0                    (AR_SM_BASE + 0x4b0)
 #define AR_PHY_AIC_CTRL_1_B0                    (AR_SM_BASE + 0x4b4)
 #define AR_PHY_AIC_CTRL_2_B0                    (AR_SM_BASE + 0x4b8)
Signature · 1 line
2.34.1
maintainer Acked-by on v3 2/11
#3 lore raw

Re: [PATCH v3 02/11] wifi: ath9k: delete some unused/duplicate macros

Quoted 8 lines · Wenli Looi

The rate macros are for AR9002 and not correct for AR9003.

The AGC 3 macros are unused and have incorrect values, at least for QCN5502, where AR_AGC3_BASE should be 0x2de00.

This change does not appear to affect the final binary.

Seems like this patch has value independently of the rest of the series (no reason to have these unused and wrong definitions sitting around), so let's merge it now:

#4 lore raw

Re: [PATCH v3 02/11] wifi: ath9k: delete some unused/duplicate macros

In reply to Wenli Looi
Quoted 10 lines · Wenli Looi

The rate macros are for AR9002 and not correct for AR9003.

The AGC 3 macros are unused and have incorrect values, at least for QCN5502, where AR_AGC3_BASE should be 0x2de00.

This change does not appear to affect the final binary.

Patch applied to ath-next branch of ath.git, thanks.

504130491026 wifi: ath9k: delete some unused/duplicate macros

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
author
#5 lore raw

PATCH v3 3/11 wifi: ath9k: add _ah parameter to certain macros

In reply to Wenli Looi

These macros will have different values for QCN5502.

This change does not appear to affect the final binary.

---
 drivers/net/wireless/ath/ath9k/ar9003_aic.c   |  52 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c |  94 +--
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 130 ++---
 drivers/net/wireless/ath/ath9k/ar9003_mci.c   |   4 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 116 ++--
 drivers/net/wireless/ath/ath9k/ar9003_phy.c   | 322 +++++-----
 drivers/net/wireless/ath/ath9k/ar9003_phy.h   | 550 +++++++++---------
 drivers/net/wireless/ath/ath9k/ar9003_rtt.c   |  32 +-
 drivers/net/wireless/ath/ath9k/reg.h          |   6 +-
 drivers/net/wireless/ath/ath9k/reg_aic.h      |  40 +-
 drivers/net/wireless/ath/ath9k/rng.c          |   4 +-
 11 files changed, 675 insertions(+), 675 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_aic.c +26 -26
index d0f1e8bcc8..9ba55fea67 100644
@@ -108,8 +108,8 @@ static void ar9003_aic_gain_table(struct ath_hw *ah)
 	u32 aic_atten_word[19], i;
 
 	/* Config LNA gain difference */
-	REG_WRITE(ah, AR_PHY_BT_COEX_4, 0x2c200a00);
-	REG_WRITE(ah, AR_PHY_BT_COEX_5, 0x5c4e4438);
+	REG_WRITE(ah, AR_PHY_BT_COEX_4(ah), 0x2c200a00);
+	REG_WRITE(ah, AR_PHY_BT_COEX_5(ah), 0x5c4e4438);
 
 	/* Program gain table */
 	aic_atten_word[0] = (0x1 & 0xf) << 14 | (0x1f & 0x1f) << 9 | (0x0 & 0xf) << 5 |
@@ -152,12 +152,12 @@ static void ar9003_aic_gain_table(struct ath_hw *ah)
 		(0x1 & 0x1f);  /* -37 dB: 4'd7, 5'd01, -36 dB: 4'd6, 5'd01 */
 
 	/* Write to Gain table with auto increment enabled. */
-	REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0 + 0x3000),
+	REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0(ah) + 0x3000),
 		  (ATH_AIC_SRAM_AUTO_INCREMENT |
 		   ATH_AIC_SRAM_GAIN_TABLE_OFFSET));
 
 	for (i = 0; i < 19; i++) {
-		REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0 + 0x3000),
+		REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0(ah) + 0x3000),
 			  aic_atten_word[i]);
 	}
 }
@@ -168,16 +168,16 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 	int i;
 
 	/* Write to Gain table with auto increment enabled. */
-	REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0 + 0x3000),
+	REG_WRITE(ah, (AR_PHY_AIC_SRAM_ADDR_B0(ah) + 0x3000),
 		  (ATH_AIC_SRAM_AUTO_INCREMENT |
 		   ATH_AIC_SRAM_CAL_OFFSET));
 
 	for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
-		REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0 + 0x3000), 0);
+		REG_WRITE(ah, (AR_PHY_AIC_SRAM_DATA_B0(ah) + 0x3000), 0);
 		aic->aic_sram[i] = 0;
 	}
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B0,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B0(ah),
 		  (SM(0, AR_PHY_AIC_MON_ENABLE) |
 		   SM(127, AR_PHY_AIC_CAL_MAX_HOP_COUNT) |
 		   SM(min_valid_count, AR_PHY_AIC_CAL_MIN_VALID_COUNT) |
@@ -187,14 +187,14 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 		   SM(0x40, AR_PHY_AIC_BTTX_PWR_THR) |
 		   SM(0, AR_PHY_AIC_ENABLE)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B1,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_0_B1(ah),
 		  (SM(0, AR_PHY_AIC_MON_ENABLE) |
 		   SM(1, AR_PHY_AIC_CAL_CH_VALID_RESET) |
 		   SM(0, AR_PHY_AIC_CAL_ENABLE) |
 		   SM(0x40, AR_PHY_AIC_BTTX_PWR_THR) |
 		   SM(0, AR_PHY_AIC_ENABLE)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B0,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B0(ah),
 		  (SM(8, AR_PHY_AIC_CAL_BT_REF_DELAY) |
 		   SM(0, AR_PHY_AIC_BT_IDLE_CFG) |
 		   SM(1, AR_PHY_AIC_STDBY_COND) |
@@ -203,11 +203,11 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 		   SM(15, AR_PHY_AIC_RSSI_MAX) |
 		   SM(0, AR_PHY_AIC_RSSI_MIN)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B1,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_1_B1(ah),
 		  (SM(15, AR_PHY_AIC_RSSI_MAX) |
 		   SM(0, AR_PHY_AIC_RSSI_MIN)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_2_B0,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_2_B0(ah),
 		  (SM(44, AR_PHY_AIC_RADIO_DELAY) |
 		   SM(8, AR_PHY_AIC_CAL_STEP_SIZE_CORR) |
 		   SM(12, AR_PHY_AIC_CAL_ROT_IDX_CORR) |
@@ -217,7 +217,7 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 		   SM(0, AR_PHY_AIC_CAL_SYNTH_AFTER_BTRX) |
 		   SM(200, AR_PHY_AIC_CAL_SYNTH_SETTLING)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_3_B0,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_3_B0(ah),
 		  (SM(2, AR_PHY_AIC_MON_MAX_HOP_COUNT) |
 		   SM(1, AR_PHY_AIC_MON_MIN_STALE_COUNT) |
 		   SM(1, AR_PHY_AIC_MON_PWR_EST_LONG) |
@@ -227,14 +227,14 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 		   SM(1, AR_PHY_AIC_CAL_PERF_CHECK_FACTOR) |
 		   SM(1, AR_PHY_AIC_CAL_PWR_EST_LONG)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B0,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B0(ah),
 		  (SM(2, AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO) |
 		   SM(3, AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO) |
 		   SM(0, AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING) |
 		   SM(2, AR_PHY_AIC_CAL_COM_ATT_DB_BACKOFF) |
 		   SM(1, AR_PHY_AIC_CAL_COM_ATT_DB_FIXED)));
 
-	REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B1,
+	REG_WRITE(ah, AR_PHY_AIC_CTRL_4_B1(ah),
 		  (SM(2, AR_PHY_AIC_CAL_ROT_ATT_DB_EST_ISO) |
 		   SM(3, AR_PHY_AIC_CAL_COM_ATT_DB_EST_ISO) |
 		   SM(0, AR_PHY_AIC_CAL_ISO_EST_INIT_SETTING) |
@@ -251,9 +251,9 @@ static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)
 	aic->aic_cal_start_time = REG_READ(ah, AR_TSF_L32);
 
 	/* Start calibration */
-	REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
-	REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_CH_VALID_RESET);
-	REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+	REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah), AR_PHY_AIC_CAL_ENABLE);
+	REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah), AR_PHY_AIC_CAL_CH_VALID_RESET);
+	REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah), AR_PHY_AIC_CAL_ENABLE);
 
 	aic->aic_caled_chan = 0;
 	aic->aic_cal_state = AIC_CAL_STATE_STARTED;
@@ -465,7 +465,7 @@ static u8 ar9003_aic_cal_continue(struct ath_hw *ah, bool cal_once)
 
 	if (cal_once) {
 		for (i = 0; i < 10000; i++) {
-			if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1) &
+			if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1(ah)) &
 			     AR_PHY_AIC_CAL_ENABLE) == 0)
 				break;
 
@@ -477,19 +477,19 @@ static u8 ar9003_aic_cal_continue(struct ath_hw *ah, bool cal_once)
 	 * Use AR_PHY_AIC_CAL_ENABLE bit instead of AR_PHY_AIC_CAL_DONE.
 	 * Sometimes CAL_DONE bit is not asserted.
 	 */
-	if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1) &
+	if ((REG_READ(ah, AR_PHY_AIC_CTRL_0_B1(ah)) &
 	     AR_PHY_AIC_CAL_ENABLE) != 0) {
 		ath_dbg(common, MCI, "AIC cal is not done after 40ms");
 		goto exit;
 	}
 
-	REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1,
+	REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1(ah),
 		  (ATH_AIC_SRAM_CAL_OFFSET | ATH_AIC_SRAM_AUTO_INCREMENT));
 
 	for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
 		u32 value;
 
-		value = REG_READ(ah, AR_PHY_AIC_SRAM_DATA_B1);
+		value = REG_READ(ah, AR_PHY_AIC_SRAM_DATA_B1(ah));
 
 		if (value & 0x01) {
 			if (aic->aic_sram[i] == 0)
@@ -506,10 +506,10 @@ static u8 ar9003_aic_cal_continue(struct ath_hw *ah, bool cal_once)
 		ar9003_aic_cal_done(ah);
 	} else {
 		/* Start calibration */
-		REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
-		REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1,
+		REG_CLR_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah), AR_PHY_AIC_CAL_ENABLE);
+		REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah),
 			    AR_PHY_AIC_CAL_CH_VALID_RESET);
-		REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1, AR_PHY_AIC_CAL_ENABLE);
+		REG_SET_BIT(ah, AR_PHY_AIC_CTRL_0_B1(ah), AR_PHY_AIC_CAL_ENABLE);
 	}
 exit:
 	return aic->aic_cal_state;
@@ -548,10 +548,10 @@ u8 ar9003_aic_start_normal(struct ath_hw *ah)
 
 	ar9003_aic_gain_table(ah);
 
-	REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1, ATH_AIC_SRAM_AUTO_INCREMENT);
+	REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1(ah), ATH_AIC_SRAM_AUTO_INCREMENT);
 
 	for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
-		REG_WRITE(ah, AR_PHY_AIC_SRAM_DATA_B1, aic->aic_sram[i]);
+		REG_WRITE(ah, AR_PHY_AIC_SRAM_DATA_B1(ah), aic->aic_sram[i]);
 	}
 
 	/* FIXME: Replace these with proper register names */
drivers/net/wireless/ath/ath9k/ar9003_calib.c +47 -47

250 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +65 -65

392 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_mci.c +2 -2
index 2b9c07961c..fdde6fb979 100644
@@ -762,7 +762,7 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
 	mci_hw->bt_state = MCI_BT_AWAKE;
 
-	REG_CLR_BIT(ah, AR_PHY_TIMING4,
+	REG_CLR_BIT(ah, AR_PHY_TIMING4(ah),
 		    1 << AR_PHY_TIMING_CONTROL4_DO_GAIN_DC_IQ_CAL_SHIFT);
 
 	if (caldata) {
@@ -774,7 +774,7 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 	if (!ath9k_hw_init_cal(ah, chan))
 		return -EIO;
 
-	REG_SET_BIT(ah, AR_PHY_TIMING4,
+	REG_SET_BIT(ah, AR_PHY_TIMING4(ah),
 		    1 << AR_PHY_TIMING_CONTROL4_DO_GAIN_DC_IQ_CAL_SHIFT);
 
 exit:
drivers/net/wireless/ath/ath9k/ar9003_paprd.c +58 -58

244 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_phy.c +161 -161

825 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_phy.h +275 -275

817 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_rtt.c +16 -16
index e4d11fa7fe..99b1ef2aaa 100644
@@ -37,31 +37,31 @@
 
 void ar9003_hw_rtt_enable(struct ath_hw *ah)
 {
-	REG_WRITE(ah, AR_PHY_RTT_CTRL, 1);
+	REG_WRITE(ah, AR_PHY_RTT_CTRL(ah), 1);
 }
 
 void ar9003_hw_rtt_disable(struct ath_hw *ah)
 {
-	REG_WRITE(ah, AR_PHY_RTT_CTRL, 0);
+	REG_WRITE(ah, AR_PHY_RTT_CTRL(ah), 0);
 }
 
 void ar9003_hw_rtt_set_mask(struct ath_hw *ah, u32 rtt_mask)
 {
-	REG_RMW_FIELD(ah, AR_PHY_RTT_CTRL,
+	REG_RMW_FIELD(ah, AR_PHY_RTT_CTRL(ah),
 		      AR_PHY_RTT_CTRL_RESTORE_MASK, rtt_mask);
 }
 
 bool ar9003_hw_rtt_force_restore(struct ath_hw *ah)
 {
-	if (!ath9k_hw_wait(ah, AR_PHY_RTT_CTRL,
+	if (!ath9k_hw_wait(ah, AR_PHY_RTT_CTRL(ah),
 			   AR_PHY_RTT_CTRL_FORCE_RADIO_RESTORE,
 			   0, RTT_RESTORE_TIMEOUT))
 		return false;
 
-	REG_RMW_FIELD(ah, AR_PHY_RTT_CTRL,
+	REG_RMW_FIELD(ah, AR_PHY_RTT_CTRL(ah),
 		      AR_PHY_RTT_CTRL_FORCE_RADIO_RESTORE, 1);
 
-	if (!ath9k_hw_wait(ah, AR_PHY_RTT_CTRL,
+	if (!ath9k_hw_wait(ah, AR_PHY_RTT_CTRL(ah),
 			   AR_PHY_RTT_CTRL_FORCE_RADIO_RESTORE,
 			   0, RTT_RESTORE_TIMEOUT))
 		return false;
@@ -75,28 +75,28 @@ static void ar9003_hw_rtt_load_hist_entry(struct ath_hw *ah, u8 chain,
 	u32 val;
 
 	val = SM(data28, AR_PHY_RTT_SW_RTT_TABLE_DATA);
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(ah, chain), val);
 
 	val = SM(0, AR_PHY_RTT_SW_RTT_TABLE_ACCESS) |
 	      SM(1, AR_PHY_RTT_SW_RTT_TABLE_WRITE) |
 	      SM(index, AR_PHY_RTT_SW_RTT_TABLE_ADDR);
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain), val);
 	udelay(1);
 
 	val |= SM(1, AR_PHY_RTT_SW_RTT_TABLE_ACCESS);
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain), val);
 	udelay(1);
 
-	if (!ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain),
+	if (!ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain),
 			   AR_PHY_RTT_SW_RTT_TABLE_ACCESS, 0,
 			   RTT_ACCESS_TIMEOUT))
 		return;
 
 	val &= ~SM(1, AR_PHY_RTT_SW_RTT_TABLE_WRITE);
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain), val);
 	udelay(1);
 
-	ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain),
+	ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain),
 		      AR_PHY_RTT_SW_RTT_TABLE_ACCESS, 0,
 		      RTT_ACCESS_TIMEOUT);
 }
@@ -147,19 +147,19 @@ static int ar9003_hw_rtt_fill_hist_entry(struct ath_hw *ah, u8 chain, u32 index)
 	      SM(0, AR_PHY_RTT_SW_RTT_TABLE_WRITE) |
 	      SM(index, AR_PHY_RTT_SW_RTT_TABLE_ADDR);
 
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain), val);
 	udelay(1);
 
 	val |= SM(1, AR_PHY_RTT_SW_RTT_TABLE_ACCESS);
-	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain), val);
+	REG_WRITE(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain), val);
 	udelay(1);
 
-	if (!ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(chain),
+	if (!ath9k_hw_wait(ah, AR_PHY_RTT_TABLE_SW_INTF_B(ah, chain),
 			   AR_PHY_RTT_SW_RTT_TABLE_ACCESS, 0,
 			   RTT_ACCESS_TIMEOUT))
 		return RTT_BAD_VALUE;
 
-	val = MS(REG_READ(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(chain)),
+	val = MS(REG_READ(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(ah, chain)),
 		 AR_PHY_RTT_SW_RTT_TABLE_DATA);
 
 
drivers/net/wireless/ath/ath9k/reg.h +3 -3
index 9f5b8a5380..2e65105d30 100644
@@ -2111,10 +2111,10 @@ enum {
 						     * pcu_txsm.
 						     */
 
-#define AR9300_SM_BASE				0xa200
+#define AR9300_SM_BASE(_ah)			0xa200
 #define AR9002_PHY_AGC_CONTROL			0x9860
-#define AR9003_PHY_AGC_CONTROL			AR9300_SM_BASE + 0xc4
-#define AR_PHY_AGC_CONTROL(_ah)			(AR_SREV_9300_20_OR_LATER(_ah) ? AR9003_PHY_AGC_CONTROL : AR9002_PHY_AGC_CONTROL)
+#define AR9003_PHY_AGC_CONTROL(_ah)		(AR9300_SM_BASE(_ah) + 0xc4)
+#define AR_PHY_AGC_CONTROL(_ah)			(AR_SREV_9300_20_OR_LATER(_ah) ? AR9003_PHY_AGC_CONTROL(_ah) : AR9002_PHY_AGC_CONTROL)
 #define AR_PHY_AGC_CONTROL_CAL			0x00000001  /* do internal calibration */
 #define AR_PHY_AGC_CONTROL_NF			0x00000002  /* do noise-floor calibration */
 #define AR_PHY_AGC_CONTROL_OFFSET_CAL		0x00000800  /* allow offset calibration */
drivers/net/wireless/ath/ath9k/reg_aic.h +20 -20
index f50994910e..ab69460314 100644
@@ -17,32 +17,32 @@
 #ifndef REG_AIC_H
 #define REG_AIC_H
 
-#define AR_PHY_AIC_CTRL_0_B0                    (AR_SM_BASE + 0x4b0)
-#define AR_PHY_AIC_CTRL_1_B0                    (AR_SM_BASE + 0x4b4)
-#define AR_PHY_AIC_CTRL_2_B0                    (AR_SM_BASE + 0x4b8)
-#define AR_PHY_AIC_CTRL_3_B0                    (AR_SM_BASE + 0x4bc)
-#define AR_PHY_AIC_CTRL_4_B0                    (AR_SM_BASE + 0x4c0)
+#define AR_PHY_AIC_CTRL_0_B0(_ah)               (AR_SM_BASE(_ah) + 0x4b0)
+#define AR_PHY_AIC_CTRL_1_B0(_ah)               (AR_SM_BASE(_ah) + 0x4b4)
+#define AR_PHY_AIC_CTRL_2_B0(_ah)               (AR_SM_BASE(_ah) + 0x4b8)
+#define AR_PHY_AIC_CTRL_3_B0(_ah)               (AR_SM_BASE(_ah) + 0x4bc)
+#define AR_PHY_AIC_CTRL_4_B0(_ah)               (AR_SM_BASE(_ah) + 0x4c0)
 
-#define AR_PHY_AIC_STAT_0_B0                    (AR_SM_BASE + 0x4c4)
-#define AR_PHY_AIC_STAT_1_B0                    (AR_SM_BASE + 0x4c8)
-#define AR_PHY_AIC_STAT_2_B0                    (AR_SM_BASE + 0x4cc)
+#define AR_PHY_AIC_STAT_0_B0(_ah)               (AR_SM_BASE(_ah) + 0x4c4)
+#define AR_PHY_AIC_STAT_1_B0(_ah)               (AR_SM_BASE(_ah) + 0x4c8)
+#define AR_PHY_AIC_STAT_2_B0(_ah)               (AR_SM_BASE(_ah) + 0x4cc)
 
-#define AR_PHY_AIC_CTRL_0_B1                    (AR_SM1_BASE + 0x4b0)
-#define AR_PHY_AIC_CTRL_1_B1                    (AR_SM1_BASE + 0x4b4)
-#define AR_PHY_AIC_CTRL_4_B1                    (AR_SM1_BASE + 0x4c0)
+#define AR_PHY_AIC_CTRL_0_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4b0)
+#define AR_PHY_AIC_CTRL_1_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4b4)
+#define AR_PHY_AIC_CTRL_4_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4c0)
 
-#define AR_PHY_AIC_STAT_0_B1                    (AR_SM1_BASE + 0x4c4)
-#define AR_PHY_AIC_STAT_1_B1                    (AR_SM1_BASE + 0x4c8)
-#define AR_PHY_AIC_STAT_2_B1                    (AR_SM1_BASE + 0x4cc)
+#define AR_PHY_AIC_STAT_0_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4c4)
+#define AR_PHY_AIC_STAT_1_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4c8)
+#define AR_PHY_AIC_STAT_2_B1(_ah)               (AR_SM1_BASE(_ah) + 0x4cc)
 
-#define AR_PHY_AIC_SRAM_ADDR_B0                 (AR_SM_BASE + 0x5f0)
-#define AR_PHY_AIC_SRAM_DATA_B0                 (AR_SM_BASE + 0x5f4)
+#define AR_PHY_AIC_SRAM_ADDR_B0(_ah)            (AR_SM_BASE(_ah) + 0x5f0)
+#define AR_PHY_AIC_SRAM_DATA_B0(_ah)            (AR_SM_BASE(_ah) + 0x5f4)
 
-#define AR_PHY_AIC_SRAM_ADDR_B1                 (AR_SM1_BASE + 0x5f0)
-#define AR_PHY_AIC_SRAM_DATA_B1                 (AR_SM1_BASE + 0x5f4)
+#define AR_PHY_AIC_SRAM_ADDR_B1(_ah)            (AR_SM1_BASE(_ah) + 0x5f0)
+#define AR_PHY_AIC_SRAM_DATA_B1(_ah)            (AR_SM1_BASE(_ah) + 0x5f4)
 
-#define AR_PHY_BT_COEX_4                        (AR_AGC_BASE + 0x60)
-#define AR_PHY_BT_COEX_5                        (AR_AGC_BASE + 0x64)
+#define AR_PHY_BT_COEX_4(_ah)                   (AR_AGC_BASE(_ah) + 0x60)
+#define AR_PHY_BT_COEX_5(_ah)                   (AR_AGC_BASE(_ah) + 0x64)
 
 /* AIC fields */
 #define AR_PHY_AIC_MON_ENABLE                   0x80000000
drivers/net/wireless/ath/ath9k/rng.c +2 -2
index e1def77591..42b313c230 100644
@@ -34,8 +34,8 @@ static int ath9k_rng_data_read(struct ath_softc *sc, u32 *buf, u32 buf_size)
 	REG_RMW_FIELD(ah, AR_PHY_TEST_CTL_STATUS(ah), AR_PHY_TEST_CTL_RX_OBS_SEL, 0);
 
 	for (i = 0, j = 0; i < buf_size; i++) {
-		v1 = REG_READ(ah, AR_PHY_TST_ADC) & 0xffff;
-		v2 = REG_READ(ah, AR_PHY_TST_ADC) & 0xffff;
+		v1 = REG_READ(ah, AR_PHY_TST_ADC(ah)) & 0xffff;
+		v2 = REG_READ(ah, AR_PHY_TST_ADC(ah)) & 0xffff;
 
 		/* wait for data ready */
 		if (v1 && v2 && rng_last != v1 && v1 != v2 && v1 != 0xffff &&
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH v3 4/11 Revert "ath9k_hw: fall back to OTP ROM when platform data has no valid eeprom data"

In reply to Wenli Looi

This reverts commit 01967360a20598f95947a86af26c930ab1b50205.

QCN5502 is a 4-stream device, so 0xff is the normal txrxMask. Users currently relying on this silent fallback will need to stop providing invalid EEPROM data to the driver.

---
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +2 -13
index 3dab290d8a..0f8af8c958 100644
@@ -3321,21 +3321,10 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
 	int it;
 	u16 checksum, mchecksum;
 	struct ath_common *common = ath9k_hw_common(ah);
-	struct ar9300_eeprom *eep;
 	eeprom_read_op read;
 
-	if (ath9k_hw_use_flash(ah)) {
-		u8 txrx;
-
-		if (ar9300_eeprom_restore_flash(ah, mptr, mdata_size))
-			return -EIO;
-
-		/* check if eeprom contains valid data */
-		eep = (struct ar9300_eeprom *) mptr;
-		txrx = eep->baseEepHeader.txrxMask;
-		if (txrx != 0 && txrx != 0xff)
-			return 0;
-	}
+	if (ath9k_hw_use_flash(ah))
+		return ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
 
 	word = kzalloc(2048, GFP_KERNEL);
 	if (!word)
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH v3 5/11 wifi: ath9k: add QCN550x device IDs

In reply to Wenli Looi

Adds the device ID constants and augments the initialization code to recognize the device.

---
 drivers/net/wireless/ath/ath9k/ahb.c | 4 ++++
 drivers/net/wireless/ath/ath9k/hw.c  | 6 ++++++
 drivers/net/wireless/ath/ath9k/hw.h  | 1 +
 drivers/net/wireless/ath/ath9k/reg.h | 5 ++++-
 4 files changed, 15 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ahb.c +4 -0
index 9cd12b20b1..1835b4469e 100644
@@ -47,6 +47,10 @@ static const struct platform_device_id ath9k_platform_id_table[] = {
 		.name = "qca956x_wmac",
 		.driver_data = AR9300_DEVID_QCA956X,
 	},
+	{
+		.name = "qcn550x_wmac",
+		.driver_data = AR9300_DEVID_QCN550X,
+	},
 	{},
 };
 
drivers/net/wireless/ath/ath9k/hw.c +6 -0
index 5982e0db45..e63314544a 100644
@@ -282,6 +282,9 @@ static bool ath9k_hw_read_revisions(struct ath_hw *ah)
 	case AR9300_DEVID_QCA956X:
 		ah->hw_version.macVersion = AR_SREV_VERSION_9561;
 		return true;
+	case AR9300_DEVID_QCN550X:
+		ah->hw_version.macVersion = AR_SREV_VERSION_5502;
+		return true;
 	}
 
 	srev = REG_READ(ah, AR_SREV(ah));
@@ -592,6 +595,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
 	case AR_SREV_VERSION_9565:
 	case AR_SREV_VERSION_9531:
 	case AR_SREV_VERSION_9561:
+	case AR_SREV_VERSION_5502:
 		break;
 	default:
 		ath_err(common,
@@ -688,6 +692,7 @@ int ath9k_hw_init(struct ath_hw *ah)
 	case AR9300_DEVID_AR9565:
 	case AR9300_DEVID_AR953X:
 	case AR9300_DEVID_QCA956X:
+	case AR9300_DEVID_QCN550X:
 		break;
 	default:
 		if (common->bus_ops->ath_bus_type == ATH_USB)
@@ -3315,6 +3320,7 @@ static struct {
 	{ AR_SREV_VERSION_9565,         "9565" },
 	{ AR_SREV_VERSION_9531,         "9531" },
 	{ AR_SREV_VERSION_9561,         "9561" },
+	{ AR_SREV_VERSION_5502,         "5502" },
 };
 
 /* For devices with external radios */
drivers/net/wireless/ath/ath9k/hw.h +1 -0
index 450ab19b1d..2349d0e93c 100644
@@ -56,6 +56,7 @@
 #define AR9300_DEVID_AR9565     0x0036
 #define AR9300_DEVID_AR953X     0x003d
 #define AR9300_DEVID_QCA956X    0x003f
+#define AR9300_DEVID_QCN550X    0x0040
 
 #define AR5416_AR9100_DEVID	0x000b
 
drivers/net/wireless/ath/ath9k/reg.h +4 -1
index 2e65105d30..75a9651983 100644
@@ -825,6 +825,7 @@
 #define AR_SREV_REVISION_9531_11        1
 #define AR_SREV_REVISION_9531_20        2
 #define AR_SREV_VERSION_9561            0x600
+#define AR_SREV_VERSION_5502            0x700
 
 #define AR_SREV_5416(_ah) \
 	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -992,10 +993,12 @@
 
 #define AR_SREV_9561(_ah) \
 	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9561))
+#define AR_SREV_5502(_ah) \
+	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5502))
 
 #define AR_SREV_SOC(_ah) \
 	(AR_SREV_9340(_ah) || AR_SREV_9531(_ah) || AR_SREV_9550(_ah) || \
-	 AR_SREV_9561(_ah))
+	 AR_SREV_9561(_ah) || AR_SREV_5502(_ah))
 
 /* NOTE: When adding chips newer than Peacock, add chip check here */
 #define AR_SREV_9580_10_OR_LATER(_ah) \
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH v3 6/11 wifi: ath9k: basic support for QCN550x

In reply to Wenli Looi

QCN550x is very similar to QCA956x. Note that AR_CH0_XTAL is intentionally unchanged.

---
 drivers/net/wireless/ath/ath9k/ani.c          |  2 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c |  4 +-
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 37 ++++++--
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c |  4 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c   | 48 ++++++----
 drivers/net/wireless/ath/ath9k/ar9003_phy.h   | 91 +++++++++++++------
 drivers/net/wireless/ath/ath9k/hw.c           | 33 ++++---
 drivers/net/wireless/ath/ath9k/mac.c          |  2 +-
 drivers/net/wireless/ath/ath9k/recv.c         |  2 +-
 drivers/net/wireless/ath/ath9k/reg.h          |  4 +-
 10 files changed, 149 insertions(+), 78 deletions(-)
drivers/net/wireless/ath/ath9k/ani.c +1 -1
index 41d192709e..281103865d 100644
@@ -261,7 +261,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel,
 
 	/* Skip MRC CCK for pre AR9003 families */
 	if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9485(ah) ||
-	    AR_SREV_9565(ah) || AR_SREV_9561(ah))
+	    AR_SREV_9565(ah) || AR_SREV_9561(ah) || AR_SREV_5502(ah))
 		return;
 
 	if (aniState->mrcCCK != entry_cck->mrc_cck_on)
drivers/net/wireless/ath/ath9k/ar9003_calib.c +2 -2
index 6d1f1242e6..95475e02af 100644
@@ -201,7 +201,7 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
 	u32 qCoffDenom, iCoffDenom;
 	int32_t qCoff, iCoff;
 	int iqCorrNeg, i;
-	static const u_int32_t offset_array[3] = {
+	const u_int32_t offset_array[3] = {
 		AR_PHY_RX_IQCAL_CORR_B0(ah),
 		AR_PHY_RX_IQCAL_CORR_B1(ah),
 		AR_PHY_RX_IQCAL_CORR_B2(ah),
@@ -1202,7 +1202,7 @@ static void ar9003_hw_manual_peak_cal(struct ath_hw *ah, u8 chain, bool is_2g)
 
 	if (AR_SREV_9550(ah) || AR_SREV_9531(ah))
 		peak_detect_threshold = 8;
-	else if (AR_SREV_9561(ah))
+	else if (AR_SREV_9561(ah) || AR_SREV_5502(ah))
 		peak_detect_threshold = 11;
 
 	/*
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +27 -10
index 0f8af8c958..810d75f553 100644
@@ -3619,6 +3619,8 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
 	if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
 	    AR_SREV_9531(ah) || AR_SREV_9561(ah))
 		REG_RMW_FIELD(ah, AR_CH0_TOP2(ah), AR_CH0_TOP2_XPABIASLVL, bias);
+	else if (AR_SREV_5502(ah))
+		REG_RMW_FIELD(ah, AR_CH0_TOP3, AR_CH0_TOP3_XPABIASLVL, bias);
 	else if (AR_SREV_9462(ah) || AR_SREV_9550(ah) || AR_SREV_9565(ah))
 		REG_RMW_FIELD(ah, AR_CH0_TOP(ah), AR_CH0_TOP_XPABIASLVL, bias);
 	else {
@@ -3637,7 +3639,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
 	struct ath9k_hw_capabilities *pCap = &ah->caps;
 	int chain;
 	u32 regval, value, gpio;
-	static const u32 switch_chain_reg[AR9300_MAX_CHAINS] = {
+	const u32 switch_chain_reg[AR9300_MAX_CHAINS] = {
 			AR_PHY_SWITCH_CHAIN_0(ah),
 			AR_PHY_SWITCH_CHAIN_1(ah),
 			AR_PHY_SWITCH_CHAIN_2(ah),
@@ -3658,7 +3660,8 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
 	if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
 		REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM(ah),
 				AR_SWITCH_TABLE_COM_AR9462_ALL, value);
-	} else if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah)) {
+	} else if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
+		   AR_SREV_5502(ah)) {
 		REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM(ah),
 				AR_SWITCH_TABLE_COM_AR9550_ALL, value);
 	} else
@@ -3989,11 +3992,11 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 			if (!is_pmu_set(ah, AR_PHY_PMU2(ah), reg_pmu_set))
 				return;
 		} else if (AR_SREV_9462(ah) || AR_SREV_9565(ah) ||
-			   AR_SREV_9561(ah)) {
+			   AR_SREV_9561(ah) || AR_SREV_5502(ah)) {
 			reg_val = le32_to_cpu(pBase->swreg);
 			REG_WRITE(ah, AR_PHY_PMU1(ah), reg_val);
 
-			if (AR_SREV_9561(ah))
+			if (AR_SREV_9561(ah) || AR_SREV_5502(ah))
 				REG_WRITE(ah, AR_PHY_PMU2(ah), 0x10200000);
 		} else {
 			/* Internal regulator is ON. Write swreg register. */
@@ -4037,17 +4040,23 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)
 {
 	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0];
+	u8 param_0, param_1;
 
 	if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
 		return;
 
 	if (eep->baseEepHeader.featureEnable & 0x40) {
-		tuning_caps_param &= 0x7f;
+		param_0 = eep->baseEepHeader.params_for_tuning_caps[0];
+		if (AR_SREV_5502(ah)) {
+			param_1 = eep->baseEepHeader.params_for_tuning_caps[1];
+		} else {
+			param_0 &= 0x7f;
+			param_1 = param_0;
+		}
 		REG_RMW_FIELD(ah, AR_CH0_XTAL(ah), AR_CH0_XTAL_CAPINDAC,
-			      tuning_caps_param);
+			      param_0);
 		REG_RMW_FIELD(ah, AR_CH0_XTAL(ah), AR_CH0_XTAL_CAPOUTDAC,
-			      tuning_caps_param);
+			      param_1);
 	}
 }
 
@@ -4098,7 +4107,8 @@ static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
 	    !AR_SREV_9340(ah) &&
 	    !AR_SREV_9580(ah) &&
 	    !AR_SREV_9531(ah) &&
-	    !AR_SREV_9561(ah))
+	    !AR_SREV_9561(ah) &&
+	    !AR_SREV_5502(ah))
 		return;
 
 	xpa_ctl = ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
@@ -4878,7 +4888,8 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 	}
 
 tempslope:
-	if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah)) {
+	if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
+	    AR_SREV_5502(ah)) {
 		u8 txmask = (eep->baseEepHeader.txrxMask & 0xf0) >> 4;
 
 		/*
@@ -4940,6 +4951,12 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 
 	REG_RMW_FIELD(ah, AR_PHY_TPC_18(ah), AR_PHY_TPC_18_THERM_CAL_VALUE,
 		      temperature[0]);
+	if (AR_SREV_5502(ah)) {
+		REG_RMW_FIELD(ah, AR_PHY_TPC_18_B1(ah),
+			      AR_PHY_TPC_18_THERM_CAL_VALUE, temperature[1]);
+		REG_RMW_FIELD(ah, AR_PHY_TPC_18_B2(ah),
+			      AR_PHY_TPC_18_THERM_CAL_VALUE, temperature[2]);
+	}
 }
 
 /* Apply the recorded correction values. */
drivers/net/wireless/ath/ath9k/ar9003_paprd.c +2 -2
index 28192df046..ec2d38f13d 100644
@@ -138,12 +138,12 @@ static int ar9003_get_training_power_5g(struct ath_hw *ah)
 static int ar9003_paprd_setup_single_table(struct ath_hw *ah)
 {
 	struct ath_common *common = ath9k_hw_common(ah);
-	static const u32 ctrl0[3] = {
+	const u32 ctrl0[3] = {
 		AR_PHY_PAPRD_CTRL0_B0(ah),
 		AR_PHY_PAPRD_CTRL0_B1(ah),
 		AR_PHY_PAPRD_CTRL0_B2(ah)
 	};
-	static const u32 ctrl1[3] = {
+	const u32 ctrl1[3] = {
 		AR_PHY_PAPRD_CTRL1_B0(ah),
 		AR_PHY_PAPRD_CTRL1_B1(ah),
 		AR_PHY_PAPRD_CTRL1_B2(ah)
drivers/net/wireless/ath/ath9k/ar9003_phy.c +30 -18

133 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/ar9003_phy.h +62 -29

205 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/hw.c +20 -13
index e63314544a..f572fca3e6 100644
@@ -834,7 +834,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 		REG_RMW_FIELD(ah, AR_CH0_BB_DPLL3,
 			      AR_CH0_BB_DPLL3_PHASE_SHIFT, 0x1);
 	} else if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah) ||
-		   AR_SREV_9561(ah)) {
+		   AR_SREV_9561(ah) || AR_SREV_5502(ah)) {
 		u32 regval, pll2_divint, pll2_divfrac, refdiv;
 
 		REG_WRITE(ah, AR_RTC_PLL_CONTROL(ah),
@@ -845,7 +845,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 		udelay(100);
 
 		if (ah->is_clk_25mhz) {
-			if (AR_SREV_9531(ah) || AR_SREV_9561(ah)) {
+			if (AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
+			    AR_SREV_5502(ah)) {
 				pll2_divint = 0x1c;
 				pll2_divfrac = 0xa3d2;
 				refdiv = 1;
@@ -861,15 +862,16 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 				refdiv = 5;
 			} else {
 				pll2_divint = 0x11;
-				pll2_divfrac = (AR_SREV_9531(ah) ||
-						AR_SREV_9561(ah)) ?
+				pll2_divfrac =
+					(AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
+					 AR_SREV_5502(ah)) ?
 						0x26665 : 0x26666;
 				refdiv = 1;
 			}
 		}
 
 		regval = REG_READ(ah, AR_PHY_PLL_MODE);
-		if (AR_SREV_9531(ah) || AR_SREV_9561(ah))
+		if (AR_SREV_9531(ah) || AR_SREV_9561(ah) || AR_SREV_5502(ah))
 			regval |= (0x1 << 22);
 		else
 			regval |= (0x1 << 16);
@@ -887,7 +889,8 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 				(0x1 << 13) |
 				(0x4 << 26) |
 				(0x18 << 19);
-		else if (AR_SREV_9531(ah) || AR_SREV_9561(ah)) {
+		else if (AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
+			 AR_SREV_5502(ah)) {
 			regval = (regval & 0x01c00fff) |
 				(0x1 << 31) |
 				(0x2 << 29) |
@@ -904,7 +907,7 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
 				(0x60 << 19);
 		REG_WRITE(ah, AR_PHY_PLL_MODE, regval);
 
-		if (AR_SREV_9531(ah) || AR_SREV_9561(ah))
+		if (AR_SREV_9531(ah) || AR_SREV_9561(ah) || AR_SREV_5502(ah))
 			REG_WRITE(ah, AR_PHY_PLL_MODE,
 				  REG_READ(ah, AR_PHY_PLL_MODE) & 0xffbfffff);
 		else
@@ -945,7 +948,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
 	u32 msi_cfg = 0;
 
 	if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah) ||
-	    AR_SREV_9561(ah))
+	    AR_SREV_9561(ah) || AR_SREV_5502(ah))
 		sync_default &= ~AR_INTR_SYNC_HOST1_FATAL;
 
 	if (AR_SREV_9300_20_OR_LATER(ah)) {
@@ -1235,8 +1238,9 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah)
 	REG_WRITE(ah, AR_RXFIFO_CFG, 0x200);
 
 	if (AR_SREV_9300_20_OR_LATER(ah)) {
-		REG_RMW_FIELD(ah, AR_RXBP_THRESH, AR_RXBP_THRESH_HP, 0x1);
-		REG_RMW_FIELD(ah, AR_RXBP_THRESH, AR_RXBP_THRESH_LP, 0x1);
+		u8 rxbp = AR_SREV_5502(ah) ? 0x3 : 0x1;
+		REG_RMW_FIELD(ah, AR_RXBP_THRESH, AR_RXBP_THRESH_HP, rxbp);
+		REG_RMW_FIELD(ah, AR_RXBP_THRESH, AR_RXBP_THRESH_LP, rxbp);
 
 		ath9k_hw_set_rx_bufsize(ah, common->rx_bufsize -
 			ah->caps.rx_status_len);
@@ -1777,7 +1781,7 @@ static void ath9k_hw_init_desc(struct ath_hw *ah)
 #ifdef __BIG_ENDIAN
 		else if (AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
 			 AR_SREV_9550(ah) || AR_SREV_9531(ah) ||
-			 AR_SREV_9561(ah))
+			 AR_SREV_9561(ah) || AR_SREV_5502(ah))
 			REG_RMW(ah, AR_CFG, AR_CFG_SWRB | AR_CFG_SWTB, 0);
 		else
 			REG_WRITE(ah, AR_CFG, AR_CFG_SWTD | AR_CFG_SWRD);
@@ -2474,6 +2478,9 @@ static void ath9k_gpio_cap_init(struct ath_hw *ah)
 	} else if (AR_SREV_9561(ah)) {
 		pCap->num_gpio_pins = AR9561_NUM_GPIO;
 		pCap->gpio_mask = AR9561_GPIO_MASK;
+	} else if (AR_SREV_5502(ah)) {
+		pCap->num_gpio_pins = AR5502_NUM_GPIO;
+		pCap->gpio_mask = AR5502_GPIO_MASK;
 	} else if (AR_SREV_9565(ah)) {
 		pCap->num_gpio_pins = AR9565_NUM_GPIO;
 		pCap->gpio_mask = AR9565_GPIO_MASK;
@@ -2610,7 +2617,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 	if (AR_SREV_9300_20_OR_LATER(ah)) {
 		pCap->hw_caps |= ATH9K_HW_CAP_EDMA | ATH9K_HW_CAP_FASTCLOCK;
 		if (!AR_SREV_9330(ah) && !AR_SREV_9485(ah) &&
-		    !AR_SREV_9561(ah) && !AR_SREV_9565(ah))
+		    !AR_SREV_9561(ah) && !AR_SREV_5502(ah) && !AR_SREV_9565(ah))
 			pCap->hw_caps |= ATH9K_HW_CAP_LDPC;
 
 		pCap->rx_hp_qdepth = ATH9K_HW_RX_HP_QDEPTH;
@@ -2627,7 +2634,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 	if (AR_SREV_9300_20_OR_LATER(ah))
 		pCap->hw_caps |= ATH9K_HW_CAP_RAC_SUPPORTED;
 
-	if (AR_SREV_9561(ah))
+	if (AR_SREV_9561(ah) || AR_SREV_5502(ah))
 		ah->ent_mode = 0x3BDA000;
 	else if (AR_SREV_9300_20_OR_LATER(ah))
 		ah->ent_mode = REG_READ(ah, AR_ENT_OTP);
drivers/net/wireless/ath/ath9k/mac.c +1 -1
index b070403e08..b18c437ca4 100644
@@ -813,7 +813,7 @@ static void __ath9k_hw_enable_interrupts(struct ath_hw *ah)
 	u32 async_mask;
 
 	if (AR_SREV_9340(ah) || AR_SREV_9550(ah) || AR_SREV_9531(ah) ||
-	    AR_SREV_9561(ah))
+	    AR_SREV_9561(ah) || AR_SREV_5502(ah))
 		sync_default &= ~AR_INTR_SYNC_HOST1_FATAL;
 
 	async_mask = AR_INTR_MAC_IRQ;
drivers/net/wireless/ath/ath9k/recv.c +1 -1
index 0c0624a3b4..3299aef65e 100644
@@ -422,7 +422,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc)
 	}
 
 	if (AR_SREV_9550(sc->sc_ah) || AR_SREV_9531(sc->sc_ah) ||
-	    AR_SREV_9561(sc->sc_ah))
+	    AR_SREV_9561(sc->sc_ah) || AR_SREV_5502(sc->sc_ah))
 		rfilt |= ATH9K_RX_FILTER_4ADDRESS;
 
 	if (AR_SREV_9462(sc->sc_ah) || AR_SREV_9565(sc->sc_ah))
drivers/net/wireless/ath/ath9k/reg.h +3 -1
index 75a9651983..1809217264 100644
@@ -1138,6 +1138,7 @@ enum {
 #define AR9531_NUM_GPIO				 18
 #define AR9550_NUM_GPIO				 24
 #define AR9561_NUM_GPIO				 23
+#define AR5502_NUM_GPIO				 20
 #define AR9565_NUM_GPIO				 14
 #define AR9580_NUM_GPIO				 16
 #define AR7010_NUM_GPIO                          16
@@ -1155,6 +1156,7 @@ enum {
 #define AR9531_GPIO_MASK			 0x0000000F
 #define AR9550_GPIO_MASK			 0x0000000F
 #define AR9561_GPIO_MASK			 0x0000000F
+#define AR5502_GPIO_MASK			 0x0000000F
 #define AR9565_GPIO_MASK			 0x00003FFF
 #define AR9580_GPIO_MASK			 0x0000F4FF
 #define AR7010_GPIO_MASK			 0x0000FFFF
@@ -2114,7 +2116,7 @@ enum {
 						     * pcu_txsm.
 						     */
 
-#define AR9300_SM_BASE(_ah)			0xa200
+#define AR9300_SM_BASE(_ah)			(AR_SREV_5502(_ah) ? 0x2a200 : 0xa200)
 #define AR9002_PHY_AGC_CONTROL			0x9860
 #define AR9003_PHY_AGC_CONTROL(_ah)		(AR9300_SM_BASE(_ah) + 0xc4)
 #define AR_PHY_AGC_CONTROL(_ah)			(AR_SREV_9300_20_OR_LATER(_ah) ? AR9003_PHY_AGC_CONTROL(_ah) : AR9002_PHY_AGC_CONTROL)
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH v3 7/11 wifi: ath9k: add QCN550x initvals

In reply to Wenli Looi

These values are based on the D-Link DAP-2682 GPL dump. Overall, they are very similar to QCA956x initvals found in ath9k except for adding 0x20000 to many addresses and adding 4th-chain related addresses. I have also edited certain values to enable the clock doubler, which matches stock firmware behavior and seems necessary for decent performance.

See the link for more details about the initvals.

---
 .../net/wireless/ath/ath9k/ar550x_initvals.h  | 1539 +++++++++++++++++
 drivers/net/wireless/ath/ath9k/ar9003_hw.c    |   65 +
 2 files changed, 1604 insertions(+)
 create mode 100644 drivers/net/wireless/ath/ath9k/ar550x_initvals.h
drivers/net/wireless/ath/ath9k/ar550x_initvals.h new file +1539 -0
new file mode 100644
index 0000000000..632283c067
@@ -0,0 +1,1539 @@
+#ifndef INITVALS_550X_H
+#define INITVALS_550X_H
+
+#define qcn550x_1p0_mac_core ar955x_1p0_mac_core
+
+#define qcn550x_1p0_mac_postamble ar9331_1p1_mac_postamble
+
+#define qcn550x_1p0_soc_preamble ar955x_1p0_soc_preamble
+
+#define qcn550x_1p0_soc_postamble ar9300_2p2_soc_postamble
+
+static const u32 qcn550x_1p0_common_wo_xlna_rx_gain_table[][2] = {
+	/* Addr      allmodes  */
+	{0x0002a000, 0x00010000},
+	{0x0002a004, 0x00030002},
+	{0x0002a008, 0x00050004},
+	{0x0002a00c, 0x00810080},
+	{0x0002a010, 0x00830082},
+	{0x0002a014, 0x01810180},
+	{0x0002a018, 0x01830182},
+	{0x0002a01c, 0x01850184},
+	{0x0002a020, 0x01890188},
+	{0x0002a024, 0x018b018a},
+	{0x0002a028, 0x018d018c},
+	{0x0002a02c, 0x03820190},
+	{0x0002a030, 0x03840383},
+	{0x0002a034, 0x03880385},
+	{0x0002a038, 0x038a0389},
+	{0x0002a03c, 0x038c038b},
+	{0x0002a040, 0x0390038d},
+	{0x0002a044, 0x03920391},
+	{0x0002a048, 0x03940393},
+	{0x0002a04c, 0x03960395},
+	{0x0002a050, 0x00000000},
+	{0x0002a054, 0x00000000},
+	{0x0002a058, 0x00000000},
+	{0x0002a05c, 0x00000000},
+	{0x0002a060, 0x00000000},
+	{0x0002a064, 0x00000000},
+	{0x0002a068, 0x00000000},
+	{0x0002a06c, 0x00000000},
+	{0x0002a070, 0x00000000},
+	{0x0002a074, 0x00000000},
+	{0x0002a078, 0x00000000},
+	{0x0002a07c, 0x00000000},
+	{0x0002a080, 0x29292929},
+	{0x0002a084, 0x29292929},
+	{0x0002a088, 0x29292929},
+	{0x0002a08c, 0x29292929},
+	{0x0002a090, 0x22292929},
+	{0x0002a094, 0x1d1d2222},
+	{0x0002a098, 0x0c111117},
+	{0x0002a09c, 0x00030303},
+	{0x0002a0a0, 0x00000000},
+	{0x0002a0a4, 0x00000000},
+	{0x0002a0a8, 0x00000000},
+	{0x0002a0ac, 0x00000000},
+	{0x0002a0b0, 0x00000000},
+	{0x0002a0b4, 0x00000000},
+	{0x0002a0b8, 0x00000000},
+	{0x0002a0bc, 0x00000000},
+	{0x0002a0c0, 0x001f0000},
+	{0x0002a0c4, 0x01000101},
+	{0x0002a0c8, 0x011e011f},
+	{0x0002a0cc, 0x011c011d},
+	{0x0002a0d0, 0x02030204},
+	{0x0002a0d4, 0x02010202},
+	{0x0002a0d8, 0x021f0200},
+	{0x0002a0dc, 0x0302021e},
+	{0x0002a0e0, 0x03000301},
+	{0x0002a0e4, 0x031e031f},
+	{0x0002a0e8, 0x0402031d},
+	{0x0002a0ec, 0x04000401},
+	{0x0002a0f0, 0x041e041f},
+	{0x0002a0f4, 0x0502041d},
+	{0x0002a0f8, 0x05000501},
+	{0x0002a0fc, 0x051e051f},
+	{0x0002a100, 0x06010602},
+	{0x0002a104, 0x061f0600},
+	{0x0002a108, 0x061d061e},
+	{0x0002a10c, 0x07020703},
+	{0x0002a110, 0x07000701},
+	{0x0002a114, 0x00000000},
+	{0x0002a118, 0x00000000},
+	{0x0002a11c, 0x00000000},
+	{0x0002a120, 0x00000000},
+	{0x0002a124, 0x00000000},
+	{0x0002a128, 0x00000000},
+	{0x0002a12c, 0x00000000},
+	{0x0002a130, 0x00000000},
+	{0x0002a134, 0x00000000},
+	{0x0002a138, 0x00000000},
+	{0x0002a13c, 0x00000000},
+	{0x0002a140, 0x001f0000},
+	{0x0002a144, 0x01000101},
+	{0x0002a148, 0x011e011f},
+	{0x0002a14c, 0x011c011d},
+	{0x0002a150, 0x02030204},
+	{0x0002a154, 0x02010202},
+	{0x0002a158, 0x021f0200},
+	{0x0002a15c, 0x0302021e},
+	{0x0002a160, 0x03000301},
+	{0x0002a164, 0x031e031f},
+	{0x0002a168, 0x0402031d},
+	{0x0002a16c, 0x04000401},
+	{0x0002a170, 0x041e041f},
+	{0x0002a174, 0x0502041d},
+	{0x0002a178, 0x05000501},
+	{0x0002a17c, 0x051e051f},
+	{0x0002a180, 0x06010602},
+	{0x0002a184, 0x061f0600},
+	{0x0002a188, 0x061d061e},
+	{0x0002a18c, 0x07020703},
+	{0x0002a190, 0x07000701},
+	{0x0002a194, 0x00000000},
+	{0x0002a198, 0x00000000},
+	{0x0002a19c, 0x00000000},
+	{0x0002a1a0, 0x00000000},
+	{0x0002a1a4, 0x00000000},
+	{0x0002a1a8, 0x00000000},
+	{0x0002a1ac, 0x00000000},
+	{0x0002a1b0, 0x00000000},
+	{0x0002a1b4, 0x00000000},
+	{0x0002a1b8, 0x00000000},
+	{0x0002a1bc, 0x00000000},
+	{0x0002a1c0, 0x00000000},
+	{0x0002a1c4, 0x00000000},
+	{0x0002a1c8, 0x00000000},
+	{0x0002a1cc, 0x00000000},
+	{0x0002a1d0, 0x00000000},
+	{0x0002a1d4, 0x00000000},
+	{0x0002a1d8, 0x00000000},
+	{0x0002a1dc, 0x00000000},
+	{0x0002a1e0, 0x00000000},
+	{0x0002a1e4, 0x00000000},
+	{0x0002a1e8, 0x00000000},
+	{0x0002a1ec, 0x00000000},
+	{0x0002a1f0, 0x00000396},
+	{0x0002a1f4, 0x00000396},
+	{0x0002a1f8, 0x00000396},
+	{0x0002a1fc, 0x00000196},
+	{0x0002b000, 0x00010000},
+	{0x0002b004, 0x00030002},
+	{0x0002b008, 0x00050004},
+	{0x0002b00c, 0x00810080},
+	{0x0002b010, 0x00830082},
+	{0x0002b014, 0x01810180},
+	{0x0002b018, 0x01830182},
+	{0x0002b01c, 0x01850184},
+	{0x0002b020, 0x02810280},
+	{0x0002b024, 0x02830282},
+	{0x0002b028, 0x02850284},
+	{0x0002b02c, 0x02890288},
+	{0x0002b030, 0x028b028a},
+	{0x0002b034, 0x0388028c},
+	{0x0002b038, 0x038a0389},
+	{0x0002b03c, 0x038c038b},
+	{0x0002b040, 0x0390038d},
+	{0x0002b044, 0x03920391},
+	{0x0002b048, 0x03940393},
+	{0x0002b04c, 0x03960395},
+	{0x0002b050, 0x00000000},
+	{0x0002b054, 0x00000000},
+	{0x0002b058, 0x00000000},
+	{0x0002b05c, 0x00000000},
+	{0x0002b060, 0x00000000},
+	{0x0002b064, 0x00000000},
+	{0x0002b068, 0x00000000},
+	{0x0002b06c, 0x00000000},
+	{0x0002b070, 0x00000000},
+	{0x0002b074, 0x00000000},
+	{0x0002b078, 0x00000000},
+	{0x0002b07c, 0x00000000},
+	{0x0002b080, 0x32323232},
+	{0x0002b084, 0x2f2f3232},
+	{0x0002b088, 0x23282a2d},
+	{0x0002b08c, 0x1c1e2123},
+	{0x0002b090, 0x14171919},
+	{0x0002b094, 0x0e0e1214},
+	{0x0002b098, 0x03050707},
+	{0x0002b09c, 0x00030303},
+	{0x0002b0a0, 0x00000000},
+	{0x0002b0a4, 0x00000000},
+	{0x0002b0a8, 0x00000000},
+	{0x0002b0ac, 0x00000000},
+	{0x0002b0b0, 0x00000000},
+	{0x0002b0b4, 0x00000000},
+	{0x0002b0b8, 0x00000000},
+	{0x0002b0bc, 0x00000000},
+	{0x0002b0c0, 0x003f0020},
+	{0x0002b0c4, 0x00400041},
+	{0x0002b0c8, 0x0140005f},
+	{0x0002b0cc, 0x0160015f},
+	{0x0002b0d0, 0x017e017f},
+	{0x0002b0d4, 0x02410242},
+	{0x0002b0d8, 0x025f0240},
+	{0x0002b0dc, 0x027f0260},
+	{0x0002b0e0, 0x0341027e},
+	{0x0002b0e4, 0x035f0340},
+	{0x0002b0e8, 0x037f0360},
+	{0x0002b0ec, 0x04400441},
+	{0x0002b0f0, 0x0460045f},
+	{0x0002b0f4, 0x0541047f},
+	{0x0002b0f8, 0x055f0540},
+	{0x0002b0fc, 0x057f0560},
+	{0x0002b100, 0x06400641},
+	{0x0002b104, 0x0660065f},
+	{0x0002b108, 0x067e067f},
+	{0x0002b10c, 0x07410742},
+	{0x0002b110, 0x075f0740},
+	{0x0002b114, 0x077f0760},
+	{0x0002b118, 0x07800781},
+	{0x0002b11c, 0x07a0079f},
+	{0x0002b120, 0x07c107bf},
+	{0x0002b124, 0x000007c0},
+	{0x0002b128, 0x00000000},
+	{0x0002b12c, 0x00000000},
+	{0x0002b130, 0x00000000},
+	{0x0002b134, 0x00000000},
+	{0x0002b138, 0x00000000},
+	{0x0002b13c, 0x00000000},
+	{0x0002b140, 0x003f0020},
+	{0x0002b144, 0x00400041},
+	{0x0002b148, 0x0140005f},
+	{0x0002b14c, 0x0160015f},
+	{0x0002b150, 0x017e017f},
+	{0x0002b154, 0x02410242},
+	{0x0002b158, 0x025f0240},
+	{0x0002b15c, 0x027f0260},
+	{0x0002b160, 0x0341027e},
+	{0x0002b164, 0x035f0340},
+	{0x0002b168, 0x037f0360},
+	{0x0002b16c, 0x04400441},
+	{0x0002b170, 0x0460045f},
+	{0x0002b174, 0x0541047f},
+	{0x0002b178, 0x055f0540},
+	{0x0002b17c, 0x057f0560},
+	{0x0002b180, 0x06400641},
+	{0x0002b184, 0x0660065f},
+	{0x0002b188, 0x067e067f},
+	{0x0002b18c, 0x07410742},
+	{0x0002b190, 0x075f0740},
+	{0x0002b194, 0x077f0760},
+	{0x0002b198, 0x07800781},
+	{0x0002b19c, 0x07a0079f},
+	{0x0002b1a0, 0x07c107bf},
+	{0x0002b1a4, 0x000007c0},
+	{0x0002b1a8, 0x00000000},
+	{0x0002b1ac, 0x00000000},
+	{0x0002b1b0, 0x00000000},
+	{0x0002b1b4, 0x00000000},
+	{0x0002b1b8, 0x00000000},
+	{0x0002b1bc, 0x00000000},
+	{0x0002b1c0, 0x00000000},
+	{0x0002b1c4, 0x00000000},
+	{0x0002b1c8, 0x00000000},
+	{0x0002b1cc, 0x00000000},
+	{0x0002b1d0, 0x00000000},
+	{0x0002b1d4, 0x00000000},
+	{0x0002b1d8, 0x00000000},
+	{0x0002b1dc, 0x00000000},
+	{0x0002b1e0, 0x00000000},
+	{0x0002b1e4, 0x00000000},
+	{0x0002b1e8, 0x00000000},
+	{0x0002b1ec, 0x00000000},
+	{0x0002b1f0, 0x00000396},
+	{0x0002b1f4, 0x00000396},
+	{0x0002b1f8, 0x00000396},
+	{0x0002b1fc, 0x00000196},
+};
+
+static const u32 qcn550x_1p0_baseband_postamble_dfs_channel[][3] = {
+	/* Addr      5G          2G        */
+	{0x00029824, 0x5ac668d0, 0x5ac668d0},
+	{0x00029e0c, 0x6d4000e2, 0x6d4000e2},
+	{0x00029e14, 0x37b9625e, 0x37b9625e},
+};
+
+static const u32 qcn550x_1p0_common_wo_xlna_rx_gain_bounds[][5] = {
+	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+	{0x00029e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+	{0x00029e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
+};
+
+static const u32 qcn550x_1p0_common_rx_gain_bounds[][5] = {
+	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+	{0x00029e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+	{0x00029e48, 0x5030201a, 0x5030201a, 0x50302018, 0x50302018},
+};
+
+static const u32 qcn550x_1p0_modes_fast_clock[][3] = {
+	/* Addr      5G_HT20     5G_HT40   */
+	{0x00001030, 0x00000268, 0x000004d0},
+	{0x00001070, 0x0000018c, 0x00000318},
+	{0x000010b0, 0x00000fd0, 0x00001fa0},
+	{0x00008014, 0x044c044c, 0x08980898},
+	{0x0000801c, 0x148ec02b, 0x148ec057},
+	{0x00008318, 0x000044c0, 0x00008980},
+	{0x00029e00, 0xc372131c, 0xc372131c},
+	{0x0002a230, 0x0000400b, 0x00004016},
+	{0x0002a254, 0x00000898, 0x00001130},
+};
+
+static const u32 qcn550x_1p0_baseband_core[][2] = {
+	/* Addr      allmodes  */
+	{0x00029800, 0xafe68e30},
+	{0x00029804, 0xfd14e000},
+	{0x00029808, 0x9c0a9f6b},
+	{0x0002980c, 0x04900000},
+	{0x00029814, 0x0280c00a},
+	{0x00029818, 0x80000000},
+	{0x0002981c, 0x00020028},
+	{0x00029834, 0x6400a190},
+	{0x00029838, 0x0108ecff},
+	{0x0002983c, 0x14000600},
+	{0x00029880, 0x201fff00},
+	{0x00029884, 0x0c411042},
+	{0x0002988c, 0x00000001},
+	{0x000298a4, 0x00200400},
+	{0x000298b0, 0x32840cbf},
+	{0x000298bc, 0x00000002},
+	{0x000298d0, 0x004b6a8e},
+	{0x000298d4, 0x00000820},
+	{0x000298dc, 0x00000000},
+	{0x000298f0, 0x00000000},
+	{0x000298f4, 0x00000000},
+	{0x00029c04, 0xff55ff55},
+	{0x00029c08, 0x0320ff55},
+	{0x00029c0c, 0x00000000},
+	{0x00029c10, 0x00000000},
+	{0x00029c14, 0x00046384},
+	{0x00029c18, 0x05b6b440},
+	{0x00029c1c, 0x00b6b440},
+	{0x00029d00, 0xc080a333},
+	{0x00029d04, 0x40206c10},
+	{0x00029d08, 0x009c4060},
+	{0x00029d0c, 0x9883800a},
+	{0x00029d10, 0x01834061},
+	{0x00029d14, 0x00c0040b},
+	{0x00029d18, 0x00000000},
+	{0x00029e08, 0x0038230c},
+	{0x00029e24, 0x990bb515},
+	{0x00029e28, 0x0c6f0000},
+	{0x00029e30, 0x06336f77},
+	{0x00029e34, 0x6af6532f},
+	{0x00029e38, 0x0cc80c00},
+	{0x00029e40, 0x0d361820},
+	{0x00029e4c, 0x00001004},
+	{0x00029e50, 0x00ff03f1},
+	{0x00029fc0, 0x813e4789},
+	{0x00029fc4, 0x0001efb5},
+	{0x00029fcc, 0x40000014},
+	{0x00029fd0, 0x02993b93},
+	{0x00029fd4, 0x81e5a8ab},
+	{0x0002a20c, 0x00000000},
+	{0x0002a218, 0x00000000},
+	{0x0002a21c, 0x00000000},
+	{0x0002a228, 0x10002310},
+	{0x0002a23c, 0x00000000},
+	{0x0002a244, 0x0c000000},
+	{0x0002a248, 0x00000140},
+	{0x0002a2a0, 0x0000000f},
+	{0x0002a2c0, 0x0000000f},
+	{0x0002a2c8, 0x00000000},
+	{0x0002a2d4, 0x00000000},
+	{0x0002a344, 0x00000000},
+	{0x0002a34c, 0x00000000},
+	{0x0002a350, 0x0000a000},
+	{0x0002a360, 0x00000000},
+	{0x0002a36c, 0x00000000},
+	{0x0002a384, 0x00000001},
+	{0x0002a388, 0x00003444},
+	{0x0002a38c, 0x00000000},
+	{0x0002a390, 0x210d0401},
+	{0x0002a394, 0xab9a7144},
+	{0x0002a398, 0x00000201},
+	{0x0002a39c, 0x45454545},
+	{0x0002a3a0, 0x3c466478},
+	{0x0002a3a4, 0x3a363600},
+	{0x0002a3a8, 0x0000003a},
+	{0x0002a3ac, 0x00000000},
+	{0x0002a3b0, 0x009011fe},
+	{0x0002a3b4, 0x00000034},
+	{0x0002a3b8, 0x00b3ec0a},
+	{0x0002a3bc, 0x00000036},
+	{0x0002a3c0, 0x20202020},
+	{0x0002a3c4, 0x22222220},
+	{0x0002a3c8, 0x20200020},
+	{0x0002a3cc, 0x20202020},
+	{0x0002a3d0, 0x20202020},
+	{0x0002a3d4, 0x20202020},
+	{0x0002a3d8, 0x20202020},
+	{0x0002a3dc, 0x20202020},
+	{0x0002a3e0, 0x20202020},
+	{0x0002a3e4, 0x20202020},
+	{0x0002a3e8, 0x20202020},
+	{0x0002a3ec, 0x20202020},
+	{0x0002a3f0, 0x00000000},
+	{0x0002a3f4, 0x00000000},
+	{0x0002a3f8, 0x0c9bd380},
+	{0x0002a3fc, 0x000f0f01},
+	{0x0002a400, 0x8fa91f01},
+	{0x0002a404, 0x00000000},
+	{0x0002a408, 0x0e79e5c6},
+	{0x0002a40c, 0x00820820},
+	{0x0002a414, 0x1ce739ce},
+	{0x0002a418, 0x2d001dce},
+	{0x0002a41c, 0x1ce739ce},
+	{0x0002a420, 0x000001ce},
+	{0x0002a424, 0x1ce739ce},
+	{0x0002a428, 0x000001ce},
+	{0x0002a42c, 0x1ce739ce},
+	{0x0002a430, 0x1ce739ce},
+	{0x0002a434, 0x00000000},
+	{0x0002a438, 0x00001801},
+	{0x0002a43c, 0x00000000},
+	{0x0002a444, 0x00000000},
+	{0x0002a448, 0x05000080},
+	{0x0002a44c, 0x00000001},
+	{0x0002a450, 0x00010000},
+	{0x0002a454, 0x05000000},
+	{0x0002a458, 0x00000000},
+	{0x0002a45c, 0x20202020},
+	{0x0002a460, 0x20202020},
+	{0x0002a464, 0x000739ce},
+	{0x0002a468, 0x000739ce},
+	{0x0002a644, 0xbfad9fee},
+	{0x0002a648, 0x0048660a},
+	{0x0002a64c, 0x00003c37},
+	{0x0002a670, 0x03020100},
+	{0x0002a674, 0x21200504},
+	{0x0002a678, 0x61602322},
+	{0x0002a67c, 0x65646362},
+	{0x0002a680, 0x6b6a6968},
+	{0x0002a684, 0xe2706d6c},
+	{0x0002a688, 0x000000e3},
+	{0x0002a690, 0x00000838},
+	{0x0002a7cc, 0x00000000},
+	{0x0002a7d0, 0x00000000},
+	{0x0002a7d4, 0x00000004},
+	{0x0002a7dc, 0x00000000},
+	{0x0002a8d0, 0x004b6a8e},
+	{0x0002a8d4, 0x00000820},
+	{0x0002a8dc, 0x00000000},
+	{0x0002a8f0, 0x00000000},
+	{0x0002a8f4, 0x00000000},
+	{0x0002b2d0, 0x00000080},
+	{0x0002b2d4, 0x00000000},
+	{0x0002b408, 0x0e79e5c0},
+	{0x0002b40c, 0x00820820},
+	{0x0002b420, 0x00000000},
+	{0x0002b43c, 0x00000000},
+	{0x0002b8d0, 0x004b6a8e},
+	{0x0002b8d4, 0x00000820},
+	{0x0002b8dc, 0x00000000},
+	{0x0002b8f0, 0x00000000},
+	{0x0002b8f4, 0x00000000},
+	{0x0002c2d0, 0x00000080},
+	{0x0002c2d4, 0x00000000},
+	{0x0002c408, 0x0e79e5c0},
+	{0x0002c40c, 0x00820820},
+	{0x0002c420, 0x00000000},
+	{0x0002c43c, 0x00000000},
+	{0x0002d8d0, 0x004b6a8e},
+	{0x0002d8d4, 0x00000820},
+	{0x0002d8dc, 0x00000000},
+	{0x0002d8f0, 0x00000000},
+	{0x0002d8f4, 0x00000000},
+	{0x0002e408, 0x0e79e5c0},
+	{0x0002e40c, 0x00820820},
+	{0x0002e420, 0x00000000},
+	{0x0002e43c, 0x00000000},
+};
+
+static const u32 qcn550x_1p0_baseband_postamble[][5] = {
+	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+	{0x00029810, 0xd00a8105, 0xd00a8105, 0xd00a8109, 0xd00a8109},
+	{0x00029820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
+	{0x00029824, 0x5ac640d0, 0x5ac640d0, 0x5ac621f1, 0x5ac621f1},
+	{0x00029828, 0x06903081, 0x06903081, 0x07d43881, 0x07d43881},
+	{0x0002982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+	{0x00029830, 0x0000059c, 0x0000059c, 0x0000099c, 0x0000099c},
+	{0x00029c00, 0x000003c4, 0x000003c4, 0x000003c4, 0x000003c4},
+	{0x00029e00, 0x8372111a, 0x8372111a, 0x837216a1, 0x837216a1},
+	{0x00029e04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+	{0x00029e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000de, 0x6c4000de},
+	{0x00029e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec87d2e, 0x7ec87d2e},
+	{0x00029e14, 0x37b95d5e, 0x37b9605e, 0x3379505e, 0x3377505e},
+	{0x00029e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+	{0x00029e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+	{0x00029e20, 0x000003b5, 0x000003b5, 0x000003a6, 0x000003a6},
+	{0x00029e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+	{0x00029e3c, 0xcfa10822, 0xcfa10822, 0xcf906222, 0xcf906222},
+	{0x00029e44, 0xfe321e27, 0xfe321e27, 0xfe291e27, 0xfe291e27},
+	{0x00029e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
+	{0x00029fc8, 0x0002f000, 0x0002f000, 0x0002e000, 0x0002e000},
+	{0x0002a204, 0x085c1ec0, 0x085c1ec4, 0x0cfc0fc4, 0x0cfc0fc0},
+	{0x0002a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+	{0x0002a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
+	{0x0002a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
+	{0x0002a234, 0xc0000fff, 0xd0000fff, 0xd0000fff, 0xc0000fff},
+	{0x0002a238, 0xffb01018, 0xffb01018, 0xffb01018, 0xffb01018},
+	{0x0002a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
+	{0x0002a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
+	{0x0002a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
+	{0x0002a25c, 0x01001010, 0x01001010, 0x01011010, 0x01011010},
+	{0x0002a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
+	{0x0002a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
+	{0x0002a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+	{0x0002a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+	{0x0002a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+	{0x0002a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+	{0x0002a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+	{0x0002a2cc, 0x18c50033, 0x18c43433, 0x18c41033, 0x18c44c33},
+	{0x0002a2d0, 0x00041982, 0x00041982, 0x00041982, 0x00041982},
+	{0x0002a2d8, 0x799ca83b, 0x799ca83b, 0x799ca83b, 0x799ca83b},
+	{0x0002a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+	{0x0002a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+	{0x0002ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+	{0x0002ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002ae20, 0x000001b5, 0x000001b5, 0x000001a6, 0x000001a6},
+	{0x0002b284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+	{0x0002b830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002be04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+	{0x0002be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+	{0x0002be1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002be20, 0x000001b5, 0x000001b5, 0x000001a6, 0x000001a6},
+	{0x0002c284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+	{0x0002d830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002de04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+	{0x0002de18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+	{0x0002de1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+	{0x0002de20, 0x000001b5, 0x000001b5, 0x000001a6, 0x000001a6},
+	{0x0002e284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
+};
+
+static const u32 qcn550x_1p0_radio_core[][2] = {
+	/* Addr      allmodes  */
+	{0x00016000, 0x36db6db6},
+	{0x00016004, 0x8db6db40},
+	{0x00016008, 0x73f00000},
+	{0x0001600c, 0x00000000},
+	{0x00016040, 0x3f80fff8},
+	{0x0001604c, 0x000f0278},
+	{0x00016050, 0x8036d36c},
+	{0x00016054, 0x6db60000},
+	{0x00016080, 0x00080000},
+	{0x00016084, 0x0e48048c},
+	{0x00016088, 0x14214514},
+	{0x0001608c, 0x119f080a},
+	{0x00016090, 0x24926490},
+	{0x00016094, 0x00000000},
+	{0x000160a0, 0x02108ffe},
+	{0x000160a4, 0x812fc373},
+	{0x000160a8, 0x423c8300},
+	{0x000160b4, 0x92480000},
+	{0x000160c0, 0x006db6d8},
+	{0x000160c4, 0x24b6db6c},
+	{0x000160c8, 0x6db6db6c},
+	{0x000160cc, 0x6db6fb7c},
+	{0x000160d0, 0x6db6da44},
+	{0x00016100, 0x07ff8001},
+	{0x00016108, 0x00080010},
+	{0x00016144, 0x01884080},
+	{0x00016148, 0x00008058},
+	{0x00016288, 0xa0307860},
+	{0x0001628c, 0x50000000},
+	{0x00016290, 0x4b96250b},
+	{0x00016294, 0x00000000},
+	{0x00016380, 0x00000000},
+	{0x00016384, 0x00000000},
+	{0x00016388, 0x00800700},
+	{0x0001638c, 0x00800700},
+	{0x00016390, 0x00800700},
+	{0x00016394, 0x00000000},
+	{0x00016398, 0x00000000},
+	{0x0001639c, 0x00000000},
+	{0x000163a0, 0x00000001},
+	{0x000163a4, 0x00000001},
+	{0x000163a8, 0x00000000},
+	{0x000163ac, 0x00000000},
+	{0x000163b0, 0x00000000},
+	{0x000163b4, 0x00000000},
+	{0x000163b8, 0x00000000},
+	{0x000163bc, 0x00000000},
+	{0x000163c0, 0x000000a0},
+	{0x000163c4, 0x000c0000},
+	{0x000163c8, 0x14021402},
+	{0x000163cc, 0x00001402},
+	{0x000163d0, 0x00000000},
+	{0x000163d4, 0x00000000},
+	{0x00016400, 0x36db6db6},
+	{0x00016404, 0x8db6db40},
+	{0x00016408, 0x73f00000},
+	{0x0001640c, 0x00000000},
+	{0x00016440, 0x3f80fff8},
+	{0x0001644c, 0x000f0278},
+	{0x00016450, 0x8036d36c},
+	{0x00016454, 0x6db60000},
+	{0x00016500, 0x07ff8001},
+	{0x00016508, 0x00080010},
+	{0x00016544, 0x01884080},
+	{0x00016548, 0x00008058},
+	{0x00016780, 0x00000000},
+	{0x00016784, 0x00000000},
+	{0x00016788, 0x00800700},
+	{0x0001678c, 0x00800700},
+	{0x00016790, 0x00800700},
+	{0x00016794, 0x00000000},
+	{0x00016798, 0x00000000},
+	{0x0001679c, 0x00000000},
+	{0x000167a0, 0x00000001},
+	{0x000167a4, 0x00000001},
+	{0x000167a8, 0x00000000},
+	{0x000167ac, 0x00000000},
+	{0x000167b0, 0x00000000},
+	{0x000167b4, 0x00000000},
+	{0x000167b8, 0x00000000},
+	{0x000167bc, 0x00000000},
+	{0x000167c0, 0x000000a0},
+	{0x000167c4, 0x000c0000},
+	{0x000167c8, 0x14021402},
+	{0x000167cc, 0x00001402},
+	{0x000167d0, 0x00000000},
+	{0x000167d4, 0x00000000},
+	{0x00016800, 0x36db6db6},
+	{0x00016804, 0x8db6db40},
+	{0x00016808, 0x73f00000},
+	{0x0001680c, 0x00000000},
+	{0x00016840, 0x3f80fff8},
+	{0x0001684c, 0x000f0278},
+	{0x00016850, 0x8036d36c},
+	{0x00016854, 0x6db60000},
+	{0x00016900, 0x07ff8001},
+	{0x00016908, 0x00080010},
+	{0x00016944, 0x01884080},
+	{0x00016948, 0x00008058},
+	{0x00016b80, 0x00000000},
+	{0x00016b84, 0x00000000},
+	{0x00016b88, 0x00800700},
+	{0x00016b8c, 0x00800700},
+	{0x00016b90, 0x00800700},
+	{0x00016b94, 0x00000000},
+	{0x00016b98, 0x00000000},
+	{0x00016b9c, 0x00000000},
+	{0x00016ba0, 0x00000001},
+	{0x00016ba4, 0x00000001},
+	{0x00016ba8, 0x00000000},
+	{0x00016bac, 0x00000000},
+	{0x00016bb0, 0x00000000},
+	{0x00016bb4, 0x00000000},
+	{0x00016bb8, 0x00000000},
+	{0x00016bbc, 0x00000000},
+	{0x00016bc0, 0x000000a0},
+	{0x00016bc4, 0x000c0000},
+	{0x00016bc8, 0x14021402},
+	{0x00016bcc, 0x00001402},
+	{0x00016bd0, 0x00000000},
+	{0x00016bd4, 0x00000000},
+	{0x00016c00, 0x36db6db6},
+	{0x00016c04, 0x8db6db40},
+	{0x00016c08, 0x73f00000},
+	{0x00016c0c, 0x00000000},
+	{0x00016c40, 0x3f80fff8},
+	{0x00016c4c, 0x000f0278},
+	{0x00016c50, 0x8036d36c},
+	{0x00016c54, 0x6db60000},
+	{0x00016cc0, 0x633c8186},
+	{0x00016d00, 0x07ff8001},
+	{0x00016d08, 0x00080010},
+	{0x00016d44, 0x01884080},
+	{0x00016d48, 0x00008058},
+	{0x00016f80, 0x00000000},
+	{0x00016f84, 0x00000000},
+	{0x00016f88, 0x00800700},
+	{0x00016f8c, 0x00800700},
+	{0x00016f90, 0x00800700},
+	{0x00016f94, 0x00000000},
+	{0x00016f98, 0x00000000},
+	{0x00016f9c, 0x00000000},
+	{0x00016fa0, 0x00000001},
+	{0x00016fa4, 0x00000001},
+	{0x00016fa8, 0x00000000},
+	{0x00016fac, 0x00000000},
+	{0x00016fb0, 0x00000000},
+	{0x00016fb4, 0x00000000},
+	{0x00016fb8, 0x00000000},
+	{0x00016fbc, 0x00000000},
+	{0x00016fc0, 0x000000a0},
+	{0x00016fc4, 0x000c0000},
+	{0x00016fc8, 0x14021402},
+	{0x00016fcc, 0x00001402},
+	{0x00016fd0, 0x00000000},
+	{0x00016fd4, 0x00000000},
+};
+
+static const u32 qcn550x_1p0_radio_postamble[][5] = {
+	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+	{0x00016098, 0xd2055554, 0xd2055554, 0xc2028f5c, 0xc2028f5c},
+	{0x0001609c, 0x02566f3a, 0x02566f3a, 0x07d08f25, 0x07d08f25},
+	{0x000160ac, 0x24647c01, 0x24647c01, 0x24646801, 0x24646801},
+	{0x000160b0, 0x09885f52, 0x09885f52, 0x08fe7f46, 0x08fe7f46},
+	{0x00016104, 0xb7a00000, 0xb7a00000, 0xfff80001, 0xfff80001},
+	{0x0001610c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+	{0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+	{0x00016504, 0xb7a00000, 0xb7a00000, 0xfff80001, 0xfff80001},
+	{0x0001650c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+	{0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+	{0x00016904, 0xb7a00000, 0xb7a00000, 0xfff80001, 0xfff80001},
+	{0x0001690c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+	{0x00016940, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+	{0x00016d04, 0xb7a00000, 0xb7a00000, 0xfff80001, 0xfff80001},
+	{0x00016d0c, 0xc0000000, 0xc0000000, 0x00000000, 0x00000000},
+	{0x00016d40, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+};
+
+static const u32 qcn550x_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
+	/* Addr      allmodes  */
+	{0x0002a38c, 0x00000000},
+	{0x0002a390, 0x6f7f0301},
+	{0x0002a394, 0xca9228ee},
+};
+
+static const u32 qcn550x_1p0_modes_no_xpa_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x049242e4, 0x049242e4},
+	{0x00016048, 0x64925a70, 0x64925a70},
+	{0x00016148, 0x00008050, 0x00008050},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x049242ed, 0x049242ed},
+	{0x00016448, 0x6c925a70, 0x6c925a70},
+	{0x00016548, 0x00008050, 0x00008050},
+	{0x00016844, 0x049242e4, 0x049242e4},
+	{0x00016848, 0x6c925a70, 0x6c925a70},
+	{0x00016948, 0x00008050, 0x00008050},
+	{0x00016c44, 0x049242e4, 0x049242e4},
+	{0x00016c48, 0x6c925a70, 0x6c925a70},
+	{0x00016d48, 0x00008050, 0x00008050},
+	{0x0002a2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002a2e0, 0xe473668c, 0xe473668c},
+	{0x0002a2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002a2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002a39c, 0x45454545, 0x45454545},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a3b0, 0x00a01404, 0x00a01404},
+	{0x0002a3b4, 0x00000034, 0x00000034},
+	{0x0002a3b8, 0x00800408, 0x00800408},
+	{0x0002a3bc, 0x00000036, 0x00000036},
+	{0x0002a410, 0x000040dc, 0x000040dc},
+	{0x0002a500, 0x09000040, 0x09000040},
+	{0x0002a504, 0x0b000041, 0x0b000041},
+	{0x0002a508, 0x0d000042, 0x0d000042},
+	{0x0002a50c, 0x11000044, 0x11000044},
+	{0x0002a510, 0x15000046, 0x15000046},
+	{0x0002a514, 0x1d000440, 0x1d000440},
+	{0x0002a518, 0x1f000441, 0x1f000441},
+	{0x0002a51c, 0x21000442, 0x21000442},
+	{0x0002a520, 0x23000443, 0x23000443},
+	{0x0002a524, 0x28000860, 0x28000860},
+	{0x0002a528, 0x2a000861, 0x2a000861},
+	{0x0002a52c, 0x2c000862, 0x2c000862},
+	{0x0002a530, 0x2e000863, 0x2e000863},
+	{0x0002a534, 0x30000864, 0x30000864},
+	{0x0002a538, 0x33000e61, 0x33000e61},
+	{0x0002a53c, 0x35000e62, 0x35000e62},
+	{0x0002a540, 0x3b000e65, 0x3b000e65},
+	{0x0002a544, 0x49001ee2, 0x49001ee2},
+	{0x0002a548, 0x4b001ee3, 0x4b001ee3},
+	{0x0002a54c, 0x4d001ee4, 0x4d001ee4},
+	{0x0002a550, 0x4f001ee5, 0x4f001ee5},
+	{0x0002a554, 0x52001ee6, 0x52001ee6},
+	{0x0002a558, 0x56001eea, 0x56001eea},
+	{0x0002a55c, 0x5a001eec, 0x5a001eec},
+	{0x0002a560, 0x5e001ef0, 0x5e001ef0},
+	{0x0002a564, 0x60001ef1, 0x60001ef1},
+	{0x0002a568, 0x61001ef2, 0x61001ef2},
+	{0x0002a56c, 0x62001ef3, 0x62001ef3},
+	{0x0002a570, 0x63001ef4, 0x63001ef4},
+	{0x0002a574, 0x64001ef5, 0x64001ef5},
+	{0x0002a578, 0x65001ffc, 0x65001ffc},
+	{0x0002a57c, 0x65001ffc, 0x65001ffc},
+	{0x0002a600, 0x00000000, 0x00000000},
+	{0x0002a604, 0x00000000, 0x00000000},
+	{0x0002a608, 0x00000000, 0x00000000},
+	{0x0002a60c, 0x00000000, 0x00000000},
+	{0x0002a610, 0x00404000, 0x00404000},
+	{0x0002a614, 0x00404101, 0x00404101},
+	{0x0002a618, 0x00404101, 0x00404101},
+	{0x0002a61c, 0x00404101, 0x00404101},
+	{0x0002a620, 0x00404101, 0x00404101},
+	{0x0002a624, 0x02008802, 0x02008802},
+	{0x0002a628, 0x0280c802, 0x0280c802},
+	{0x0002a62c, 0x0280ca03, 0x0280ca03},
+	{0x0002a630, 0x0280ca03, 0x0280ca03},
+	{0x0002a634, 0x03c10f04, 0x03c10f04},
+	{0x0002a638, 0x03c10f04, 0x03c10f04},
+	{0x0002a63c, 0x05015405, 0x05015405},
+	{0x0002b2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002b2e0, 0xe473668c, 0xe473668c},
+	{0x0002b2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002b2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002c2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002c2e0, 0xe47c668c, 0xe473668c},
+	{0x0002c2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002c2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002e2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002e2e0, 0xe473668c, 0xe473668c},
+	{0x0002e2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002e2e8, 0x3cfb8000, 0x3cfb8000},
+};
+
+static const u32 qcn550x_1p0_modes_xpa_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x024922e4, 0x024922e4},
+	{0x00016048, 0x6c927a70, 0x6c927a70},
+	{0x00016090, 0x249b64d0, 0x249b64d0},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x024922e4, 0x024922e4},
+	{0x00016448, 0x6c927a70, 0x6c927a70},
+	{0x00016844, 0x024922e4, 0x024922e4},
+	{0x00016848, 0x6c927a70, 0x6c927a70},
+	{0x00016c44, 0x024922e4, 0x024922e4},
+	{0x00016c48, 0x6c927a70, 0x6c927a70},
+	{0x0002a2dc, 0xcc69ac8c, 0xcc69ac8c},
+	{0x0002a2e0, 0xf0b23100, 0xf0b23100},
+	{0x0002a2e4, 0xffffc000, 0xffffc000},
+	{0x0002a2e8, 0xc0000000, 0xc0000000},
+	{0x0002a410, 0x000040d2, 0x000040d2},
+	{0x0002a418, 0x2d0019ce, 0x2d0019ce},
+	{0x0002a500, 0x0a000040, 0x0a000040},
+	{0x0002a504, 0x0c000041, 0x0c000041},
+	{0x0002a508, 0x0e000042, 0x0e000042},
+	{0x0002a50c, 0x10000043, 0x10000043},
+	{0x0002a510, 0x16000240, 0x16000240},
+	{0x0002a514, 0x1d000440, 0x1d000440},
+	{0x0002a518, 0x1f000441, 0x1f000441},
+	{0x0002a51c, 0x23000443, 0x23000443},
+	{0x0002a520, 0x25000444, 0x25000444},
+	{0x0002a524, 0x29000a40, 0x29000a40},
+	{0x0002a528, 0x2d000a42, 0x2d000a42},
+	{0x0002a52c, 0x2f000a43, 0x2f000a43},
+	{0x0002a530, 0x31000a44, 0x31000a44},
+	{0x0002a534, 0x35000a46, 0x35000a46},
+	{0x0002a538, 0x38000ce0, 0x38000ce0},
+	{0x0002a53c, 0x3c000ce2, 0x3c000ce2},
+	{0x0002a540, 0x3e000ce3, 0x3e000ce3},
+	{0x0002a544, 0x40000ce4, 0x40000ce4},
+	{0x0002a548, 0x46001ee0, 0x46001ee0},
+	{0x0002a54c, 0x4a001ee2, 0x4a001ee2},
+	{0x0002a550, 0x4e001ee4, 0x4e001ee4},
+	{0x0002a554, 0x52001ee6, 0x52001ee6},
+	{0x0002a558, 0x56001eea, 0x56001eea},
+	{0x0002a55c, 0x5a001eec, 0x5a001eec},
+	{0x0002a560, 0x5e001ef0, 0x5e001ef0},
+	{0x0002a564, 0x60001ef1, 0x60001ef1},
+	{0x0002a568, 0x61001ef2, 0x61001ef2},
+	{0x0002a56c, 0x62001ef3, 0x62001ef3},
+	{0x0002a570, 0x63001ef4, 0x63001ef4},
+	{0x0002a574, 0x64001ef5, 0x64001ef5},
+	{0x0002a578, 0x65001ffc, 0x65001ffc},
+	{0x0002a57c, 0x65001ffc, 0x65001ffc},
+	{0x0002a600, 0x00000000, 0x00000000},
+	{0x0002a604, 0x00000000, 0x00000000},
+	{0x0002a608, 0x00000000, 0x00000000},
+	{0x0002a60c, 0x00000000, 0x00000000},
+	{0x0002a610, 0x00000000, 0x00000000},
+	{0x0002a614, 0x00000000, 0x00000000},
+	{0x0002a618, 0x00000000, 0x00000000},
+	{0x0002a61c, 0x00804201, 0x00804201},
+	{0x0002a620, 0x00804201, 0x00804201},
+	{0x0002a624, 0x00804201, 0x00804201},
+	{0x0002a628, 0x00804201, 0x00804201},
+	{0x0002a62c, 0x02808a02, 0x02808a02},
+	{0x0002a630, 0x0340cd03, 0x0340cd03},
+	{0x0002a634, 0x0340cd03, 0x0340cd03},
+	{0x0002a638, 0x0340cd03, 0x0340cd03},
+	{0x0002a63c, 0x05011404, 0x05011404},
+	{0x0002b2dc, 0xcc69ac8c, 0xcc69ac8c},
+	{0x0002b2e0, 0xf0b23100, 0xf0b23100},
+	{0x0002b2e4, 0xffffc000, 0xffffc000},
+	{0x0002b2e8, 0xc0000000, 0xc0000000},
+	{0x0002c2dc, 0xcc69ac8c, 0xcc69ac8c},
+	{0x0002c2e0, 0xf0b23100, 0xf0b23100},
+	{0x0002c2e4, 0xffffc000, 0xffffc000},
+	{0x0002c2e8, 0xc0000000, 0xc0000000},
+	{0x0002e2dc, 0xcc69ac8c, 0xcc69ac8c},
+	{0x0002e2e0, 0xf0b23100, 0xf0b23100},
+	{0x0002e2e4, 0xffffc000, 0xffffc000},
+	{0x0002e2e8, 0xc0000000, 0xc0000000},
+};
+
+static const u32 qcn550x_1p0_modes_no_xpa_low_ob_db_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x046e42e4, 0x046e42e4},
+	{0x00016048, 0x64925a70, 0x64925a70},
+	{0x00016148, 0x00008050, 0x00008050},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x046e42ed, 0x046e42ed},
+	{0x00016448, 0x6c925a70, 0x6c925a70},
+	{0x00016548, 0x00008050, 0x00008050},
+	{0x00016844, 0x046e42e4, 0x046e42e4},
+	{0x00016848, 0x6c925a70, 0x6c925a70},
+	{0x00016948, 0x00008050, 0x00008050},
+	{0x00016c44, 0x046e42e4, 0x046e42e4},
+	{0x00016c48, 0x6c925a70, 0x6c925a70},
+	{0x00016d48, 0x00008050, 0x00008050},
+	{0x0002a2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002a2e0, 0xe473668c, 0xe473668c},
+	{0x0002a2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002a2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002a39c, 0x45454545, 0x45454545},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a3b0, 0x00a01404, 0x00a01404},
+	{0x0002a3b4, 0x00000034, 0x00000034},
+	{0x0002a3b8, 0x00800408, 0x00800408},
+	{0x0002a3bc, 0x00000036, 0x00000036},
+	{0x0002a410, 0x000040dc, 0x000040dc},
+	{0x0002a414, 0x16b739ce, 0x16b739ce},
+	{0x0002a418, 0x2d001d8b, 0x2d001d8b},
+	{0x0002a41c, 0x16b5adce, 0x16b5adce},
+	{0x0002a420, 0x0000014a, 0x0000014a},
+	{0x0002a424, 0x14a525cc, 0x14a525cc},
+	{0x0002a428, 0x0000012a, 0x0000012a},
+	{0x0002a42c, 0x14a5294a, 0x14a5294a},
+	{0x0002a430, 0x1294a929, 0x1294a929},
+	{0x0002a500, 0x09000040, 0x09000040},
+	{0x0002a504, 0x0b000041, 0x0b000041},
+	{0x0002a508, 0x0d000042, 0x0d000042},
+	{0x0002a50c, 0x11000044, 0x11000044},
+	{0x0002a510, 0x15000046, 0x15000046},
+	{0x0002a514, 0x1d000440, 0x1d000440},
+	{0x0002a518, 0x1f000441, 0x1f000441},
+	{0x0002a51c, 0x21000442, 0x21000442},
+	{0x0002a520, 0x23000443, 0x23000443},
+	{0x0002a524, 0x28000860, 0x28000860},
+	{0x0002a528, 0x2a000861, 0x2a000861},
+	{0x0002a52c, 0x2c000862, 0x2c000862},
+	{0x0002a530, 0x2e000863, 0x2e080863},
+	{0x0002a534, 0x30000864, 0x30000864},
+	{0x0002a538, 0x33000e61, 0x33000e61},
+	{0x0002a53c, 0x35000e62, 0x35000e62},
+	{0x0002a540, 0x3b000e65, 0x3b000e65},
+	{0x0002a544, 0x49001ee2, 0x49001ee2},
+	{0x0002a548, 0x4b001ee3, 0x4b001ee3},
+	{0x0002a54c, 0x4d001ee4, 0x4d001ee4},
+	{0x0002a550, 0x4f001ee5, 0x4f001ee5},
+	{0x0002a554, 0x52001ee6, 0x52001ee6},
+	{0x0002a558, 0x56001eea, 0x56001eea},
+	{0x0002a55c, 0x5a001eec, 0x5a001eec},
+	{0x0002a560, 0x5e001ef0, 0x5e001ef0},
+	{0x0002a564, 0x60001ef1, 0x60001ef1},
+	{0x0002a568, 0x61001ef2, 0x61001ef2},
+	{0x0002a56c, 0x62001ef3, 0x62001ef3},
+	{0x0002a570, 0x63001ef4, 0x63001ef4},
+	{0x0002a574, 0x64001ef5, 0x64001ef5},
+	{0x0002a578, 0x65001ffc, 0x65001ffc},
+	{0x0002a57c, 0x65001ffc, 0x65001ffc},
+	{0x0002a600, 0x00000000, 0x00000000},
+	{0x0002a604, 0x00000000, 0x00000000},
+	{0x0002a608, 0x00000000, 0x00000000},
+	{0x0002a60c, 0x00000000, 0x00000000},
+	{0x0002a610, 0x00404000, 0x00404000},
+	{0x0002a614, 0x00404101, 0x00404101},
+	{0x0002a618, 0x00404101, 0x00404101},
+	{0x0002a61c, 0x00404101, 0x00404101},
+	{0x0002a620, 0x00404101, 0x00404101},
+	{0x0002a624, 0x02008802, 0x02008802},
+	{0x0002a628, 0x0280c802, 0x0280c802},
+	{0x0002a62c, 0x0280ca03, 0x0280ca03},
+	{0x0002a630, 0x0280ca03, 0x0280ca03},
+	{0x0002a634, 0x03c10f04, 0x03c10f04},
+	{0x0002a638, 0x03c10f04, 0x03c10f04},
+	{0x0002a63c, 0x05015405, 0x05015405},
+	{0x0002b2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002b2e0, 0xe473668c, 0xe473668c},
+	{0x0002b2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002b2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002c2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002c2e0, 0xe473668c, 0xe473668c},
+	{0x0002c2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002c2e8, 0x3cfb8000, 0x3cfb8000},
+	{0x0002e2dc, 0x16ea554a, 0x16ea554a},
+	{0x0002e2e0, 0xe473668c, 0xe473668c},
+	{0x0002e2e4, 0x38fc4710, 0x38fc4710},
+	{0x0002e2e8, 0x3cfb8000, 0x3cfb8000},
+};
+
+static const u32 qcn550x_1p0_modes_no_xpa_green_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x849242e4, 0x849242e4},
+	{0x00016048, 0x64925a70, 0x64925a70},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x849242ed, 0x849242ed},
+	{0x00016448, 0x6c925a70, 0x6c925a70},
+	{0x00016844, 0x849242e4, 0x849242e4},
+	{0x00016848, 0x6c925a70, 0x6c925a70},
+	{0x00016c44, 0x849242e4, 0x849242e4},
+	{0x00016c48, 0x6c925a70, 0x6c925a70},
+	{0x000298bc, 0x00000001, 0x00000001},
+	{0x0002a2dc, 0xd3555284, 0xd3555284},
+	{0x0002a2e0, 0x1c666318, 0x1c666318},
+	{0x0002a2e4, 0xe07bbc00, 0xe07bbc00},
+	{0x0002a2e8, 0xff800000, 0xff800000},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a410, 0x000040dc, 0x000040dc},
+	{0x0002a500, 0x07000040, 0x07000040},
+	{0x0002a504, 0x09000041, 0x09000041},
+	{0x0002a508, 0x0b000042, 0x0b000042},
+	{0x0002a50c, 0x0f000044, 0x0f000044},
+	{0x0002a510, 0x11000045, 0x11000045},
+	{0x0002a514, 0x18000440, 0x18000440},
+	{0x0002a518, 0x1a000441, 0x1a000441},
+	{0x0002a51c, 0x1e000443, 0x1e000443},
+	{0x0002a520, 0x20000444, 0x20000444},
+	{0x0002a524, 0x230004e0, 0x230004e0},
+	{0x0002a528, 0x270004e2, 0x270004e2},
+	{0x0002a52c, 0x290004e3, 0x290004e3},
+	{0x0002a530, 0x2b0004e4, 0x2b0004e4},
+	{0x0002a534, 0x2f0004e6, 0x2f0004e6},
+	{0x0002a538, 0x34000ce0, 0x34000ce0},
+	{0x0002a53c, 0x38000ce2, 0x38000ce2},
+	{0x0002a540, 0x3c000ce4, 0x3c000ce4},
+	{0x0002a544, 0x40000ce6, 0x40000ce6},
+	{0x0002a548, 0x45001ee0, 0x45001ee0},
+	{0x0002a54c, 0x49001ee2, 0x49001ee2},
+	{0x0002a550, 0x4d001ee4, 0x4d001ee4},
+	{0x0002a554, 0x50001ee6, 0x50001ee6},
+	{0x0002a558, 0x53001eea, 0x53001eea},
+	{0x0002a55c, 0x55001eec, 0x55001eec},
+	{0x0002a560, 0x57001ef0, 0x57001ef0},
+	{0x0002a564, 0x58001ef1, 0x58001ef1},
+	{0x0002a568, 0x59001ef2, 0x59001ef2},
+	{0x0002a56c, 0x5a001ef3, 0x5a001ef3},
+	{0x0002a570, 0x5b001ef4, 0x5b001ef4},
+	{0x0002a574, 0x5c001ff5, 0x5c001ff5},
+	{0x0002a578, 0x64001ffc, 0x64001ffc},
+	{0x0002a57c, 0x64001ffc, 0x64001ffc},
+	{0x0002a600, 0x00000000, 0x00000000},
+	{0x0002a604, 0x00000000, 0x00000000},
+	{0x0002a608, 0x00000000, 0x00000000},
+	{0x0002a60c, 0x00000000, 0x00000000},
+	{0x0002a610, 0x00804000, 0x00804000},
+	{0x0002a614, 0x00804201, 0x00804201},
+	{0x0002a618, 0x00804201, 0x00804201},
+	{0x0002a61c, 0x00804201, 0x00804201},
+	{0x0002a620, 0x00804201, 0x00804201},
+	{0x0002a624, 0x00804201, 0x00804201},
+	{0x0002a628, 0x00804201, 0x00804201},
+	{0x0002a62c, 0x02808a02, 0x02808a02},
+	{0x0002a630, 0x0340cd03, 0x0340cd03},
+	{0x0002a634, 0x0340cd03, 0x0340cd03},
+	{0x0002a638, 0x0340cd03, 0x0340cd03},
+	{0x0002a63c, 0x05011404, 0x05011404},
+	{0x0002b2dc, 0xd3555284, 0xd3555284},
+	{0x0002b2e0, 0x1c666318, 0x1c666318},
+	{0x0002b2e4, 0xe07bbc00, 0xe07bbc00},
+	{0x0002b2e8, 0xff800000, 0xff800000},
+	{0x0002c2dc, 0xd3555284, 0xd3555284},
+	{0x0002c2e0, 0x1c666318, 0x1c666318},
+	{0x0002c2e4, 0xe07bbc00, 0xe07bbc00},
+	{0x0002c2e8, 0xff800000, 0xff800000},
+	{0x0002e2dc, 0xd3555284, 0xd3555284},
+	{0x0002e2e0, 0x1c666318, 0x1c666318},
+	{0x0002e2e4, 0xe07bbc00, 0xe07bbc00},
+	{0x0002e2e8, 0xff800000, 0xff800000},
+};
+
+static const u32 qcn550x_1p0_modes_no_xpa_mcal_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x049242c9, 0x049242c9},
+	{0x00016048, 0x64925a70, 0x64925a70},
+	{0x00016148, 0x00008050, 0x00008050},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x049242c9, 0x049242c9},
+	{0x00016448, 0x6c925a70, 0x6c925a70},
+	{0x00016548, 0x00008050, 0x00008050},
+	{0x00016844, 0x049242c9, 0x049242c9},
+	{0x00016848, 0x6c925a70, 0x6c925a70},
+	{0x00016948, 0x00008050, 0x00008050},
+	{0x00016c44, 0x049242c9, 0x049242c9},
+	{0x00016c48, 0x6c925a70, 0x6c925a70},
+	{0x00016d48, 0x00008050, 0x00008050},
+	{0x0002a2dc, 0xec69ac94, 0xec69ac94},
+	{0x0002a2e0, 0xf0b23118, 0xf0b23118},
+	{0x0002a2e4, 0xe0fffe00, 0xe0fffe00},
+	{0x0002a2e8, 0xff000000, 0xff000000},
+	{0x0002a39c, 0x42424242, 0x42424242},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a3b0, 0x00a01404, 0x00a01404},
+	{0x0002a3b4, 0x00000034, 0x00000034},
+	{0x0002a3b8, 0x00800408, 0x00800408},
+	{0x0002a3bc, 0x00000036, 0x00000036},
+	{0x0002a410, 0x000050dc, 0x000050dc},
+	{0x0002a500, 0x09000040, 0x09000040},
+	{0x0002a504, 0x0b000041, 0x0b000041},
+	{0x0002a508, 0x0d000042, 0x0d000042},
+	{0x0002a50c, 0x11000044, 0x11000044},
+	{0x0002a510, 0x15000046, 0x15000046},
+	{0x0002a514, 0x1d000440, 0x1d000440},
+	{0x0002a518, 0x1f000441, 0x1f000441},
+	{0x0002a51c, 0x23000443, 0x23000443},
+	{0x0002a520, 0x25000444, 0x25000444},
+	{0x0002a524, 0x280004e0, 0x280004e0},
+	{0x0002a528, 0x2c0004e2, 0x2c0004e2},
+	{0x0002a52c, 0x2e0004e3, 0x2e0004e3},
+	{0x0002a530, 0x300004e4, 0x300004e4},
+	{0x0002a534, 0x340004e6, 0x340004e6},
+	{0x0002a538, 0x37000ce0, 0x37000ce0},
+	{0x0002a53c, 0x3b000ce2, 0x3b000ce2},
+	{0x0002a540, 0x3d000ce3, 0x3d000ce3},
+	{0x0002a544, 0x3f000ce4, 0x3f000ce4},
+	{0x0002a548, 0x45001ee0, 0x45001ee0},
+	{0x0002a54c, 0x49001ee2, 0x49001ee2},
+	{0x0002a550, 0x4d001ee4, 0x4d001ee4},
+	{0x0002a554, 0x51001ee6, 0x51001ee6},
+	{0x0002a558, 0x55001eea, 0x55001eea},
+	{0x0002a55c, 0x59001eec, 0x59001eec},
+	{0x0002a560, 0x5d001ef0, 0x5d001ef0},
+	{0x0002a564, 0x5f001ef1, 0x5f001ef1},
+	{0x0002a568, 0x60001ef2, 0x60001ef2},
+	{0x0002a56c, 0x61001ef3, 0x61001ef3},
+	{0x0002a570, 0x62001ef4, 0x62001ef4},
+	{0x0002a574, 0x63001ef5, 0x63001ef5},
+	{0x0002a578, 0x64001ffc, 0x64001ffc},
+	{0x0002a57c, 0x64001ffc, 0x64001ffc},
+	{0x0002a600, 0x00000000, 0x00000000},
+	{0x0002a604, 0x00804402, 0x00804402},
+	{0x0002a608, 0x00000603, 0x00000603},
+	{0x0002a60c, 0x00804000, 0x00804000},
+	{0x0002a610, 0x01008604, 0x01008604},
+	{0x0002a614, 0x01e14785, 0x01e14785},
+	{0x0002a618, 0x02e1c986, 0x02e1c986},
+	{0x0002a61c, 0x01810785, 0x01810785},
+	{0x0002a620, 0x02618785, 0x02618785},
+	{0x0002a624, 0x01810785, 0x01810785},
+	{0x0002a628, 0x02e1c986, 0x02e1c986},
+	{0x0002a62c, 0x02618785, 0x02618785},
+	{0x0002a630, 0x01810604, 0x01810604},
+	{0x0002a634, 0x01e14785, 0x01e14785},
+	{0x0002a638, 0x02618986, 0x02618986},
+	{0x0002a63c, 0x02618986, 0x02618986},
+	{0x0002b2dc, 0xec69ac94, 0xec69ac94},
+	{0x0002b2e0, 0xf0b23118, 0xf0b23118},
+	{0x0002b2e4, 0xe0fffe00, 0xe0fffe00},
+	{0x0002b2e8, 0xff000000, 0xff000000},
+	{0x0002c2dc, 0xec69ac94, 0xec69ac94},
+	{0x0002c2e0, 0xf0b23118, 0xf0b23118},
+	{0x0002c2e4, 0xe0fffe00, 0xe0fffe00},
+	{0x0002c2e8, 0xff000000, 0xff000000},
+	{0x0002e2dc, 0xec69ac94, 0xec69ac94},
+	{0x0002e2e0, 0xf0b23118, 0xf0b23118},
+	{0x0002e2e4, 0xe0fffe00, 0xe0fffe00},
+	{0x0002e2e8, 0xff000000, 0xff000000},
+};
+
+static const u32 qcn550x_1p0_modes_no_xpa_table_5_tx_gain_table[][3] = {
+	/* Addr      5G          2G        */
+	{0x00016044, 0x049242c9, 0x049242c9},
+	{0x00016048, 0x64925a70, 0x64925a70},
+	{0x00016148, 0x00008050, 0x00008050},
+	{0x00016280, 0x42222000, 0x42222000},
+	{0x00016284, 0x0060800b, 0x0060800b},
+	{0x00016444, 0x049242c9, 0x049242c9},
+	{0x00016448, 0x6c925a70, 0x6c925a70},
+	{0x00016548, 0x00008050, 0x00008050},
+	{0x00016844, 0x049242c9, 0x049242c9},
+	{0x00016848, 0x6c925a70, 0x6c925a70},
+	{0x00016948, 0x00008050, 0x00008050},
+	{0x00016c44, 0x049242c9, 0x049242c9},
+	{0x00016c48, 0x6c925a70, 0x6c925a70},
+	{0x00016d48, 0x00008050, 0x00008050},
+	{0x0002a2dc, 0xf3486e8a, 0xf3486e8a},
+	{0x0002a2e0, 0xfc8c730c, 0xfc8c730c},
+	{0x0002a2e4, 0xff118390, 0xff118390},
+	{0x0002a2e8, 0x0e020000, 0x0e020000},
+	{0x0002a39c, 0x42424242, 0x42424242},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a3b0, 0x00a01404, 0x00a01404},
+	{0x0002a3b4, 0x00000034, 0x00000034},
+	{0x0002a3b8, 0x00800408, 0x00800408},
+	{0x0002a3bc, 0x00000036, 0x00000036},
+	{0x0002a410, 0x000050dc, 0x000050dc},
+	{0x0002a500, 0x1b000060, 0x1b000060},
+	{0x0002a504, 0x1f000062, 0x1f000062},
+	{0x0002a508, 0x23000064, 0x23000064},
+	{0x0002a50c, 0x27000068, 0x27000068},
+	{0x0002a510, 0x2b00006a, 0x2b00006a},
+	{0x0002a514, 0x2d00006b, 0x2d00006b},
+	{0x0002a518, 0x3100006d, 0x3100006d},
+	{0x0002a51c, 0x350000f1, 0x350000f1},
+	{0x0002a520, 0x390004e1, 0x390004e1},
+	{0x0002a524, 0x3c0004e3, 0x3c0004e3},
+	{0x0002a528, 0x3e000464, 0x3e000464},
+	{0x0002a52c, 0x41000c62, 0x41000c62},
+	{0x0002a530, 0x43000c63, 0x43000c63},
+	{0x0002a534, 0x45000c64, 0x45000c64},
+	{0x0002a538, 0x49000c68, 0x49000c68},
+	{0x0002a53c, 0x4b000c69, 0x4b000c69},
+	{0x0002a540, 0x4d000c6a, 0x4d000c6a},
+	{0x0002a544, 0x4f000ceb, 0x4f000ceb},
+	{0x0002a548, 0x53001e64, 0x53001e64},
+	{0x0002a54c, 0x56001e68, 0x56001e68},
+	{0x0002a550, 0x5a001e6a, 0x5a001e6a},
+	{0x0002a554, 0x5e001ee8, 0x5e001ee8},
+	{0x0002a558, 0x60001eea, 0x60001eea},
+	{0x0002a55c, 0x62001eec, 0x62001eec},
+	{0x0002a560, 0x64001ef0, 0x64001ef0},
+	{0x0002a564, 0x65001ef1, 0x65001ef1},
+	{0x0002a568, 0x66001ef2, 0x66001ef2},
+	{0x0002a56c, 0x67001ef3, 0x67001ef3},
+	{0x0002a570, 0x68001ef4, 0x68001ef4},
+	{0x0002a574, 0x69001ef5, 0x69001ef5},
+	{0x0002a578, 0x6a001ffc, 0x6a001ffc},
+	{0x0002a57c, 0x6a001ffc, 0x6a001ffc},
+	{0x0002a600, 0x00804000, 0x00804000},
+	{0x0002a604, 0x00000402, 0x00000402},
+	{0x0002a608, 0x00804201, 0x00804201},
+	{0x0002a60c, 0x00000402, 0x00000402},
+	{0x0002a610, 0x01a14504, 0x01a14504},
+	{0x0002a614, 0x00804786, 0x00804786},
+	{0x0002a618, 0x01008201, 0x01008201},
+	{0x0002a61c, 0x00000000, 0x00000000},
+	{0x0002a620, 0x00804201, 0x00804201},
+	{0x0002a624, 0x00000402, 0x00000402},
+	{0x0002a628, 0x01410201, 0x01410201},
+	{0x0002a62c, 0x01e18685, 0x01e18685},
+	{0x0002a630, 0x01410504, 0x01410504},
+	{0x0002a634, 0x01a14685, 0x01a14685},
+	{0x0002a638, 0x01e18786, 0x01e18786},
+	{0x0002a63c, 0x01e18786, 0x01e18786},
+	{0x0002b2dc, 0xf3486e8a, 0xf3486e8a},
+	{0x0002b2e0, 0xfc8c730c, 0xfc8c730c},
+	{0x0002b2e4, 0xff118390, 0xff118390},
+	{0x0002b2e8, 0x0e020000, 0x0e020000},
+	{0x0002c2dc, 0xf3486e8a, 0xf3486e8a},
+	{0x0002c2e0, 0xfc8c730c, 0xfc8c730c},
+	{0x0002c2e4, 0xff118390, 0xff118390},
+	{0x0002c2e8, 0x0e020000, 0x0e020000},
+	{0x0002e2dc, 0xf3486e8a, 0xf3486e8a},
+	{0x0002e2e0, 0xfc8c730c, 0xfc8c730c},
+	{0x0002e2e4, 0xff118390, 0xff118390},
+	{0x0002e2e8, 0x0e020000, 0x0e020000},
+};
+
+static const u32 qcn550x_1p0_common_rx_gain_table[][2] = {
+	/* Addr      allmodes  */
+	{0x0002a000, 0x00010000},
+	{0x0002a004, 0x00030002},
+	{0x0002a008, 0x00050004},
+	{0x0002a00c, 0x00810080},
+	{0x0002a010, 0x00830082},
+	{0x0002a014, 0x01810180},
+	{0x0002a018, 0x01830182},
+	{0x0002a01c, 0x01850184},
+	{0x0002a020, 0x01890188},
+	{0x0002a024, 0x018b018a},
+	{0x0002a028, 0x018d018c},
+	{0x0002a02c, 0x01910190},
+	{0x0002a030, 0x01930192},
+	{0x0002a034, 0x01950194},
+	{0x0002a038, 0x038a0196},
+	{0x0002a03c, 0x038c038b},
+	{0x0002a040, 0x0390038d},
+	{0x0002a044, 0x03920391},
+	{0x0002a048, 0x03940393},
+	{0x0002a04c, 0x03960395},
+	{0x0002a050, 0x00000000},
+	{0x0002a054, 0x00000000},
+	{0x0002a058, 0x00000000},
+	{0x0002a05c, 0x00000000},
+	{0x0002a060, 0x00000000},
+	{0x0002a064, 0x00000000},
+	{0x0002a068, 0x00000000},
+	{0x0002a06c, 0x00000000},
+	{0x0002a070, 0x00000000},
+	{0x0002a074, 0x00000000},
+	{0x0002a078, 0x00000000},
+	{0x0002a07c, 0x00000000},
+	{0x0002a080, 0x22292929},
+	{0x0002a084, 0x1d1d1d1d},
+	{0x0002a088, 0x1d1d1d1d},
+	{0x0002a08c, 0x1d1d1d1d},
+	{0x0002a090, 0x17171717},
+	{0x0002a094, 0x11111717},
+	{0x0002a098, 0x00030311},
+	{0x0002a09c, 0x00000000},
+	{0x0002a0a0, 0x00000000},
+	{0x0002a0a4, 0x00000000},
+	{0x0002a0a8, 0x00000000},
+	{0x0002a0ac, 0x00000000},
+	{0x0002a0b0, 0x00000000},
+	{0x0002a0b4, 0x00000000},
+	{0x0002a0b8, 0x00000000},
+	{0x0002a0bc, 0x00000000},
+	{0x0002a0c0, 0x001f0000},
+	{0x0002a0c4, 0x01000101},
+	{0x0002a0c8, 0x011e011f},
+	{0x0002a0cc, 0x011c011d},
+	{0x0002a0d0, 0x02030204},
+	{0x0002a0d4, 0x02010202},
+	{0x0002a0d8, 0x021f0200},
+	{0x0002a0dc, 0x0302021e},
+	{0x0002a0e0, 0x03000301},
+	{0x0002a0e4, 0x031e031f},
+	{0x0002a0e8, 0x0402031d},
+	{0x0002a0ec, 0x04000401},
+	{0x0002a0f0, 0x041e041f},
+	{0x0002a0f4, 0x0502041d},
+	{0x0002a0f8, 0x05000501},
+	{0x0002a0fc, 0x051e051f},
+	{0x0002a100, 0x06010602},
+	{0x0002a104, 0x061f0600},
+	{0x0002a108, 0x061d061e},
+	{0x0002a10c, 0x07020703},
+	{0x0002a110, 0x07000701},
+	{0x0002a114, 0x00000000},
+	{0x0002a118, 0x00000000},
+	{0x0002a11c, 0x00000000},
+	{0x0002a120, 0x00000000},
+	{0x0002a124, 0x00000000},
+	{0x0002a128, 0x00000000},
+	{0x0002a12c, 0x00000000},
+	{0x0002a130, 0x00000000},
+	{0x0002a134, 0x00000000},
+	{0x0002a138, 0x00000000},
+	{0x0002a13c, 0x00000000},
+	{0x0002a140, 0x001f0000},
+	{0x0002a144, 0x01000101},
+	{0x0002a148, 0x011e011f},
+	{0x0002a14c, 0x011c011d},
+	{0x0002a150, 0x02030204},
+	{0x0002a154, 0x02010202},
+	{0x0002a158, 0x021f0200},
+	{0x0002a15c, 0x0302021e},
+	{0x0002a160, 0x03000301},
+	{0x0002a164, 0x031e031f},
+	{0x0002a168, 0x0402031d},
+	{0x0002a16c, 0x04000401},
+	{0x0002a170, 0x041e041f},
+	{0x0002a174, 0x0502041d},
+	{0x0002a178, 0x05000501},
+	{0x0002a17c, 0x051e051f},
+	{0x0002a180, 0x06010602},
+	{0x0002a184, 0x061f0600},
+	{0x0002a188, 0x061d061e},
+	{0x0002a18c, 0x07020703},
+	{0x0002a190, 0x07000701},
+	{0x0002a194, 0x00000000},
+	{0x0002a198, 0x00000000},
+	{0x0002a19c, 0x00000000},
+	{0x0002a1a0, 0x00000000},
+	{0x0002a1a4, 0x00000000},
+	{0x0002a1a8, 0x00000000},
+	{0x0002a1ac, 0x00000000},
+	{0x0002a1b0, 0x00000000},
+	{0x0002a1b4, 0x00000000},
+	{0x0002a1b8, 0x00000000},
+	{0x0002a1bc, 0x00000000},
+	{0x0002a1c0, 0x00000000},
+	{0x0002a1c4, 0x00000000},
+	{0x0002a1c8, 0x00000000},
+	{0x0002a1cc, 0x00000000},
+	{0x0002a1d0, 0x00000000},
+	{0x0002a1d4, 0x00000000},
+	{0x0002a1d8, 0x00000000},
+	{0x0002a1dc, 0x00000000},
+	{0x0002a1e0, 0x00000000},
+	{0x0002a1e4, 0x00000000},
+	{0x0002a1e8, 0x00000000},
+	{0x0002a1ec, 0x00000000},
+	{0x0002a1f0, 0x00000396},
+	{0x0002a1f4, 0x00000396},
+	{0x0002a1f8, 0x00000396},
+	{0x0002a1fc, 0x00000196},
+	{0x0002b000, 0x00010000},
+	{0x0002b004, 0x00030002},
+	{0x0002b008, 0x00050004},
+	{0x0002b00c, 0x00810080},
+	{0x0002b010, 0x00830082},
+	{0x0002b014, 0x01810180},
+	{0x0002b018, 0x01830182},
+	{0x0002b01c, 0x01850184},
+	{0x0002b020, 0x02810280},
+	{0x0002b024, 0x02830282},
+	{0x0002b028, 0x02850284},
+	{0x0002b02c, 0x02890288},
+	{0x0002b030, 0x028b028a},
+	{0x0002b034, 0x0388028c},
+	{0x0002b038, 0x038a0389},
+	{0x0002b03c, 0x038c038b},
+	{0x0002b040, 0x0390038d},
+	{0x0002b044, 0x03920391},
+	{0x0002b048, 0x03940393},
+	{0x0002b04c, 0x03960395},
+	{0x0002b050, 0x00000000},
+	{0x0002b054, 0x00000000},
+	{0x0002b058, 0x00000000},
+	{0x0002b05c, 0x00000000},
+	{0x0002b060, 0x00000000},
+	{0x0002b064, 0x00000000},
+	{0x0002b068, 0x00000000},
+	{0x0002b06c, 0x00000000},
+	{0x0002b070, 0x00000000},
+	{0x0002b074, 0x00000000},
+	{0x0002b078, 0x00000000},
+	{0x0002b07c, 0x00000000},
+	{0x0002b080, 0x23232323},
+	{0x0002b084, 0x21232323},
+	{0x0002b088, 0x19191c1e},
+	{0x0002b08c, 0x12141417},
+	{0x0002b090, 0x07070e0e},
+	{0x0002b094, 0x03030305},
+	{0x0002b098, 0x00000003},
+	{0x0002b09c, 0x00000000},
+	{0x0002b0a0, 0x00000000},
+	{0x0002b0a4, 0x00000000},
+	{0x0002b0a8, 0x00000000},
+	{0x0002b0ac, 0x00000000},
+	{0x0002b0b0, 0x00000000},
+	{0x0002b0b4, 0x00000000},
+	{0x0002b0b8, 0x00000000},
+	{0x0002b0bc, 0x00000000},
+	{0x0002b0c0, 0x003f0020},
+	{0x0002b0c4, 0x00400041},
+	{0x0002b0c8, 0x0140005f},
+	{0x0002b0cc, 0x0160015f},
+	{0x0002b0d0, 0x017e017f},
+	{0x0002b0d4, 0x02410242},
+	{0x0002b0d8, 0x025f0240},
+	{0x0002b0dc, 0x027f0260},
+	{0x0002b0e0, 0x0341027e},
+	{0x0002b0e4, 0x035f0340},
+	{0x0002b0e8, 0x037f0360},
+	{0x0002b0ec, 0x04400441},
+	{0x0002b0f0, 0x0460045f},
+	{0x0002b0f4, 0x0541047f},
+	{0x0002b0f8, 0x055f0540},
+	{0x0002b0fc, 0x057f0560},
+	{0x0002b100, 0x06400641},
+	{0x0002b104, 0x0660065f},
+	{0x0002b108, 0x067e067f},
+	{0x0002b10c, 0x07410742},
+	{0x0002b110, 0x075f0740},
+	{0x0002b114, 0x077f0760},
+	{0x0002b118, 0x07800781},
+	{0x0002b11c, 0x07a0079f},
+	{0x0002b120, 0x07c107bf},
+	{0x0002b124, 0x000007c0},
+	{0x0002b128, 0x00000000},
+	{0x0002b12c, 0x00000000},
+	{0x0002b130, 0x00000000},
+	{0x0002b134, 0x00000000},
+	{0x0002b138, 0x00000000},
+	{0x0002b13c, 0x00000000},
+	{0x0002b140, 0x003f0020},
+	{0x0002b144, 0x00400041},
+	{0x0002b148, 0x0140005f},
+	{0x0002b14c, 0x0160015f},
+	{0x0002b150, 0x017e017f},
+	{0x0002b154, 0x02410242},
+	{0x0002b158, 0x025f0240},
+	{0x0002b15c, 0x027f0260},
+	{0x0002b160, 0x0341027e},
+	{0x0002b164, 0x035f0340},
+	{0x0002b168, 0x037f0360},
+	{0x0002b16c, 0x04400441},
+	{0x0002b170, 0x0460045f},
+	{0x0002b174, 0x0541047f},
+	{0x0002b178, 0x055f0540},
+	{0x0002b17c, 0x057f0560},
+	{0x0002b180, 0x06400641},
+	{0x0002b184, 0x0660065f},
+	{0x0002b188, 0x067e067f},
+	{0x0002b18c, 0x07410742},
+	{0x0002b190, 0x075f0740},
+	{0x0002b194, 0x077f0760},
+	{0x0002b198, 0x07800781},
+	{0x0002b19c, 0x07a0079f},
+	{0x0002b1a0, 0x07c107bf},
+	{0x0002b1a4, 0x000007c0},
+	{0x0002b1a8, 0x00000000},
+	{0x0002b1ac, 0x00000000},
+	{0x0002b1b0, 0x00000000},
+	{0x0002b1b4, 0x00000000},
+	{0x0002b1b8, 0x00000000},
+	{0x0002b1bc, 0x00000000},
+	{0x0002b1c0, 0x00000000},
+	{0x0002b1c4, 0x00000000},
+	{0x0002b1c8, 0x00000000},
+	{0x0002b1cc, 0x00000000},
+	{0x0002b1d0, 0x00000000},
+	{0x0002b1d4, 0x00000000},
+	{0x0002b1d8, 0x00000000},
+	{0x0002b1dc, 0x00000000},
+	{0x0002b1e0, 0x00000000},
+	{0x0002b1e4, 0x00000000},
+	{0x0002b1e8, 0x00000000},
+	{0x0002b1ec, 0x00000000},
+	{0x0002b1f0, 0x00000396},
+	{0x0002b1f4, 0x00000396},
+	{0x0002b1f8, 0x00000396},
+	{0x0002b1fc, 0x00000196},
+};
+
+static const u32 qcn550x_1p0_xlna_only[][5] = {
+	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+	{0x00029820, 0x206a022e, 0x206a022e, 0x206a01ae, 0x206a022e},
+	{0x00029824, 0x5ac640d0, 0x5ac640d0, 0x5ac621f1, 0x5ac621f1},
+	{0x00029828, 0x06903081, 0x06903081, 0x0712b281, 0x052e6381},
+	{0x00029e00, 0x8372111a, 0x8372111a, 0x8372159d, 0x83721620},
+	{0x00029e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000de, 0x6c4000da},
+	{0x00029e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec86d2e, 0x7ec86d2e},
+	{0x00029e14, 0x37b95d5e, 0x37b9605e, 0x317a625d, 0x3175535d},
+	{0x00029e18, 0x00000000, 0x00000000, 0x04008020, 0x04008020},
+	{0x00029e20, 0x000003b5, 0x000003b5, 0x000003b2, 0x000003b2},
+	{0x00029e3c, 0xcfa10822, 0xcfa10822, 0xcf946222, 0xcf946222},
+	{0x00029e40, 0x0cf61820, 0x0cf61820, 0x0cf61820, 0x0cf61820},
+	{0x00029e44, 0xfe292927, 0xfe292927, 0xfe292927, 0xfe292927},
+	{0x00029e48, 0x50302020, 0x50302020, 0x50302020, 0x50302020},
+	{0x00029fc0, 0x813e4788, 0x813e4788, 0x813e4789, 0x813e4789},
+	{0x00029fd4, 0x81e5a89a, 0x81e5a89a, 0x81e5a89a, 0x81e5a89a},
+	{0x0002a3a4, 0x3a3e3e00, 0x3a3e3e00, 0x3a3e3e00, 0x3a3e3e00},
+	{0x0002a424, 0x1ce739cb, 0x1ce739cb, 0x1ce739cb, 0x1ce739cb},
+	{0x0002ae18, 0x00000000, 0x00000000, 0x04008020, 0x04008020},
+	{0x0002ae20, 0x000001b5, 0x000001b5, 0x000001b2, 0x000001b2},
+	{0x0002be18, 0x00000000, 0x00000000, 0x04008020, 0x04008020},
+	{0x0002be20, 0x000001b5, 0x000001b5, 0x000001b2, 0x000001b2},
+	{0x0002de04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+	{0x0002de18, 0x00000000, 0x00000000, 0x04008020, 0x04008020},
+	{0x0002de20, 0x000001b5, 0x000001b5, 0x000001b2, 0x000001b2},
+};
+
+#endif /* INITVALS_550X_H */
drivers/net/wireless/ath/ath9k/ar9003_hw.c +65 -0

125 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#10 lore raw

PATCH v3 8/11 wifi: ath9k: implement QCN550x rx

In reply to Wenli Looi

The rx status for this device has 2 additional status values.

---
 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 47 +++++++++++++--------
 drivers/net/wireless/ath/ath9k/ar9003_mac.h |  6 +++
 drivers/net/wireless/ath/ath9k/hw.c         |  4 +-
 3 files changed, 38 insertions(+), 19 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_mac.c +29 -18
index a8bc003077..3d512916a2 100644
@@ -481,10 +481,21 @@ EXPORT_SYMBOL(ath9k_hw_addrxbuf_edma);
 int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 				 void *buf_addr)
 {
-	struct ar9003_rxs *rxsp = buf_addr;
+	const struct qcn5502_rxs *qcn5502_rxsp = NULL;
+	const struct ar9003_rxs *rxsp = NULL;
 	unsigned int phyerr;
+	u32 last_status;
 
-	if ((rxsp->status11 & AR_RxDone) == 0)
+	if (AR_SREV_5502(ah)) {
+		qcn5502_rxsp = buf_addr;
+		rxsp = &qcn5502_rxsp->ar9003_rxs;
+		last_status = qcn5502_rxsp->status13;
+	} else {
+		rxsp = buf_addr;
+		last_status = rxsp->status11;
+	}
+
+	if ((last_status & AR_RxDone) == 0)
 		return -EINPROGRESS;
 
 	if (MS(rxsp->ds_info, AR_DescId) != 0x168c)
@@ -510,17 +521,17 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 	rxs->rs_rssi_ext[1] = MS(rxsp->status5, AR_RxRSSIAnt11);
 	rxs->rs_rssi_ext[2] = MS(rxsp->status5, AR_RxRSSIAnt12);
 
-	if (rxsp->status11 & AR_RxKeyIdxValid)
-		rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
+	if (last_status & AR_RxKeyIdxValid)
+		rxs->rs_keyix = MS(last_status, AR_KeyIdx);
 	else
 		rxs->rs_keyix = ATH9K_RXKEYIX_INVALID;
 
 	rxs->rs_rate = MS(rxsp->status1, AR_RxRate);
 	rxs->rs_more = (rxsp->status2 & AR_RxMore) ? 1 : 0;
 
-	rxs->rs_firstaggr = (rxsp->status11 & AR_RxFirstAggr) ? 1 : 0;
-	rxs->rs_isaggr = (rxsp->status11 & AR_RxAggr) ? 1 : 0;
-	rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ? 1 : 0;
+	rxs->rs_firstaggr = (last_status & AR_RxFirstAggr) ? 1 : 0;
+	rxs->rs_isaggr = (last_status & AR_RxAggr) ? 1 : 0;
+	rxs->rs_moreaggr = (last_status & AR_RxMoreAggr) ? 1 : 0;
 	rxs->rs_antenna = (MS(rxsp->status4, AR_RxAntenna) & 0x7);
 	rxs->enc_flags |= (rxsp->status4 & AR_GI) ? RX_ENC_FLAG_SHORT_GI : 0;
 	rxs->enc_flags |=
@@ -533,16 +544,16 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 	rxs->evm3 = rxsp->status9;
 	rxs->evm4 = (rxsp->status10 & 0xffff);
 
-	if (rxsp->status11 & AR_PreDelimCRCErr)
+	if (last_status & AR_PreDelimCRCErr)
 		rxs->rs_flags |= ATH9K_RX_DELIM_CRC_PRE;
 
-	if (rxsp->status11 & AR_PostDelimCRCErr)
+	if (last_status & AR_PostDelimCRCErr)
 		rxs->rs_flags |= ATH9K_RX_DELIM_CRC_POST;
 
-	if (rxsp->status11 & AR_DecryptBusyErr)
+	if (last_status & AR_DecryptBusyErr)
 		rxs->rs_flags |= ATH9K_RX_DECRYPT_BUSY;
 
-	if ((rxsp->status11 & AR_RxFrameOK) == 0) {
+	if ((last_status & AR_RxFrameOK) == 0) {
 		/*
 		 * AR_CRCErr will bet set to true if we're on the last
 		 * subframe and the AR_PostDelimCRCErr is caught.
@@ -551,14 +562,14 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 		 * possibly be reviewing the last subframe. AR_CRCErr
 		 * is the CRC of the actual data.
 		 */
-		if (rxsp->status11 & AR_CRCErr)
+		if (last_status & AR_CRCErr)
 			rxs->rs_status |= ATH9K_RXERR_CRC;
-		else if (rxsp->status11 & AR_DecryptCRCErr)
+		else if (last_status & AR_DecryptCRCErr)
 			rxs->rs_status |= ATH9K_RXERR_DECRYPT;
-		else if (rxsp->status11 & AR_MichaelErr)
+		else if (last_status & AR_MichaelErr)
 			rxs->rs_status |= ATH9K_RXERR_MIC;
-		if (rxsp->status11 & AR_PHYErr) {
-			phyerr = MS(rxsp->status11, AR_PHYErrCode);
+		if (last_status & AR_PHYErr) {
+			phyerr = MS(last_status, AR_PHYErrCode);
 			/*
 			 * If we reach a point here where AR_PostDelimCRCErr is
 			 * true it implies we're *not* on the last subframe. In
@@ -573,7 +584,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 			 * delimiter for an A-MPDU subframe (0x4E = 'N' ASCII).
 			 */
 			if ((phyerr == ATH9K_PHYERR_OFDM_RESTART) &&
-			    (rxsp->status11 & AR_PostDelimCRCErr)) {
+			    (last_status & AR_PostDelimCRCErr)) {
 				rxs->rs_phyerr = 0;
 			} else {
 				rxs->rs_status |= ATH9K_RXERR_PHY;
@@ -582,7 +593,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs,
 		}
 	}
 
-	if (rxsp->status11 & AR_KeyMiss)
+	if (last_status & AR_KeyMiss)
 		rxs->rs_status |= ATH9K_RXERR_KEYMISS;
 
 	return 0;
drivers/net/wireless/ath/ath9k/ar9003_mac.h +6 -0
index cbf60b090b..ec8f3fac67 100644
@@ -67,6 +67,12 @@ struct ar9003_rxs {
 	u32 status11;
 } __packed __aligned(4);
 
+struct qcn5502_rxs {
+	struct ar9003_rxs ar9003_rxs;
+	u32 status12;
+	u32 status13;
+} __packed __aligned(4);
+
 /* Transmit Control Descriptor */
 struct ar9003_txc {
 	u32 info;   /* descriptor information */
drivers/net/wireless/ath/ath9k/hw.c +3 -1
index f572fca3e6..8d1dc77da0 100644
@@ -2622,7 +2622,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
 		pCap->rx_hp_qdepth = ATH9K_HW_RX_HP_QDEPTH;
 		pCap->rx_lp_qdepth = ATH9K_HW_RX_LP_QDEPTH;
-		pCap->rx_status_len = sizeof(struct ar9003_rxs);
+		pCap->rx_status_len = AR_SREV_5502(ah) ?
+					      sizeof(struct qcn5502_rxs) :
+					      sizeof(struct ar9003_rxs);
 		pCap->tx_desc_len = sizeof(struct ar9003_txc);
 		pCap->txs_len = sizeof(struct ar9003_txs);
 	} else {
Signature · 1 line
2.34.1
author
#11 lore raw

PATCH v3 9/11 wifi: ath9k: implement QCN550x tx

In reply to Wenli Looi

Certain fields in ar9003_txc are slightly different, but overall this device can be treated similar to other AR9003 devices.

---
 drivers/net/wireless/ath/ath9k/ar9003_mac.c | 45 +++++++++++++++------
 drivers/net/wireless/ath/ath9k/ar9003_mac.h |  4 ++
 drivers/net/wireless/ath/ath9k/mac.h        | 13 ++++++
 3 files changed, 50 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_mac.c +33 -12
index 3d512916a2..be80fd9263 100644
@@ -26,9 +26,9 @@ static void ar9003_hw_rx_enable(struct ath_hw *hw)
 static void
 ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
 {
+	u32 val, ctl12, ctl17, ctl18;
 	struct ar9003_txc *ads = ds;
 	int checksum = 0;
-	u32 val, ctl12, ctl17;
 	u8 desc_len;
 
 	desc_len = ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x18 : 0x17);
@@ -132,8 +132,21 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
 		break;
 	}
 
+	ctl18 = set11nRateFlags(i->rates, 0) |
+		set11nRateFlags(i->rates, 1) |
+		set11nRateFlags(i->rates, 2) |
+		set11nRateFlags(i->rates, 3) |
+		SM(i->rtscts_rate, AR_RTSCTSRate);
+
 	val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
-	ctl12 |= SM(val, AR_PAPRDChainMask);
+
+	if (!AR_SREV_5502(ah)) {
+		ctl12 |= SM(val, AR_PAPRDChainMask);
+		ctl18 |= set11nChainSel(i->rates, 0) |
+			 set11nChainSel(i->rates, 1) |
+			 set11nChainSel(i->rates, 2) |
+			 set11nChainSel(i->rates, 3);
+	}
 
 	WRITE_ONCE(ads->ctl12, ctl12);
 	WRITE_ONCE(ads->ctl17, ctl17);
@@ -144,18 +157,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
 	WRITE_ONCE(ads->ctl16, set11nPktDurRTSCTS(i->rates, 2)
 		| set11nPktDurRTSCTS(i->rates, 3));
 
-	WRITE_ONCE(ads->ctl18,
-		  set11nRateFlags(i->rates, 0) | set11nChainSel(i->rates, 0)
-		| set11nRateFlags(i->rates, 1) | set11nChainSel(i->rates, 1)
-		| set11nRateFlags(i->rates, 2) | set11nChainSel(i->rates, 2)
-		| set11nRateFlags(i->rates, 3) | set11nChainSel(i->rates, 3)
-		| SM(i->rtscts_rate, AR_RTSCTSRate));
+	WRITE_ONCE(ads->ctl18, ctl18);
 
 	WRITE_ONCE(ads->ctl19, AR_Not_Sounding);
 
 	WRITE_ONCE(ads->ctl20, SM(i->txpower[1], AR_XmitPower1));
 	WRITE_ONCE(ads->ctl21, SM(i->txpower[2], AR_XmitPower2));
 	WRITE_ONCE(ads->ctl22, SM(i->txpower[3], AR_XmitPower3));
+
+	if (AR_SREV_5502(ah)) {
+		WRITE_ONCE(ads->ctl23,
+			   set11nChainSelQCN5502(i->rates, 0) |
+			   set11nChainSelQCN5502(i->rates, 1) |
+			   set11nChainSelQCN5502(i->rates, 2) |
+			   set11nChainSelQCN5502(i->rates, 3) |
+			   SM(val, QCN5502_PAPRDChainMask));
+	}
 }
 
 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
@@ -355,8 +372,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,
 static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
 				 struct ath_tx_status *ts)
 {
+	u32 status, tx_ba_status;
 	struct ar9003_txs *ads;
-	u32 status;
 
 	ads = &ah->ts_ring[ah->ts_tail];
 
@@ -390,13 +407,17 @@ static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds,
 	ts->ts_rssi_ctl0 = MS(status, AR_TxRSSIAnt00);
 	ts->ts_rssi_ctl1 = MS(status, AR_TxRSSIAnt01);
 	ts->ts_rssi_ctl2 = MS(status, AR_TxRSSIAnt02);
-	if (status & AR_TxBaStatus) {
+	if (!AR_SREV_5502(ah))
+		tx_ba_status = status & AR_TxBaStatus;
+
+	status = READ_ONCE(ads->status3);
+	if (AR_SREV_5502(ah))
+		tx_ba_status = status & QCN5502_TxBaStatus;
+	if (tx_ba_status) {
 		ts->ts_flags |= ATH9K_TX_BA;
 		ts->ba_low = ads->status5;
 		ts->ba_high = ads->status6;
 	}
-
-	status = READ_ONCE(ads->status3);
 	if (status & AR_ExcessiveRetries)
 		ts->ts_status |= ATH9K_TXERR_XRETRY;
 	if (status & AR_Filtered)
drivers/net/wireless/ath/ath9k/ar9003_mac.h +4 -0
index ec8f3fac67..11a67822fa 100644
@@ -41,6 +41,10 @@
 #define AR_PAPRDChainMask	0x00000e00
 #define AR_PAPRDChainMask_S	9
 
+/* ctl 23 */
+#define QCN5502_PAPRDChainMask		0x0000f000
+#define QCN5502_PAPRDChainMask_S	16
+
 #define MAP_ISR_S2_CST          6
 #define MAP_ISR_S2_GTT          6
 #define MAP_ISR_S2_TIM          3
drivers/net/wireless/ath/ath9k/mac.h +13 -0
index af44b33814..81e1918ad4 100644
@@ -40,6 +40,9 @@
 #define set11nChainSel(_series, _index)					\
 	(SM((_series)[_index].ChSel, AR_ChainSel##_index))
 
+#define set11nChainSelQCN5502(_series, _index)				\
+	(SM((_series)[_index].ChSel, QCN5502_ChainSel_##_index))
+
 #define CCK_SIFS_TIME        10
 #define CCK_PREAMBLE_BITS   144
 #define CCK_PLCP_BITS        48
@@ -458,6 +461,16 @@ struct ar5416_desc {
 #define AR_TxBaStatus       0x40000000
 #define AR_TxStatusRsvd01   0x80000000
 
+#define QCN5502_ChainSel_0   0x0000000f
+#define QCN5502_ChainSel_0_S 0
+#define QCN5502_ChainSel_1   0x000000f0
+#define QCN5502_ChainSel_1_S 4
+#define QCN5502_ChainSel_2   0x00000f00
+#define QCN5502_ChainSel_2_S 8
+#define QCN5502_ChainSel_3   0x0000f000
+#define QCN5502_ChainSel_3_S 12
+#define QCN5502_TxBaStatus   0x00200000
+
 /*
  * AR_FrmXmitOK - Frame transmission success flag. If set, the frame was
  * transmitted successfully. If clear, no ACK or BA was received to indicate
Signature · 1 line
2.34.1
author
#12 lore raw

PATCH v3 10/11 wifi: ath9k: add abstractions over ar9300 eeprom

In reply to Wenli Looi

This will allow the code to handle both old and new AR9300 eeprom formats.

---
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 635 +++++++++++-------
 1 file changed, 410 insertions(+), 225 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +410 -225
index 810d75f553..669506884b 100644
@@ -2982,6 +2982,16 @@ static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah)
 	return 0;
 }
 
+static struct ar9300_base_eep_hdr *ar9003_base_header(struct ath_hw *ah)
+{
+	return &ah->eeprom.ar9300_eep.baseEepHeader;
+}
+
+static struct ar9300_BaseExtension_1 *ar9003_base_ext1(struct ath_hw *ah)
+{
+	return &ah->eeprom.ar9300_eep.base_ext1;
+}
+
 static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
 							   bool is2ghz)
 {
@@ -2993,6 +3003,105 @@ static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
 		return &eep->modalHeader5G;
 }
 
+static int8_t ar9003_ant_gain(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->antennaGain;
+}
+
+static u8 ar9003_cal_freq_pier(struct ath_hw *ah, int idx, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calFreqPier2G[idx] : eep->calFreqPier5G[idx];
+}
+
+static struct ar9300_cal_data_per_freq_op_loop *
+ar9003_cal_pier_data(struct ath_hw *ah, int chain, int idx, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? &eep->calPierData2G[chain][idx] :
+			      &eep->calPierData5G[chain][idx];
+}
+
+static u8 ar9003_cal_target_freqbin(struct ath_hw *ah, int idx, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTarget_freqbin_2G[idx] :
+			      eep->calTarget_freqbin_5G[idx];
+}
+
+static u8 ar9003_cal_target_freqbin_cck(struct ath_hw *ah, int idx)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return eep->calTarget_freqbin_Cck[idx];
+}
+
+static u8 ar9003_cal_target_freqbin_ht20(struct ath_hw *ah, int idx,
+					 bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTarget_freqbin_2GHT20[idx] :
+			      eep->calTarget_freqbin_5GHT20[idx];
+}
+
+static u8 ar9003_cal_target_freqbin_ht40(struct ath_hw *ah, int idx,
+					 bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTarget_freqbin_2GHT40[idx] :
+			      eep->calTarget_freqbin_5GHT40[idx];
+}
+
+static u8 ar9003_cal_target_power(struct ath_hw *ah, int idx, int rateIndex,
+				  bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTargetPower2G[idx].tPow2x[rateIndex] :
+			      eep->calTargetPower5G[idx].tPow2x[rateIndex];
+}
+
+static u8 ar9003_cal_target_power_cck(struct ath_hw *ah, int idx, int rateIndex)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return eep->calTargetPowerCck[idx].tPow2x[rateIndex];
+}
+
+static u8 ar9003_cal_target_power_ht20(struct ath_hw *ah, int idx,
+				       int rateIndex, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTargetPower2GHT20[idx].tPow2x[rateIndex] :
+			      eep->calTargetPower5GHT20[idx].tPow2x[rateIndex];
+}
+
+static u8 ar9003_cal_target_power_ht40(struct ath_hw *ah, int idx,
+				       int rateIndex, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->calTargetPower2GHT40[idx].tPow2x[rateIndex] :
+			      eep->calTargetPower5GHT40[idx].tPow2x[rateIndex];
+}
+
+static u8 ar9003_ctl_freqbin(struct ath_hw *ah, int idx, int edge, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->ctl_freqbin_2G[idx][edge] :
+			      eep->ctl_freqbin_5G[idx][edge];
+}
+
+static u8 ar9003_ctl_index(struct ath_hw *ah, int idx, bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->ctlIndex_2G[idx] : eep->ctlIndex_5G[idx];
+}
+
+static u8 ar9003_ctl_power_data(struct ath_hw *ah, int idx, int edge,
+				bool is2ghz)
+{
+	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	return is2ghz ? eep->ctlPowerData_2G[idx].ctlEdges[edge] :
+			      eep->ctlPowerData_5G[idx].ctlEdges[edge];
+}
+
 static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
 					bool is2ghz)
 {
@@ -3010,6 +3119,87 @@ u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
 	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
 }
 
+static int8_t ar9003_noise_floor_thres(struct ath_hw *ah, int chain,
+				       bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->noiseFloorThreshCh[chain];
+}
+
+static int8_t ar9003_quick_drop(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->quick_drop;
+}
+
+static int8_t ar9003_temp_slope(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->tempSlope;
+}
+
+static int8_t ar9003_temp_slope_high(struct ath_hw *ah)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.tempSlopeHigh;
+}
+
+static int8_t ar9003_temp_slope_low(struct ath_hw *ah)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.tempSlopeLow;
+}
+
+static u8 ar9003_tx_end_to_xpa_off(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
+}
+
+static u8 ar9003_tx_frame_to_xpa_on(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
+}
+
+static u8 ar9003_xatten1_db_high(struct ath_hw *ah, int chain)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.xatten1DBHigh[chain];
+}
+
+static u8 ar9003_xatten1_db_low(struct ath_hw *ah, int chain)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.xatten1DBLow[chain];
+}
+
+static u8 ar9003_xatten1_db_margin_high(struct ath_hw *ah, int chain)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.xatten1MarginHigh[chain];
+}
+
+static u8 ar9003_xatten1_db_margin_low(struct ath_hw *ah, int chain)
+{
+	return ah->eeprom.ar9300_eep.base_ext2.xatten1MarginLow[chain];
+}
+
+static u8 ar9003_xatten1_db(struct ath_hw *ah, int chain, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->xatten1DB[chain];
+}
+
+static u8 ar9003_xatten1_margin(struct ath_hw *ah, int chain, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->xatten1Margin[chain];
+}
+
+static u8 ar9003_xlna_bias_strength(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
+}
+
+static u8 ar9003_xpa_bias_lvl(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
+}
+
+static u8 *ar9003_mac_addr(struct ath_hw *ah)
+{
+	return ah->eeprom.ar9300_eep.macAddr;
+}
+
 static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
 {
 	return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
@@ -3018,16 +3208,17 @@ static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
 static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
 				      enum eeprom_param param)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
+	struct ar9300_BaseExtension_1 *base_ext1 = ar9003_base_ext1(ah);
+	u8 *mac_addr = ar9003_mac_addr(ah);
 
 	switch (param) {
 	case EEP_MAC_LSW:
-		return get_unaligned_be16(eep->macAddr);
+		return get_unaligned_be16(mac_addr);
 	case EEP_MAC_MID:
-		return get_unaligned_be16(eep->macAddr + 2);
+		return get_unaligned_be16(mac_addr + 2);
 	case EEP_MAC_MSW:
-		return get_unaligned_be16(eep->macAddr + 4);
+		return get_unaligned_be16(mac_addr + 4);
 	case EEP_REG_0:
 		return le16_to_cpu(pBase->regDmn[0]);
 	case EEP_OP_CAP:
@@ -3048,11 +3239,11 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
 		if (AR_SREV_9565(ah))
 			return AR9300_EEP_ANTDIV_CONTROL_DEFAULT_VALUE;
 		else
-			return eep->base_ext1.ant_div_control;
+			return base_ext1->ant_div_control;
 	case EEP_ANTENNA_GAIN_5G:
-		return eep->modalHeader5G.antennaGain;
+		return ar9003_ant_gain(ah, /*is2ghz=*/false);
 	case EEP_ANTENNA_GAIN_2G:
-		return eep->modalHeader2G.antennaGain;
+		return ar9003_ant_gain(ah, /*is2ghz=*/true);
 	default:
 		return 0;
 	}
@@ -3433,40 +3624,79 @@ static bool ath9k_hw_ar9300_fill_eeprom(struct ath_hw *ah)
 }
 
 #if defined(CONFIG_ATH9K_DEBUGFS) || defined(CONFIG_ATH9K_HTC_DEBUGFS)
-static u32 ar9003_dump_modal_eeprom(char *buf, u32 len, u32 size,
-				    struct ar9300_modal_eep_header *modal_hdr)
+
+static int8_t ar9003_adc_desired_size(struct ath_hw *ah, bool is2ghz)
 {
-	PR_EEP("Chain0 Ant. Control", le16_to_cpu(modal_hdr->antCtrlChain[0]));
-	PR_EEP("Chain1 Ant. Control", le16_to_cpu(modal_hdr->antCtrlChain[1]));
-	PR_EEP("Chain2 Ant. Control", le16_to_cpu(modal_hdr->antCtrlChain[2]));
-	PR_EEP("Ant. Common Control", le32_to_cpu(modal_hdr->antCtrlCommon));
-	PR_EEP("Ant. Common Control2", le32_to_cpu(modal_hdr->antCtrlCommon2));
-	PR_EEP("Ant. Gain", modal_hdr->antennaGain);
-	PR_EEP("Switch Settle", modal_hdr->switchSettling);
-	PR_EEP("Chain0 xatten1DB", modal_hdr->xatten1DB[0]);
-	PR_EEP("Chain1 xatten1DB", modal_hdr->xatten1DB[1]);
-	PR_EEP("Chain2 xatten1DB", modal_hdr->xatten1DB[2]);
-	PR_EEP("Chain0 xatten1Margin", modal_hdr->xatten1Margin[0]);
-	PR_EEP("Chain1 xatten1Margin", modal_hdr->xatten1Margin[1]);
-	PR_EEP("Chain2 xatten1Margin", modal_hdr->xatten1Margin[2]);
-	PR_EEP("Temp Slope", modal_hdr->tempSlope);
-	PR_EEP("Volt Slope", modal_hdr->voltSlope);
-	PR_EEP("spur Channels0", modal_hdr->spurChans[0]);
-	PR_EEP("spur Channels1", modal_hdr->spurChans[1]);
-	PR_EEP("spur Channels2", modal_hdr->spurChans[2]);
-	PR_EEP("spur Channels3", modal_hdr->spurChans[3]);
-	PR_EEP("spur Channels4", modal_hdr->spurChans[4]);
-	PR_EEP("Chain0 NF Threshold", modal_hdr->noiseFloorThreshCh[0]);
-	PR_EEP("Chain1 NF Threshold", modal_hdr->noiseFloorThreshCh[1]);
-	PR_EEP("Chain2 NF Threshold", modal_hdr->noiseFloorThreshCh[2]);
-	PR_EEP("Quick Drop", modal_hdr->quick_drop);
-	PR_EEP("txEndToXpaOff", modal_hdr->txEndToXpaOff);
-	PR_EEP("xPA Bias Level", modal_hdr->xpaBiasLvl);
-	PR_EEP("txFrameToDataStart", modal_hdr->txFrameToDataStart);
-	PR_EEP("txFrameToPaOn", modal_hdr->txFrameToPaOn);
-	PR_EEP("txFrameToXpaOn", modal_hdr->txFrameToXpaOn);
-	PR_EEP("txClip", modal_hdr->txClip);
-	PR_EEP("ADC Desired size", modal_hdr->adcDesiredSize);
+	return ar9003_modal_header(ah, is2ghz)->adcDesiredSize;
+}
+
+static u8 ar9003_switch_settling(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->switchSettling;
+}
+
+static u8 ar9003_tx_clip(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->txClip;
+}
+
+static u8 ar9003_tx_frame_to_data_start(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->txFrameToDataStart;
+}
+
+static u8 ar9003_tx_frame_to_pa_on(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->txFrameToPaOn;
+}
+
+static int8_t ar9003_volt_slope(struct ath_hw *ah, bool is2ghz)
+{
+	return ar9003_modal_header(ah, is2ghz)->voltSlope;
+}
+
+static u32 ar9003_dump_modal_eeprom(struct ath_hw *ah, char *buf, u32 len,
+				    u32 size, bool is_2g)
+{
+	PR_EEP("Chain0 Ant. Control",
+	       ar9003_hw_ant_ctrl_chain_get(ah, 0, is_2g));
+	PR_EEP("Chain1 Ant. Control",
+	       ar9003_hw_ant_ctrl_chain_get(ah, 1, is_2g));
+	PR_EEP("Chain2 Ant. Control",
+	       ar9003_hw_ant_ctrl_chain_get(ah, 2, is_2g));
+	PR_EEP("Ant. Common Control", ar9003_hw_ant_ctrl_common_get(ah, is_2g));
+	PR_EEP("Ant. Common Control2",
+	       ar9003_hw_ant_ctrl_common_2_get(ah, is_2g));
+	PR_EEP("Ant. Gain", ar9003_ant_gain(ah, is_2g));
+	PR_EEP("Switch Settle", ar9003_switch_settling(ah, is_2g));
+	PR_EEP("Chain0 xatten1DB", ar9003_xatten1_db(ah, 0, is_2g));
+	PR_EEP("Chain1 xatten1DB", ar9003_xatten1_db(ah, 1, is_2g));
+	PR_EEP("Chain2 xatten1DB", ar9003_xatten1_db(ah, 2, is_2g));
+	PR_EEP("Chain0 xatten1Margin", ar9003_xatten1_margin(ah, 0, is_2g));
+	PR_EEP("Chain1 xatten1Margin", ar9003_xatten1_margin(ah, 1, is_2g));
+	PR_EEP("Chain2 xatten1Margin", ar9003_xatten1_margin(ah, 2, is_2g));
+	PR_EEP("Temp Slope", ar9003_temp_slope(ah, is_2g));
+	PR_EEP("Volt Slope", ar9003_volt_slope(ah, is_2g));
+	PR_EEP("spur Channels0", ar9003_get_spur_chan_ptr(ah, is_2g)[0]);
+	PR_EEP("spur Channels1", ar9003_get_spur_chan_ptr(ah, is_2g)[1]);
+	PR_EEP("spur Channels2", ar9003_get_spur_chan_ptr(ah, is_2g)[2]);
+	PR_EEP("spur Channels3", ar9003_get_spur_chan_ptr(ah, is_2g)[3]);
+	PR_EEP("spur Channels4", ar9003_get_spur_chan_ptr(ah, is_2g)[4]);
+	PR_EEP("Chain0 NF Threshold",
+	       ar9003_noise_floor_thres(ah, 0, is_2g));
+	PR_EEP("Chain1 NF Threshold",
+	       ar9003_noise_floor_thres(ah, 1, is_2g));
+	PR_EEP("Chain2 NF Threshold",
+	       ar9003_noise_floor_thres(ah, 2, is_2g));
+	PR_EEP("Quick Drop", ar9003_quick_drop(ah, is_2g));
+	PR_EEP("txEndToXpaOff", ar9003_tx_end_to_xpa_off(ah, is_2g));
+	PR_EEP("xPA Bias Level", ar9003_xpa_bias_lvl(ah, is_2g));
+	PR_EEP("txFrameToDataStart",
+	       ar9003_tx_frame_to_data_start(ah, is_2g));
+	PR_EEP("txFrameToPaOn", ar9003_tx_frame_to_pa_on(ah, is_2g));
+	PR_EEP("txFrameToXpaOn", ar9003_tx_frame_to_xpa_on(ah, is_2g));
+	PR_EEP("txClip", ar9003_tx_clip(ah, is_2g));
+	PR_EEP("ADC Desired size", ar9003_adc_desired_size(ah, is_2g));
 
 	return len;
 }
@@ -3474,15 +3704,12 @@ static u32 ar9003_dump_modal_eeprom(char *buf, u32 len, u32 size,
 static u32 ar9003_dump_cal_data(struct ath_hw *ah, char *buf, u32 len, u32 size,
 				bool is_2g)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	struct ar9300_cal_data_per_freq_op_loop *cal_pier;
 	int cal_pier_nr;
 	int freq;
 	int i, j;
 
-	pBase = &eep->baseEepHeader;
-
 	if (is_2g)
 		cal_pier_nr = AR9300_NUM_2G_CAL_PIERS;
 	else
@@ -3498,12 +3725,11 @@ static u32 ar9003_dump_cal_data(struct ath_hw *ah, char *buf, u32 len, u32 size,
 			"Freq\t ref\tvolt\ttemp\tnf_cal\tnf_pow\trx_temp\n");
 
 		for (j = 0; j < cal_pier_nr; j++) {
+			cal_pier = ar9003_cal_pier_data(ah, i, j, is_2g);
 			if (is_2g) {
-				cal_pier = &eep->calPierData2G[i][j];
-				freq = 2300 + eep->calFreqPier2G[j];
+				freq = 2300 + ar9003_cal_freq_pier(ah, j, is_2g);
 			} else {
-				cal_pier = &eep->calPierData5G[i][j];
-				freq = 4800 + eep->calFreqPier5G[j] * 5;
+				freq = 4800 + ar9003_cal_freq_pier(ah, j, is_2g) * 5;
 			}
 
 			len += scnprintf(buf + len, size - len,
@@ -3528,22 +3754,19 @@ static u32 ar9003_dump_cal_data(struct ath_hw *ah, char *buf, u32 len, u32 size,
 static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 				       u8 *buf, u32 len, u32 size)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 
 	if (!dump_base_hdr) {
 		len += scnprintf(buf + len, size - len,
 				 "%20s :\n", "2GHz modal Header");
-		len = ar9003_dump_modal_eeprom(buf, len, size,
-						&eep->modalHeader2G);
+		len = ar9003_dump_modal_eeprom(ah, buf, len, size, true);
 
 		len += scnprintf(buf + len, size - len, "Calibration data\n");
 		len = ar9003_dump_cal_data(ah, buf, len, size, true);
 
 		len += scnprintf(buf + len, size - len,
 				 "%20s :\n", "5GHz modal Header");
-		len = ar9003_dump_modal_eeprom(buf, len, size,
-						&eep->modalHeader5G);
+		len = ar9003_dump_modal_eeprom(ah, buf, len, size, false);
 
 		len += scnprintf(buf + len, size - len, "Calibration data\n");
 		len = ar9003_dump_cal_data(ah, buf, len, size, false);
@@ -3551,9 +3774,7 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 		goto out;
 	}
 
-	pBase = &eep->baseEepHeader;
-
-	PR_EEP("EEPROM Version", ah->eeprom.ar9300_eep.eepromVersion);
+	PR_EEP("EEPROM Version", ath9k_hw_ar9300_get_eeprom_ver(ah));
 	PR_EEP("RegDomain1", le16_to_cpu(pBase->regDmn[0]));
 	PR_EEP("RegDomain2", le16_to_cpu(pBase->regDmn[1]));
 	PR_EEP("TX Mask", (pBase->txrxMask >> 4));
@@ -3597,7 +3818,7 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 	PR_EEP("SW Reg", le32_to_cpu(pBase->swreg));
 
 	len += scnprintf(buf + len, size - len, "%20s : %pM\n", "MacAddress",
-			 ah->eeprom.ar9300_eep.macAddr);
+			 ar9003_mac_addr(ah));
 out:
 	if (len > size)
 		len = size;
@@ -3614,7 +3835,7 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 
 static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
 {
-	int bias = ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
+	int bias = ar9003_xpa_bias_lvl(ah, is2ghz);
 
 	if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah) ||
 	    AR_SREV_9531(ah) || AR_SREV_9561(ah))
@@ -3787,8 +4008,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
 
 static void ar9003_hw_drive_strength_apply(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	int drive_strength;
 	unsigned long reg;
 
@@ -3832,23 +4052,23 @@ static u16 ar9003_hw_atten_chain_get(struct ath_hw *ah, int chain,
 {
 	int f[3], t[3];
 	u16 value;
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	bool is2ghz = IS_CHAN_2GHZ(chan);
 
 	if (chain >= 0 && chain < 3) {
-		if (IS_CHAN_2GHZ(chan))
-			return eep->modalHeader2G.xatten1DB[chain];
-		else if (eep->base_ext2.xatten1DBLow[chain] != 0) {
-			t[0] = eep->base_ext2.xatten1DBLow[chain];
+		if (is2ghz)
+			return ar9003_xatten1_db(ah, chain, is2ghz);
+		else if (ar9003_xatten1_db_low(ah, chain) != 0) {
+			t[0] = ar9003_xatten1_db_low(ah, chain);
 			f[0] = 5180;
-			t[1] = eep->modalHeader5G.xatten1DB[chain];
+			t[1] = ar9003_xatten1_db(ah, chain, is2ghz);
 			f[1] = 5500;
-			t[2] = eep->base_ext2.xatten1DBHigh[chain];
+			t[2] = ar9003_xatten1_db_high(ah, chain);
 			f[2] = 5785;
 			value = ar9003_hw_power_interpolate((s32) chan->channel,
 							    f, t, 3);
 			return value;
 		} else
-			return eep->modalHeader5G.xatten1DB[chain];
+			return ar9003_xatten1_db(ah, chain, is2ghz);
 	}
 
 	return 0;
@@ -3860,23 +4080,23 @@ static u16 ar9003_hw_atten_chain_get_margin(struct ath_hw *ah, int chain,
 {
 	int f[3], t[3];
 	u16 value;
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	bool is2ghz = IS_CHAN_2GHZ(chan);
 
 	if (chain >= 0 && chain < 3) {
-		if (IS_CHAN_2GHZ(chan))
-			return eep->modalHeader2G.xatten1Margin[chain];
-		else if (eep->base_ext2.xatten1MarginLow[chain] != 0) {
-			t[0] = eep->base_ext2.xatten1MarginLow[chain];
+		if (is2ghz)
+			return ar9003_xatten1_margin(ah, chain, is2ghz);
+		else if (ar9003_xatten1_db_margin_low(ah, chain) != 0) {
+			t[0] = ar9003_xatten1_db_margin_low(ah, chain);
 			f[0] = 5180;
-			t[1] = eep->modalHeader5G.xatten1Margin[chain];
+			t[1] = ar9003_xatten1_margin(ah, chain, is2ghz);
 			f[1] = 5500;
-			t[2] = eep->base_ext2.xatten1MarginHigh[chain];
+			t[2] = ar9003_xatten1_db_margin_high(ah, chain);
 			f[2] = 5785;
 			value = ar9003_hw_power_interpolate((s32) chan->channel,
 							    f, t, 3);
 			return value;
 		} else
-			return eep->modalHeader5G.xatten1Margin[chain];
+			return ar9003_xatten1_margin(ah, chain, is2ghz);
 	}
 
 	return 0;
@@ -3944,8 +4164,7 @@ static bool is_pmu_set(struct ath_hw *ah, u32 pmu_reg, int pmu_set)
 
 void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	u32 reg_val;
 
 	if (pBase->featureEnable & BIT(4)) {
@@ -4039,16 +4258,16 @@ void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 
 static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	u8 param_0, param_1;
 
 	if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
 		return;
 
-	if (eep->baseEepHeader.featureEnable & 0x40) {
-		param_0 = eep->baseEepHeader.params_for_tuning_caps[0];
+	if (pBase->featureEnable & 0x40) {
+		param_0 = pBase->params_for_tuning_caps[0];
 		if (AR_SREV_5502(ah)) {
-			param_1 = eep->baseEepHeader.params_for_tuning_caps[1];
+			param_1 = pBase->params_for_tuning_caps[1];
 		} else {
 			param_0 &= 0x7f;
 			param_1 = param_0;
@@ -4062,21 +4281,22 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)
 
 static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
+	struct ar9300_BaseExtension_1 *base_ext1 = ar9003_base_ext1(ah);
 	int quick_drop;
 	s32 t[3], f[3] = {5180, 5500, 5785};
+	bool is2ghz = freq < 4000;
 
 	if (!(pBase->miscConfiguration & BIT(4)))
 		return;
 
 	if (AR_SREV_9300(ah) || AR_SREV_9580(ah) || AR_SREV_9340(ah)) {
-		if (freq < 4000) {
-			quick_drop = eep->modalHeader2G.quick_drop;
+		if (is2ghz) {
+			quick_drop = ar9003_quick_drop(ah, is2ghz);
 		} else {
-			t[0] = eep->base_ext1.quick_drop_low;
-			t[1] = eep->modalHeader5G.quick_drop;
-			t[2] = eep->base_ext1.quick_drop_high;
+			t[0] = base_ext1->quick_drop_low;
+			t[1] = ar9003_quick_drop(ah, is2ghz);
+			t[2] = base_ext1->quick_drop_high;
 			quick_drop = ar9003_hw_power_interpolate(freq, f, t, 3);
 		}
 		REG_RMW_FIELD(ah, AR_PHY_AGC(ah), AR_PHY_AGC_QUICK_DROP, quick_drop);
@@ -4087,7 +4307,7 @@ static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)
 {
 	u32 value;
 
-	value = ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
+	value = ar9003_tx_end_to_xpa_off(ah, is2ghz);
 
 	REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL(ah),
 		      AR_PHY_XPA_TIMING_CTL_TX_END_XPAB_OFF, value);
@@ -4097,10 +4317,10 @@ static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, bool is2ghz)
 
 static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	u8 xpa_ctl;
 
-	if (!(eep->baseEepHeader.featureEnable & 0x80))
+	if (!(pBase->featureEnable & 0x80))
 		return;
 
 	if (!AR_SREV_9300(ah) &&
@@ -4111,7 +4331,7 @@ static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
 	    !AR_SREV_5502(ah))
 		return;
 
-	xpa_ctl = ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
+	xpa_ctl = ar9003_tx_frame_to_xpa_on(ah, is2ghz);
 	if (is2ghz)
 		REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL(ah),
 			      AR_PHY_XPA_TIMING_CTL_FRAME_XPAB_ON, xpa_ctl);
@@ -4122,16 +4342,16 @@ static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)
 
 static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	u8 bias;
 
-	if (!(eep->baseEepHeader.miscConfiguration & 0x40))
+	if (!(pBase->miscConfiguration & 0x40))
 		return;
 
 	if (!AR_SREV_9300(ah))
 		return;
 
-	bias = ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
+	bias = ar9003_xlna_bias_strength(ah, is2ghz);
 	REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX4, AR_PHY_65NM_RXTX4_XLNA_BIAS,
 		      bias & 0x3);
 	bias >>= 2;
@@ -4144,8 +4364,7 @@ static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)
 
 static int ar9003_hw_get_thermometer(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct ar9300_base_eep_hdr *pBase = &eep->baseEepHeader;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
 	int thermometer =  (pBase->miscConfiguration >> 1) & 0x3;
 
 	return --thermometer;
@@ -4203,7 +4422,7 @@ static void ar9003_hw_thermo_cal_apply(struct ath_hw *ah)
 static void ar9003_hw_apply_minccapwr_thresh(struct ath_hw *ah,
 					     bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	struct ar9300_BaseExtension_1 *base_ext1 = ar9003_base_ext1(ah);
 	const u_int32_t cca_ctrl[AR9300_MAX_CHAINS] = {
 		AR_PHY_CCA_CTRL_0(ah),
 		AR_PHY_CCA_CTRL_1(ah),
@@ -4213,10 +4432,10 @@ static void ar9003_hw_apply_minccapwr_thresh(struct ath_hw *ah,
 	u32 val;
 
 	if (is2ghz) {
-		if (!(eep->base_ext1.misc_enable & BIT(2)))
+		if (!(base_ext1->misc_enable & BIT(2)))
 			return;
 	} else {
-		if (!(eep->base_ext1.misc_enable & BIT(3)))
+		if (!(base_ext1->misc_enable & BIT(3)))
 			return;
 	}
 
@@ -4224,7 +4443,7 @@ static void ar9003_hw_apply_minccapwr_thresh(struct ath_hw *ah,
 		if (!(ah->caps.tx_chainmask & BIT(chain)))
 			continue;
 
-		val = ar9003_modal_header(ah, is2ghz)->noiseFloorThreshCh[chain];
+		val = ar9003_noise_floor_thres(ah, chain, is2ghz);
 		REG_RMW_FIELD(ah, cca_ctrl[chain],
 			      AR_PHY_EXT_CCA0_THRESH62_1, val);
 	}
@@ -4325,18 +4544,11 @@ static u8 ar9003_hw_eeprom_get_tgt_pwr(struct ath_hw *ah,
 	u16 numPiers, i;
 	s32 targetPowerArray[AR9300_NUM_5G_20_TARGET_POWERS];
 	s32 freqArray[AR9300_NUM_5G_20_TARGET_POWERS];
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct cal_tgt_pow_legacy *pEepromTargetPwr;
-	u8 *pFreqBin;
 
 	if (is2GHz) {
 		numPiers = AR9300_NUM_2G_20_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower2G;
-		pFreqBin = eep->calTarget_freqbin_2G;
 	} else {
 		numPiers = AR9300_NUM_5G_20_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower5G;
-		pFreqBin = eep->calTarget_freqbin_5G;
 	}
 
 	/*
@@ -4344,8 +4556,10 @@ static u8 ar9003_hw_eeprom_get_tgt_pwr(struct ath_hw *ah,
 	 * targetpower piers stored on eeprom
 	 */
 	for (i = 0; i < numPiers; i++) {
-		freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
-		targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
+		freqArray[i] = ath9k_hw_fbin2freq(
+			ar9003_cal_target_freqbin(ah, i, is2GHz), is2GHz);
+		targetPowerArray[i] =
+			ar9003_cal_target_power(ah, i, rateIndex, is2GHz);
 	}
 
 	/* interpolate to get target power for given frequency */
@@ -4361,18 +4575,11 @@ static u8 ar9003_hw_eeprom_get_ht20_tgt_pwr(struct ath_hw *ah,
 	u16 numPiers, i;
 	s32 targetPowerArray[AR9300_NUM_5G_20_TARGET_POWERS];
 	s32 freqArray[AR9300_NUM_5G_20_TARGET_POWERS];
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct cal_tgt_pow_ht *pEepromTargetPwr;
-	u8 *pFreqBin;
 
 	if (is2GHz) {
 		numPiers = AR9300_NUM_2G_20_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower2GHT20;
-		pFreqBin = eep->calTarget_freqbin_2GHT20;
 	} else {
 		numPiers = AR9300_NUM_5G_20_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower5GHT20;
-		pFreqBin = eep->calTarget_freqbin_5GHT20;
 	}
 
 	/*
@@ -4380,8 +4587,11 @@ static u8 ar9003_hw_eeprom_get_ht20_tgt_pwr(struct ath_hw *ah,
 	 * from targetpower piers stored on eeprom
 	 */
 	for (i = 0; i < numPiers; i++) {
-		freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
-		targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
+		freqArray[i] = ath9k_hw_fbin2freq(
+			ar9003_cal_target_freqbin_ht20(ah, i, is2GHz),
+			is2GHz);
+		targetPowerArray[i] = ar9003_cal_target_power_ht20(
+			ah, i, rateIndex, is2GHz);
 	}
 
 	/* interpolate to get target power for given frequency */
@@ -4397,18 +4607,11 @@ static u8 ar9003_hw_eeprom_get_ht40_tgt_pwr(struct ath_hw *ah,
 	u16 numPiers, i;
 	s32 targetPowerArray[AR9300_NUM_5G_40_TARGET_POWERS];
 	s32 freqArray[AR9300_NUM_5G_40_TARGET_POWERS];
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct cal_tgt_pow_ht *pEepromTargetPwr;
-	u8 *pFreqBin;
 
 	if (is2GHz) {
 		numPiers = AR9300_NUM_2G_40_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower2GHT40;
-		pFreqBin = eep->calTarget_freqbin_2GHT40;
 	} else {
 		numPiers = AR9300_NUM_5G_40_TARGET_POWERS;
-		pEepromTargetPwr = eep->calTargetPower5GHT40;
-		pFreqBin = eep->calTarget_freqbin_5GHT40;
 	}
 
 	/*
@@ -4416,8 +4619,11 @@ static u8 ar9003_hw_eeprom_get_ht40_tgt_pwr(struct ath_hw *ah,
 	 * targetpower piers stored on eeprom
 	 */
 	for (i = 0; i < numPiers; i++) {
-		freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], is2GHz);
-		targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
+		freqArray[i] = ath9k_hw_fbin2freq(
+			ar9003_cal_target_freqbin_ht40(ah, i, is2GHz),
+			is2GHz);
+		targetPowerArray[i] = ar9003_cal_target_power_ht40(
+			ah, i, rateIndex, is2GHz);
 	}
 
 	/* interpolate to get target power for given frequency */
@@ -4432,17 +4638,16 @@ static u8 ar9003_hw_eeprom_get_cck_tgt_pwr(struct ath_hw *ah,
 	u16 numPiers = AR9300_NUM_2G_CCK_TARGET_POWERS, i;
 	s32 targetPowerArray[AR9300_NUM_2G_CCK_TARGET_POWERS];
 	s32 freqArray[AR9300_NUM_2G_CCK_TARGET_POWERS];
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	struct cal_tgt_pow_legacy *pEepromTargetPwr = eep->calTargetPowerCck;
-	u8 *pFreqBin = eep->calTarget_freqbin_Cck;
 
 	/*
 	 * create array of channels and targetpower from
 	 * targetpower piers stored on eeprom
 	 */
 	for (i = 0; i < numPiers; i++) {
-		freqArray[i] = ath9k_hw_fbin2freq(pFreqBin[i], 1);
-		targetPowerArray[i] = pEepromTargetPwr[i].tPow2x[rateIndex];
+		freqArray[i] = ath9k_hw_fbin2freq(
+			ar9003_cal_target_freqbin_cck(ah, i), 1);
+		targetPowerArray[i] =
+			ar9003_cal_target_power_cck(ah, i, rateIndex);
 	}
 
 	/* interpolate to get target power for given frequency */
@@ -4754,9 +4959,8 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
 				  int *ptemperature, int *pvoltage,
 				  int *pnf_cal, int *pnf_power)
 {
-	u8 *pCalPier;
+	u8 calPier;
 	struct ar9300_cal_data_per_freq_op_loop *pCalPierStruct;
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
 	struct ath_common *common = ath9k_hw_common(ah);
 
 	if (ichain >= AR9300_MAX_CHAINS) {
@@ -4773,9 +4977,8 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
 				AR9300_NUM_2G_CAL_PIERS);
 			return -1;
 		}
-
-		pCalPier = &(eep->calFreqPier2G[ipier]);
-		pCalPierStruct = &(eep->calPierData2G[ichain][ipier]);
+		calPier = ar9003_cal_freq_pier(ah, ipier, is2ghz);
+		pCalPierStruct = ar9003_cal_pier_data(ah, ichain, ipier, is2ghz);
 	} else {
 		if (ipier >= AR9300_NUM_5G_CAL_PIERS) {
 			ath_dbg(common, EEPROM,
@@ -4783,11 +4986,11 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
 				AR9300_NUM_5G_CAL_PIERS);
 			return -1;
 		}
-		pCalPier = &(eep->calFreqPier5G[ipier]);
-		pCalPierStruct = &(eep->calPierData5G[ichain][ipier]);
+		calPier = ar9003_cal_freq_pier(ah, ipier, is2ghz);
+		pCalPierStruct = ar9003_cal_pier_data(ah, ichain, ipier, is2ghz);
 	}
 
-	*pfrequency = ath9k_hw_fbin2freq(*pCalPier, is2ghz);
+	*pfrequency = ath9k_hw_fbin2freq(calPier, is2ghz);
 	*pcorrection = pCalPierStruct->refPower;
 	*ptemperature = pCalPierStruct->tempMeas;
 	*pvoltage = pCalPierStruct->voltMeas;
@@ -4805,7 +5008,12 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 					     int *voltage, int *temperature)
 {
 	int temp_slope = 0, temp_slope1 = 0, temp_slope2 = 0;
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+	struct ar9300_base_eep_hdr *pBase = ar9003_base_header(ah);
+	struct ar9300_BaseExtension_1 *base_ext1 = ar9003_base_ext1(ah);
+	bool is2ghz = frequency < 4000;
+	int8_t eep_temp_slope = ar9003_temp_slope(ah, is2ghz);
+	int8_t eep_temp_slope_low = ar9003_temp_slope_low(ah);
+	int8_t eep_temp_slope_high = ar9003_temp_slope_high(ah);
 	int f[8], t[8], t1[3], t2[3], i;
 
 	REG_RMW(ah, AR_PHY_TPC_11_B0(ah),
@@ -4837,23 +5045,23 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 	 * enable temperature compensation
 	 * Need to use register names
 	 */
-	if (frequency < 4000) {
-		temp_slope = eep->modalHeader2G.tempSlope;
+	if (is2ghz) {
+		temp_slope = eep_temp_slope;
 	} else {
 		if (AR_SREV_9550(ah)) {
-			t[0] = eep->base_ext1.tempslopextension[2];
-			t1[0] = eep->base_ext1.tempslopextension[3];
-			t2[0] = eep->base_ext1.tempslopextension[4];
+			t[0] = base_ext1->tempslopextension[2];
+			t1[0] = base_ext1->tempslopextension[3];
+			t2[0] = base_ext1->tempslopextension[4];
 			f[0] = 5180;
 
-			t[1] = eep->modalHeader5G.tempSlope;
-			t1[1] = eep->base_ext1.tempslopextension[0];
-			t2[1] = eep->base_ext1.tempslopextension[1];
+			t[1] = eep_temp_slope;
+			t1[1] = base_ext1->tempslopextension[0];
+			t2[1] = base_ext1->tempslopextension[1];
 			f[1] = 5500;
 
-			t[2] = eep->base_ext1.tempslopextension[5];
-			t1[2] = eep->base_ext1.tempslopextension[6];
-			t2[2] = eep->base_ext1.tempslopextension[7];
+			t[2] = base_ext1->tempslopextension[5];
+			t1[2] = base_ext1->tempslopextension[6];
+			t2[2] = base_ext1->tempslopextension[7];
 			f[2] = 5785;
 
 			temp_slope = ar9003_hw_power_interpolate(frequency,
@@ -4866,42 +5074,44 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 			goto tempslope;
 		}
 
-		if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
+		if ((pBase->miscConfiguration & 0x20) != 0) {
 			for (i = 0; i < 8; i++) {
-				t[i] = eep->base_ext1.tempslopextension[i];
-				f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
+				t[i] = base_ext1->tempslopextension[i];
+				f[i] = FBIN2FREQ(
+					ar9003_cal_freq_pier(ah, i, is2ghz),
+					0);
 			}
 			temp_slope = ar9003_hw_power_interpolate((s32) frequency,
 								 f, t, 8);
-		} else if (eep->base_ext2.tempSlopeLow != 0) {
-			t[0] = eep->base_ext2.tempSlopeLow;
+		} else if (eep_temp_slope_low != 0) {
+			t[0] = eep_temp_slope_low;
 			f[0] = 5180;
-			t[1] = eep->modalHeader5G.tempSlope;
+			t[1] = eep_temp_slope;
 			f[1] = 5500;
-			t[2] = eep->base_ext2.tempSlopeHigh;
+			t[2] = eep_temp_slope_high;
 			f[2] = 5785;
 			temp_slope = ar9003_hw_power_interpolate((s32) frequency,
 								 f, t, 3);
 		} else {
-			temp_slope = eep->modalHeader5G.tempSlope;
+			temp_slope = eep_temp_slope;
 		}
 	}
 
 tempslope:
 	if (AR_SREV_9550(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah) ||
 	    AR_SREV_5502(ah)) {
-		u8 txmask = (eep->baseEepHeader.txrxMask & 0xf0) >> 4;
+		u8 txmask = (pBase->txrxMask & 0xf0) >> 4;
 
 		/*
 		 * AR955x has tempSlope register for each chain.
 		 * Check whether temp_compensation feature is enabled or not.
 		 */
-		if (eep->baseEepHeader.featureEnable & 0x1) {
-			if (frequency < 4000) {
+		if (pBase->featureEnable & 0x1) {
+			if (is2ghz) {
 				if (txmask & BIT(0))
 					REG_RMW_FIELD(ah, AR_PHY_TPC_19(ah),
 						      AR_PHY_TPC_19_ALPHA_THERM,
-						      eep->base_ext2.tempSlopeLow);
+						      eep_temp_slope_low);
 				if (txmask & BIT(1))
 					REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1(ah),
 						      AR_PHY_TPC_19_ALPHA_THERM,
@@ -4909,7 +5119,7 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah,
 				if (txmask & BIT(2))
 					REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2(ah),
 						      AR_PHY_TPC_19_ALPHA_THERM,
-						      eep->base_ext2.tempSlopeHigh);
+						      eep_temp_slope_high);
 			} else {
 				if (txmask & BIT(0))
 					REG_RMW_FIELD(ah, AR_PHY_TPC_19(ah),
@@ -5140,42 +5350,25 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)
 	return 0;
 }
 
-static u16 ar9003_hw_get_direct_edge_power(struct ar9300_eeprom *eep,
+static u16 ar9003_hw_get_direct_edge_power(struct ath_hw *ah,
 					   int idx,
 					   int edge,
 					   bool is2GHz)
 {
-	struct cal_ctl_data_2g *ctl_2g = eep->ctlPowerData_2G;
-	struct cal_ctl_data_5g *ctl_5g = eep->ctlPowerData_5G;
-
-	if (is2GHz)
-		return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge]);
-	else
-		return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge]);
+	return CTL_EDGE_TPOWER(ar9003_ctl_power_data(ah, idx, edge, is2GHz));
 }
 
-static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
+static u16 ar9003_hw_get_indirect_edge_power(struct ath_hw *ah,
 					     int idx,
 					     unsigned int edge,
 					     u16 freq,
 					     bool is2GHz)
 {
-	struct cal_ctl_data_2g *ctl_2g = eep->ctlPowerData_2G;
-	struct cal_ctl_data_5g *ctl_5g = eep->ctlPowerData_5G;
-
-	u8 *ctl_freqbin = is2GHz ?
-		&eep->ctl_freqbin_2G[idx][0] :
-		&eep->ctl_freqbin_5G[idx][0];
-
-	if (is2GHz) {
-		if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 1) < freq &&
-		    CTL_EDGE_FLAGS(ctl_2g[idx].ctlEdges[edge - 1]))
-			return CTL_EDGE_TPOWER(ctl_2g[idx].ctlEdges[edge - 1]);
-	} else {
-		if (ath9k_hw_fbin2freq(ctl_freqbin[edge - 1], 0) < freq &&
-		    CTL_EDGE_FLAGS(ctl_5g[idx].ctlEdges[edge - 1]))
-			return CTL_EDGE_TPOWER(ctl_5g[idx].ctlEdges[edge - 1]);
-	}
+	if (ath9k_hw_fbin2freq(ar9003_ctl_freqbin(ah, idx, edge - 1, is2GHz),
+			       is2GHz) < freq &&
+	    CTL_EDGE_FLAGS(ar9003_ctl_power_data(ah, idx, edge - 1, is2GHz)))
+		return CTL_EDGE_TPOWER(
+			ar9003_ctl_power_data(ah, idx, edge - 1, is2GHz));
 
 	return MAX_RATE_POWER;
 }
@@ -5183,37 +5376,36 @@ static u16 ar9003_hw_get_indirect_edge_power(struct ar9300_eeprom *eep,
 /*
  * Find the maximum conformance test limit for the given channel and CTL info
  */
-static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep,
+static u16 ar9003_hw_get_max_edge_power(struct ath_hw *ah,
 					u16 freq, int idx, bool is2GHz)
 {
 	u16 twiceMaxEdgePower = MAX_RATE_POWER;
-	u8 *ctl_freqbin = is2GHz ?
-		&eep->ctl_freqbin_2G[idx][0] :
-		&eep->ctl_freqbin_5G[idx][0];
 	u16 num_edges = is2GHz ?
 		AR9300_NUM_BAND_EDGES_2G : AR9300_NUM_BAND_EDGES_5G;
 	unsigned int edge;
 
 	/* Get the edge power */
 	for (edge = 0;
-	     (edge < num_edges) && (ctl_freqbin[edge] != AR5416_BCHAN_UNUSED);
+	     (edge < num_edges) &&
+	     (ar9003_ctl_freqbin(ah, idx, edge, is2GHz) != AR5416_BCHAN_UNUSED);
 	     edge++) {
 		/*
 		 * If there's an exact channel match or an inband flag set
 		 * on the lower channel use the given rdEdgePower
 		 */
-		if (freq == ath9k_hw_fbin2freq(ctl_freqbin[edge], is2GHz)) {
-			twiceMaxEdgePower =
-				ar9003_hw_get_direct_edge_power(eep, idx,
-								edge, is2GHz);
+		if (freq == ath9k_hw_fbin2freq(ar9003_ctl_freqbin(ah, idx, edge,
+								  is2GHz),
+					       is2GHz)) {
+			twiceMaxEdgePower = ar9003_hw_get_direct_edge_power(
+				ah, idx, edge, is2GHz);
 			break;
 		} else if ((edge > 0) &&
-			   (freq < ath9k_hw_fbin2freq(ctl_freqbin[edge],
-						      is2GHz))) {
-			twiceMaxEdgePower =
-				ar9003_hw_get_indirect_edge_power(eep, idx,
-								  edge, freq,
-								  is2GHz);
+			   (freq <
+			    ath9k_hw_fbin2freq(ar9003_ctl_freqbin(ah, idx, edge,
+								  is2GHz),
+					       is2GHz))) {
+			twiceMaxEdgePower = ar9003_hw_get_indirect_edge_power(
+				ah, idx, edge, freq, is2GHz);
 			/*
 			 * Leave loop - no more affecting edges possible in
 			 * this monotonic increasing list
@@ -5235,7 +5427,6 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 					       u16 powerLimit)
 {
 	struct ath_common *common = ath9k_hw_common(ah);
-	struct ar9300_eeprom *pEepData = &ah->eeprom.ar9300_eep;
 	u16 twiceMaxEdgePower;
 	int i;
 	u16 scaledPower = 0, minCtlPower;
@@ -5250,7 +5441,6 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 	const u16 *pCtlMode;
 	u16 ctlMode, freq;
 	struct chan_centers centers;
-	u8 *ctlIndex;
 	u8 ctlNum;
 	u16 twiceMinEdgePower;
 	bool is2ghz = IS_CHAN_2GHZ(chan);
@@ -5305,18 +5495,17 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 
 		/* walk through each CTL index stored in EEPROM */
 		if (is2ghz) {
-			ctlIndex = pEepData->ctlIndex_2G;
 			ctlNum = AR9300_NUM_CTLS_2G;
 		} else {
-			ctlIndex = pEepData->ctlIndex_5G;
 			ctlNum = AR9300_NUM_CTLS_5G;
 		}
 
 		twiceMaxEdgePower = MAX_RATE_POWER;
-		for (i = 0; (i < ctlNum) && ctlIndex[i]; i++) {
+		for (i = 0; (i < ctlNum) && ar9003_ctl_index(ah, i, is2ghz);
+		     i++) {
 			ath_dbg(common, REGULATORY,
 				"LOOP-Ctlidx %d: cfgCtl 0x%2.2x pCtlMode 0x%2.2x ctlIndex 0x%2.2x chan %d\n",
-				i, cfgCtl, pCtlMode[ctlMode], ctlIndex[i],
+				i, cfgCtl, pCtlMode[ctlMode], ar9003_ctl_index(ah, i, is2ghz),
 				chan->channel);
 
 			/*
@@ -5326,13 +5515,13 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
 			 */
 			if ((((cfgCtl & ~CTL_MODE_M) |
 			       (pCtlMode[ctlMode] & CTL_MODE_M)) ==
-				ctlIndex[i]) ||
+				ar9003_ctl_index(ah, i, is2ghz)) ||
 			    (((cfgCtl & ~CTL_MODE_M) |
 			       (pCtlMode[ctlMode] & CTL_MODE_M)) ==
-			     ((ctlIndex[i] & CTL_MODE_M) |
+			     ((ar9003_ctl_index(ah, i, is2ghz) & CTL_MODE_M) |
 			       SD_NO_CTL))) {
 				twiceMinEdgePower =
-				  ar9003_hw_get_max_edge_power(pEepData,
+				  ar9003_hw_get_max_edge_power(ah,
 							       freq, i,
 							       is2ghz);
 
@@ -5570,16 +5759,12 @@ static u16 ath9k_hw_ar9300_get_spur_channel(struct ath_hw *ah,
 
 s32 ar9003_hw_get_tx_gain_idx(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-
-	return (eep->baseEepHeader.txrxgain >> 4) & 0xf; /* bits 7:4 */
+	return (ar9003_base_header(ah)->txrxgain >> 4) & 0xf; /* bits 7:4 */
 }
 
 s32 ar9003_hw_get_rx_gain_idx(struct ath_hw *ah)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-
-	return (eep->baseEepHeader.txrxgain) & 0xf; /* bits 3:0 */
+	return (ar9003_base_header(ah)->txrxgain) & 0xf; /* bits 3:0 */
 }
 
 u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is2ghz)
@@ -5620,7 +5805,7 @@ unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
 
 static u8 ar9003_get_eepmisc(struct ath_hw *ah)
 {
-	return ah->eeprom.ar9300_eep.baseEepHeader.opCapFlags.eepMisc;
+	return ar9003_base_header(ah)->opCapFlags.eepMisc;
 }
 
 const struct eeprom_ops eep_ar9300_ops = {
Signature · 1 line
2.34.1
author
#13 lore raw

PATCH v3 11/11 wifi: ath9k: add QCN550x eeprom

In reply to Wenli Looi

This adds support for the 4-chain eeprom used by QCN550x.

---
 .../net/wireless/ath/ath9k/ar9003_eeprom.c    | 294 +++++++++++++-----
 .../net/wireless/ath/ath9k/ar9003_eeprom.h    | 112 +++++++
 drivers/net/wireless/ath/ath9k/hw.h           |   1 +
 3 files changed, 337 insertions(+), 70 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +224 -70
index 669506884b..f28ebc9953 100644
@@ -2984,12 +2984,14 @@ static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah)
 
 static struct ar9300_base_eep_hdr *ar9003_base_header(struct ath_hw *ah)
 {
-	return &ah->eeprom.ar9300_eep.baseEepHeader;
+	return AR_SREV_5502(ah) ? &ah->eeprom.qcn5502.baseEepHeader :
+				  &ah->eeprom.ar9300_eep.baseEepHeader;
 }
 
 static struct ar9300_BaseExtension_1 *ar9003_base_ext1(struct ath_hw *ah)
 {
-	return &ah->eeprom.ar9300_eep.base_ext1;
+	return AR_SREV_5502(ah) ? &ah->eeprom.qcn5502.base_ext1 :
+				  &ah->eeprom.ar9300_eep.base_ext1;
 }
 
 static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
@@ -3003,206 +3005,338 @@ static struct ar9300_modal_eep_header *ar9003_modal_header(struct ath_hw *ah,
 		return &eep->modalHeader5G;
 }
 
+static struct qcn5502_modal_eep_header *qcn5502_modal_header(struct ath_hw *ah,
+							     bool is2ghz)
+{
+	struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+
+	if (is2ghz)
+		return &eep->modalHeader2G;
+	else
+		return &eep->modalHeader5G;
+}
+
 static int8_t ar9003_ant_gain(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->antennaGain;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->antennaGain :
+		       ar9003_modal_header(ah, is2ghz)->antennaGain;
 }
 
 static u8 ar9003_cal_freq_pier(struct ath_hw *ah, int idx, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calFreqPier2G[idx] : eep->calFreqPier5G[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->calFreqPier2G[idx] :
+				eep->calFreqPier5G[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->calFreqPier2G[idx] :
+				eep->calFreqPier5G[idx];
+	}
 }
 
 static struct ar9300_cal_data_per_freq_op_loop *
 ar9003_cal_pier_data(struct ath_hw *ah, int chain, int idx, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? &eep->calPierData2G[chain][idx] :
-			      &eep->calPierData5G[chain][idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? &eep->calPierData2G[chain][idx] :
+				&eep->calPierData5G[chain][idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? &eep->calPierData2G[chain][idx] :
+				&eep->calPierData5G[chain][idx];
+	}
 }
 
 static u8 ar9003_cal_target_freqbin(struct ath_hw *ah, int idx, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTarget_freqbin_2G[idx] :
-			      eep->calTarget_freqbin_5G[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->calTarget_freqbin_2G[idx] :
+				eep->calTarget_freqbin_5G[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->calTarget_freqbin_2G[idx] :
+				eep->calTarget_freqbin_5G[idx];
+	}
 }
 
 static u8 ar9003_cal_target_freqbin_cck(struct ath_hw *ah, int idx)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return eep->calTarget_freqbin_Cck[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return eep->calTarget_freqbin_Cck[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return eep->calTarget_freqbin_Cck[idx];
+	}
 }
 
 static u8 ar9003_cal_target_freqbin_ht20(struct ath_hw *ah, int idx,
 					 bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTarget_freqbin_2GHT20[idx] :
-			      eep->calTarget_freqbin_5GHT20[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->calTarget_freqbin_2GHT20[idx] :
+				eep->calTarget_freqbin_5GHT20[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->calTarget_freqbin_2GHT20[idx] :
+				eep->calTarget_freqbin_5GHT20[idx];
+	}
 }
 
 static u8 ar9003_cal_target_freqbin_ht40(struct ath_hw *ah, int idx,
 					 bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTarget_freqbin_2GHT40[idx] :
-			      eep->calTarget_freqbin_5GHT40[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->calTarget_freqbin_2GHT40[idx] :
+				eep->calTarget_freqbin_5GHT40[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->calTarget_freqbin_2GHT40[idx] :
+				eep->calTarget_freqbin_5GHT40[idx];
+	}
 }
 
 static u8 ar9003_cal_target_power(struct ath_hw *ah, int idx, int rateIndex,
 				  bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTargetPower2G[idx].tPow2x[rateIndex] :
-			      eep->calTargetPower5G[idx].tPow2x[rateIndex];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->calTargetPower2G[idx].tPow2x[rateIndex] :
+				eep->calTargetPower5G[idx].tPow2x[rateIndex];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->calTargetPower2G[idx].tPow2x[rateIndex] :
+				eep->calTargetPower5G[idx].tPow2x[rateIndex];
+	}
 }
 
 static u8 ar9003_cal_target_power_cck(struct ath_hw *ah, int idx, int rateIndex)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return eep->calTargetPowerCck[idx].tPow2x[rateIndex];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return eep->calTargetPowerCck[idx].tPow2x[rateIndex];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return eep->calTargetPowerCck[idx].tPow2x[rateIndex];
+	}
 }
 
 static u8 ar9003_cal_target_power_ht20(struct ath_hw *ah, int idx,
 				       int rateIndex, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTargetPower2GHT20[idx].tPow2x[rateIndex] :
-			      eep->calTargetPower5GHT20[idx].tPow2x[rateIndex];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ?
+			       eep->calTargetPower2GHT20[idx].tPow2x[rateIndex] :
+			       eep->calTargetPower5GHT20[idx].tPow2x[rateIndex];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ?
+			       eep->calTargetPower2GHT20[idx].tPow2x[rateIndex] :
+			       eep->calTargetPower5GHT20[idx].tPow2x[rateIndex];
+	}
 }
 
 static u8 ar9003_cal_target_power_ht40(struct ath_hw *ah, int idx,
 				       int rateIndex, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->calTargetPower2GHT40[idx].tPow2x[rateIndex] :
-			      eep->calTargetPower5GHT40[idx].tPow2x[rateIndex];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ?
+			       eep->calTargetPower2GHT40[idx].tPow2x[rateIndex] :
+			       eep->calTargetPower5GHT40[idx].tPow2x[rateIndex];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ?
+			       eep->calTargetPower2GHT40[idx].tPow2x[rateIndex] :
+			       eep->calTargetPower5GHT40[idx].tPow2x[rateIndex];
+	}
 }
 
 static u8 ar9003_ctl_freqbin(struct ath_hw *ah, int idx, int edge, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->ctl_freqbin_2G[idx][edge] :
-			      eep->ctl_freqbin_5G[idx][edge];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->ctl_freqbin_2G[idx][edge] :
+				eep->ctl_freqbin_5G[idx][edge];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->ctl_freqbin_2G[idx][edge] :
+				eep->ctl_freqbin_5G[idx][edge];
+	}
 }
 
 static u8 ar9003_ctl_index(struct ath_hw *ah, int idx, bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->ctlIndex_2G[idx] : eep->ctlIndex_5G[idx];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->ctlIndex_2G[idx] : eep->ctlIndex_5G[idx];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->ctlIndex_2G[idx] : eep->ctlIndex_5G[idx];
+	}
 }
 
 static u8 ar9003_ctl_power_data(struct ath_hw *ah, int idx, int edge,
 				bool is2ghz)
 {
-	struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-	return is2ghz ? eep->ctlPowerData_2G[idx].ctlEdges[edge] :
-			      eep->ctlPowerData_5G[idx].ctlEdges[edge];
+	if (AR_SREV_5502(ah)) {
+		struct qcn5502_eeprom *eep = &ah->eeprom.qcn5502;
+		return is2ghz ? eep->ctlPowerData_2G[idx].ctlEdges[edge] :
+				eep->ctlPowerData_5G[idx].ctlEdges[edge];
+	} else {
+		struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+		return is2ghz ? eep->ctlPowerData_2G[idx].ctlEdges[edge] :
+				eep->ctlPowerData_5G[idx].ctlEdges[edge];
+	}
 }
 
 static u16 ar9003_hw_ant_ctrl_chain_get(struct ath_hw *ah, int chain,
 					bool is2ghz)
 {
-	__le16 val = ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
+	__le16 val =
+		AR_SREV_5502(ah) ?
+			qcn5502_modal_header(ah, is2ghz)->antCtrlChain[chain] :
+			ar9003_modal_header(ah, is2ghz)->antCtrlChain[chain];
 	return le16_to_cpu(val);
 }
 
 u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
 {
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon);
+	__le32 val = AR_SREV_5502(ah) ?
+			     qcn5502_modal_header(ah, is2ghz)->antCtrlCommon :
+			     ar9003_modal_header(ah, is2ghz)->antCtrlCommon;
+	return le32_to_cpu(val);
 }
 
 u32 ar9003_hw_ant_ctrl_common_2_get(struct ath_hw *ah, bool is2ghz)
 {
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->antCtrlCommon2);
+	__le32 val = AR_SREV_5502(ah) ?
+			     qcn5502_modal_header(ah, is2ghz)->antCtrlCommon2 :
+			     ar9003_modal_header(ah, is2ghz)->antCtrlCommon2;
+	return le32_to_cpu(val);
 }
 
 static int8_t ar9003_noise_floor_thres(struct ath_hw *ah, int chain,
 				       bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->noiseFloorThreshCh[chain];
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)
+					  ->noiseFloorThreshCh[chain] :
+				  ar9003_modal_header(ah, is2ghz)
+					  ->noiseFloorThreshCh[chain];
 }
 
 static int8_t ar9003_quick_drop(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->quick_drop;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->quick_drop :
+				  ar9003_modal_header(ah, is2ghz)->quick_drop;
 }
 
 static int8_t ar9003_temp_slope(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->tempSlope;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->tempSlope :
+				  ar9003_modal_header(ah, is2ghz)->tempSlope;
 }
 
 static int8_t ar9003_temp_slope_high(struct ath_hw *ah)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.tempSlopeHigh;
+	return AR_SREV_5502(ah) ? ah->eeprom.qcn5502.base_ext2.tempSlopeHigh :
+				  ah->eeprom.ar9300_eep.base_ext2.tempSlopeHigh;
 }
 
 static int8_t ar9003_temp_slope_low(struct ath_hw *ah)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.tempSlopeLow;
+	return AR_SREV_5502(ah) ? ah->eeprom.qcn5502.base_ext2.tempSlopeLow :
+				  ah->eeprom.ar9300_eep.base_ext2.tempSlopeLow;
 }
 
 static u8 ar9003_tx_end_to_xpa_off(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->txEndToXpaOff :
+		       ar9003_modal_header(ah, is2ghz)->txEndToXpaOff;
 }
 
 static u8 ar9003_tx_frame_to_xpa_on(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->txFrameToXpaOn :
+		       ar9003_modal_header(ah, is2ghz)->txFrameToXpaOn;
 }
 
 static u8 ar9003_xatten1_db_high(struct ath_hw *ah, int chain)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.xatten1DBHigh[chain];
+	return AR_SREV_5502(ah) ?
+		       ah->eeprom.qcn5502.base_ext2.xatten1DBHigh[chain] :
+		       ah->eeprom.ar9300_eep.base_ext2.xatten1DBHigh[chain];
 }
 
 static u8 ar9003_xatten1_db_low(struct ath_hw *ah, int chain)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.xatten1DBLow[chain];
+	return AR_SREV_5502(ah) ?
+		       ah->eeprom.qcn5502.base_ext2.xatten1DBLow[chain] :
+		       ah->eeprom.ar9300_eep.base_ext2.xatten1DBLow[chain];
 }
 
 static u8 ar9003_xatten1_db_margin_high(struct ath_hw *ah, int chain)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.xatten1MarginHigh[chain];
+	return AR_SREV_5502(ah) ?
+		       ah->eeprom.qcn5502.base_ext2.xatten1MarginHigh[chain] :
+		       ah->eeprom.ar9300_eep.base_ext2.xatten1MarginHigh[chain];
 }
 
 static u8 ar9003_xatten1_db_margin_low(struct ath_hw *ah, int chain)
 {
-	return ah->eeprom.ar9300_eep.base_ext2.xatten1MarginLow[chain];
+	return AR_SREV_5502(ah) ?
+		       ah->eeprom.qcn5502.base_ext2.xatten1MarginLow[chain] :
+		       ah->eeprom.ar9300_eep.base_ext2.xatten1MarginLow[chain];
 }
 
 static u8 ar9003_xatten1_db(struct ath_hw *ah, int chain, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->xatten1DB[chain];
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->xatten1DB[chain] :
+		       ar9003_modal_header(ah, is2ghz)->xatten1DB[chain];
 }
 
 static u8 ar9003_xatten1_margin(struct ath_hw *ah, int chain, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->xatten1Margin[chain];
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->xatten1Margin[chain] :
+		       ar9003_modal_header(ah, is2ghz)->xatten1Margin[chain];
 }
 
 static u8 ar9003_xlna_bias_strength(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->xlna_bias_strength :
+		       ar9003_modal_header(ah, is2ghz)->xlna_bias_strength;
 }
 
 static u8 ar9003_xpa_bias_lvl(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->xpaBiasLvl :
+				  ar9003_modal_header(ah, is2ghz)->xpaBiasLvl;
 }
 
 static u8 *ar9003_mac_addr(struct ath_hw *ah)
 {
-	return ah->eeprom.ar9300_eep.macAddr;
+	return AR_SREV_5502(ah) ? ah->eeprom.qcn5502.macAddr :
+				  ah->eeprom.ar9300_eep.macAddr;
 }
 
 static u16 ar9003_switch_com_spdt_get(struct ath_hw *ah, bool is2ghz)
 {
-	return le16_to_cpu(ar9003_modal_header(ah, is2ghz)->switchcomspdt);
+	__le16 val = AR_SREV_5502(ah) ?
+			     qcn5502_modal_header(ah, is2ghz)->switchcomspdt :
+			     ar9003_modal_header(ah, is2ghz)->switchcomspdt;
+	return le16_to_cpu(val);
 }
 
 static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
@@ -3614,10 +3748,11 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
  */
 static bool ath9k_hw_ar9300_fill_eeprom(struct ath_hw *ah)
 {
-	u8 *mptr = (u8 *) &ah->eeprom.ar9300_eep;
+	u8 *mptr = (u8 *)&ah->eeprom;
+	int mdata_size = AR_SREV_5502(ah) ? sizeof(struct qcn5502_eeprom) :
+					    sizeof(struct ar9300_eeprom);
 
-	if (ar9300_eeprom_restore_internal(ah, mptr,
-			sizeof(struct ar9300_eeprom)) < 0)
+	if (ar9300_eeprom_restore_internal(ah, mptr, mdata_size) < 0)
 		return false;
 
 	return true;
@@ -3627,32 +3762,42 @@ static bool ath9k_hw_ar9300_fill_eeprom(struct ath_hw *ah)
 
 static int8_t ar9003_adc_desired_size(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->adcDesiredSize;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->adcDesiredSize :
+		       ar9003_modal_header(ah, is2ghz)->adcDesiredSize;
 }
 
 static u8 ar9003_switch_settling(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->switchSettling;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->switchSettling :
+		       ar9003_modal_header(ah, is2ghz)->switchSettling;
 }
 
 static u8 ar9003_tx_clip(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->txClip;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->txClip :
+				  ar9003_modal_header(ah, is2ghz)->txClip;
 }
 
 static u8 ar9003_tx_frame_to_data_start(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->txFrameToDataStart;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->txFrameToDataStart :
+		       ar9003_modal_header(ah, is2ghz)->txFrameToDataStart;
 }
 
 static u8 ar9003_tx_frame_to_pa_on(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->txFrameToPaOn;
+	return AR_SREV_5502(ah) ?
+		       qcn5502_modal_header(ah, is2ghz)->txFrameToPaOn :
+		       ar9003_modal_header(ah, is2ghz)->txFrameToPaOn;
 }
 
 static int8_t ar9003_volt_slope(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->voltSlope;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->voltSlope :
+				  ar9003_modal_header(ah, is2ghz)->voltSlope;
 }
 
 static u32 ar9003_dump_modal_eeprom(struct ath_hw *ah, char *buf, u32 len,
@@ -5769,17 +5914,26 @@ s32 ar9003_hw_get_rx_gain_idx(struct ath_hw *ah)
 
 u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is2ghz)
 {
-	return ar9003_modal_header(ah, is2ghz)->spurChans;
+	return AR_SREV_5502(ah) ? qcn5502_modal_header(ah, is2ghz)->spurChans :
+				  ar9003_modal_header(ah, is2ghz)->spurChans;
 }
 
 u32 ar9003_get_paprd_rate_mask_ht20(struct ath_hw *ah, bool is2ghz)
 {
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->papdRateMaskHt20);
+	__le32 val =
+		AR_SREV_5502(ah) ?
+			qcn5502_modal_header(ah, is2ghz)->papdRateMaskHt20 :
+			ar9003_modal_header(ah, is2ghz)->papdRateMaskHt20;
+	return le32_to_cpu(val);
 }
 
 u32 ar9003_get_paprd_rate_mask_ht40(struct ath_hw *ah, bool is2ghz)
 {
-	return le32_to_cpu(ar9003_modal_header(ah, is2ghz)->papdRateMaskHt40);
+	__le32 val =
+		AR_SREV_5502(ah) ?
+			qcn5502_modal_header(ah, is2ghz)->papdRateMaskHt40 :
+			ar9003_modal_header(ah, is2ghz)->papdRateMaskHt40;
+	return le32_to_cpu(val);
 }
 
 unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/ar9003_eeprom.h +112 -0

142 lines not on this page · raw message

drivers/net/wireless/ath/ath9k/hw.h +1 -0
index 2349d0e93c..20ece9eb9a 100644
@@ -790,6 +790,7 @@ struct ath_hw {
 		struct ar5416_eeprom_4k map4k;
 		struct ar9287_eeprom map9287;
 		struct ar9300_eeprom ar9300_eep;
+		struct qcn5502_eeprom qcn5502;
 	} eeprom;
 	const struct eeprom_ops *eep_ops;
 
Signature · 1 line
2.34.1
#14 lore raw
In reply to Wenli Looi

I've started looking at this now. A few initial questions:

Quoted 10 lines

This patchset adds support for QCN550x. Compared to previous versions of this patchset:

- Removed hidden dependencies on ah macro
(see commit b3a663f0037d20e77bbafd9271a3d9dd0351059d)
- Done significantly more testing and performance improvements. In my informal testing, the 3x3 performance of this driver generally meets or exceeds the performance of stock firmwares, which was not the case for previous patchsets. The main source of the improvement was enabling the clock doubler.

Did you do any regression tests on other types of ar9300 hardware to ensure these patches don't negatively affect existing systems?

Quoted 2 lines

Revert "ath9k_hw: fall back to OTP ROM when platform data has no valid
eeprom data"

This revert seems a bit dodgy; the commit message states "Users currently relying on this silent fallback will need to stop providing invalid EEPROM data to the driver." - which kinda sounds like a kernel-to-userspace regression to me? Do any such systems actually exist?

-Toke

author
#15 lore raw
Quoted 2 lines

Did you do any regression tests on other types of ar9300 hardware to ensure these patches don't negatively affect existing systems?

I've tried this new driver on a QCA9558 SoC (Netgear EX7300v1) which is another ar9300 device, and the access point performance didn't seem to be affected. I could do more detailed tests if desired.

Quoted 9 lines
Quoted 3 lines

Revert "ath9k_hw: fall back to OTP ROM when platform data has no valid
eeprom data"

This revert seems a bit dodgy; the commit message states "Users currently relying on this silent fallback will need to stop providing invalid EEPROM data to the driver." - which kinda sounds like a kernel-to-userspace regression to me? Do any such systems actually exist?

I'm not sure if such systems exist. They shouldn't for the SoC devices like QCA9558, because i don't think they support EEPROM at all. It's possible that they exist for pcie devices, but I expect the vast majority of users would not be overriding the eeprom. Arguably, if they are setting qca,no-eeprom and this silent fallback ignores and uses eeprom anyways, that could be considered a bug that is fixed here? We could also choose to keep the fallback except for this new device.

I cc'ed Felix Fietkau here. If you remember the context for this change, that would probably be helpful.

author
#16 lore raw
In reply to Wenli Looi

I've updated the following github pull request to show how this patch can be incorporated into OpenWrt to provide 2.4GHz wifi support for all QCN5502 devices: https://github.com/openwrt/openwrt/pull/9389

There are prebuilt images for all existing QCN5502 devices, and it is also possible to build from source for any device.

Hopefully this can provide some context on how this driver can be useful, and can be a source of feedback from others who try out the driver.

#17 lore raw
Quoted 10 lines · Wenli Looi

I've updated the following github pull request to show how this patch can be incorporated into OpenWrt to provide 2.4GHz wifi support for all QCN5502 devices: https://github.com/openwrt/openwrt/pull/9389

There are prebuilt images for all existing QCN5502 devices, and it is also possible to build from source for any device.

Hopefully this can provide some context on how this driver can be useful, and can be a source of feedback from others who try out the driver.

Thanks! FWIW, I don't have any objections in principle to merging this, but I'm not comfortable doing so until someone has reviewed it. So anything you can do to help find a reviewer will be helpful :)

-Toke