From nobody Mon Feb 9 05:52:58 2026 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C06534A3BF for ; Sun, 8 Feb 2026 11:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770548509; cv=none; b=AnBAvTB7Y9tOvldYDLeSeUcUOtlrfHbLvjcx2px3O0XFVQcVqlaYgMBAARIHZPC/tnFts4fBZlAkamqasSfYjqnHrhPwYCos8VtAGD/fs5mBP5PNBnoLcCX+i0lQ149ET5GP4gq3fz8WELLBK9xZDkYtSuDjOpr40py6+eeD+Ts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770548509; c=relaxed/simple; bh=RQWG1EwqqPe3dowcnxI5ye/y1MFanHEHO63bXRJrZv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mQS5CriCAB0Mu64VtpUpOki5eHdoxZK9MxiGMi2hAWkXsS4Svlj+uErrPo13k9BkWnC4YaMNKdZ3d0P3mK5mji0JuKZsiBS7N5AQNiIEsSlz4XH85wejNB/ZzQxky0A0CBX7toUCRz01jZe2lSP3KCpGtl+ukbMhWhhG9RTquZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=BT+eymSm; arc=none smtp.client-ip=95.215.58.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="BT+eymSm" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770548505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=15g/Itv85hRbyQPlzRvPLtxkfwTGszipOx5aENjCTlM=; b=BT+eymSmDco21iH2A+PjmcPbI8ybKchjb1t3T6lPMTCilJGlSVkA/XsnIO01zmHUVHk76H U1nrCUQwmLk1DfQ2cQIE8Ac5IWOobHLtz85ddX+LZNgNrHT0jfhVfCIR49VRbD3aO4Q85m xFAXq+N+be+POehxrdP8qnzobjKbR44= From: luka.gejak@linux.dev To: Greg Kroah-Hartman Cc: Dan Carpenter , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Luka Gejak Subject: [PATCH v3 10/22] staging: rtl8723bs: hal: fix line lengths in HalPhyRf_8723B.c Date: Sun, 8 Feb 2026 12:00:59 +0100 Message-ID: <20260208110111.46642-11-luka.gejak@linux.dev> In-Reply-To: <20260208110111.46642-1-luka.gejak@linux.dev> References: <20260208110111.46642-1-luka.gejak@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Luka Gejak Break long lines exceeding 100 characters to comply with kernel coding style. Signed-off-by: Luka Gejak --- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 176 ++++++++++++------ 1 file changed, 124 insertions(+), 52 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/stagi= ng/rtl8723bs/hal/HalPhyRf_8723B.c index 9df3274c1048..567a23627db9 100644 --- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c @@ -101,13 +101,15 @@ static void setIqkMatrix_8723B( } else { switch (RFPath) { case RF_PATH_A: - PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord, OFDM= SwingTable_New[OFDM_index]); + PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, + bMaskDWord, OFDMSwingTable_New[OFDM_index]); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XCTxAFE, bMaskH4Bits, 0x00); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT24, 0x00); break; =20 case RF_PATH_B: - PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord, OFDM= SwingTable_New[OFDM_index]); + PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, + bMaskDWord, OFDMSwingTable_New[OFDM_index]); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskH4Bits, 0x00); PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT28, 0x00); break; @@ -957,20 +959,25 @@ static void _PHY_PathAFillIQKMatrix8723B( TX0_C =3D (Y * Oldval_0) >> 8; PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XCTxAFE, 0xF0000000, ((TX0_C&0x3C0= )>>6)); pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC94][KEY] =3D rOFDM0_XCTxAF= E; - pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC94][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XCTxAFE, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC94][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XCTxAFE, bMaskDWord); =20 PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, 0x003F0000, (TX0_= C&0x3F)); pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC80][KEY] =3D rOFDM0_XATxIQ= Imbalance; - pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC80][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC80][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XATxIQImbalance, bMaskDWord); =20 PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT(29), ((Y*Oldval= _0>>7) & 0x1)); pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC4C][KEY] =3D rOFDM0_ECCATh= reshold; - pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC4C][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC4C][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord); =20 if (bTxOnly) { /* <20130226, Kordan> Saving RxIQC, otherwise not initialized. */ pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][KEY] =3D rOFDM0_RxIQE= xtAnta; - pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][VAL] =3D 0xfffffff & = PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); + pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][VAL] =3D + 0xfffffff & PHY_QueryBBReg(pDM_Odm->Adapter, + rOFDM0_RxIQExtAnta, bMaskDWord); pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][KEY] =3D rOFDM0_XARxI= QImbalance; /* pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] =3D PHY_Query= BBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] =3D 0x40000100; @@ -984,12 +991,14 @@ static void _PHY_PathAFillIQKMatrix8723B( reg =3D result[final_candidate][3] & 0x3F; PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, 0xFC00, reg); pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][KEY] =3D rOFDM0_XARxIQ= Imbalance; - pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); + pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); =20 reg =3D (result[final_candidate][3] >> 6) & 0xF; PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, 0xF0000000, reg); pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][KEY] =3D rOFDM0_RxIQEx= tAnta; - pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); + pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xCA0][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); =20 } } @@ -1035,22 +1044,27 @@ static void _PHY_PathBFillIQKMatrix8723B( /* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][KEY] =3D rOFDM0_XDT= xAFE; */ /* pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC9C][VAL] =3D PHY_QueryB= BReg(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord); */ pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC94][KEY] =3D rOFDM0_XCTxAF= E; - pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC94][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC94][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XDTxAFE, bMaskDWord); =20 PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, 0x003F0000, (TX1_= C&0x3F)); pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][KEY] =3D rOFDM0_XATxIQ= Imbalance; - pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBTxIQImbalance, bMaskDWord); =20 PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, BIT(25), ((Y*Oldval= _1>>7) & 0x1)); pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC4C][KEY] =3D rOFDM0_ECCATh= reshold; - pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC4C][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord); + pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC4C][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_ECCAThreshold, bMaskDWord); =20 if (bTxOnly) { pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][KEY] =3D rOFDM0_XARxI= QImbalance; /* pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] =3D PHY_Query= BBReg(pDM_Odm->Adapter, rOFDM0_XARxIQImbalance, bMaskDWord); */ pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] =3D 0x40000100; pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][KEY] =3D rOFDM0_RxIQE= xtAnta; - pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][VAL] =3D 0x0fffffff &= PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); + pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][VAL] =3D + 0x0fffffff & PHY_QueryBBReg(pDM_Odm->Adapter, + rOFDM0_RxIQExtAnta, bMaskDWord); return; } =20 @@ -1060,12 +1074,15 @@ static void _PHY_PathBFillIQKMatrix8723B( reg =3D result[final_candidate][7] & 0x3F; PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBRxIQImbalance, 0xFC00, reg); pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][KEY] =3D rOFDM0_XARxIQ= Imbalance; - pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] =3D PHY_QueryBBRe= g(pDM_Odm->Adapter, rOFDM0_XBRxIQImbalance, bMaskDWord); + pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xC14][VAL] =3D + PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBRxIQImbalance, bMaskDWord); =20 reg =3D (result[final_candidate][7] >> 6) & 0xF; /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_AGCRSSITable, 0x0000F000, reg);= */ pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][KEY] =3D rOFDM0_RxIQEx= tAnta; - pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][VAL] =3D (reg << 28)|(= PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord)&0x0fffffff= ); + pRFCalibrateInfo->RxIQC_8723B[PATH_S0][IDX_0xCA0][VAL] =3D (reg << 28) | + (PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord) & + 0x0fffffff); } } =20 @@ -1078,7 +1095,6 @@ void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32= RFpath) { =20 struct odm_rf_cal_t *pRFCalibrateInfo =3D &pDM_Odm->RFCalibrateInfo; - u8 path; =20 if ( (pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] !=3D 0x0) && @@ -1086,18 +1102,31 @@ void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u= 32 RFpath) (pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC80][VAL] !=3D 0x0) && (pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] !=3D 0x0) ) { - if (RFpath) - path =3D PATH_S0; - else - path =3D PATH_S1; - - /* TX IQC */ - PHY_SetBBReg(pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0= xC94][KEY], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC94][VAL]= ); - PHY_SetBBReg(pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0= xC80][KEY], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC80][VAL]= ); - PHY_SetBBReg(pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0= xC4C][KEY], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC4C][VAL]= ); - /* RX IQC */ - PHY_SetBBReg(pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0= xC14][KEY], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xC14][VAL]= ); - PHY_SetBBReg(pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0= xCA0][KEY], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xCA0][VAL]= ); + if (RFpath) { /* S1: RFpath =3D 0, S0:RFpath =3D 1 */ + u32 (*tx)[2] =3D pRFCalibrateInfo->TxIQC_8723B[PATH_S0]; + u32 (*rx)[2] =3D pRFCalibrateInfo->RxIQC_8723B[PATH_S0]; + struct adapter *a =3D pDM_Odm->Adapter; + + /* S0 TX IQC */ + PHY_SetBBReg(a, tx[IDX_0xC94][KEY], bMaskDWord, tx[IDX_0xC94][VAL]); + PHY_SetBBReg(a, tx[IDX_0xC80][KEY], bMaskDWord, tx[IDX_0xC80][VAL]); + PHY_SetBBReg(a, tx[IDX_0xC4C][KEY], bMaskDWord, tx[IDX_0xC4C][VAL]); + /* S0 RX IQC */ + PHY_SetBBReg(a, rx[IDX_0xC14][KEY], bMaskDWord, rx[IDX_0xC14][VAL]); + PHY_SetBBReg(a, rx[IDX_0xCA0][KEY], bMaskDWord, rx[IDX_0xCA0][VAL]); + } else { + u32 (*tx)[2] =3D pRFCalibrateInfo->TxIQC_8723B[PATH_S1]; + u32 (*rx)[2] =3D pRFCalibrateInfo->RxIQC_8723B[PATH_S1]; + struct adapter *a =3D pDM_Odm->Adapter; + + /* S1 TX IQC */ + PHY_SetBBReg(a, tx[IDX_0xC94][KEY], bMaskDWord, tx[IDX_0xC94][VAL]); + PHY_SetBBReg(a, tx[IDX_0xC80][KEY], bMaskDWord, tx[IDX_0xC80][VAL]); + PHY_SetBBReg(a, tx[IDX_0xC4C][KEY], bMaskDWord, tx[IDX_0xC4C][VAL]); + /* S1 RX IQC */ + PHY_SetBBReg(a, rx[IDX_0xC14][KEY], bMaskDWord, rx[IDX_0xC14][VAL]); + PHY_SetBBReg(a, rx[IDX_0xCA0][KEY], bMaskDWord, rx[IDX_0xCA0][VAL]); + } } } =20 @@ -1356,11 +1385,15 @@ static void phy_IQCalibrate_8723B( /* u32 bbvalue; */ =20 if (t =3D=3D 0) { + struct odm_rf_cal_t *cal =3D &pDM_Odm->RFCalibrateInfo; =20 /* Save ADDA parameters, turn Path A ADDA on */ - _PHY_SaveADDARegisters8723B(padapter, ADDA_REG, pDM_Odm->RFCalibrateInfo= .ADDA_backup, IQK_ADDA_REG_NUM); - _PHY_SaveMACRegisters8723B(padapter, IQK_MAC_REG, pDM_Odm->RFCalibrateIn= fo.IQK_MAC_backup); - _PHY_SaveADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalibra= teInfo.IQK_BB_backup, IQK_BB_REG_NUM); + _PHY_SaveADDARegisters8723B(padapter, ADDA_REG, + cal->ADDA_backup, IQK_ADDA_REG_NUM); + _PHY_SaveMACRegisters8723B(padapter, IQK_MAC_REG, + cal->IQK_MAC_backup); + _PHY_SaveADDARegisters8723B(padapter, IQK_BB_REG_92C, + cal->IQK_BB_backup, IQK_BB_REG_NUM); } =20 _PHY_PathADDAOn8723B(padapter, ADDA_REG, is2T); @@ -1403,12 +1436,20 @@ static void phy_IQCalibrate_8723B( PathAOK =3D phy_PathA_IQK_8723B(padapter, is2T, RF_Path); /* if (PathAOK =3D=3D 0x03) { */ if (PathAOK =3D=3D 0x01) { + u32 val; + /* Path A Tx IQK Success */ PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes, 0x000000); - pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_A] =3D PHY_QueryRFReg(pDM_Odm->A= dapter, RF_PATH_A, 0x8, bRFRegOffsetMask); - - result[t][0] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQ= K_A, bMaskDWord)&0x3FF0000)>>16; - result[t][1] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK= _A, bMaskDWord)&0x3FF0000)>>16; + pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_A] =3D + PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, 0x8, + bRFRegOffsetMask); + + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rTx_Power_Before_IQK_A, bMaskDWord); + result[t][0] =3D (val & 0x3FF0000) >> 16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rTx_Power_After_IQK_A, bMaskDWord); + result[t][1] =3D (val & 0x3FF0000) >> 16; break; } } @@ -1417,10 +1458,15 @@ static void phy_IQCalibrate_8723B( for (i =3D 0 ; i < retryCount ; i++) { PathAOK =3D phy_PathA_RxIQK8723B(padapter, is2T, RF_Path); if (PathAOK =3D=3D 0x03) { + u32 val; /* result[t][0] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before= _IQK_A, bMaskDWord)&0x3FF0000)>>16; */ /* result[t][1] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_= IQK_A, bMaskDWord)&0x3FF0000)>>16; */ - result[t][2] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQ= K_A_2, bMaskDWord)&0x3FF0000)>>16; - result[t][3] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_After_IQK= _A_2, bMaskDWord)&0x3FF0000)>>16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rRx_Power_Before_IQK_A_2, bMaskDWord); + result[t][2] =3D (val & 0x3FF0000) >> 16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rRx_Power_After_IQK_A_2, bMaskDWord); + result[t][3] =3D (val & 0x3FF0000) >> 16; break; } } @@ -1435,12 +1481,20 @@ static void phy_IQCalibrate_8723B( for (i =3D 0 ; i < retryCount ; i++) { PathBOK =3D phy_PathB_IQK_8723B(padapter); if (PathBOK =3D=3D 0x01) { + u32 val; + /* Path B Tx IQK Success */ PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes, 0x000000); - pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_B] =3D PHY_QueryRFReg(pDM_Odm->= Adapter, RF_PATH_B, 0x8, bRFRegOffsetMask); - - result[t][4] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before_IQ= K_A, bMaskDWord)&0x3FF0000)>>16; - result[t][5] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_IQK= _A, bMaskDWord)&0x3FF0000)>>16; + pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_B] =3D + PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_B, + 0x8, bRFRegOffsetMask); + + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rTx_Power_Before_IQK_A, bMaskDWord); + result[t][4] =3D (val & 0x3FF0000) >> 16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rTx_Power_After_IQK_A, bMaskDWord); + result[t][5] =3D (val & 0x3FF0000) >> 16; break; } } @@ -1449,10 +1503,15 @@ static void phy_IQCalibrate_8723B( for (i =3D 0 ; i < retryCount ; i++) { PathBOK =3D phy_PathB_RxIQK8723B(padapter, is2T); if (PathBOK =3D=3D 0x03) { + u32 val; /* result[t][0] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_Before= _IQK_A, bMaskDWord)&0x3FF0000)>>16; */ /* result[t][1] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rTx_Power_After_= IQK_A, bMaskDWord)&0x3FF0000)>>16; */ - result[t][6] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_Before_IQ= K_A_2, bMaskDWord)&0x3FF0000)>>16; - result[t][7] =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rRx_Power_After_IQK= _A_2, bMaskDWord)&0x3FF0000)>>16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rRx_Power_Before_IQK_A_2, bMaskDWord); + result[t][6] =3D (val & 0x3FF0000) >> 16; + val =3D PHY_QueryBBReg(pDM_Odm->Adapter, + rRx_Power_After_IQK_A_2, bMaskDWord); + result[t][7] =3D (val & 0x3FF0000) >> 16; break; } } @@ -1464,13 +1523,18 @@ static void phy_IQCalibrate_8723B( PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_IQK, bMaskH3Bytes, 0); =20 if (t !=3D 0) { + struct odm_rf_cal_t *cal =3D &pDM_Odm->RFCalibrateInfo; + /* Reload ADDA power saving parameters */ - _PHY_ReloadADDARegisters8723B(padapter, ADDA_REG, pDM_Odm->RFCalibrateIn= fo.ADDA_backup, IQK_ADDA_REG_NUM); + _PHY_ReloadADDARegisters8723B(padapter, ADDA_REG, + cal->ADDA_backup, IQK_ADDA_REG_NUM); =20 /* Reload MAC parameters */ - _PHY_ReloadMACRegisters8723B(padapter, IQK_MAC_REG, pDM_Odm->RFCalibrate= Info.IQK_MAC_backup); + _PHY_ReloadMACRegisters8723B(padapter, IQK_MAC_REG, + cal->IQK_MAC_backup); =20 - _PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalib= rateInfo.IQK_BB_backup, IQK_BB_REG_NUM); + _PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, + cal->IQK_BB_backup, IQK_BB_REG_NUM); =20 /* Reload RF path */ /* PHY_SetBBReg(pDM_Odm->Adapter, 0x948, bMaskDWord, Path_SEL_BB); */ @@ -1609,8 +1673,10 @@ void PHY_IQCalibrate_8723B( u32 offset, data; u8 path, bResult =3D SUCCESS; struct odm_rf_cal_t *pRFCalibrateInfo =3D &pDM_Odm->RFCalibrateInfo; + struct adapter *a =3D pDM_Odm->Adapter; =20 - path =3D (PHY_QueryBBReg(pDM_Odm->Adapter, rS0S1_PathSwitch, bMaskByte0)= =3D=3D 0x00) ? RF_PATH_A : RF_PATH_B; + path =3D (PHY_QueryBBReg(a, rS0S1_PathSwitch, bMaskByte0) =3D=3D 0x00) ? + RF_PATH_A : RF_PATH_B; =20 /* Restore TX IQK */ for (i =3D 0; i < 3; ++i) { @@ -1620,7 +1686,7 @@ void PHY_IQCalibrate_8723B( bResult =3D FAIL; break; } - PHY_SetBBReg(pDM_Odm->Adapter, offset, bMaskDWord, data); + PHY_SetBBReg(a, offset, bMaskDWord, data); } =20 /* Restore RX IQK */ @@ -1631,14 +1697,16 @@ void PHY_IQCalibrate_8723B( bResult =3D FAIL; break; } - PHY_SetBBReg(pDM_Odm->Adapter, offset, bMaskDWord, data); + PHY_SetBBReg(a, offset, bMaskDWord, data); } =20 if (pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_A] =3D=3D 0) { bResult =3D FAIL; } else { - PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_TXM_IDAC, bRFRegOffsetMask= , pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_A]); - PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_B, RF_TXM_IDAC, bRFRegOffsetMask= , pDM_Odm->RFCalibrateInfo.TxLOK[RF_PATH_B]); + PHY_SetRFReg(a, RF_PATH_A, RF_TXM_IDAC, bRFRegOffsetMask, + pRFCalibrateInfo->TxLOK[RF_PATH_A]); + PHY_SetRFReg(a, RF_PATH_B, RF_TXM_IDAC, bRFRegOffsetMask, + pRFCalibrateInfo->TxLOK[RF_PATH_B]); } =20 if (bResult =3D=3D SUCCESS) @@ -1646,7 +1714,9 @@ void PHY_IQCalibrate_8723B( } =20 if (bReCovery) { - _PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalib= rateInfo.IQK_BB_backup_recover, 9); + _PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, + pDM_Odm->RFCalibrateInfo.IQK_BB_backup_recover, + 9); return; } =20 @@ -1748,7 +1818,9 @@ void PHY_IQCalibrate_8723B( pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[0][i] =3D result= [final_candidate][i]; } =20 - _PHY_SaveADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrat= eInfo.IQK_BB_backup_recover, 9); + _PHY_SaveADDARegisters8723B(padapter, IQK_BB_REG_92C, + pDM_Odm->RFCalibrateInfo.IQK_BB_backup_recover, + 9); =20 /* restore GNT_BT */ PHY_SetBBReg(pDM_Odm->Adapter, 0x764, bMaskDWord, GNT_BT_default); --=20 2.52.0