Commit 9e749e6f authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove 5Ghz code related to RF power calibration 



remove 5Ghz code related to RF calibration. Remove
table arrays, variables and macros related to RF power
tracking.

Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/f2096f71ae80f0cb7805a0e48536babc9809a3de.1624367072.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c

+0 −77
Original line number Diff line number Diff line
@@ -282,62 +282,6 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm) 
*                           TxPowerTrack_SDIO.TXT

******************************************************************************/



static u8 gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {

	{

		0, 1, 1, 2, 2, 3, 4, 5, 5, 6,  6,  7,  7,  8,  8,  9,

		9, 10, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  7,  8,  8,  9,  9, 10,

		10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  7,  8,  8,  9,  9, 10,

		10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14

	},

};

static u8 gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 11, 12,

		12, 13, 14, 15, 15, 16, 16, 17, 17, 18, 19, 20, 20, 20

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 11, 12,

		12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 19, 20, 20, 20

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 11, 12,

		12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21

	},

};

static u8 gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {

	{

		0, 1, 2, 3, 3, 4, 4, 5, 5, 6,  7,  8,  8,  9,  9, 10,

		10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 6,  7,  7,  8,  8,  9, 10,

		11, 11, 12, 13, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 10, 11,

		11, 12, 13, 14, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16

	},

};

static u8 gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {

	{

		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 11, 12,

		12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21

	},

	{

		0, 1, 2, 3, 3, 4, 5, 6, 6, 7,  8,  9,  9, 10, 11, 12,

		12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21

	},

};

static u8 gDeltaSwingTableIdx_MP_2GB_N_TxPowerTrack_SDIO_8723B[] = {

	0, 0, 1, 2, 2, 2, 3, 3, 3, 4,  5,  5,  6,  6, 6,  6,

	7,  7,  7, 8,  8,  9,  9, 10, 10, 11, 12, 13, 14, 15
@@ -417,27 +361,6 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm) 
		gDeltaSwingTableIdx_MP_2GCCKB_N_TxPowerTrack_SDIO_8723B,

		DELTA_SWINGIDX_SIZE

	);



	memcpy(

		pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P,

		gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723B,

		DELTA_SWINGIDX_SIZE*3

	);

	memcpy(

		pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N,

		gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723B,

		DELTA_SWINGIDX_SIZE*3

	);

	memcpy(

		pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P,

		gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723B,

		DELTA_SWINGIDX_SIZE*3

	);

	memcpy(

		pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N,

		gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723B,

		DELTA_SWINGIDX_SIZE*3

	);

}



/******************************************************************************

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c

+1 −16
Original line number Diff line number Diff line
@@ -347,22 +347,7 @@ static void GetDeltaSwingTable_8723B( 
			*TemperatureUP_B   = pRFCalibrateInfo->DeltaSwingTableIdx_2GB_P;

			*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_2GB_N;

		}

	} /*else if (36 <= channel && channel <= 64) {

		*TemperatureUP_A   = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[0];

		*TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[0];

		*TemperatureUP_B   = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[0];

		*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[0];

	} else if (100 <= channel && channel <= 140) {

		*TemperatureUP_A   = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[1];

		*TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[1];

		*TemperatureUP_B   = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[1];

		*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[1];

	} else if (149 <= channel && channel <= 173) {

		*TemperatureUP_A   = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[2];

		*TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[2];

		*TemperatureUP_B   = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[2];

		*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[2];

	}*/else {

	} else {

		*TemperatureUP_A   = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;

		*TemperatureDOWN_A = (u8 *)DeltaSwingTableIdx_2GA_N_8188E;

		*TemperatureUP_B   = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;

drivers/staging/rtl8723bs/hal/odm.c

+0 −8
Original line number Diff line number Diff line
@@ -896,18 +896,10 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V 
		pDM_Odm->ExtLNA = (u8)Value;

		break;



	case ODM_CMNINFO_5G_EXT_LNA:

		pDM_Odm->ExtLNA5G = (u8)Value;

		break;



	case ODM_CMNINFO_EXT_PA:

		pDM_Odm->ExtPA = (u8)Value;

		break;



	case ODM_CMNINFO_5G_EXT_PA:

		pDM_Odm->ExtPA5G = (u8)Value;

		break;



	case ODM_CMNINFO_GPA:

		pDM_Odm->TypeGPA = (enum odm_type_gpa_e)Value;

		break;

drivers/staging/rtl8723bs/hal/odm.h

+1 −13
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ struct swat_t { /* _SW_Antenna_Switch_ */ 
	bool ANTB_ON;	/* To indicate Ant B is on or not */

	bool Pre_Aux_FailDetec;

	bool RSSI_AntDect_bResult;

	u8 Ant5G;

	u8 Ant2G;



	s32 RSSI_sum_A;
@@ -295,9 +294,7 @@ enum odm_cmninfo_e { 
	ODM_CMNINFO_BOARD_TYPE,				/*  ODM_BOARD_TYPE_E */

	ODM_CMNINFO_PACKAGE_TYPE,

	ODM_CMNINFO_EXT_LNA,					/*  true */

	ODM_CMNINFO_5G_EXT_LNA,

	ODM_CMNINFO_EXT_PA,

	ODM_CMNINFO_5G_EXT_PA,

	ODM_CMNINFO_GPA,

	ODM_CMNINFO_APA,

	ODM_CMNINFO_GLNA,
@@ -514,7 +511,6 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */ 
	bool bTXPowerTracking;

	u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking as default */

	u8 TM_Trigger;

	u8 InternalPA5G[2];	/* pathA / pathB */



	u8 ThermalMeter[2];    /*  ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 */

	u8 ThermalValue;
@@ -549,7 +545,7 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */ 
	bool bIQKInProgress;

	u8 Delta_IQK;

	u8 Delta_LCK;

	s8 BBSwingDiff2G, BBSwingDiff5G; /*  Unit: dB */

	s8 BBSwingDiff2G; /*  Unit: dB */

	u8 DeltaSwingTableIdx_2GCCKA_P[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GCCKA_N[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GCCKB_P[DELTA_SWINGIDX_SIZE];
@@ -558,10 +554,6 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */ 
	u8 DeltaSwingTableIdx_2GA_N[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GB_P[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GB_N[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_5GA_P[BAND_NUM][DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_5GA_N[BAND_NUM][DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_5GB_P[BAND_NUM][DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_5GB_N[BAND_NUM][DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GA_P_8188E[DELTA_SWINGIDX_SIZE];

	u8 DeltaSwingTableIdx_2GA_N_8188E[DELTA_SWINGIDX_SIZE];
@@ -627,7 +619,6 @@ struct fat_t { /* _FAST_ANTENNA_TRAINNING_ */ 
	bool	bBecomeLinked;

	u32 MinMaxRSSI;

	u8 idx_AntDiv_counter_2G;

	u8 idx_AntDiv_counter_5G;

	u32 CCK_counter_main;

	u32 CCK_counter_aux;

	u32 OFDM_counter_main;
@@ -746,10 +737,8 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 
	u8 TypeAPA;

	/*  with external LNA  NO/Yes = 0/1 */

	u8 ExtLNA;

	u8 ExtLNA5G;

	/*  with external PA  NO/Yes = 0/1 */

	u8 ExtPA;

	u8 ExtPA5G;

	/*  with external TRSW  NO/Yes = 0/1 */

	u8 ExtTRSW;

	u8 PatchID; /* Customer ID */
@@ -1046,7 +1035,6 @@ enum ODM_BB_Config_Type { 
	CONFIG_BB_PHY_REG,

	CONFIG_BB_AGC_TAB,

	CONFIG_BB_AGC_TAB_2G,

	CONFIG_BB_AGC_TAB_5G,

	CONFIG_BB_PHY_REG_PG,

	CONFIG_BB_PHY_REG_MP,

	CONFIG_BB_AGC_TAB_DIFF,