Commit edc64e7a authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove ODM_RT_TRACE calls from hal/phy.c 



Remove all ODM_RT_TRACE calls from hal/phy.c, as this debug code
is not optimal and doesn't follow best practices. This in concert
with other removals allows for the removal of include/odm_debug.h
in its entirety.

Tested-by: default avatarMartin Kaiser <martin@kaiser.cx>
Reviewed-by: default avatarMartin Kaiser <martin@kaiser.cx>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210611002504.166405-2-phil@philpotter.co.uk


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

drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c

+4 −119
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ static void odm_SetTxRPTTiming_8188E(struct odm_dm_struct *dm_odm, 
			idx -= 1;

	}

	pRaInfo->RptTime = DynamicTxRPTTiming[idx];



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("pRaInfo->RptTime = 0x%x\n", pRaInfo->RptTime));

}



static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm,
@@ -112,20 +109,13 @@ static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm, 
	u8 RateID, LowestRate, HighestRate;

	u8 i;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

		     ODM_DBG_TRACE, ("=====>%s()\n", __func__));

	if (!pRaInfo) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

			     ("%s(): pRaInfo is NULL\n", __func__));

	if (!pRaInfo)

		return -1;

	}



	RateID = pRaInfo->PreRate;

	LowestRate = pRaInfo->LowestRate;

	HighestRate = pRaInfo->HighestRate;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" RateID =%d LowestRate =%d HighestRate =%d RateSGI =%d\n",

		     RateID, LowestRate, HighestRate, pRaInfo->RateSGI));

	if (RateID > HighestRate) {

		RateID = HighestRate;

	} else if (pRaInfo->RateSGI) {
@@ -158,15 +148,6 @@ static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm, 


	pRaInfo->DecisionRate = RateID;

	odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 2);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

		     ODM_DBG_LOUD, ("Rate down, RPT Timing default\n"));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("RAWaitingCounter %d, RAPendingCounter %d",

			 pRaInfo->RAWaitingCounter, pRaInfo->RAPendingCounter));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("Rate down to RateID %d RateSGI %d\n", RateID, pRaInfo->RateSGI));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("<===== %s()\n", __func__));

	return 0;

}
@@ -176,18 +157,11 @@ static int odm_RateUp_8188E(struct odm_dm_struct *dm_odm, 
	u8 RateID, HighestRate;

	u8 i;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

		     ODM_DBG_TRACE, ("=====>%s()\n", __func__));

	if (!pRaInfo) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

			     ("%s(): pRaInfo is NULL\n", __func__));

	if (!pRaInfo)

		return -1;

	}



	RateID = pRaInfo->PreRate;

	HighestRate = pRaInfo->HighestRate;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" RateID =%d HighestRate =%d\n",

		     RateID, HighestRate));

	if (pRaInfo->RAWaitingCounter == 1) {

		pRaInfo->RAWaitingCounter = 0;

		pRaInfo->RAPendingCounter = 0;
@@ -196,8 +170,6 @@ static int odm_RateUp_8188E(struct odm_dm_struct *dm_odm, 
		goto RateUpfinish;

	}

	odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 0);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("%s():Decrease RPT Timing\n", __func__));



	if (RateID < HighestRate) {

		for (i = RateID + 1; i <= HighestRate; i++) {
@@ -222,13 +194,6 @@ static int odm_RateUp_8188E(struct odm_dm_struct *dm_odm, 
		pRaInfo->RAWaitingCounter++;



	pRaInfo->DecisionRate = RateID;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("Rate up to RateID %d\n", RateID));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("RAWaitingCounter %d, RAPendingCounter %d",

		      pRaInfo->RAWaitingCounter, pRaInfo->RAPendingCounter));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

		     ODM_DBG_TRACE, ("<===== %s()\n", __func__));

	return 0;

}
@@ -250,9 +215,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 
	/* u32 pool_retry; */

	static u8 DynamicTxRPTTimingCounter;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("=====>%s()\n", __func__));



	if (pRaInfo->Active && (pRaInfo->TOTAL > 0)) { /*  STA used and data packet exits */

		if ((pRaInfo->RssiStaRA < (pRaInfo->PreRssiStaRA - 3)) ||

		    (pRaInfo->RssiStaRA > (pRaInfo->PreRssiStaRA + 3))) {
@@ -270,16 +232,9 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 
			RtyPtID = 1;

		PenaltyID1 = RETRY_PENALTY_IDX[RtyPtID][RateID]; /* TODO by page */



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscDown init is %d\n", pRaInfo->NscDown));



		for (i = 0 ; i <= 4 ; i++)

			pRaInfo->NscDown += pRaInfo->RTY[i] * RETRY_PENALTY[PenaltyID1][i];



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscDown is %d, total*penalty[5] is %d\n", pRaInfo->NscDown,

			      (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5])));



		if (pRaInfo->NscDown > (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5]))

			pRaInfo->NscDown -= pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5];

		else
@@ -287,24 +242,15 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		/*  rate up */

		PenaltyID2 = RETRY_PENALTY_UP_IDX[RateID];

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscUp init is %d\n", pRaInfo->NscUp));



		for (i = 0 ; i <= 4 ; i++)

			pRaInfo->NscUp += pRaInfo->RTY[i] * RETRY_PENALTY[PenaltyID2][i];



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     ("NscUp is %d, total*up[5] is %d\n",

			     pRaInfo->NscUp, (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5])));



		if (pRaInfo->NscUp > (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5]))

			pRaInfo->NscUp -= pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5];

		else

			pRaInfo->NscUp = 0;



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE | ODM_COMP_INIT, ODM_DBG_LOUD,

			     (" RssiStaRa = %d RtyPtID =%d PenaltyID1 = 0x%x  PenaltyID2 = 0x%x RateID =%d NscDown =%d NscUp =%d SGI =%d\n",

			     pRaInfo->RssiStaRA, RtyPtID, PenaltyID1, PenaltyID2, RateID, pRaInfo->NscDown, pRaInfo->NscUp, pRaInfo->RateSGI));

		if ((pRaInfo->NscDown < N_THRESHOLD_LOW[RateID]) ||

		    (pRaInfo->DROP > DROPING_NECESSARY[RateID]))

			odm_RateDown_8188E(dm_odm, pRaInfo);
@@ -321,8 +267,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		if (DynamicTxRPTTimingCounter >= 4) {

			odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 1);

			ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

				     ODM_DBG_LOUD, ("<===== Rate don't change 4 times, Extend RPT Timing\n"));

			DynamicTxRPTTimingCounter = 0;

		}
@@ -330,8 +274,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		odm_ResetRaCounter_8188E(pRaInfo);

	}

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("<===== %s()\n", __func__));

}



static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info *pRaInfo)
@@ -414,15 +356,9 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf 
	else

		pRaInfo->PTModeSS = 0;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("ODM_ARFBRefresh_8188E(): PTModeSS =%d\n", pRaInfo->PTModeSS));



	if (pRaInfo->DecisionRate > pRaInfo->HighestRate)

		pRaInfo->DecisionRate = pRaInfo->HighestRate;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("ODM_ARFBRefresh_8188E(): RateID =%d RateMask =%8.8x RAUseRate =%8.8x HighestRate =%d, DecisionRate =%d\n",

		     pRaInfo->RateID, pRaInfo->RateMask, pRaInfo->RAUseRate, pRaInfo->HighestRate, pRaInfo->DecisionRate));

	return 0;

}
@@ -518,17 +454,10 @@ static void odm_PTDecision_8188E(struct odm_ra_info *pRaInfo) 
static void odm_RATxRPTTimerSetting(struct odm_dm_struct *dm_odm,

				    u16 minRptTime)

{

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" =====>%s()\n", __func__));



	if (dm_odm->CurrminRptTime != minRptTime) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

			     (" CurrminRptTime = 0x%04x minRptTime = 0x%04x\n", dm_odm->CurrminRptTime, minRptTime));

		rtw_rpt_timer_cfg_cmd(dm_odm->Adapter, minRptTime);

		dm_odm->CurrminRptTime = minRptTime;

	}

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" <===== %s()\n", __func__));

}



int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid)
@@ -549,10 +478,6 @@ int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid) 
			max_rate_idx = 0x03;

	}



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("%s(): WirelessMode:0x%08x , max_raid_idx:0x%02x\n",

		      __func__, WirelessMode, max_rate_idx));



	pRaInfo->DecisionRate = max_rate_idx;

	pRaInfo->PreRate = max_rate_idx;

	pRaInfo->HighestRate = max_rate_idx;
@@ -593,7 +518,6 @@ int ODM_RAInfo_Init_all(struct odm_dm_struct *dm_odm) 
{

	u8 macid = 0;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>\n"));

	dm_odm->CurrminRptTime = 0;



	for (macid = 0; macid < ODM_ASSOCIATE_ENTRY_NUM; macid++)
@@ -606,8 +530,6 @@ u8 ODM_RA_GetShortGI_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
{

	if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("macid =%d SGI =%d\n", macid, dm_odm->RAInfo[macid].RateSGI));

	return dm_odm->RAInfo[macid].RateSGI;

}
@@ -618,8 +540,6 @@ u8 ODM_RA_GetDecisionRate_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
	if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	DecisionRate = dm_odm->RAInfo[macid].DecisionRate;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" macid =%d DecisionRate = 0x%x\n", macid, DecisionRate));

	return DecisionRate;

}
@@ -630,8 +550,6 @@ u8 ODM_RA_GetHwPwrStatus_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
	if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	PTStage = dm_odm->RAInfo[macid].PTStage;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("macid =%d PTStage = 0x%x\n", macid, PTStage));

	return PTStage;

}
@@ -641,9 +559,6 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate 


	if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n",

		     macid, RateID, RateMask, SGIEnable));



	pRaInfo = &dm_odm->RAInfo[macid];

	pRaInfo->RateID = RateID;
@@ -658,8 +573,6 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi) 


	if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" macid =%d Rssi =%d\n", macid, Rssi));



	pRaInfo = &dm_odm->RAInfo[macid];

	pRaInfo->RssiStaRA = Rssi;
@@ -680,10 +593,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
	u32 valid = 0, ItemNum = 0;

	u16 minRptTime = 0x927c;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("=====>%s(): valid0 =%d valid1 =%d BufferLength =%d\n",

		      __func__, macid_entry0, macid_entry1, TxRPT_Len));



	ItemNum = TxRPT_Len >> 3;

	pBuffer = TxRPT_Buf;
@@ -707,13 +616,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
					 pRAInfo->RTY[2] + pRAInfo->RTY[3] +

					 pRAInfo->RTY[4] + pRAInfo->DROP;

			if (pRAInfo->TOTAL != 0) {

				ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

					     ("macid =%d Total =%d R0 =%d R1 =%d R2 =%d R3 =%d R4 =%d D0 =%d valid0 =%x valid1 =%x\n",

					     MacId, pRAInfo->TOTAL,

					     pRAInfo->RTY[0], pRAInfo->RTY[1],

					     pRAInfo->RTY[2], pRAInfo->RTY[3],

					     pRAInfo->RTY[4], pRAInfo->DROP,

					     macid_entry0, macid_entry1));

				if (pRAInfo->PTActive) {

					if (pRAInfo->RAstage < 5)

						odm_RateDecision_8188E(dm_odm, pRAInfo);
@@ -730,20 +632,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
				} else {

					odm_RateDecision_8188E(dm_odm, pRAInfo);

				}

				ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD,

					     ("macid =%d R0 =%d R1 =%d R2 =%d R3 =%d R4 =%d drop =%d valid0 =%x RateID =%d SGI =%d\n",

					     MacId,

					     pRAInfo->RTY[0],

					     pRAInfo->RTY[1],

					     pRAInfo->RTY[2],

					     pRAInfo->RTY[3],

					     pRAInfo->RTY[4],

					     pRAInfo->DROP,

					     macid_entry0,

					     pRAInfo->DecisionRate,

					     pRAInfo->RateSGI));

			} else {

				ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, (" TOTAL = 0!!!!\n"));

			}

		}
@@ -755,7 +643,4 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
	} while (MacId < ItemNum);



	odm_RATxRPTTimerSetting(dm_odm, minRptTime);



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("<===== %s()\n", __func__));

}

drivers/staging/rtl8188eu/hal/odm.c

+9 −141
Original line number Diff line number Diff line
@@ -149,13 +149,6 @@ u8 CCKSwingTable_Ch14[CCK_TABLE_SIZE][8] = { 
#define		RxDefaultAnt1		0x65a9

#define	RxDefaultAnt2		0x569a



void ODM_InitDebugSetting(struct odm_dm_struct *pDM_Odm)

{

	pDM_Odm->DebugLevel = ODM_DBG_TRACE;



	pDM_Odm->DebugComponents = 0;

}



/* 3 Export Interface */



/*  2011/09/21 MH Add to describe different team necessary resource allocate?? */
@@ -163,7 +156,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm) 
{

	/* 2012.05.03 Luke: For all IC series */

	odm_CommonInfoSelfInit(pDM_Odm);

	odm_CmnInfoInit_Debug(pDM_Odm);

	odm_DIGInit(pDM_Odm);

	odm_RateAdaptiveMaskInit(pDM_Odm);
@@ -183,8 +175,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm) 
void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)

{

	/* 2012.05.03 Luke: For all IC series */

	odm_CmnInfoHook_Debug(pDM_Odm);

	odm_CmnInfoUpdate_Debug(pDM_Odm);

	odm_CommonInfoSelfUpdate(pDM_Odm);

	odm_FalseAlarmCounterStatistics(pDM_Odm);

	odm_RSSIMonitorCheck(pDM_Odm);
@@ -219,8 +209,6 @@ void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm) 


	pDM_Odm->bCckHighPower = (bool)phy_query_bb_reg(adapter, 0x824, BIT(9));

	pDM_Odm->RFPathRxEnable = (u8)phy_query_bb_reg(adapter, 0xc04, 0x0F);



	ODM_InitDebugSetting(pDM_Odm);

}



void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)
@@ -249,48 +237,6 @@ void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) 
		pDM_Odm->bOneEntryOnly = false;

}



void odm_CmnInfoInit_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportPlatform=%d\n", pDM_Odm->SupportPlatform));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportAbility=0x%x\n", pDM_Odm->SupportAbility));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportInterface=%d\n", pDM_Odm->SupportInterface));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportICType=0x%x\n", pDM_Odm->SupportICType));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("CutVersion=%d\n", pDM_Odm->CutVersion));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("BoardType=%d\n", pDM_Odm->BoardType));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("ExtLNA=%d\n", pDM_Odm->ExtLNA));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("ExtPA=%d\n", pDM_Odm->ExtPA));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("ExtTRSW=%d\n", pDM_Odm->ExtTRSW));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("PatchID=%d\n", pDM_Odm->PatchID));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bInHctTest=%d\n", pDM_Odm->bInHctTest));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bWIFITest=%d\n", pDM_Odm->bWIFITest));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bDualMacSmartConcurrent=%d\n", pDM_Odm->bDualMacSmartConcurrent));

}



void odm_CmnInfoHook_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumTxBytesUnicast=%llu\n", *pDM_Odm->pNumTxBytesUnicast));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pNumRxBytesUnicast=%llu\n", *pDM_Odm->pNumRxBytesUnicast));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pWirelessMode=0x%x\n", *pDM_Odm->pWirelessMode));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecChOffset=%d\n", *pDM_Odm->pSecChOffset));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pSecurity=%d\n", *pDM_Odm->pSecurity));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pBandWidth=%d\n", *pDM_Odm->pBandWidth));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel=%d\n", *pDM_Odm->pChannel));



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess=%d\n", *pDM_Odm->pbScanInProcess));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbPowerSaving=%d\n", *pDM_Odm->pbPowerSaving));

}



void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("%s==>\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bWIFI_Direct=%d\n", pDM_Odm->bWIFI_Direct));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bWIFI_Display=%d\n", pDM_Odm->bWIFI_Display));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("bLinked=%d\n", pDM_Odm->bLinked));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("RSSI_Min=%d\n", pDM_Odm->RSSI_Min));

}



void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)

{

	struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
@@ -341,23 +287,15 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
	u8 dm_dig_max, dm_dig_min;

	u8 CurrentIGI = pDM_DigTable->CurIGValue;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s()==>\n", __func__));

	if ((!(pDM_Odm->SupportAbility & ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

			     ("%s() Return: SupportAbility ODM_BB_DIG or ODM_BB_FA_CNT is disabled\n", __func__));

	if ((!(pDM_Odm->SupportAbility & ODM_BB_DIG)) || (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)))

		return;

	}



	if (*pDM_Odm->pbScanInProcess) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() Return: In Scan Progress\n", __func__));

	if (*pDM_Odm->pbScanInProcess)

		return;

	}



	/* add by Neil Chen to avoid PSD is processing */

	if (!pDM_Odm->bDMInitialGainEnable) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() Return: PSD is Processing\n", __func__));

	if (!pDM_Odm->bDMInitialGainEnable)

		return;

	}



	DIG_Dynamic_MIN = pDM_DigTable->DIG_Dynamic_MIN_0;

	FirstConnect = (pDM_Odm->bLinked) && (!pDM_DigTable->bMediaConnect_0);
@@ -384,33 +322,20 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				DIG_Dynamic_MIN = DIG_MaxOfMin;

			else

				DIG_Dynamic_MIN = pDM_Odm->RSSI_Min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

				     ("%s() : bOneEntryOnly=true,  DIG_Dynamic_MIN=0x%x\n",

				      __func__, DIG_Dynamic_MIN));

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

				     ("%s() : pDM_Odm->RSSI_Min=%d\n",

				      __func__, pDM_Odm->RSSI_Min));

		} else if (pDM_Odm->SupportAbility & ODM_BB_ANT_DIV) {

			/* 1 Lower Bound for 88E AntDiv */

			if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) {

			if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)

				DIG_Dynamic_MIN = (u8)pDM_DigTable->AntDiv_RSSI_max;

				ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

					     ("%s(): pDM_DigTable->AntDiv_RSSI_max=%d\n",

					      __func__, pDM_DigTable->AntDiv_RSSI_max));

			}

		} else {

			DIG_Dynamic_MIN = dm_dig_min;

		}

	} else {

		pDM_DigTable->rx_gain_range_max = dm_dig_max;

		DIG_Dynamic_MIN = dm_dig_min;

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s() : No Link\n", __func__));

	}



	/* 1 Modify DIG lower bound, deal with abnormally large false alarm */

	if (pFalseAlmCnt->Cnt_all > 10000) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("dm_DIG(): Abnormally false alarm case.\n"));



		if (pDM_DigTable->LargeFAHit != 3)

			pDM_DigTable->LargeFAHit++;

		if (pDM_DigTable->ForbiddenIGI < CurrentIGI) {
@@ -435,27 +360,20 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				if ((pDM_DigTable->ForbiddenIGI - 1) < DIG_Dynamic_MIN) { /* DM_DIG_MIN) */

					pDM_DigTable->ForbiddenIGI = DIG_Dynamic_MIN; /* DM_DIG_MIN; */

					pDM_DigTable->rx_gain_range_min = DIG_Dynamic_MIN; /* DM_DIG_MIN; */

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): Normal Case: At Lower Bound\n", __func__));

				} else {

					pDM_DigTable->ForbiddenIGI--;

					pDM_DigTable->rx_gain_range_min = (pDM_DigTable->ForbiddenIGI + 1);

					ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): Normal Case: Approach Lower Bound\n", __func__));

				}

			} else {

				pDM_DigTable->LargeFAHit = 0;

			}

		}

	}

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

		     ("%s(): pDM_DigTable->LargeFAHit=%d\n",

		      __func__, pDM_DigTable->LargeFAHit));



	/* 1 Adjust initial gain by false alarm */

	if (pDM_Odm->bLinked) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG AfterLink\n", __func__));

		if (FirstConnect) {

			CurrentIGI = pDM_Odm->RSSI_Min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("DIG: First Connect\n"));

		} else {

			if (pFalseAlmCnt->Cnt_all > DM_DIG_FA_TH2)

				CurrentIGI = CurrentIGI + 4;/* pDM_DigTable->CurIGValue = pDM_DigTable->PreIGValue+2; */
@@ -465,10 +383,8 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				CurrentIGI = CurrentIGI - 2;/* pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; */

		}

	} else {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG BeforeLink\n", __func__));

		if (FirstDisConnect) {

			CurrentIGI = pDM_DigTable->rx_gain_range_min;

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): First DisConnect\n", __func__));

		} else {

			/* 2012.03.30 LukeLee: enable DIG before link but with very high thresholds */

			if (pFalseAlmCnt->Cnt_all > 10000)
@@ -477,24 +393,15 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm) 
				CurrentIGI = CurrentIGI + 1;/* pDM_DigTable->CurIGValue = pDM_DigTable->PreIGValue+1; */

			else if (pFalseAlmCnt->Cnt_all < 500)

				CurrentIGI = CurrentIGI - 1;/* pDM_DigTable->CurIGValue =pDM_DigTable->PreIGValue-1; */

			ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): England DIG\n", __func__));

		}

	}

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): DIG End Adjust IGI\n", __func__));

	/* 1 Check initial gain by upper/lower bound */

	if (CurrentIGI > pDM_DigTable->rx_gain_range_max)

		CurrentIGI = pDM_DigTable->rx_gain_range_max;

	if (CurrentIGI < pDM_DigTable->rx_gain_range_min)

		CurrentIGI = pDM_DigTable->rx_gain_range_min;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD,

		     ("%s(): rx_gain_range_max=0x%x, rx_gain_range_min=0x%x\n",

		      __func__, pDM_DigTable->rx_gain_range_max, pDM_DigTable->rx_gain_range_min));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): TotalFA=%d\n", __func__, pFalseAlmCnt->Cnt_all));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("%s(): CurIGValue=0x%x\n", __func__, CurrentIGI));



	/* 2 High power RSSI threshold */



	ODM_Write_DIG(pDM_Odm, CurrentIGI);/* ODM_Write_DIG(pDM_Odm, pDM_DigTable->CurIGValue); */

	pDM_DigTable->bMediaConnect_0 = pDM_Odm->bLinked;

	pDM_DigTable->DIG_Dynamic_MIN_0 = DIG_Dynamic_MIN;
@@ -558,20 +465,6 @@ void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm) 
				FalseAlmCnt->Cnt_Cck_fail);



	FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Enter %s\n", __func__));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD,

		     ("Cnt_Fast_Fsync=%d, Cnt_SB_Search_fail=%d\n",

		     FalseAlmCnt->Cnt_Fast_Fsync, FalseAlmCnt->Cnt_SB_Search_fail));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD,

		     ("Cnt_Parity_Fail=%d, Cnt_Rate_Illegal=%d\n",

		     FalseAlmCnt->Cnt_Parity_Fail, FalseAlmCnt->Cnt_Rate_Illegal));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD,

		     ("Cnt_Crc8_fail=%d, Cnt_Mcs_fail=%d\n",

		     FalseAlmCnt->Cnt_Crc8_fail, FalseAlmCnt->Cnt_Mcs_fail));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Cnt_Cck_fail=%d\n", FalseAlmCnt->Cnt_Cck_fail));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Cnt_Ofdm_fail=%d\n", FalseAlmCnt->Cnt_Ofdm_fail));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_FA_CNT, ODM_DBG_LOUD, ("Total False Alarm=%d\n", FalseAlmCnt->Cnt_all));

}



/* 3============================================================ */
@@ -752,10 +645,6 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u 
		break;

	}



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD,

		     (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",

		     rssi_level, WirelessMode, rate_bitmap));



	return rate_bitmap;

}
@@ -777,29 +666,21 @@ void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm) 
	u8 i;

	struct adapter *pAdapter = pDM_Odm->Adapter;



	if (pAdapter->bDriverStopped) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("<---- odm_RefreshRateAdaptiveMask(): driver is going to unload\n"));

	if (pAdapter->bDriverStopped)

		return;

	}



	if (!pDM_Odm->bUseRAMask) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("<---- odm_RefreshRateAdaptiveMask(): driver does not control rate adaptive mask\n"));

	if (!pDM_Odm->bUseRAMask)

		return;

	}



	for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {

		struct sta_info *pstat = pDM_Odm->pODM_StaInfo[i];



		if (IS_STA_VALID(pstat)) {

			if (ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {

				ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD,

					     ("RSSI:%d, RSSI_LEVEL:%d\n",

					     pstat->rssi_stat.UndecoratedSmoothedPWDB, pstat->rssi_level));

			if (ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level))

				rtw_hal_update_ra_mask(pAdapter, i, pstat->rssi_level);

		}

	}

}

}



/*  Return Value: bool */

/*  - true: RATRState is changed. */
@@ -840,7 +721,6 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate 
		RATRState = DM_RATR_STA_LOW;



	if (*pRATRState != RATRState || bForceUpdate) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, ("RSSI Level %d -> %d\n", *pRATRState, RATRState));

		*pRATRState = RATRState;

		return true;

	}
@@ -979,20 +859,16 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm) 


void odm_InitHybridAntDiv(struct odm_dm_struct *pDM_Odm)

{

	if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Return: Not Support HW AntDiv\n"));

	if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))

		return;

	}



	rtl88eu_dm_antenna_div_init(pDM_Odm);

}



void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm)

{

	if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Return: Not Support HW AntDiv\n"));

	if (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV))

		return;

	}



	rtl88eu_dm_antenna_diversity(pDM_Odm);

}
@@ -1005,11 +881,6 @@ void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm) 
	pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false;

	pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false;

	Adapter->recvpriv.bIsAnyNonBEPkts = false;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Original VO PARAM: 0x%x\n", usb_read32(Adapter, ODM_EDCA_VO_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Original VI PARAM: 0x%x\n", usb_read32(Adapter, ODM_EDCA_VI_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Original BE PARAM: 0x%x\n", usb_read32(Adapter, ODM_EDCA_BE_PARAM)));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("Original BK PARAM: 0x%x\n", usb_read32(Adapter, ODM_EDCA_BK_PARAM)));

}	/*  ODM_InitEdcaTurbo */



void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm)
@@ -1017,13 +888,10 @@ void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm) 
	/*  2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */

	/*  at the same time. In the stage2/3, we need to prive universal interface and merge all */

	/*  HW dynamic mechanism. */

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("%s========================>\n", __func__));



	if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))

		return;



	odm_EdcaTurboCheckCE(pDM_Odm);

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_EDCA_TURBO, ODM_DBG_LOUD, ("<========================%s\n", __func__));

}	/*  odm_CheckEdcaTurbo */



void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm)

drivers/staging/rtl8188eu/hal/odm_rtl8188e.c

+0 −6

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8188eu/hal/phy.c

+1 −37

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+0 −2
Original line number Diff line number Diff line
@@ -165,11 +165,9 @@ void rtw_hal_dm_watchdog(struct adapter *Adapter) 
void rtw_hal_dm_init(struct adapter *Adapter)

{

	struct dm_priv *pdmpriv = &Adapter->HalData->dmpriv;

	struct odm_dm_struct *podmpriv = &Adapter->HalData->odmpriv;



	memset(pdmpriv, 0, sizeof(struct dm_priv));

	Init_ODM_ComInfo_88E(Adapter);

	ODM_InitDebugSetting(podmpriv);

}



/*  Add new function to reset the state of antenna diversity before link. */