mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-11 00:42:56 -04:00
staging: r8188eu: remove ODM_SingleDualAntennaDetection()
Function ODM_SingleDualAntennaDetection() is not used, remove it. It is the only user of odm_PHY_SaveAFERegisters() and odm_PHY_ReloadAFERegisters() so remove these functions as well. Signed-off-by: Michael Straube <straube.linux@gmail.com> Link: https://lore.kernel.org/r/20210918211046.6865-1-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
42350b2e6f
commit
e4ccdaf4fb
@@ -1655,229 +1655,6 @@ void ODM_SingleDualAntennaDefaultSetting(struct odm_dm_struct *pDM_Odm)
|
||||
pDM_SWAT_Table->ANTB_ON = true;
|
||||
}
|
||||
|
||||
/* 2 8723A ANT DETECT */
|
||||
|
||||
static void odm_PHY_SaveAFERegisters(struct odm_dm_struct *pDM_Odm, u32 *AFEReg, u32 *AFEBackup, u32 RegisterNum)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
/* RTPRINT(FINIT, INIT_IQK, ("Save ADDA parameters.\n")); */
|
||||
for (i = 0; i < RegisterNum; i++)
|
||||
AFEBackup[i] = ODM_GetBBReg(pDM_Odm, AFEReg[i], bMaskDWord);
|
||||
}
|
||||
|
||||
static void odm_PHY_ReloadAFERegisters(struct odm_dm_struct *pDM_Odm, u32 *AFEReg, u32 *AFEBackup, u32 RegiesterNum)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < RegiesterNum; i++)
|
||||
ODM_SetBBReg(pDM_Odm, AFEReg[i], bMaskDWord, AFEBackup[i]);
|
||||
}
|
||||
|
||||
/* 2 8723A ANT DETECT */
|
||||
/* Description: */
|
||||
/* Implement IQK single tone for RF DPK loopback and BB PSD scanning. */
|
||||
/* This function is cooperated with BB team Neil. */
|
||||
bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode)
|
||||
{
|
||||
struct sw_ant_switch *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
|
||||
u32 CurrentChannel, RfLoopReg;
|
||||
u8 n;
|
||||
u32 Reg88c, Regc08, Reg874, Regc50;
|
||||
u8 initial_gain = 0x5a;
|
||||
u32 PSD_report_tmp;
|
||||
u32 AntA_report = 0x0, AntB_report = 0x0, AntO_report = 0x0;
|
||||
bool bResult = true;
|
||||
u32 AFE_Backup[16];
|
||||
u32 AFE_REG_8723A[16] = {
|
||||
rRx_Wait_CCA, rTx_CCK_RFON,
|
||||
rTx_CCK_BBON, rTx_OFDM_RFON,
|
||||
rTx_OFDM_BBON, rTx_To_Rx,
|
||||
rTx_To_Tx, rRx_CCK,
|
||||
rRx_OFDM, rRx_Wait_RIFS,
|
||||
rRx_TO_Rx, rStandby,
|
||||
rSleep, rPMPD_ANAEN,
|
||||
rFPGA0_XCD_SwitchControl, rBlue_Tooth};
|
||||
|
||||
if (!(pDM_Odm->SupportICType & (ODM_RTL8723A | ODM_RTL8192C)))
|
||||
return bResult;
|
||||
|
||||
if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))
|
||||
return bResult;
|
||||
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8192C) {
|
||||
/* Which path in ADC/DAC is turnned on for PSD: both I/Q */
|
||||
ODM_SetBBReg(pDM_Odm, 0x808, BIT(10) | BIT(11), 0x3);
|
||||
/* Ageraged number: 8 */
|
||||
ODM_SetBBReg(pDM_Odm, 0x808, BIT(12) | BIT(13), 0x1);
|
||||
/* pts = 128; */
|
||||
ODM_SetBBReg(pDM_Odm, 0x808, BIT(14) | BIT(15), 0x0);
|
||||
}
|
||||
|
||||
/* 1 Backup Current RF/BB Settings */
|
||||
|
||||
CurrentChannel = ODM_GetRFReg(pDM_Odm, RF_PATH_A, ODM_CHANNEL, bRFRegOffsetMask);
|
||||
RfLoopReg = ODM_GetRFReg(pDM_Odm, RF_PATH_A, 0x00, bRFRegOffsetMask);
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, ODM_DPDT, Antenna_A); /* change to Antenna A */
|
||||
/* Step 1: USE IQK to transmitter single tone */
|
||||
|
||||
ODM_StallExecution(10);
|
||||
|
||||
/* Store A Path Register 88c, c08, 874, c50 */
|
||||
Reg88c = ODM_GetBBReg(pDM_Odm, rFPGA0_AnalogParameter4, bMaskDWord);
|
||||
Regc08 = ODM_GetBBReg(pDM_Odm, rOFDM0_TRMuxPar, bMaskDWord);
|
||||
Reg874 = ODM_GetBBReg(pDM_Odm, rFPGA0_XCD_RFInterfaceSW, bMaskDWord);
|
||||
Regc50 = ODM_GetBBReg(pDM_Odm, rOFDM0_XAAGCCore1, bMaskDWord);
|
||||
|
||||
/* Store AFE Registers */
|
||||
odm_PHY_SaveAFERegisters(pDM_Odm, AFE_REG_8723A, AFE_Backup, 16);
|
||||
|
||||
/* Set PSD 128 pts */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_PSDFunction, BIT(14) | BIT(15), 0x0); /* 128 pts */
|
||||
|
||||
/* To SET CH1 to do */
|
||||
ODM_SetRFReg(pDM_Odm, RF_PATH_A, ODM_CHANNEL, bRFRegOffsetMask, 0x01); /* Channel 1 */
|
||||
|
||||
/* AFE all on step */
|
||||
ODM_SetBBReg(pDM_Odm, rRx_Wait_CCA, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_CCK_RFON, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_CCK_BBON, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_OFDM_RFON, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_OFDM_BBON, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_To_Rx, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_To_Tx, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_CCK, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_OFDM, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_Wait_RIFS, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_TO_Rx, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rStandby, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rSleep, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rPMPD_ANAEN, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XCD_SwitchControl, bMaskDWord, 0x6FDB25A4);
|
||||
ODM_SetBBReg(pDM_Odm, rBlue_Tooth, bMaskDWord, 0x6FDB25A4);
|
||||
|
||||
/* 3 wire Disable */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_AnalogParameter4, bMaskDWord, 0xCCF000C0);
|
||||
|
||||
/* BB IQK Setting */
|
||||
ODM_SetBBReg(pDM_Odm, rOFDM0_TRMuxPar, bMaskDWord, 0x000800E4);
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XCD_RFInterfaceSW, bMaskDWord, 0x22208000);
|
||||
|
||||
/* IQK setting tone@ 4.34Mhz */
|
||||
ODM_SetBBReg(pDM_Odm, rTx_IQK_Tone_A, bMaskDWord, 0x10008C1C);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_IQK, bMaskDWord, 0x01007c00);
|
||||
|
||||
/* Page B init */
|
||||
ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x00080000);
|
||||
ODM_SetBBReg(pDM_Odm, rConfig_AntA, bMaskDWord, 0x0f600000);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_IQK, bMaskDWord, 0x01004800);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_IQK_Tone_A, bMaskDWord, 0x10008c1f);
|
||||
ODM_SetBBReg(pDM_Odm, rTx_IQK_PI_A, bMaskDWord, 0x82150008);
|
||||
ODM_SetBBReg(pDM_Odm, rRx_IQK_PI_A, bMaskDWord, 0x28150008);
|
||||
ODM_SetBBReg(pDM_Odm, rIQK_AGC_Rsp, bMaskDWord, 0x001028d0);
|
||||
|
||||
/* RF loop Setting */
|
||||
ODM_SetRFReg(pDM_Odm, RF_PATH_A, 0x0, 0xFFFFF, 0x50008);
|
||||
|
||||
/* IQK Single tone start */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, bMaskDWord, 0x80800000);
|
||||
ODM_SetBBReg(pDM_Odm, rIQK_AGC_Pts, bMaskDWord, 0xf8000000);
|
||||
ODM_StallExecution(1000);
|
||||
PSD_report_tmp = 0x0;
|
||||
|
||||
for (n = 0; n < 2; n++) {
|
||||
PSD_report_tmp = GetPSDData(pDM_Odm, 14, initial_gain);
|
||||
if (PSD_report_tmp > AntA_report)
|
||||
AntA_report = PSD_report_tmp;
|
||||
}
|
||||
|
||||
PSD_report_tmp = 0x0;
|
||||
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_B); /* change to Antenna B */
|
||||
ODM_StallExecution(10);
|
||||
|
||||
for (n = 0; n < 2; n++) {
|
||||
PSD_report_tmp = GetPSDData(pDM_Odm, 14, initial_gain);
|
||||
if (PSD_report_tmp > AntB_report)
|
||||
AntB_report = PSD_report_tmp;
|
||||
}
|
||||
|
||||
/* change to open case */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, 0); /* change to Ant A and B all open case */
|
||||
ODM_StallExecution(10);
|
||||
|
||||
for (n = 0; n < 2; n++) {
|
||||
PSD_report_tmp = GetPSDData(pDM_Odm, 14, initial_gain);
|
||||
if (PSD_report_tmp > AntO_report)
|
||||
AntO_report = PSD_report_tmp;
|
||||
}
|
||||
|
||||
/* Close IQK Single Tone function */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_IQK, bMaskDWord, 0x00000000);
|
||||
PSD_report_tmp = 0x0;
|
||||
|
||||
/* 1 Return to antanna A */
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_A);
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_AnalogParameter4, bMaskDWord, Reg88c);
|
||||
ODM_SetBBReg(pDM_Odm, rOFDM0_TRMuxPar, bMaskDWord, Regc08);
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XCD_RFInterfaceSW, bMaskDWord, Reg874);
|
||||
ODM_SetBBReg(pDM_Odm, rOFDM0_XAAGCCore1, 0x7F, 0x40);
|
||||
ODM_SetBBReg(pDM_Odm, rOFDM0_XAAGCCore1, bMaskDWord, Regc50);
|
||||
ODM_SetRFReg(pDM_Odm, RF_PATH_A, RF_CHNLBW, bRFRegOffsetMask, CurrentChannel);
|
||||
ODM_SetRFReg(pDM_Odm, RF_PATH_A, 0x00, bRFRegOffsetMask, RfLoopReg);
|
||||
|
||||
/* Reload AFE Registers */
|
||||
odm_PHY_ReloadAFERegisters(pDM_Odm, AFE_REG_8723A, AFE_Backup, 16);
|
||||
|
||||
if (pDM_Odm->SupportICType == ODM_RTL8723A) {
|
||||
/* 2 Test Ant B based on Ant A is ON */
|
||||
if (mode == ANTTESTB) {
|
||||
if (AntA_report >= 100) {
|
||||
if (AntB_report > (AntA_report + 1))
|
||||
pDM_SWAT_Table->ANTB_ON = false;
|
||||
else
|
||||
pDM_SWAT_Table->ANTB_ON = true;
|
||||
} else {
|
||||
pDM_SWAT_Table->ANTB_ON = false; /* Set Antenna B off as default */
|
||||
bResult = false;
|
||||
}
|
||||
} else if (mode == ANTTESTALL) {
|
||||
/* 2 Test Ant A and B based on DPDT Open */
|
||||
if ((AntO_report >= 100) & (AntO_report < 118)) {
|
||||
if (AntA_report > (AntO_report + 1))
|
||||
pDM_SWAT_Table->ANTA_ON = false;
|
||||
else
|
||||
pDM_SWAT_Table->ANTA_ON = true;
|
||||
|
||||
if (AntB_report > (AntO_report + 2))
|
||||
pDM_SWAT_Table->ANTB_ON = false;
|
||||
else
|
||||
pDM_SWAT_Table->ANTB_ON = true;
|
||||
}
|
||||
}
|
||||
} else if (pDM_Odm->SupportICType == ODM_RTL8192C) {
|
||||
if (AntA_report >= 100) {
|
||||
if (AntB_report > (AntA_report + 2)) {
|
||||
pDM_SWAT_Table->ANTA_ON = false;
|
||||
pDM_SWAT_Table->ANTB_ON = true;
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_B);
|
||||
} else if (AntA_report > (AntB_report + 2)) {
|
||||
pDM_SWAT_Table->ANTA_ON = true;
|
||||
pDM_SWAT_Table->ANTB_ON = false;
|
||||
ODM_SetBBReg(pDM_Odm, rFPGA0_XA_RFInterfaceOE, 0x300, Antenna_A);
|
||||
} else {
|
||||
pDM_SWAT_Table->ANTA_ON = true;
|
||||
pDM_SWAT_Table->ANTB_ON = true;
|
||||
}
|
||||
} else {
|
||||
pDM_SWAT_Table->ANTA_ON = true; /* Set Antenna A on as default */
|
||||
pDM_SWAT_Table->ANTB_ON = false; /* Set Antenna B off as default */
|
||||
bResult = false;
|
||||
}
|
||||
}
|
||||
return bResult;
|
||||
}
|
||||
|
||||
/* Justin: According to the current RRSI to adjust Response Frame TX power, 2012/11/05 */
|
||||
void odm_dtc(struct odm_dm_struct *pDM_Odm)
|
||||
{
|
||||
|
||||
@@ -1126,8 +1126,6 @@ void ODM_AntselStatistics_88C(struct odm_dm_struct *pDM_Odm, u8 MacId,
|
||||
|
||||
void ODM_SingleDualAntennaDefaultSetting(struct odm_dm_struct *pDM_Odm);
|
||||
|
||||
bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode);
|
||||
|
||||
void odm_dtc(struct odm_dm_struct *pDM_Odm);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user