Commit 61b919fe authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: clean driver from unused RF paths 



rtl8723bs support only two rf paths (A and B), remove all
the others (C, D, BC, ...) as they are unused. Keep
just one enum selecting rf path, remove unused macro
indicating max rf path number, add an item in rf_path
enum for this pourpose.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/23060c85ab9aa468c9c021378f0dc8a8f887a578.1628329348.git.fabioaiuto83@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3678dc1

drivers/staging/rtl8723bs/hal/HalPhyRf.c

+26 −26
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void ODM_ClearTxPowerTrackingState(struct dm_odm_t *pDM_Odm) 
	pDM_Odm->BbSwingIdxCck = pDM_Odm->DefaultCckIndex;

	pDM_Odm->RFCalibrateInfo.CCK_index = 0;



	for (p = ODM_RF_PATH_A; p < MAX_RF_PATH; ++p) {

	for (p = RF_PATH_A; p < MAX_RF_PATH; ++p) {

		pDM_Odm->BbSwingIdxOfdmBase[p] = pDM_Odm->DefaultOfdmIndex;

		pDM_Odm->BbSwingIdxOfdm[p] = pDM_Odm->DefaultOfdmIndex;

		pDM_Odm->RFCalibrateInfo.OFDM_index[p] = pDM_Odm->DefaultOfdmIndex;
@@ -93,7 +93,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
	pDM_Odm->RFCalibrateInfo.TXPowerTrackingCallbackCnt++;

	pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = true;



	ThermalValue = (u8)PHY_QueryRFReg(pDM_Odm->Adapter, ODM_RF_PATH_A, c.ThermalRegAddr, 0xfc00);	/* 0x42: RF Reg[15:10] 88E */

	ThermalValue = (u8)PHY_QueryRFReg(pDM_Odm->Adapter, RF_PATH_A, c.ThermalRegAddr, 0xfc00);	/* 0x42: RF Reg[15:10] 88E */

	if (

		!pDM_Odm->RFCalibrateInfo.TxPowerTrackControl ||

		pHalData->EEPROMThermalMeter == 0 ||
@@ -154,49 +154,49 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 


		/* 4 7.1 The Final Power Index = BaseIndex + PowerIndexOffset */

		if (ThermalValue > pHalData->EEPROMThermalMeter) {

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A] =

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_A] =

				deltaSwingTableIdx_TUP_A[delta];



			/*  Record delta swing for mix mode power tracking */

			pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] =

			pDM_Odm->Absolute_OFDMSwingIdx[RF_PATH_A] =

				deltaSwingTableIdx_TUP_A[delta];



			if (c.RfPathCount > 1) {

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_B] =

					deltaSwingTableIdx_TUP_B[delta];



				/*  Record delta swing for mix mode power tracking */

				pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] =

				pDM_Odm->Absolute_OFDMSwingIdx[RF_PATH_B] =

					deltaSwingTableIdx_TUP_B[delta];

			}



		} else {

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A] =

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_A] =

				-1 * deltaSwingTableIdx_TDOWN_A[delta];



			/*  Record delta swing for mix mode power tracking */

			pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] =

			pDM_Odm->Absolute_OFDMSwingIdx[RF_PATH_A] =

				-1 * deltaSwingTableIdx_TDOWN_A[delta];



			if (c.RfPathCount > 1) {

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[RF_PATH_B] =

					-1 * deltaSwingTableIdx_TDOWN_B[delta];



				 /*  Record delta swing for mix mode power tracking */

				pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] =

				pDM_Odm->Absolute_OFDMSwingIdx[RF_PATH_B] =

					-1 * deltaSwingTableIdx_TDOWN_B[delta];

			}

		}



		for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++) {

		for (p = RF_PATH_A; p < c.RfPathCount; p++) {

			if (

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[p] ==

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[p]
@@ -230,17 +230,17 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */

			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */

	} else {

			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

			for (p = RF_PATH_A; p < c.RfPathCount; p++)

				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;

	}



	/* Print Swing base & current */

	for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++) {

	for (p = RF_PATH_A; p < c.RfPathCount; p++) {

	}



	if (

		(pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_A] != 0 ||

		 pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_B] != 0) &&

		(pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_A] != 0 ||

		 pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_B] != 0) &&

		 pDM_Odm->RFCalibrateInfo.TxPowerTrackControl

	 ) {

		/* 4 7.2 Configure the Swing Table to adjust Tx Power. */
@@ -253,16 +253,16 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
		/*  2012/04/25 MH Add for tx power tracking to set tx power in tx agc for 88E. */



		if (ThermalValue > pHalData->EEPROMThermalMeter) {

			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

			for (p = RF_PATH_A; p < c.RfPathCount; p++)

					(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);

		} else {

			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

			for (p = RF_PATH_A; p < c.RfPathCount; p++)

				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, Indexforchannel);

		}



		/*  Record last time Power Tracking result as base. */

		pDM_Odm->BbSwingIdxCckBase = pDM_Odm->BbSwingIdxCck;

		for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

		for (p = RF_PATH_A; p < c.RfPathCount; p++)

			pDM_Odm->BbSwingIdxOfdmBase[p] = pDM_Odm->BbSwingIdxOfdm[p];



		/* Record last Power Tracking Thermal Value */

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c

+82 −82

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c

+11 −11

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8723bs/hal/odm.c

+2 −2
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm) 
	pDM_Odm->BbSwingIdxCckBase = pDM_Odm->DefaultCckIndex;

	pDM_Odm->RFCalibrateInfo.CCK_index = pDM_Odm->DefaultCckIndex;



	for (p = ODM_RF_PATH_A; p < MAX_RF_PATH; ++p) {

	for (p = RF_PATH_A; p < MAX_RF_PATH; ++p) {

		pDM_Odm->BbSwingIdxOfdmBase[p] = pDM_Odm->DefaultOfdmIndex;

		pDM_Odm->RFCalibrateInfo.OFDM_index[p] = pDM_Odm->DefaultOfdmIndex;

		pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[p] = 0;
@@ -736,7 +736,7 @@ void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm) 
		return;



	if (!pDM_Odm->RFCalibrateInfo.TM_Trigger) { /* at least delay 1 sec */

		PHY_SetRFReg(pDM_Odm->Adapter, ODM_RF_PATH_A, RF_T_METER_NEW, (BIT17 | BIT16), 0x03);

		PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_T_METER_NEW, (BIT17 | BIT16), 0x03);



		pDM_Odm->RFCalibrateInfo.TM_Trigger = 1;

		return;

drivers/staging/rtl8723bs/hal/odm.h

+0 −20
Original line number Diff line number Diff line
@@ -998,26 +998,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 
	#endif

};



#define ODM_RF_PATH_MAX 2



enum odm_rf_radio_path_e {

	ODM_RF_PATH_A = 0,   /* Radio Path A */

	ODM_RF_PATH_B = 1,   /* Radio Path B */

	ODM_RF_PATH_C = 2,   /* Radio Path C */

	ODM_RF_PATH_D = 3,   /* Radio Path D */

	ODM_RF_PATH_AB,

	ODM_RF_PATH_AC,

	ODM_RF_PATH_AD,

	ODM_RF_PATH_BC,

	ODM_RF_PATH_BD,

	ODM_RF_PATH_CD,

	ODM_RF_PATH_ABC,

	ODM_RF_PATH_ACD,

	ODM_RF_PATH_BCD,

	ODM_RF_PATH_ABCD,

	/*   ODM_RF_PATH_MAX,    Max RF number 90 support */

};



 enum odm_rf_content {

	odm_radioa_txt = 0x1000,

	odm_radiob_txt = 0x1001,