Skip to content

L
linux
Commit 598fda7b authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8723au: Clean up PHY_{Query,Set}BBReg() 32 bit read/writes 

This switches pure 32 bit read/writes to use the
rtl8723au_{read,write}32() functions directly.
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bfd83bbe
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 93 deletions
drivers/staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c
View file @ 598fda7b
...@@ -65,8 +65,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -65,8 +65,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
if (ThermalValue) { if (ThermalValue) {
/* Query OFDM path A default setting */ /* Query OFDM path A default setting */
ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XATxIQImbalance, ele_D = rtl8723au_read32(Adapter, rOFDM0_XATxIQImbalance) &
bMaskDWord)&bMaskOFDM_D; bMaskOFDM_D;
for (i = 0; i < OFDM_TABLE_SIZE_92C; i++) { for (i = 0; i < OFDM_TABLE_SIZE_92C; i++) {
/* find the index */ /* find the index */
if (ele_D == (OFDMSwingTable23A[i]&bMaskOFDM_D)) { if (ele_D == (OFDMSwingTable23A[i]&bMaskOFDM_D)) {
...@@ -77,8 +77,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -77,8 +77,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
/* Query OFDM path B default setting */ /* Query OFDM path B default setting */
if (pHalData->rf_type == RF_2T2R) { if (pHalData->rf_type == RF_2T2R) {
ele_D = PHY_QueryBBReg(Adapter, rOFDM0_XBTxIQImbalance, ele_D = rtl8723au_read32(Adapter,
bMaskDWord)&bMaskOFDM_D; rOFDM0_XBTxIQImbalance);
ele_D &= bMaskOFDM_D;
for (i = 0; i < OFDM_TABLE_SIZE_92C; i++) { /* find the index */ for (i = 0; i < OFDM_TABLE_SIZE_92C; i++) { /* find the index */
if (ele_D == (OFDMSwingTable23A[i]&bMaskOFDM_D)) { if (ele_D == (OFDMSwingTable23A[i]&bMaskOFDM_D)) {
OFDM_index_old[1] = (u8)i; OFDM_index_old[1] = (u8)i;
...@@ -88,8 +89,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -88,8 +89,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
} }
/* Query CCK default setting From 0xa24 */ /* Query CCK default setting From 0xa24 */
TempCCk = PHY_QueryBBReg(Adapter, rCCK0_TxFilter2, TempCCk = rtl8723au_read32(Adapter, rCCK0_TxFilter2) & bMaskCCK;
bMaskDWord)&bMaskCCK;
for (i = 0 ; i < CCK_TABLE_SIZE ; i++) { for (i = 0 ; i < CCK_TABLE_SIZE ; i++) {
if (pdmpriv->bCCKinCH14) { if (pdmpriv->bCCKinCH14) {
if (!memcmp(&TempCCk, if (!memcmp(&TempCCk,
...@@ -227,7 +227,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -227,7 +227,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
CCK_index = 0; CCK_index = 0;
} }
if (pdmpriv->TxPowerTrackControl && (delta != 0 || delta_HP != 0)) { if (pdmpriv->TxPowerTrackControl &&
(delta != 0 || delta_HP != 0)) {
/* Adujst OFDM Ant_A according to IQK result */ /* Adujst OFDM Ant_A according to IQK result */
ele_D = (OFDMSwingTable23A[OFDM_index[0]] & 0xFFC00000)>>22; ele_D = (OFDMSwingTable23A[OFDM_index[0]] & 0xFFC00000)>>22;
X = pdmpriv->RegE94; X = pdmpriv->RegE94;
...@@ -245,7 +246,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -245,7 +246,9 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
/* write new elements A, C, D to regC80 and regC94, element B is always 0 */ /* write new elements A, C, D to regC80 and regC94, element B is always 0 */
value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A; value32 = (ele_D<<22)|((ele_C&0x3F)<<16)|ele_A;
PHY_SetBBReg(Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, value32); rtl8723au_write32(Adapter,
rOFDM0_XATxIQImbalance,
value32);
value32 = (ele_C&0x000003C0)>>6; value32 = (ele_C&0x000003C0)>>6;
PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE, bMaskH4Bits, value32); PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE, bMaskH4Bits, value32);
...@@ -258,8 +261,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -258,8 +261,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold, PHY_SetBBReg(Adapter, rOFDM0_ECCAThreshold,
BIT(29), value32); BIT(29), value32);
} else { } else {
PHY_SetBBReg(Adapter, rOFDM0_XATxIQImbalance, rtl8723au_write32(Adapter,
bMaskDWord, rOFDM0_XATxIQImbalance,
OFDMSwingTable23A[OFDM_index[0]]); OFDMSwingTable23A[OFDM_index[0]]);
PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE, PHY_SetBBReg(Adapter, rOFDM0_XCTxAFE,
bMaskH4Bits, 0x00); bMaskH4Bits, 0x00);
...@@ -307,7 +310,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -307,7 +310,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
/* write new elements A, C, D to regC88 and regC9C, element B is always 0 */ /* write new elements A, C, D to regC88 and regC9C, element B is always 0 */
value32 = (ele_D<<22)|((ele_C&0x3F)<<16) | ele_A; value32 = (ele_D<<22)|((ele_C&0x3F)<<16) | ele_A;
PHY_SetBBReg(Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, value32); rtl8723au_write32(Adapter, rOFDM0_XBTxIQImbalance, value32);
value32 = (ele_C&0x000003C0)>>6; value32 = (ele_C&0x000003C0)>>6;
PHY_SetBBReg(Adapter, rOFDM0_XDTxAFE, bMaskH4Bits, value32); PHY_SetBBReg(Adapter, rOFDM0_XDTxAFE, bMaskH4Bits, value32);
...@@ -322,9 +325,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter) ...@@ -322,9 +325,8 @@ odm_TXPowerTrackingCallback_ThermalMeter_92C(struct rtw_adapter *Adapter)
rOFDM0_ECCAThreshold, rOFDM0_ECCAThreshold,
BIT(25), value32); BIT(25), value32);
} else { } else {
PHY_SetBBReg(Adapter, rtl8723au_write32(Adapter,
rOFDM0_XBTxIQImbalance, rOFDM0_XBTxIQImbalance,
bMaskDWord,
OFDMSwingTable23A[OFDM_index[1]]); OFDMSwingTable23A[OFDM_index[1]]);
PHY_SetBBReg(Adapter, PHY_SetBBReg(Adapter,
rOFDM0_XDTxAFE, rOFDM0_XDTxAFE,
...@@ -386,36 +388,37 @@ static u8 _PHY_PathA_IQK(struct rtw_adapter *pAdapter, bool configPathB) ...@@ -386,36 +388,37 @@ static u8 _PHY_PathA_IQK(struct rtw_adapter *pAdapter, bool configPathB)
struct hal_data_8723a *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8723a *pHalData = GET_HAL_DATA(pAdapter);
/* path-A IQK setting */ /* path-A IQK setting */
PHY_SetBBReg(pAdapter, rTx_IQK_Tone_A, bMaskDWord, 0x10008c1f); rtl8723au_write32(pAdapter, rTx_IQK_Tone_A, 0x10008c1f);
PHY_SetBBReg(pAdapter, rRx_IQK_Tone_A, bMaskDWord, 0x10008c1f); rtl8723au_write32(pAdapter, rRx_IQK_Tone_A, 0x10008c1f);
PHY_SetBBReg(pAdapter, rTx_IQK_PI_A, bMaskDWord, 0x82140102); rtl8723au_write32(pAdapter, rTx_IQK_PI_A, 0x82140102);
PHY_SetBBReg(pAdapter, rRx_IQK_PI_A, bMaskDWord, configPathB ? 0x28160202 : rtl8723au_write32(pAdapter, rRx_IQK_PI_A, configPathB ? 0x28160202 :
IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)?0x28160202:0x28160502); IS_81xxC_VENDOR_UMC_B_CUT(pHalData->VersionID)?0x28160202:0x28160502);
/* path-B IQK setting */ /* path-B IQK setting */
if (configPathB) { if (configPathB) {
PHY_SetBBReg(pAdapter, rTx_IQK_Tone_B, bMaskDWord, 0x10008c22); rtl8723au_write32(pAdapter, rTx_IQK_Tone_B, 0x10008c22);
PHY_SetBBReg(pAdapter, rRx_IQK_Tone_B, bMaskDWord, 0x10008c22); rtl8723au_write32(pAdapter, rRx_IQK_Tone_B, 0x10008c22);
PHY_SetBBReg(pAdapter, rTx_IQK_PI_B, bMaskDWord, 0x82140102); rtl8723au_write32(pAdapter, rTx_IQK_PI_B, 0x82140102);
PHY_SetBBReg(pAdapter, rRx_IQK_PI_B, bMaskDWord, 0x28160202); rtl8723au_write32(pAdapter, rRx_IQK_PI_B, 0x28160202);
} }
/* LO calibration setting */ /* LO calibration setting */
PHY_SetBBReg(pAdapter, rIQK_AGC_Rsp, bMaskDWord, 0x001028d1); rtl8723au_write32(pAdapter, rIQK_AGC_Rsp, 0x001028d1);
/* One shot, path A LOK & IQK */ /* One shot, path A LOK & IQK */
PHY_SetBBReg(pAdapter, rIQK_AGC_Pts, bMaskDWord, 0xf9000000); rtl8723au_write32(pAdapter, rIQK_AGC_Pts, 0xf9000000);
PHY_SetBBReg(pAdapter, rIQK_AGC_Pts, bMaskDWord, 0xf8000000); rtl8723au_write32(pAdapter, rIQK_AGC_Pts, 0xf8000000);
/* delay x ms */ /* delay x ms */
udelay(IQK_DELAY_TIME*1000);/* PlatformStallExecution(IQK_DELAY_TIME*1000); */ /* PlatformStallExecution(IQK_DELAY_TIME*1000); */
udelay(IQK_DELAY_TIME*1000);
/* Check failed */ /* Check failed */
regEAC = PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEAC = rtl8723au_read32(pAdapter, rRx_Power_After_IQK_A_2);
regE94 = PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord); regE94 = rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_A);
regE9C = PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord); regE9C = rtl8723au_read32(pAdapter, rTx_Power_After_IQK_A);
regEA4 = PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_A_2, bMaskDWord); regEA4 = rtl8723au_read32(pAdapter, rRx_Power_Before_IQK_A_2);
if (!(regEAC & BIT(28)) && if (!(regEAC & BIT(28)) &&
(((regE94 & 0x03FF0000)>>16) != 0x142) && (((regE94 & 0x03FF0000)>>16) != 0x142) &&
...@@ -439,18 +442,18 @@ static u8 _PHY_PathB_IQK(struct rtw_adapter *pAdapter) ...@@ -439,18 +442,18 @@ static u8 _PHY_PathB_IQK(struct rtw_adapter *pAdapter)
u8 result = 0x00; u8 result = 0x00;
/* One shot, path B LOK & IQK */ /* One shot, path B LOK & IQK */
PHY_SetBBReg(pAdapter, rIQK_AGC_Cont, bMaskDWord, 0x00000002); rtl8723au_write32(pAdapter, rIQK_AGC_Cont, 0x00000002);
PHY_SetBBReg(pAdapter, rIQK_AGC_Cont, bMaskDWord, 0x00000000); rtl8723au_write32(pAdapter, rIQK_AGC_Cont, 0x00000000);
/* delay x ms */ /* delay x ms */
udelay(IQK_DELAY_TIME*1000); udelay(IQK_DELAY_TIME*1000);
/* Check failed */ /* Check failed */
regEAC = PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord); regEAC = rtl8723au_read32(pAdapter, rRx_Power_After_IQK_A_2);
regEB4 = PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord); regEB4 = rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_B);
regEBC = PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord); regEBC = rtl8723au_read32(pAdapter, rTx_Power_After_IQK_B);
regEC4 = PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_B_2, bMaskDWord); regEC4 = rtl8723au_read32(pAdapter, rRx_Power_Before_IQK_B_2);
regECC = PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_B_2, bMaskDWord); regECC = rtl8723au_read32(pAdapter, rRx_Power_After_IQK_B_2);
if (!(regEAC & BIT(31)) && if (!(regEAC & BIT(31)) &&
(((regEB4 & 0x03FF0000)>>16) != 0x142) && (((regEB4 & 0x03FF0000)>>16) != 0x142) &&
...@@ -483,22 +486,27 @@ static void _PHY_PathAFillIQKMatrix(struct rtw_adapter *pAdapter, ...@@ -483,22 +486,27 @@ static void _PHY_PathAFillIQKMatrix(struct rtw_adapter *pAdapter,
if (final_candidate == 0xFF) { if (final_candidate == 0xFF) {
return; return;
} else if (bIQKOK) { } else if (bIQKOK) {
Oldval_0 = (PHY_QueryBBReg(pAdapter, rOFDM0_XATxIQImbalance, bMaskDWord) >> 22) & 0x3FF; Oldval_0 = rtl8723au_read32(pAdapter, rOFDM0_XATxIQImbalance);
Oldval_0 = (Oldval_0 >> 22) & 0x3FF;
X = result[final_candidate][0]; X = result[final_candidate][0];
if ((X & 0x00000200) != 0) if ((X & 0x00000200) != 0)
X = X | 0xFFFFFC00; X = X | 0xFFFFFC00;
TX0_A = (X * Oldval_0) >> 8; TX0_A = (X * Oldval_0) >> 8;
PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x3FF, TX0_A); PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x3FF, TX0_A);
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(31), ((X * Oldval_0>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(31),
((X * Oldval_0>>7) & 0x1));
Y = result[final_candidate][1]; Y = result[final_candidate][1];
if ((Y & 0x00000200) != 0) if ((Y & 0x00000200) != 0)
Y = Y | 0xFFFFFC00; Y = Y | 0xFFFFFC00;
TX0_C = (Y * Oldval_0) >> 8; TX0_C = (Y * Oldval_0) >> 8;
PHY_SetBBReg(pAdapter, rOFDM0_XCTxAFE, 0xF0000000, ((TX0_C&0x3C0)>>6)); PHY_SetBBReg(pAdapter, rOFDM0_XCTxAFE, 0xF0000000,
PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x003F0000, (TX0_C&0x3F)); ((TX0_C&0x3C0)>>6));
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(29), ((Y * Oldval_0>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_XATxIQImbalance, 0x003F0000,
(TX0_C&0x3F));
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(29),
((Y * Oldval_0>>7) & 0x1));
if (bTxOnly) { if (bTxOnly) {
DBG_8723A("_PHY_PathAFillIQKMatrix only Tx OK\n"); DBG_8723A("_PHY_PathAFillIQKMatrix only Tx OK\n");
...@@ -526,22 +534,27 @@ static void _PHY_PathBFillIQKMatrix(struct rtw_adapter *pAdapter, bool bIQKOK, i ...@@ -526,22 +534,27 @@ static void _PHY_PathBFillIQKMatrix(struct rtw_adapter *pAdapter, bool bIQKOK, i
if (final_candidate == 0xFF) { if (final_candidate == 0xFF) {
return; return;
} else if (bIQKOK) { } else if (bIQKOK) {
Oldval_1 = (PHY_QueryBBReg(pAdapter, rOFDM0_XBTxIQImbalance, bMaskDWord) >> 22) & 0x3FF; Oldval_1 = rtl8723au_read32(pAdapter, rOFDM0_XBTxIQImbalance);
Oldval_1 = (Oldval_1 >> 22) & 0x3FF;
X = result[final_candidate][4]; X = result[final_candidate][4];
if ((X & 0x00000200) != 0) if ((X & 0x00000200) != 0)
X = X | 0xFFFFFC00; X = X | 0xFFFFFC00;
TX1_A = (X * Oldval_1) >> 8; TX1_A = (X * Oldval_1) >> 8;
PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x3FF, TX1_A); PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x3FF, TX1_A);
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(27), ((X * Oldval_1>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(27),
((X * Oldval_1 >> 7) & 0x1));
Y = result[final_candidate][5]; Y = result[final_candidate][5];
if ((Y & 0x00000200) != 0) if ((Y & 0x00000200) != 0)
Y = Y | 0xFFFFFC00; Y = Y | 0xFFFFFC00;
TX1_C = (Y * Oldval_1) >> 8; TX1_C = (Y * Oldval_1) >> 8;
PHY_SetBBReg(pAdapter, rOFDM0_XDTxAFE, 0xF0000000, ((TX1_C&0x3C0)>>6)); PHY_SetBBReg(pAdapter, rOFDM0_XDTxAFE, 0xF0000000,
PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x003F0000, (TX1_C&0x3F)); ((TX1_C & 0x3C0) >> 6));
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(25), ((Y * Oldval_1>>7) & 0x1)); PHY_SetBBReg(pAdapter, rOFDM0_XBTxIQImbalance, 0x003F0000,
(TX1_C & 0x3F));
PHY_SetBBReg(pAdapter, rOFDM0_ECCAThreshold, BIT(25),
((Y * Oldval_1 >> 7) & 0x1));
if (bTxOnly) if (bTxOnly)
return; return;
...@@ -562,11 +575,12 @@ static void _PHY_SaveADDARegisters(struct rtw_adapter *pAdapter, u32 *ADDAReg, u ...@@ -562,11 +575,12 @@ static void _PHY_SaveADDARegisters(struct rtw_adapter *pAdapter, u32 *ADDAReg, u
u32 i; u32 i;
for (i = 0 ; i < RegisterNum ; i++) { for (i = 0 ; i < RegisterNum ; i++) {
ADDABackup[i] = PHY_QueryBBReg(pAdapter, ADDAReg[i], bMaskDWord); ADDABackup[i] = rtl8723au_read32(pAdapter, ADDAReg[i]);
} }
} }
static void _PHY_SaveMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u32 *MACBackup) static void _PHY_SaveMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg,
u32 *MACBackup)
{ {
u32 i; u32 i;
...@@ -576,16 +590,19 @@ static void _PHY_SaveMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u32 ...@@ -576,16 +590,19 @@ static void _PHY_SaveMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u32
MACBackup[i] = rtl8723au_read32(pAdapter, MACReg[i]); MACBackup[i] = rtl8723au_read32(pAdapter, MACReg[i]);
} }
static void _PHY_ReloadADDARegisters(struct rtw_adapter *pAdapter, u32 *ADDAReg, u32 *ADDABackup, u32 RegiesterNum) static void _PHY_ReloadADDARegisters(struct rtw_adapter *pAdapter,
u32 *ADDAReg, u32 *ADDABackup,
u32 RegiesterNum)
{ {
u32 i; u32 i;
for (i = 0 ; i < RegiesterNum ; i++) { for (i = 0 ; i < RegiesterNum ; i++) {
PHY_SetBBReg(pAdapter, ADDAReg[i], bMaskDWord, ADDABackup[i]); rtl8723au_write32(pAdapter, ADDAReg[i], ADDABackup[i]);
} }
} }
static void _PHY_ReloadMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u32 *MACBackup) static void _PHY_ReloadMACRegisters(struct rtw_adapter *pAdapter,
u32 *MACReg, u32 *MACBackup)
{ {
u32 i; u32 i;
...@@ -595,7 +612,8 @@ static void _PHY_ReloadMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u ...@@ -595,7 +612,8 @@ static void _PHY_ReloadMACRegisters(struct rtw_adapter *pAdapter, u32 *MACReg, u
rtl8723au_write32(pAdapter, MACReg[i], MACBackup[i]); rtl8723au_write32(pAdapter, MACReg[i], MACBackup[i]);
} }
static void _PHY_PathADDAOn(struct rtw_adapter *pAdapter, u32 *ADDAReg, bool isPathAOn, bool is2T) static void _PHY_PathADDAOn(struct rtw_adapter *pAdapter, u32 *ADDAReg,
bool isPathAOn, bool is2T)
{ {
u32 pathOn; u32 pathOn;
u32 i; u32 i;
...@@ -603,16 +621,17 @@ static void _PHY_PathADDAOn(struct rtw_adapter *pAdapter, u32 *ADDAReg, bool isP ...@@ -603,16 +621,17 @@ static void _PHY_PathADDAOn(struct rtw_adapter *pAdapter, u32 *ADDAReg, bool isP
pathOn = isPathAOn ? 0x04db25a4 : 0x0b1b25a4; pathOn = isPathAOn ? 0x04db25a4 : 0x0b1b25a4;
if (!is2T) { if (!is2T) {
pathOn = 0x0bdb25a0; pathOn = 0x0bdb25a0;
PHY_SetBBReg(pAdapter, ADDAReg[0], bMaskDWord, 0x0b1b25a0); rtl8723au_write32(pAdapter, ADDAReg[0], 0x0b1b25a0);
} else { } else {
PHY_SetBBReg(pAdapter, ADDAReg[0], bMaskDWord, pathOn); rtl8723au_write32(pAdapter, ADDAReg[0], pathOn);
} }
for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++) for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++)
PHY_SetBBReg(pAdapter, ADDAReg[i], bMaskDWord, pathOn); rtl8723au_write32(pAdapter, ADDAReg[i], pathOn);
} }
static void _PHY_MACSettingCalibration(struct rtw_adapter *pAdapter, u32 *MACReg, u32 *MACBackup) static void _PHY_MACSettingCalibration(struct rtw_adapter *pAdapter,
u32 *MACReg, u32 *MACBackup)
{ {
u32 i = 0; u32 i = 0;
...@@ -627,9 +646,9 @@ static void _PHY_MACSettingCalibration(struct rtw_adapter *pAdapter, u32 *MACReg ...@@ -627,9 +646,9 @@ static void _PHY_MACSettingCalibration(struct rtw_adapter *pAdapter, u32 *MACReg
static void _PHY_PathAStandBy(struct rtw_adapter *pAdapter) static void _PHY_PathAStandBy(struct rtw_adapter *pAdapter)
{ {
PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x0); rtl8723au_write32(pAdapter, rFPGA0_IQK, 0x0);
PHY_SetBBReg(pAdapter, 0x840, bMaskDWord, 0x00010000); rtl8723au_write32(pAdapter, 0x840, 0x00010000);
PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x80800000); rtl8723au_write32(pAdapter, rFPGA0_IQK, 0x80800000);
} }
static void _PHY_PIModeSwitch(struct rtw_adapter *pAdapter, bool PIMode) static void _PHY_PIModeSwitch(struct rtw_adapter *pAdapter, bool PIMode)
...@@ -637,8 +656,8 @@ static void _PHY_PIModeSwitch(struct rtw_adapter *pAdapter, bool PIMode) ...@@ -637,8 +656,8 @@ static void _PHY_PIModeSwitch(struct rtw_adapter *pAdapter, bool PIMode)
u32 mode; u32 mode;
mode = PIMode ? 0x01000100 : 0x01000000; mode = PIMode ? 0x01000100 : 0x01000000;
PHY_SetBBReg(pAdapter, 0x820, bMaskDWord, mode); rtl8723au_write32(pAdapter, 0x820, mode);
PHY_SetBBReg(pAdapter, 0x828, bMaskDWord, mode); rtl8723au_write32(pAdapter, 0x828, mode);
} }
/* /*
...@@ -735,7 +754,7 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t ...@@ -735,7 +754,7 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t
u32 bbvalue; u32 bbvalue;
if (t == 0) { if (t == 0) {
bbvalue = PHY_QueryBBReg(pAdapter, rFPGA0_RFMOD, bMaskDWord); bbvalue = rtl8723au_read32(pAdapter, rFPGA0_RFMOD);
/* Save ADDA parameters, turn Path A ADDA on */ /* Save ADDA parameters, turn Path A ADDA on */
_PHY_SaveADDARegisters(pAdapter, ADDA_REG, pdmpriv->ADDA_backup, IQK_ADDA_REG_NUM); _PHY_SaveADDARegisters(pAdapter, ADDA_REG, pdmpriv->ADDA_backup, IQK_ADDA_REG_NUM);
...@@ -755,48 +774,50 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t ...@@ -755,48 +774,50 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t
} }
PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, BIT(24), 0x00); PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, BIT(24), 0x00);
PHY_SetBBReg(pAdapter, rOFDM0_TRxPathEnable, bMaskDWord, 0x03a05600); rtl8723au_write32(pAdapter, rOFDM0_TRxPathEnable, 0x03a05600);
PHY_SetBBReg(pAdapter, rOFDM0_TRMuxPar, bMaskDWord, 0x000800e4); rtl8723au_write32(pAdapter, rOFDM0_TRMuxPar, 0x000800e4);
PHY_SetBBReg(pAdapter, rFPGA0_XCD_RFInterfaceSW, bMaskDWord, 0x22204000); rtl8723au_write32(pAdapter, rFPGA0_XCD_RFInterfaceSW, 0x22204000);
PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT(10), 0x01); PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT(10), 0x01);
PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT(26), 0x01); PHY_SetBBReg(pAdapter, rFPGA0_XAB_RFInterfaceSW, BIT(26), 0x01);
PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, BIT(10), 0x00); PHY_SetBBReg(pAdapter, rFPGA0_XA_RFInterfaceOE, BIT(10), 0x00);
PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT(10), 0x00); PHY_SetBBReg(pAdapter, rFPGA0_XB_RFInterfaceOE, BIT(10), 0x00);
if (is2T) { if (is2T) {
PHY_SetBBReg(pAdapter, rFPGA0_XA_LSSIParameter, bMaskDWord, 0x00010000); rtl8723au_write32(pAdapter,
PHY_SetBBReg(pAdapter, rFPGA0_XB_LSSIParameter, bMaskDWord, 0x00010000); rFPGA0_XA_LSSIParameter, 0x00010000);
rtl8723au_write32(pAdapter,
rFPGA0_XB_LSSIParameter, 0x00010000);
} }
/* MAC settings */ /* MAC settings */
_PHY_MACSettingCalibration(pAdapter, IQK_MAC_REG, pdmpriv->IQK_MAC_backup); _PHY_MACSettingCalibration(pAdapter, IQK_MAC_REG, pdmpriv->IQK_MAC_backup);
/* Page B init */ /* Page B init */
PHY_SetBBReg(pAdapter, rConfig_AntA, bMaskDWord, 0x00080000); rtl8723au_write32(pAdapter, rConfig_AntA, 0x00080000);
if (is2T) if (is2T)
PHY_SetBBReg(pAdapter, rConfig_AntB, bMaskDWord, 0x00080000); rtl8723au_write32(pAdapter, rConfig_AntB, 0x00080000);
/* IQ calibration setting */ /* IQ calibration setting */
PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0x80800000); rtl8723au_write32(pAdapter, rFPGA0_IQK, 0x80800000);
PHY_SetBBReg(pAdapter, rTx_IQK, bMaskDWord, 0x01007c00); rtl8723au_write32(pAdapter, rTx_IQK, 0x01007c00);
PHY_SetBBReg(pAdapter, rRx_IQK, bMaskDWord, 0x01004800); rtl8723au_write32(pAdapter, rRx_IQK, 0x01004800);
for (i = 0 ; i < retryCount ; i++) { for (i = 0 ; i < retryCount ; i++) {
PathAOK = _PHY_PathA_IQK(pAdapter, is2T); PathAOK = _PHY_PathA_IQK(pAdapter, is2T);
if (PathAOK == 0x03) { if (PathAOK == 0x03) {
DBG_8723A("Path A IQK Success!!\n"); DBG_8723A("Path A IQK Success!!\n");
result[t][0] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; result[t][0] = (rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_A)&0x3FF0000)>>16;
result[t][1] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; result[t][1] = (rtl8723au_read32(pAdapter, rTx_Power_After_IQK_A)&0x3FF0000)>>16;
result[t][2] = (PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_A_2, bMaskDWord)&0x3FF0000)>>16; result[t][2] = (rtl8723au_read32(pAdapter, rRx_Power_Before_IQK_A_2)&0x3FF0000)>>16;
result[t][3] = (PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_A_2, bMaskDWord)&0x3FF0000)>>16; result[t][3] = (rtl8723au_read32(pAdapter, rRx_Power_After_IQK_A_2)&0x3FF0000)>>16;
break; break;
} else if (i == (retryCount-1) && PathAOK == 0x01) { } else if (i == (retryCount-1) && PathAOK == 0x01) {
/* Tx IQK OK */ /* Tx IQK OK */
DBG_8723A("Path A IQK Only Tx Success!!\n"); DBG_8723A("Path A IQK Only Tx Success!!\n");
result[t][0] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_A, bMaskDWord)&0x3FF0000)>>16; result[t][0] = (rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_A)&0x3FF0000)>>16;
result[t][1] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_A, bMaskDWord)&0x3FF0000)>>16; result[t][1] = (rtl8723au_read32(pAdapter, rTx_Power_After_IQK_A)&0x3FF0000)>>16;
} }
} }
...@@ -814,16 +835,16 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t ...@@ -814,16 +835,16 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t
PathBOK = _PHY_PathB_IQK(pAdapter); PathBOK = _PHY_PathB_IQK(pAdapter);
if (PathBOK == 0x03) { if (PathBOK == 0x03) {
DBG_8723A("Path B IQK Success!!\n"); DBG_8723A("Path B IQK Success!!\n");
result[t][4] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord)&0x3FF0000)>>16; result[t][4] = (rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_B)&0x3FF0000)>>16;
result[t][5] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord)&0x3FF0000)>>16; result[t][5] = (rtl8723au_read32(pAdapter, rTx_Power_After_IQK_B)&0x3FF0000)>>16;
result[t][6] = (PHY_QueryBBReg(pAdapter, rRx_Power_Before_IQK_B_2, bMaskDWord)&0x3FF0000)>>16; result[t][6] = (rtl8723au_read32(pAdapter, rRx_Power_Before_IQK_B_2)&0x3FF0000)>>16;
result[t][7] = (PHY_QueryBBReg(pAdapter, rRx_Power_After_IQK_B_2, bMaskDWord)&0x3FF0000)>>16; result[t][7] = (rtl8723au_read32(pAdapter, rRx_Power_After_IQK_B_2)&0x3FF0000)>>16;
break; break;
} else if (i == (retryCount - 1) && PathBOK == 0x01) { } else if (i == (retryCount - 1) && PathBOK == 0x01) {
/* Tx IQK OK */ /* Tx IQK OK */
DBG_8723A("Path B Only Tx IQK Success!!\n"); DBG_8723A("Path B Only Tx IQK Success!!\n");
result[t][4] = (PHY_QueryBBReg(pAdapter, rTx_Power_Before_IQK_B, bMaskDWord)&0x3FF0000)>>16; result[t][4] = (rtl8723au_read32(pAdapter, rTx_Power_Before_IQK_B)&0x3FF0000)>>16;
result[t][5] = (PHY_QueryBBReg(pAdapter, rTx_Power_After_IQK_B, bMaskDWord)&0x3FF0000)>>16; result[t][5] = (rtl8723au_read32(pAdapter, rTx_Power_After_IQK_B)&0x3FF0000)>>16;
} }
} }
...@@ -833,7 +854,7 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t ...@@ -833,7 +854,7 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t
} }
/* Back to BB mode, load original value */ /* Back to BB mode, load original value */
PHY_SetBBReg(pAdapter, rFPGA0_IQK, bMaskDWord, 0); rtl8723au_write32(pAdapter, rFPGA0_IQK, 0);
if (t != 0) { if (t != 0) {
if (!pdmpriv->bRfPiEnable) { if (!pdmpriv->bRfPiEnable) {
...@@ -851,14 +872,16 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t ...@@ -851,14 +872,16 @@ static void _PHY_IQCalibrate(struct rtw_adapter *pAdapter, int result[][8], u8 t
_PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup, IQK_BB_REG_NUM); _PHY_ReloadADDARegisters(pAdapter, IQK_BB_REG_92C, pdmpriv->IQK_BB_backup, IQK_BB_REG_NUM);
/* Restore RX initial gain */ /* Restore RX initial gain */
PHY_SetBBReg(pAdapter, rFPGA0_XA_LSSIParameter, bMaskDWord, 0x00032ed3); rtl8723au_write32(pAdapter,
rFPGA0_XA_LSSIParameter, 0x00032ed3);
if (is2T) { if (is2T) {
PHY_SetBBReg(pAdapter, rFPGA0_XB_LSSIParameter, bMaskDWord, 0x00032ed3); rtl8723au_write32(pAdapter,
rFPGA0_XB_LSSIParameter, 0x00032ed3);
} }
/* load 0xe30 IQC default value */ /* load 0xe30 IQC default value */
PHY_SetBBReg(pAdapter, rTx_IQK_Tone_A, bMaskDWord, 0x01008c00); rtl8723au_write32(pAdapter, rTx_IQK_Tone_A, 0x01008c00);
PHY_SetBBReg(pAdapter, rRx_IQK_Tone_A, bMaskDWord, 0x01008c00); rtl8723au_write32(pAdapter, rRx_IQK_Tone_A, 0x01008c00);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7