AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-12 22:46:48 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: rtl8192su: some work on dm_check_edca_turbo()

Browse Source 
Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Florian Schilhabel 2010-07-14 14:45:32 +02:00 committed by Greg Kroah-Hartman
parent d9c5cc9887
commit 56c93a0537
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h
View File

@ -476,10 +476,9 @@ typedef enum _HT_IOT_ACTION{
HT_IOT_ACT_FORCED_CTS2SELF = 0x00000200, HT_IOT_ACT_FORCED_CTS2SELF = 0x00000200,
HT_IOT_ACT_FORCED_RTS = 0x00000400, HT_IOT_ACT_FORCED_RTS = 0x00000400,
HT_IOT_ACT_AMSDU_ENABLE = 0x00000800, HT_IOT_ACT_AMSDU_ENABLE = 0x00000800,
HT_IOT_ACT_MID_HIGHPOWER = 0x00001000, HT_IOT_ACT_REJECT_ADDBA_REQ = 0x00001000,
HT_IOT_ACT_REJECT_ADDBA_REQ = 0x00002000, HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT = 0x00002000,
HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT = 0x00004000, HT_IOT_ACT_EDCA_BIAS_ON_RX = 0x00004000,
HT_IOT_ACT_EDCA_BIAS_ON_RX = 0x00008000,
HT_IOT_ACT_HYBRID_AGGREGATION = 0x00010000, HT_IOT_ACT_HYBRID_AGGREGATION = 0x00010000,
HT_IOT_ACT_DISABLE_SHORT_GI = 0x00020000, HT_IOT_ACT_DISABLE_SHORT_GI = 0x00020000,
@ -487,6 +486,13 @@ typedef enum _HT_IOT_ACTION{
HT_IOT_ACT_DISABLE_TX_40_MHZ = 0x00080000, HT_IOT_ACT_DISABLE_TX_40_MHZ = 0x00080000,
HT_IOT_ACT_TX_NO_AGGREGATION = 0x00100000, HT_IOT_ACT_TX_NO_AGGREGATION = 0x00100000,
HT_IOT_ACT_DISABLE_TX_2SS = 0x00200000, HT_IOT_ACT_DISABLE_TX_2SS = 0x00200000,
HT_IOT_ACT_MID_HIGHPOWER = 0x00400000,
HT_IOT_ACT_NULL_DATA_POWER_SAVING = 0x00800000,
HT_IOT_ACT_DISABLE_CCK_RATE = 0x01000000,
HT_IOT_ACT_FORCED_ENABLE_BE_TXOP = 0x02000000,
HT_IOT_ACT_WA_IOT_Broadcom = 0x04000000,
}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E; }HT_IOT_ACTION_E, *PHT_IOT_ACTION_E;
typedef enum _HT_IOT_RAFUNC{ typedef enum _HT_IOT_RAFUNC{

29
drivers/staging/rtl8192su/r8192U_dm.c
View File

@ -2673,7 +2673,6 @@ static void dm_check_edca_turbo(
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo; PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;
//PSTA_QOS pStaQos = pMgntInfo->pStaQos;
// Keep past Tx/Rx packet count for RT-to-RT EDCA turbo. // Keep past Tx/Rx packet count for RT-to-RT EDCA turbo.
static unsigned long lastTxOkCnt = 0; static unsigned long lastTxOkCnt = 0;
@ -2681,10 +2680,8 @@ static void dm_check_edca_turbo(
unsigned long curTxOkCnt = 0; unsigned long curTxOkCnt = 0;
unsigned long curRxOkCnt = 0; unsigned long curRxOkCnt = 0;
// u32 EDCA_BE_UL = edca_setting_UL[pHTInfo->IOTPeer];
// Do not be Turbo if it's under WiFi config and Qos Enabled, because the EDCA parameters u32 EDCA_BE_DL = edca_setting_DL[pHTInfo->IOTPeer];
// should follow the settings from QAP. By Bruce, 2007-12-07.
//
#if 1 #if 1
if(priv->ieee80211->state != IEEE80211_LINKED) if(priv->ieee80211->state != IEEE80211_LINKED)
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
@ -2693,6 +2690,14 @@ static void dm_check_edca_turbo(
if(priv->ieee80211->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO) if(priv->ieee80211->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO)
goto dm_CheckEdcaTurbo_EXIT; goto dm_CheckEdcaTurbo_EXIT;
if(priv->ieee80211->pHTInfo->IOTAction & HT_IOT_ACT_FORCED_ENABLE_BE_TXOP)
{
if(!(EDCA_BE_UL & 0xffff0000))
EDCA_BE_UL |= 0x005e0000;
if(!(EDCA_BE_DL & 0xffff0000))
EDCA_BE_DL |= 0x005e0000;
}
{ {
u8* peername[11] = {"unknown", "realtek", "realtek_92se", "broadcom", "ralink", "atheros", "cisco", "marvell", "92u_softap", "self_softap"}; u8* peername[11] = {"unknown", "realtek", "realtek_92se", "broadcom", "ralink", "atheros", "cisco", "marvell", "92u_softap", "self_softap"};
static int wb_tmp = 0; static int wb_tmp = 0;
@ -2714,7 +2719,7 @@ static void dm_check_edca_turbo(
{ {
if(priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) if(priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)
{ {
write_nic_dword(dev, EDCAPARA_BE, edca_setting_UL[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE, EDCA_BE_UL);
priv->bis_cur_rdlstate = false; priv->bis_cur_rdlstate = false;
} }
} }
@ -2722,7 +2727,7 @@ static void dm_check_edca_turbo(
{ {
if(!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) if(!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)
{ {
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE, EDCA_BE_DL);
priv->bis_cur_rdlstate = true; priv->bis_cur_rdlstate = true;
} }
} }
@ -2734,7 +2739,7 @@ static void dm_check_edca_turbo(
{ {
if(!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) if(!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)
{ {
write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE, EDCA_BE_DL);
priv->bis_cur_rdlstate = true; priv->bis_cur_rdlstate = true;
} }
} }
@ -2742,7 +2747,7 @@ static void dm_check_edca_turbo(
{ {
if(priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) if(priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)
{ {
write_nic_dword(dev, EDCAPARA_BE, edca_setting_UL[pHTInfo->IOTPeer]); write_nic_dword(dev, EDCAPARA_BE, EDCA_BE_UL);
priv->bis_cur_rdlstate = false; priv->bis_cur_rdlstate = false;
} }
} }
@ -2771,7 +2776,7 @@ static void dm_check_edca_turbo(
(((u32)(qos_parameters->cw_max[0]))<< AC_PARAM_ECW_MAX_OFFSET)| (((u32)(qos_parameters->cw_max[0]))<< AC_PARAM_ECW_MAX_OFFSET)|
(((u32)(qos_parameters->cw_min[0]))<< AC_PARAM_ECW_MIN_OFFSET)| (((u32)(qos_parameters->cw_min[0]))<< AC_PARAM_ECW_MIN_OFFSET)|
((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET)); ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
//write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);
write_nic_dword(dev, EDCAPARA_BE, u4bAcParam); write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
// Check ACM bit. // Check ACM bit.
@ -2780,7 +2785,7 @@ static void dm_check_edca_turbo(
// TODO: Modified this part and try to set acm control in only 1 IO processing!! // TODO: Modified this part and try to set acm control in only 1 IO processing!!
PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]); PACI_AIFSN pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
u8 AcmCtrl = read_nic_byte( dev, AcmHwCtrl ); u8 AcmCtrl = priv->AcmControl | 0x1;
if( pAciAifsn->f.ACM ) if( pAciAifsn->f.ACM )
{ // ACM bit is 1. { // ACM bit is 1.
AcmCtrl |= AcmHw_BeqEn; AcmCtrl |= AcmHw_BeqEn;
@ -2804,7 +2809,7 @@ static void dm_check_edca_turbo(
priv->ieee80211->bis_any_nonbepkts = false; priv->ieee80211->bis_any_nonbepkts = false;
lastTxOkCnt = priv->stats.txbytesunicast; lastTxOkCnt = priv->stats.txbytesunicast;
lastRxOkCnt = priv->stats.rxbytesunicast; lastRxOkCnt = priv->stats.rxbytesunicast;
} // dm_CheckEdcaTurbo }
#endif #endif
extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value) extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value)