Skip to content

L
linux
Commit b9ffad08 authored by Larry Finger's avatar Larry Finger
Browse files
Options

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part II 

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 81e38636
Hide whitespace changes
Inline Side-by-side
Showing with 1198 additions and 1077 deletions
drivers/staging/rtl8192e/r8192E_dev.c
View file @ b9ffad08
...@@ -37,8 +37,8 @@ void rtl8192e_start_beacon(struct net_device *dev) ...@@ -37,8 +37,8 @@ void rtl8192e_start_beacon(struct net_device *dev)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct rtllib_network *net = &priv->rtllib->current_network; struct rtllib_network *net = &priv->rtllib->current_network;
u16 BcnTimeCfg = 0; u16 BcnTimeCfg = 0;
u16 BcnCW = 6; u16 BcnCW = 6;
u16 BcnIFS = 0xf; u16 BcnIFS = 0xf;
DMESG("Enabling beacon TX"); DMESG("Enabling beacon TX");
rtl8192_irq_disable(dev); rtl8192_irq_disable(dev);
...@@ -63,7 +63,7 @@ void rtl8192e_update_msr(struct net_device *dev) ...@@ -63,7 +63,7 @@ void rtl8192e_update_msr(struct net_device *dev)
u8 msr; u8 msr;
enum led_ctl_mode LedAction = LED_CTL_NO_LINK; enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
msr = read_nic_byte(dev, MSR); msr = read_nic_byte(dev, MSR);
msr &= ~ MSR_LINK_MASK; msr &= ~MSR_LINK_MASK;
switch (priv->rtllib->iw_mode) { switch (priv->rtllib->iw_mode) {
case IW_MODE_INFRA: case IW_MODE_INFRA:
...@@ -94,250 +94,246 @@ void rtl8192e_update_msr(struct net_device *dev) ...@@ -94,250 +94,246 @@ void rtl8192e_update_msr(struct net_device *dev)
priv->rtllib->LedControlHandler(dev, LedAction); priv->rtllib->LedControlHandler(dev, LedAction);
} }
void void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
{ {
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
switch (variable)
{
case HW_VAR_BSSID: switch (variable) {
write_nic_dword(dev, BSSIDR, ((u32*)(val))[0]); case HW_VAR_BSSID:
write_nic_word(dev, BSSIDR+2, ((u16*)(val+2))[0]); write_nic_dword(dev, BSSIDR, ((u32 *)(val))[0]);
write_nic_word(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
break; break;
case HW_VAR_MEDIA_STATUS: case HW_VAR_MEDIA_STATUS:
{ {
enum rt_op_mode OpMode = *((enum rt_op_mode *)(val)); enum rt_op_mode OpMode = *((enum rt_op_mode *)(val));
enum led_ctl_mode LedAction = LED_CTL_NO_LINK; enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
u8 btMsr = read_nic_byte(dev, MSR); u8 btMsr = read_nic_byte(dev, MSR);
btMsr &= 0xfc; btMsr &= 0xfc;
switch (OpMode) switch (OpMode) {
{ case RT_OP_MODE_INFRASTRUCTURE:
case RT_OP_MODE_INFRASTRUCTURE: btMsr |= MSR_INFRA;
btMsr |= MSR_INFRA; LedAction = LED_CTL_LINK;
LedAction = LED_CTL_LINK; break;
break;
case RT_OP_MODE_IBSS: case RT_OP_MODE_IBSS:
btMsr |= MSR_ADHOC; btMsr |= MSR_ADHOC;
break; break;
case RT_OP_MODE_AP: case RT_OP_MODE_AP:
btMsr |= MSR_AP; btMsr |= MSR_AP;
LedAction = LED_CTL_LINK; LedAction = LED_CTL_LINK;
break; break;
default: default:
btMsr |= MSR_NOLINK; btMsr |= MSR_NOLINK;
break; break;
} }
write_nic_byte(dev, MSR, btMsr); write_nic_byte(dev, MSR, btMsr);
} }
break; break;
case HW_VAR_CECHK_BSSID: case HW_VAR_CECHK_BSSID:
{ {
u32 RegRCR, Type; u32 RegRCR, Type;
Type = ((u8*)(val))[0]; Type = ((u8 *)(val))[0];
RegRCR = read_nic_dword(dev,RCR); RegRCR = read_nic_dword(dev, RCR);
priv->ReceiveConfig = RegRCR; priv->ReceiveConfig = RegRCR;
if (Type == true) if (Type == true)
RegRCR |= (RCR_CBSSID); RegRCR |= (RCR_CBSSID);
else if (Type == false) else if (Type == false)
RegRCR &= (~RCR_CBSSID); RegRCR &= (~RCR_CBSSID);
write_nic_dword(dev, RCR,RegRCR); write_nic_dword(dev, RCR, RegRCR);
priv->ReceiveConfig = RegRCR; priv->ReceiveConfig = RegRCR;
} }
break; break;
case HW_VAR_SLOT_TIME: case HW_VAR_SLOT_TIME:
{
priv->slot_time = val[0]; priv->slot_time = val[0];
write_nic_byte(dev, SLOT_TIME, val[0]); write_nic_byte(dev, SLOT_TIME, val[0]);
}
break; break;
case HW_VAR_ACK_PREAMBLE: case HW_VAR_ACK_PREAMBLE:
{ {
u32 regTmp = 0; u32 regTmp;
priv->short_preamble = (bool)(*(u8*)val ); priv->short_preamble = (bool)(*(u8 *)val);
regTmp = priv->basic_rate; regTmp = priv->basic_rate;
if (priv->short_preamble) if (priv->short_preamble)
regTmp |= BRSR_AckShortPmb; regTmp |= BRSR_AckShortPmb;
write_nic_dword(dev, RRSR, regTmp); write_nic_dword(dev, RRSR, regTmp);
}
break; break;
}
case HW_VAR_CPU_RST: case HW_VAR_CPU_RST:
write_nic_dword(dev, CPU_GEN, ((u32*)(val))[0]); write_nic_dword(dev, CPU_GEN, ((u32 *)(val))[0]);
break; break;
case HW_VAR_AC_PARAM: case HW_VAR_AC_PARAM:
{ {
u8 pAcParam = *((u8*)val); u8 pAcParam = *((u8 *)val);
u32 eACI = pAcParam; u32 eACI = pAcParam;
u8 u1bAIFS; u8 u1bAIFS;
u32 u4bAcParam; u32 u4bAcParam;
u8 mode = priv->rtllib->mode; u8 mode = priv->rtllib->mode;
struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters; struct rtllib_qos_parameters *qos_parameters =
&priv->rtllib->current_network.qos_data.parameters;
u1bAIFS = qos_parameters->aifs[pAcParam] *
((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
dm_init_edca_turbo(dev);
u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[pAcParam])) <<
AC_PARAM_TXOP_LIMIT_OFFSET) |
(((u32)(qos_parameters->cw_max[pAcParam])) <<
AC_PARAM_ECW_MAX_OFFSET) |
(((u32)(qos_parameters->cw_min[pAcParam])) <<
AC_PARAM_ECW_MIN_OFFSET) |
(((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET));
RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n",
__func__, eACI, u4bAcParam);
switch (eACI) {
case AC1_BK:
write_nic_dword(dev, EDCAPARA_BK, u4bAcParam);
break;
u1bAIFS = qos_parameters->aifs[pAcParam] * ((mode&(IEEE_G|IEEE_N_24G)) ?9:20) + aSifsTime; case AC0_BE:
write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
break;
dm_init_edca_turbo(dev); case AC2_VI:
write_nic_dword(dev, EDCAPARA_VI, u4bAcParam);
break;
u4bAcParam = ( (((u32)(qos_parameters->tx_op_limit[pAcParam])) << AC_PARAM_TXOP_LIMIT_OFFSET) | case AC3_VO:
(((u32)(qos_parameters->cw_max[pAcParam])) << AC_PARAM_ECW_MAX_OFFSET) | write_nic_dword(dev, EDCAPARA_VO, u4bAcParam);
(((u32)(qos_parameters->cw_min[pAcParam])) << AC_PARAM_ECW_MIN_OFFSET) | break;
(((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET) );
RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n", __func__,eACI, u4bAcParam); default:
switch (eACI) printk(KERN_INFO "SetHwReg8185(): invalid ACI: %d !\n",
{ eACI);
case AC1_BK: break;
write_nic_dword(dev, EDCAPARA_BK, u4bAcParam); }
break; priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACM_CTRL,
(u8 *)(&pAcParam));
break;
}
case HW_VAR_ACM_CTRL:
{
struct rtllib_qos_parameters *qos_parameters =
&priv->rtllib->current_network.qos_data.parameters;
u8 pAcParam = *((u8 *)val);
u32 eACI = pAcParam;
union aci_aifsn *pAciAifsn = (union aci_aifsn *) &
(qos_parameters->aifs[0]);
u8 acm = pAciAifsn->f.acm;
u8 AcmCtrl = read_nic_byte(dev, AcmHwCtrl);
RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n",
__func__, eACI);
AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2) ? 0x0 : 0x1);
if (acm) {
switch (eACI) {
case AC0_BE: case AC0_BE:
write_nic_dword(dev, EDCAPARA_BE, u4bAcParam); AcmCtrl |= AcmHw_BeqEn;
break; break;
case AC2_VI: case AC2_VI:
write_nic_dword(dev, EDCAPARA_VI, u4bAcParam); AcmCtrl |= AcmHw_ViqEn;
break; break;
case AC3_VO: case AC3_VO:
write_nic_dword(dev, EDCAPARA_VO, u4bAcParam); AcmCtrl |= AcmHw_VoqEn;
break; break;
default: default:
printk("SetHwReg8185(): invalid ACI: %d !\n", eACI); RT_TRACE(COMP_QOS, "SetHwReg8185(): [HW_VAR_"
"ACM_CTRL] acm set failed: eACI is "
"%d\n", eACI);
break; break;
} }
priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACM_CTRL, (u8*)(&pAcParam)); } else {
} switch (eACI) {
break; case AC0_BE:
AcmCtrl &= (~AcmHw_BeqEn);
case HW_VAR_ACM_CTRL: break;
{
struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;
u8 pAcParam = *((u8*)val);
u32 eACI = pAcParam;
union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]);
u8 acm = pAciAifsn->f.acm;
u8 AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI);
AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1);
if (acm)
{
switch (eACI)
{
case AC0_BE:
AcmCtrl |= AcmHw_BeqEn;
break;
case AC2_VI:
AcmCtrl |= AcmHw_ViqEn;
break;
case AC3_VO:
AcmCtrl |= AcmHw_VoqEn;
break;
default:
RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n", eACI );
break;
}
}
else
{
switch (eACI)
{
case AC0_BE:
AcmCtrl &= (~AcmHw_BeqEn);
break;
case AC2_VI: case AC2_VI:
AcmCtrl &= (~AcmHw_ViqEn); AcmCtrl &= (~AcmHw_ViqEn);
break; break;
case AC3_VO: case AC3_VO:
AcmCtrl &= (~AcmHw_BeqEn); AcmCtrl &= (~AcmHw_BeqEn);
break; break;
default: default:
break; break;
}
} }
RT_TRACE( COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl );
write_nic_byte(dev, AcmHwCtrl, AcmCtrl );
} }
RT_TRACE(COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write"
" 0x%X\n", AcmCtrl);
write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
break; break;
}
case HW_VAR_SIFS: case HW_VAR_SIFS:
write_nic_byte(dev, SIFS, val[0]); write_nic_byte(dev, SIFS, val[0]);
write_nic_byte(dev, SIFS+1, val[0]); write_nic_byte(dev, SIFS+1, val[0]);
break; break;
case HW_VAR_RF_TIMING: case HW_VAR_RF_TIMING:
{ {
u8 Rf_Timing = *((u8*)val); u8 Rf_Timing = *((u8 *)val);
write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing); write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing);
}
break; break;
}
default: default:
break; break;
} }
} }
static void rtl8192_read_eeprom_info(struct net_device* dev) static void rtl8192_read_eeprom_info(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u8 tempval; u8 tempval;
u8 ICVer8192, ICVer8256; u8 ICVer8192, ICVer8256;
u16 i,usValue, IC_Version; u16 i, usValue, IC_Version;
u16 EEPROMId; u16 EEPROMId;
u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01}; u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01};
RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n"); RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n");
EEPROMId = eprom_read(dev, 0); EEPROMId = eprom_read(dev, 0);
if ( EEPROMId != RTL8190_EEPROM_ID ) if (EEPROMId != RTL8190_EEPROM_ID) {
{ RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n",
RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n", EEPROMId, RTL8190_EEPROM_ID); EEPROMId, RTL8190_EEPROM_ID);
priv->AutoloadFailFlag=true; priv->AutoloadFailFlag = true;
} } else {
else priv->AutoloadFailFlag = false;
{
priv->AutoloadFailFlag=false;
} }
if (!priv->AutoloadFailFlag) if (!priv->AutoloadFailFlag) {
{
priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1)); priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1));
priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1)); priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1));
usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8 ; usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8;
priv->eeprom_CustomerID = (u8)( usValue & 0xff); priv->eeprom_CustomerID = (u8)(usValue & 0xff);
usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1)); usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1));
priv->eeprom_ChannelPlan = usValue&0xff; priv->eeprom_ChannelPlan = usValue&0xff;
IC_Version = ((usValue&0xff00)>>8); IC_Version = ((usValue&0xff00)>>8);
...@@ -346,24 +342,21 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) ...@@ -346,24 +342,21 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
ICVer8256 = ((IC_Version&0xf0)>>4); ICVer8256 = ((IC_Version&0xf0)>>4);
RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192); RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192);
RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256); RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256);
if (ICVer8192 == 0x2) if (ICVer8192 == 0x2) {
{
if (ICVer8256 == 0x5) if (ICVer8256 == 0x5)
priv->card_8192_version= VERSION_8190_BE; priv->card_8192_version = VERSION_8190_BE;
} }
switch (priv->card_8192_version) switch (priv->card_8192_version) {
{ case VERSION_8190_BD:
case VERSION_8190_BD: case VERSION_8190_BE:
case VERSION_8190_BE: break;
break; default:
default: priv->card_8192_version = VERSION_8190_BD;
priv->card_8192_version = VERSION_8190_BD; break;
break;
} }
RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n", priv->card_8192_version); RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n",
} priv->card_8192_version);
else } else {
{
priv->card_8192_version = VERSION_8190_BD; priv->card_8192_version = VERSION_8190_BD;
priv->eeprom_vid = 0; priv->eeprom_vid = 0;
priv->eeprom_did = 0; priv->eeprom_did = 0;
...@@ -374,282 +367,289 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) ...@@ -374,282 +367,289 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid); RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid);
RT_TRACE(COMP_INIT, "EEPROM DID = 0x%4x\n", priv->eeprom_did); RT_TRACE(COMP_INIT, "EEPROM DID = 0x%4x\n", priv->eeprom_did);
RT_TRACE(COMP_INIT,"EEPROM Customer ID: 0x%2x\n", priv->eeprom_CustomerID); RT_TRACE(COMP_INIT, "EEPROM Customer ID: 0x%2x\n",
priv->eeprom_CustomerID);
if (!priv->AutoloadFailFlag)
{ if (!priv->AutoloadFailFlag) {
for (i = 0; i < 6; i += 2) for (i = 0; i < 6; i += 2) {
{ usValue = eprom_read(dev,
usValue = eprom_read(dev, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1)); (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1));
*(u16*)(&dev->dev_addr[i]) = usValue; *(u16 *)(&dev->dev_addr[i]) = usValue;
} }
} else { } else {
memcpy(dev->dev_addr, bMac_Tmp_Addr, 6); memcpy(dev->dev_addr, bMac_Tmp_Addr, 6);
} }
RT_TRACE(COMP_INIT, "Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n", RT_TRACE(COMP_INIT, "Permanent Address = %pM\n",
dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr);
dev->dev_addr[2], dev->dev_addr[3],
dev->dev_addr[4], dev->dev_addr[5]);
if (priv->card_8192_version > VERSION_8190_BD) { if (priv->card_8192_version > VERSION_8190_BD)
priv->bTXPowerDataReadFromEEPORM = true; priv->bTXPowerDataReadFromEEPORM = true;
} else { else
priv->bTXPowerDataReadFromEEPORM = false; priv->bTXPowerDataReadFromEEPORM = false;
}
priv->rf_type = RTL819X_DEFAULT_RF_TYPE; priv->rf_type = RTL819X_DEFAULT_RF_TYPE;
if (priv->card_8192_version > VERSION_8190_BD) if (priv->card_8192_version > VERSION_8190_BD) {
{ if (!priv->AutoloadFailFlag) {
if (!priv->AutoloadFailFlag) tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff >>
{ 1))) & 0xff;
tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf; priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;
if (tempval&0x80) if (tempval&0x80)
priv->rf_type = RF_1T2R; priv->rf_type = RF_1T2R;
else else
priv->rf_type = RF_2T4R; priv->rf_type = RF_2T4R;
} } else {
else
{
priv->EEPROMLegacyHTTxPowerDiff = 0x04; priv->EEPROMLegacyHTTxPowerDiff = 0x04;
} }
RT_TRACE(COMP_INIT, "EEPROMLegacyHTTxPowerDiff = %d\n", RT_TRACE(COMP_INIT, "EEPROMLegacyHTTxPowerDiff = %d\n",
priv->EEPROMLegacyHTTxPowerDiff); priv->EEPROMLegacyHTTxPowerDiff);
if (!priv->AutoloadFailFlag) if (!priv->AutoloadFailFlag)
{ priv->EEPROMThermalMeter = (u8)(((eprom_read(dev,
priv->EEPROMThermalMeter = (u8)(((eprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8); (EEPROM_ThermalMeter>>1))) &
} 0xff00)>>8);
else else
{
priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter; priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;
} RT_TRACE(COMP_INIT, "ThermalMeter = %d\n",
RT_TRACE(COMP_INIT, "ThermalMeter = %d\n", priv->EEPROMThermalMeter); priv->EEPROMThermalMeter);
priv->TSSI_13dBm = priv->EEPROMThermalMeter *100; priv->TSSI_13dBm = priv->EEPROMThermalMeter * 100;
if (priv->epromtype == EEPROM_93C46) if (priv->epromtype == EEPROM_93C46) {
{ if (!priv->AutoloadFailFlag) {
if (!priv->AutoloadFailFlag) usValue = eprom_read(dev,
{ (EEPROM_TxPwDiff_CrystalCap >> 1));
usValue = eprom_read(dev, (EEPROM_TxPwDiff_CrystalCap>>1));
priv->EEPROMAntPwDiff = (usValue&0x0fff); priv->EEPROMAntPwDiff = (usValue&0x0fff);
priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12); priv->EEPROMCrystalCap = (u8)((usValue & 0xf000)
} >> 12);
else } else {
{ priv->EEPROMAntPwDiff =
priv->EEPROMAntPwDiff = EEPROM_Default_AntTxPowerDiff; EEPROM_Default_AntTxPowerDiff;
priv->EEPROMCrystalCap = EEPROM_Default_TxPwDiff_CrystalCap; priv->EEPROMCrystalCap =
} EEPROM_Default_TxPwDiff_CrystalCap;
RT_TRACE(COMP_INIT, "EEPROMAntPwDiff = %d\n", priv->EEPROMAntPwDiff);
RT_TRACE(COMP_INIT, "EEPROMCrystalCap = %d\n", priv->EEPROMCrystalCap);
for (i=0; i<14; i+=2)
{
if (!priv->AutoloadFailFlag)
{
usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
}
else
{
usValue = EEPROM_Default_TxPower;
} }
*((u16*)(&priv->EEPROMTxPowerLevelCCK[i])) = usValue; RT_TRACE(COMP_INIT, "EEPROMAntPwDiff = %d\n",
RT_TRACE(COMP_INIT,"CCK Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelCCK[i]); priv->EEPROMAntPwDiff);
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index %d = 0x%02x\n", i+1, priv->EEPROMTxPowerLevelCCK[i+1]); RT_TRACE(COMP_INIT, "EEPROMCrystalCap = %d\n",
} priv->EEPROMCrystalCap);
for (i=0; i<14; i+=2)
{ for (i = 0; i < 14; i += 2) {
if (!priv->AutoloadFailFlag) if (!priv->AutoloadFailFlag)
{ usValue = eprom_read(dev,
usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) ); (u16)((EEPROM_TxPwIndex_CCK +
i) >> 1));
else
usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) =
usValue;
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
" %d = 0x%02x\n", i,
priv->EEPROMTxPowerLevelCCK[i]);
RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
" %d = 0x%02x\n", i+1,
priv->EEPROMTxPowerLevelCCK[i+1]);
} }
else for (i = 0; i < 14; i += 2) {
{ if (!priv->AutoloadFailFlag)
usValue = EEPROM_Default_TxPower; usValue = eprom_read(dev,
(u16)((EEPROM_TxPwIndex_OFDM_24G
+ i) >> 1));
else
usValue = EEPROM_Default_TxPower;
*((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i]))
= usValue;
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
" Index %d = 0x%02x\n", i,
priv->EEPROMTxPowerLevelOFDM24G[i]);
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
" Index %d = 0x%02x\n", i + 1,
priv->EEPROMTxPowerLevelOFDM24G[i+1]);
} }
*((u16*)(&priv->EEPROMTxPowerLevelOFDM24G[i])) = usValue;
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelOFDM24G[i]);
RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i+1, priv->EEPROMTxPowerLevelOFDM24G[i+1]);
}
}
else if (priv->epromtype== EEPROM_93C56)
{
} }
if (priv->epromtype == EEPROM_93C46) if (priv->epromtype == EEPROM_93C46) {
{ for (i = 0; i < 14; i++) {
for (i=0; i<14; i++) priv->TxPowerLevelCCK[i] =
{ priv->EEPROMTxPowerLevelCCK[i];
priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK[i]; priv->TxPowerLevelOFDM24G[i] =
priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[i]; priv->EEPROMTxPowerLevelOFDM24G[i];
} }
priv->LegacyHTTxPowerDiff = priv->EEPROMLegacyHTTxPowerDiff; priv->LegacyHTTxPowerDiff =
priv->AntennaTxPwDiff[0] = (priv->EEPROMAntPwDiff & 0xf); priv->EEPROMLegacyHTTxPowerDiff;
priv->AntennaTxPwDiff[1] = ((priv->EEPROMAntPwDiff & 0xf0)>>4); priv->AntennaTxPwDiff[0] = (priv->EEPROMAntPwDiff &
priv->AntennaTxPwDiff[2] = ((priv->EEPROMAntPwDiff & 0xf00)>>8); 0xf);
priv->AntennaTxPwDiff[1] = ((priv->EEPROMAntPwDiff &
0xf0)>>4);
priv->AntennaTxPwDiff[2] = ((priv->EEPROMAntPwDiff &
0xf00)>>8);
priv->CrystalCap = priv->EEPROMCrystalCap; priv->CrystalCap = priv->EEPROMCrystalCap;
priv->ThermalMeter[0] = (priv->EEPROMThermalMeter & 0xf); priv->ThermalMeter[0] = (priv->EEPROMThermalMeter &
priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter & 0xf0)>>4); 0xf);
} priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter &
else if (priv->epromtype == EEPROM_93C56) 0xf0)>>4);
{ } else if (priv->epromtype == EEPROM_93C56) {
for (i=0; i<3; i++) for (i = 0; i < 3; i++) {
{ priv->TxPowerLevelCCK_A[i] =
priv->TxPowerLevelCCK_A[i] = priv->EEPROMRfACCKChnl1TxPwLevel[0]; priv->EEPROMRfACCKChnl1TxPwLevel[0];
priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[0]; priv->TxPowerLevelOFDM24G_A[i] =
priv->TxPowerLevelCCK_C[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[0]; priv->EEPROMRfAOfdmChnlTxPwLevel[0];
priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[0]; priv->TxPowerLevelCCK_C[i] =
priv->EEPROMRfCCCKChnl1TxPwLevel[0];
priv->TxPowerLevelOFDM24G_C[i] =
priv->EEPROMRfCOfdmChnlTxPwLevel[0];
} }
for (i=3; i<9; i++) for (i = 3; i < 9; i++) {
{ priv->TxPowerLevelCCK_A[i] =
priv->TxPowerLevelCCK_A[i] = priv->EEPROMRfACCKChnl1TxPwLevel[1]; priv->EEPROMRfACCKChnl1TxPwLevel[1];
priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[1]; priv->TxPowerLevelOFDM24G_A[i] =
priv->TxPowerLevelCCK_C[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[1]; priv->EEPROMRfAOfdmChnlTxPwLevel[1];
priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[1]; priv->TxPowerLevelCCK_C[i] =
priv->EEPROMRfCCCKChnl1TxPwLevel[1];
priv->TxPowerLevelOFDM24G_C[i] =
priv->EEPROMRfCOfdmChnlTxPwLevel[1];
} }
for (i=9; i<14; i++) for (i = 9; i < 14; i++) {
{ priv->TxPowerLevelCCK_A[i] =
priv->TxPowerLevelCCK_A[i] = priv->EEPROMRfACCKChnl1TxPwLevel[2]; priv->EEPROMRfACCKChnl1TxPwLevel[2];
priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[2]; priv->TxPowerLevelOFDM24G_A[i] =
priv->TxPowerLevelCCK_C[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[2]; priv->EEPROMRfAOfdmChnlTxPwLevel[2];
priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[2]; priv->TxPowerLevelCCK_C[i] =
priv->EEPROMRfCCCKChnl1TxPwLevel[2];
priv->TxPowerLevelOFDM24G_C[i] =
priv->EEPROMRfCOfdmChnlTxPwLevel[2];
} }
for (i=0; i<14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A[%d] = 0x%x\n", i, priv->TxPowerLevelCCK_A[i]); RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A"
for (i=0; i<14; i++) "[%d] = 0x%x\n", i,
RT_TRACE(COMP_INIT,"priv->TxPowerLevelOFDM24G_A[%d] = 0x%x\n", i, priv->TxPowerLevelOFDM24G_A[i]); priv->TxPowerLevelCCK_A[i]);
for (i=0; i<14; i++) for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C[%d] = 0x%x\n", i, priv->TxPowerLevelCCK_C[i]); RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
for (i=0; i<14; i++) "24G_A[%d] = 0x%x\n", i,
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM24G_C[%d] = 0x%x\n", i, priv->TxPowerLevelOFDM24G_C[i]); priv->TxPowerLevelOFDM24G_A[i]);
priv->LegacyHTTxPowerDiff = priv->EEPROMLegacyHTTxPowerDiff; for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C"
"[%d] = 0x%x\n", i,
priv->TxPowerLevelCCK_C[i]);
for (i = 0; i < 14; i++)
RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
"24G_C[%d] = 0x%x\n", i,
priv->TxPowerLevelOFDM24G_C[i]);
priv->LegacyHTTxPowerDiff =
priv->EEPROMLegacyHTTxPowerDiff;
priv->AntennaTxPwDiff[0] = 0; priv->AntennaTxPwDiff[0] = 0;
priv->AntennaTxPwDiff[1] = 0; priv->AntennaTxPwDiff[1] = 0;
priv->AntennaTxPwDiff[2] = 0; priv->AntennaTxPwDiff[2] = 0;
priv->CrystalCap = priv->EEPROMCrystalCap; priv->CrystalCap = priv->EEPROMCrystalCap;
priv->ThermalMeter[0] = (priv->EEPROMThermalMeter & 0xf); priv->ThermalMeter[0] = (priv->EEPROMThermalMeter &
priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter & 0xf0)>>4); 0xf);
priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter &
0xf0)>>4);
} }
} }
if (priv->rf_type == RF_1T2R) if (priv->rf_type == RF_1T2R) {
{ /* no matter what checkpatch says, the braces are needed */
RT_TRACE(COMP_INIT, "\n1T2R config\n"); RT_TRACE(COMP_INIT, "\n1T2R config\n");
} } else if (priv->rf_type == RF_2T4R) {
else if (priv->rf_type == RF_2T4R)
{
RT_TRACE(COMP_INIT, "\n2T4R config\n"); RT_TRACE(COMP_INIT, "\n2T4R config\n");
} }
init_rate_adaptive(dev); init_rate_adaptive(dev);
priv->rf_chip = RF_8256;
priv->rf_chip= RF_8256;
if (priv->RegChannelPlan == 0xf) if (priv->RegChannelPlan == 0xf)
{
priv->ChannelPlan = priv->eeprom_ChannelPlan; priv->ChannelPlan = priv->eeprom_ChannelPlan;
}
else else
{
priv->ChannelPlan = priv->RegChannelPlan; priv->ChannelPlan = priv->RegChannelPlan;
}
if ( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304 ) if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
{
priv->CustomerID = RT_CID_DLINK; priv->CustomerID = RT_CID_DLINK;
}
switch (priv->eeprom_CustomerID)
{
case EEPROM_CID_DEFAULT:
priv->CustomerID = RT_CID_DEFAULT;
break;
case EEPROM_CID_CAMEO:
priv->CustomerID = RT_CID_819x_CAMEO;
break;
case EEPROM_CID_RUNTOP:
priv->CustomerID = RT_CID_819x_RUNTOP;
break;
case EEPROM_CID_NetCore:
priv->CustomerID = RT_CID_819x_Netcore;
break;
case EEPROM_CID_TOSHIBA:
priv->CustomerID = RT_CID_TOSHIBA;
if (priv->eeprom_ChannelPlan&0x80)
priv->ChannelPlan = priv->eeprom_ChannelPlan&0x7f;
else
priv->ChannelPlan = 0x0;
RT_TRACE(COMP_INIT, "Toshiba ChannelPlan = 0x%x\n",
priv->ChannelPlan);
break;
case EEPROM_CID_Nettronix:
priv->ScanDelay = 100;
priv->CustomerID = RT_CID_Nettronix;
break;
case EEPROM_CID_Pronet:
priv->CustomerID = RT_CID_PRONET;
break;
case EEPROM_CID_DLINK:
priv->CustomerID = RT_CID_DLINK;
break;
case EEPROM_CID_WHQL:
switch (priv->eeprom_CustomerID) {
case EEPROM_CID_DEFAULT:
priv->CustomerID = RT_CID_DEFAULT;
break;
case EEPROM_CID_CAMEO:
priv->CustomerID = RT_CID_819x_CAMEO;
break;
case EEPROM_CID_RUNTOP:
priv->CustomerID = RT_CID_819x_RUNTOP;
break;
case EEPROM_CID_NetCore:
priv->CustomerID = RT_CID_819x_Netcore;
break;
case EEPROM_CID_TOSHIBA:
priv->CustomerID = RT_CID_TOSHIBA;
if (priv->eeprom_ChannelPlan&0x80)
priv->ChannelPlan = priv->eeprom_ChannelPlan&0x7f;
else
priv->ChannelPlan = 0x0;
RT_TRACE(COMP_INIT, "Toshiba ChannelPlan = 0x%x\n",
priv->ChannelPlan);
break;
case EEPROM_CID_Nettronix:
priv->ScanDelay = 100;
priv->CustomerID = RT_CID_Nettronix;
break;
case EEPROM_CID_Pronet:
priv->CustomerID = RT_CID_PRONET;
break;
case EEPROM_CID_DLINK:
priv->CustomerID = RT_CID_DLINK;
break;
break; case EEPROM_CID_WHQL:
default: break;
break; default:
break;
} }
if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)
priv->ChannelPlan = 0; priv->ChannelPlan = 0;
priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13; priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;
if ( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) if (priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
priv->rtllib->bSupportRemoteWakeUp = true; priv->rtllib->bSupportRemoteWakeUp = true;
else else
priv->rtllib->bSupportRemoteWakeUp = false; priv->rtllib->bSupportRemoteWakeUp = false;
RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan); RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan);
RT_TRACE(COMP_INIT, "ChannelPlan = %d \n", priv->ChannelPlan); RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan);
RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n"); RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n");
return ;
} }
void rtl8192_get_eeprom_size(struct net_device* dev) void rtl8192_get_eeprom_size(struct net_device *dev)
{ {
u16 curCR = 0; u16 curCR;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
RT_TRACE(COMP_INIT, "===========>%s()\n", __func__); RT_TRACE(COMP_INIT, "===========>%s()\n", __func__);
curCR = read_nic_dword(dev, EPROM_CMD); curCR = read_nic_dword(dev, EPROM_CMD);
RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD, curCR); RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD,
priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 : EEPROM_93C46; curCR);
RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __func__, priv->epromtype); priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 :
EEPROM_93C46;
RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __func__,
priv->epromtype);
rtl8192_read_eeprom_info(dev); rtl8192_read_eeprom_info(dev);
} }
static void rtl8192_hwconfig(struct net_device* dev) static void rtl8192_hwconfig(struct net_device *dev)
{ {
u32 regRATR = 0, regRRSR = 0; u32 regRATR = 0, regRRSR = 0;
u8 regBwOpMode = 0, regTmp = 0; u8 regBwOpMode = 0, regTmp = 0;
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
switch (priv->rtllib->mode) switch (priv->rtllib->mode) {
{
case WIRELESS_MODE_B: case WIRELESS_MODE_B:
regBwOpMode = BW_OPMODE_20MHZ; regBwOpMode = BW_OPMODE_20MHZ;
regRATR = RATE_ALL_CCK; regRATR = RATE_ALL_CCK;
regRRSR = RATE_ALL_CCK; regRRSR = RATE_ALL_CCK;
break; break;
case WIRELESS_MODE_A: case WIRELESS_MODE_A:
regBwOpMode = BW_OPMODE_5G |BW_OPMODE_20MHZ; regBwOpMode = BW_OPMODE_5G | BW_OPMODE_20MHZ;
regRATR = RATE_ALL_OFDM_AG; regRATR = RATE_ALL_OFDM_AG;
regRRSR = RATE_ALL_OFDM_AG; regRRSR = RATE_ALL_OFDM_AG;
break; break;
...@@ -661,12 +661,14 @@ static void rtl8192_hwconfig(struct net_device* dev) ...@@ -661,12 +661,14 @@ static void rtl8192_hwconfig(struct net_device* dev)
case WIRELESS_MODE_AUTO: case WIRELESS_MODE_AUTO:
case WIRELESS_MODE_N_24G: case WIRELESS_MODE_N_24G:
regBwOpMode = BW_OPMODE_20MHZ; regBwOpMode = BW_OPMODE_20MHZ;
regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG; regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
break; break;
case WIRELESS_MODE_N_5G: case WIRELESS_MODE_N_5G:
regBwOpMode = BW_OPMODE_5G; regBwOpMode = BW_OPMODE_5G;
regRATR = RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS; regRATR = RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS |
RATE_ALL_OFDM_2SS;
regRRSR = RATE_ALL_OFDM_AG; regRRSR = RATE_ALL_OFDM_AG;
break; break;
default: default:
...@@ -681,9 +683,7 @@ static void rtl8192_hwconfig(struct net_device* dev) ...@@ -681,9 +683,7 @@ static void rtl8192_hwconfig(struct net_device* dev)
u32 ratr_value = 0; u32 ratr_value = 0;
ratr_value = regRATR; ratr_value = regRATR;
if (priv->rf_type == RF_1T2R) if (priv->rf_type == RF_1T2R)
{
ratr_value &= ~(RATE_ALL_OFDM_2SS); ratr_value &= ~(RATE_ALL_OFDM_2SS);
}
write_nic_dword(dev, RATR0, ratr_value); write_nic_dword(dev, RATR0, ratr_value);
write_nic_byte(dev, UFWP, 1); write_nic_byte(dev, UFWP, 1);
} }
...@@ -692,11 +692,8 @@ static void rtl8192_hwconfig(struct net_device* dev) ...@@ -692,11 +692,8 @@ static void rtl8192_hwconfig(struct net_device* dev)
write_nic_dword(dev, RRSR, regRRSR); write_nic_dword(dev, RRSR, regRRSR);
write_nic_word(dev, RETRY_LIMIT, write_nic_word(dev, RETRY_LIMIT,
priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT | \ priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT); priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
} }
bool rtl8192_adapter_start(struct net_device *dev) bool rtl8192_adapter_start(struct net_device *dev)
...@@ -705,7 +702,7 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -705,7 +702,7 @@ bool rtl8192_adapter_start(struct net_device *dev)
u32 ulRegRead; u32 ulRegRead;
bool rtStatus = true; bool rtStatus = true;
u8 tmpvalue; u8 tmpvalue;
u8 ICVersion,SwitchingRegulatorOutput; u8 ICVersion, SwitchingRegulatorOutput;
bool bfirmwareok = true; bool bfirmwareok = true;
u32 tmpRegA, tmpRegC, TempCCk; u32 tmpRegA, tmpRegC, TempCCk;
int i = 0; int i = 0;
...@@ -715,13 +712,12 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -715,13 +712,12 @@ bool rtl8192_adapter_start(struct net_device *dev)
priv->being_init_adapter = true; priv->being_init_adapter = true;
start: start:
rtl8192_pci_resetdescring(dev); rtl8192_pci_resetdescring(dev);
priv->Rf_Mode = RF_OP_By_SW_3wire; priv->Rf_Mode = RF_OP_By_SW_3wire;
if (priv->ResetProgress == RESET_TYPE_NORESET) if (priv->ResetProgress == RESET_TYPE_NORESET) {
{ write_nic_byte(dev, ANAPAR, 0x37);
write_nic_byte(dev, ANAPAR, 0x37); mdelay(500);
mdelay(500); }
}
priv->pFirmware->firmware_status = FW_STATUS_0_INIT; priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
if (priv->RegRfOff == true) if (priv->RegRfOff == true)
...@@ -729,23 +725,19 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -729,23 +725,19 @@ bool rtl8192_adapter_start(struct net_device *dev)
ulRegRead = read_nic_dword(dev, CPU_GEN); ulRegRead = read_nic_dword(dev, CPU_GEN);
if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT) if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT)
{
ulRegRead |= CPU_GEN_SYSTEM_RESET; ulRegRead |= CPU_GEN_SYSTEM_RESET;
}else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY) else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
ulRegRead |= CPU_GEN_FIRMWARE_RESET; ulRegRead |= CPU_GEN_FIRMWARE_RESET;
else else
RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __func__, priv->pFirmware->firmware_status); RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)"
"\n", __func__, priv->pFirmware->firmware_status);
write_nic_dword(dev, CPU_GEN, ulRegRead); write_nic_dword(dev, CPU_GEN, ulRegRead);
ICVersion = read_nic_byte(dev, IC_VERRSION); ICVersion = read_nic_byte(dev, IC_VERRSION);
if (ICVersion >= 0x4) if (ICVersion >= 0x4) {
{
SwitchingRegulatorOutput = read_nic_byte(dev, SWREGULATOR); SwitchingRegulatorOutput = read_nic_byte(dev, SWREGULATOR);
if (SwitchingRegulatorOutput != 0xb8) if (SwitchingRegulatorOutput != 0xb8) {
{
write_nic_byte(dev, SWREGULATOR, 0xa8); write_nic_byte(dev, SWREGULATOR, 0xa8);
mdelay(1); mdelay(1);
write_nic_byte(dev, SWREGULATOR, 0xb8); write_nic_byte(dev, SWREGULATOR, 0xb8);
...@@ -753,64 +745,64 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -753,64 +745,64 @@ bool rtl8192_adapter_start(struct net_device *dev)
} }
RT_TRACE(COMP_INIT, "BB Config Start!\n"); RT_TRACE(COMP_INIT, "BB Config Start!\n");
rtStatus = rtl8192_BBConfig(dev); rtStatus = rtl8192_BBConfig(dev);
if (rtStatus != true) if (rtStatus != true) {
{
RT_TRACE(COMP_ERR, "BB Config failed\n"); RT_TRACE(COMP_ERR, "BB Config failed\n");
return rtStatus; return rtStatus;
} }
RT_TRACE(COMP_INIT,"BB Config Finished!\n"); RT_TRACE(COMP_INIT, "BB Config Finished!\n");
priv->LoopbackMode = RTL819X_NO_LOOPBACK; priv->LoopbackMode = RTL819X_NO_LOOPBACK;
if (priv->ResetProgress == RESET_TYPE_NORESET) if (priv->ResetProgress == RESET_TYPE_NORESET) {
{ ulRegRead = read_nic_dword(dev, CPU_GEN);
ulRegRead = read_nic_dword(dev, CPU_GEN); if (priv->LoopbackMode == RTL819X_NO_LOOPBACK)
if (priv->LoopbackMode == RTL819X_NO_LOOPBACK) ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) |
{ CPU_GEN_NO_LOOPBACK_SET);
ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | CPU_GEN_NO_LOOPBACK_SET); else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
} ulRegRead |= CPU_CCK_LOOPBACK;
else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK ) else
{ RT_TRACE(COMP_ERR, "Serious error: wrong loopback"
ulRegRead |= CPU_CCK_LOOPBACK; " mode setting\n");
}
else
{
RT_TRACE(COMP_ERR,"Serious error: wrong loopback mode setting\n");
}
write_nic_dword(dev, CPU_GEN, ulRegRead); write_nic_dword(dev, CPU_GEN, ulRegRead);
udelay(500); udelay(500);
} }
rtl8192_hwconfig(dev); rtl8192_hwconfig(dev);
write_nic_byte(dev, CMDR, CR_RE|CR_TE); write_nic_byte(dev, CMDR, CR_RE | CR_TE);
write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |\ write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
(MXDMA2_NoLimit<<MXDMA2_TX_SHIFT) )); (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)[0]); write_nic_dword(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
write_nic_word(dev, MAC4, ((u16*)(dev->dev_addr + 4))[0]); write_nic_word(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
write_nic_dword(dev, RCR, priv->ReceiveConfig); write_nic_dword(dev, RCR, priv->ReceiveConfig);
{ write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK <<
write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\ RSVD_FW_QUEUE_PAGE_BK_SHIFT |
NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \ NUM_OF_PAGE_IN_FW_QUEUE_BE <<
NUM_OF_PAGE_IN_FW_QUEUE_VI << RSVD_FW_QUEUE_PAGE_VI_SHIFT | \ RSVD_FW_QUEUE_PAGE_BE_SHIFT |
NUM_OF_PAGE_IN_FW_QUEUE_VO <<RSVD_FW_QUEUE_PAGE_VO_SHIFT); NUM_OF_PAGE_IN_FW_QUEUE_VI <<
write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT); RSVD_FW_QUEUE_PAGE_VI_SHIFT |
write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW| \ NUM_OF_PAGE_IN_FW_QUEUE_VO <<
NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT|\ RSVD_FW_QUEUE_PAGE_VO_SHIFT);
NUM_OF_PAGE_IN_FW_QUEUE_PUB<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT); write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
} RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
rtl8192_tx_enable(dev); rtl8192_tx_enable(dev);
rtl8192_rx_enable(dev); rtl8192_rx_enable(dev);
ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR)) | RATE_ALL_OFDM_AG | RATE_ALL_CCK; ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR)) |
RATE_ALL_OFDM_AG | RATE_ALL_CCK;
write_nic_dword(dev, RRSR, ulRegRead); write_nic_dword(dev, RRSR, ulRegRead);
write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK)); write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
write_nic_byte(dev, ACK_TIMEOUT, 0x30); write_nic_byte(dev, ACK_TIMEOUT, 0x30);
if (priv->ResetProgress == RESET_TYPE_NORESET) if (priv->ResetProgress == RESET_TYPE_NORESET)
rtl8192_SetWirelessMode(dev, priv->rtllib->mode); rtl8192_SetWirelessMode(dev, priv->rtllib->mode);
CamResetAllEntry(dev); CamResetAllEntry(dev);
{ {
u8 SECR_value = 0x0; u8 SECR_value = 0x0;
...@@ -823,8 +815,8 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -823,8 +815,8 @@ bool rtl8192_adapter_start(struct net_device *dev)
write_nic_word(dev, BCN_INTERVAL, 100); write_nic_word(dev, BCN_INTERVAL, 100);
{ {
int i; int i;
for (i=0; i<QOS_QUEUE_NUM; i++) for (i = 0; i < QOS_QUEUE_NUM; i++)
write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332); write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
} }
write_nic_byte(dev, 0xbe, 0xc0); write_nic_byte(dev, 0xbe, 0xc0);
...@@ -836,13 +828,13 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -836,13 +828,13 @@ bool rtl8192_adapter_start(struct net_device *dev)
} }
tmpvalue = read_nic_byte(dev, IC_VERRSION); tmpvalue = read_nic_byte(dev, IC_VERRSION);
priv->IC_Cut= tmpvalue; priv->IC_Cut = tmpvalue;
RT_TRACE(COMP_INIT, "priv->IC_Cut= 0x%x\n", priv->IC_Cut); RT_TRACE(COMP_INIT, "priv->IC_Cut= 0x%x\n", priv->IC_Cut);
if (priv->IC_Cut>= IC_VersionCut_D) if (priv->IC_Cut >= IC_VersionCut_D) {
{ if (priv->IC_Cut == IC_VersionCut_D) {
if (priv->IC_Cut== IC_VersionCut_D) { /* no matter what checkpatch says, braces are needed */
RT_TRACE(COMP_INIT, "D-cut\n"); RT_TRACE(COMP_INIT, "D-cut\n");
} else if (priv->IC_Cut== IC_VersionCut_E) { } else if (priv->IC_Cut == IC_VersionCut_E) {
RT_TRACE(COMP_INIT, "E-cut\n"); RT_TRACE(COMP_INIT, "E-cut\n");
} }
} else { } else {
...@@ -878,20 +870,27 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -878,20 +870,27 @@ bool rtl8192_adapter_start(struct net_device *dev)
write_nic_byte(dev, 0x87, 0x0); write_nic_byte(dev, 0x87, 0x0);
if (priv->RegRfOff == true) { if (priv->RegRfOff == true) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RegRfOff ----------\n",__func__); RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER),
MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW,true); "%s(): Turn off RF for RegRfOff ----------\n",
__func__);
MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true);
} else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) { } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __func__,priv->rtllib->RfOffReason); RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,true); " RfOffReason(%d) ----------\n", __func__,
priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true);
} else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) { } else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __func__,priv->rtllib->RfOffReason); RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,true); " RfOffReason(%d) ----------\n", __func__,
priv->rtllib->RfOffReason);
MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
true);
} else { } else {
RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON \n",__func__); RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON\n",
__func__);
priv->rtllib->eRFPowerState = eRfOn; priv->rtllib->eRFPowerState = eRfOn;
priv->rtllib->RfOffReason = 0; priv->rtllib->RfOffReason = 0;
} }
if (priv->rtllib->FwRWRF) if (priv->rtllib->FwRWRF)
...@@ -899,37 +898,51 @@ bool rtl8192_adapter_start(struct net_device *dev) ...@@ -899,37 +898,51 @@ bool rtl8192_adapter_start(struct net_device *dev)
else else
priv->Rf_Mode = RF_OP_By_SW_3wire; priv->Rf_Mode = RF_OP_By_SW_3wire;
if (priv->ResetProgress == RESET_TYPE_NORESET) if (priv->ResetProgress == RESET_TYPE_NORESET) {
{
dm_initialize_txpower_tracking(dev); dm_initialize_txpower_tracking(dev);
if (priv->IC_Cut>= IC_VersionCut_D) { if (priv->IC_Cut >= IC_VersionCut_D) {
tmpRegA= rtl8192_QueryBBReg(dev,rOFDM0_XATxIQImbalance,bMaskDWord); tmpRegA = rtl8192_QueryBBReg(dev,
tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord); rOFDM0_XATxIQImbalance, bMaskDWord);
for (i = 0; i<TxBBGainTableLength; i++) { tmpRegC = rtl8192_QueryBBReg(dev,
if (tmpRegA == priv->txbbgain_table[i].txbbgain_value) { rOFDM0_XCTxIQImbalance, bMaskDWord);
priv->rfa_txpowertrackingindex= (u8)i; for (i = 0; i < TxBBGainTableLength; i++) {
priv->rfa_txpowertrackingindex_real= (u8)i; if (tmpRegA ==
priv->rfa_txpowertracking_default = priv->rfa_txpowertrackingindex; priv->txbbgain_table[i].txbbgain_value) {
priv->rfa_txpowertrackingindex = (u8)i;
priv->rfa_txpowertrackingindex_real =
(u8)i;
priv->rfa_txpowertracking_default =
priv->rfa_txpowertrackingindex;
break; break;
} }
} }
TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2); TempCCk = rtl8192_QueryBBReg(dev,
rCCK0_TxFilter1, bMaskByte2);
for (i = 0; i < CCKTxBBGainTableLength; i++) { for (i = 0; i < CCKTxBBGainTableLength; i++) {
if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) { if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) {
priv->CCKPresentAttentuation_20Mdefault =(u8) i; priv->CCKPresentAttentuation_20Mdefault = (u8)i;
break; break;
} }
} }
priv->CCKPresentAttentuation_40Mdefault = 0; priv->CCKPresentAttentuation_40Mdefault = 0;
priv->CCKPresentAttentuation_difference = 0; priv->CCKPresentAttentuation_difference = 0;
priv->CCKPresentAttentuation = priv->CCKPresentAttentuation_20Mdefault; priv->CCKPresentAttentuation =
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_initial = %d\n", priv->rfa_txpowertrackingindex); priv->CCKPresentAttentuation_20Mdefault;
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real__initial = %d\n", priv->rfa_txpowertrackingindex_real); RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_difference_initial = %d\n", priv->CCKPresentAttentuation_difference); "trackingindex_initial = %d\n",
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_initial = %d\n", priv->CCKPresentAttentuation); priv->rfa_txpowertrackingindex);
RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
"trackingindex_real__initial = %d\n",
priv->rfa_txpowertrackingindex_real);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
"Attentuation_difference_initial = %d\n",
priv->CCKPresentAttentuation_difference);
RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
"Attentuation_initial = %d\n",
priv->CCKPresentAttentuation);
priv->btxpower_tracking = false; priv->btxpower_tracking = false;
} }
} }
...@@ -951,8 +964,8 @@ void rtl8192_net_update(struct net_device *dev) ...@@ -951,8 +964,8 @@ void rtl8192_net_update(struct net_device *dev)
rtl8192_config_rate(dev, &rate_config); rtl8192_config_rate(dev, &rate_config);
priv->dot11CurrentPreambleMode = PREAMBLE_AUTO; priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
priv->basic_rate = rate_config &= 0x15f; priv->basic_rate = rate_config &= 0x15f;
write_nic_dword(dev,BSSIDR,((u32*)net->bssid)[0]); write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
write_nic_word(dev,BSSIDR+4,((u16*)net->bssid)[2]); write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
if (priv->rtllib->iw_mode == IW_MODE_ADHOC) { if (priv->rtllib->iw_mode == IW_MODE_ADHOC) {
write_nic_word(dev, ATIMWND, 2); write_nic_word(dev, ATIMWND, 2);
...@@ -971,15 +984,16 @@ void rtl8192_net_update(struct net_device *dev) ...@@ -971,15 +984,16 @@ void rtl8192_net_update(struct net_device *dev)
void rtl8192_link_change(struct net_device *dev) void rtl8192_link_change(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
if (!priv->up) if (!priv->up)
return; return;
if (ieee->state == RTLLIB_LINKED) { if (ieee->state == RTLLIB_LINKED) {
rtl8192_net_update(dev); rtl8192_net_update(dev);
priv->ops->update_ratr_table(dev); priv->ops->update_ratr_table(dev);
if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
(KEY_TYPE_WEP104 == ieee->pairwise_key_type))
EnableHWSecurityConfig8192(dev); EnableHWSecurityConfig8192(dev);
} else { } else {
write_nic_byte(dev, 0x173, 0); write_nic_byte(dev, 0x173, 0);
...@@ -991,8 +1005,8 @@ void rtl8192_link_change(struct net_device *dev) ...@@ -991,8 +1005,8 @@ void rtl8192_link_change(struct net_device *dev)
reg = read_nic_dword(dev, RCR); reg = read_nic_dword(dev, RCR);
if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->rtllib->state == RTLLIB_LINKED) {
if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn) if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn)
; ;
else else
priv->ReceiveConfig = reg |= RCR_CBSSID; priv->ReceiveConfig = reg |= RCR_CBSSID;
} else } else
priv->ReceiveConfig = reg &= ~RCR_CBSSID; priv->ReceiveConfig = reg &= ~RCR_CBSSID;
...@@ -1001,21 +1015,20 @@ void rtl8192_link_change(struct net_device *dev) ...@@ -1001,21 +1015,20 @@ void rtl8192_link_change(struct net_device *dev)
} }
} }
void rtl8192_AllowAllDestAddr(struct net_device* dev, void rtl8192_AllowAllDestAddr(struct net_device *dev,
bool bAllowAllDA, bool WriteIntoReg) bool bAllowAllDA, bool WriteIntoReg)
{ {
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
if (bAllowAllDA) if (bAllowAllDA)
priv->ReceiveConfig |= RCR_AAP; priv->ReceiveConfig |= RCR_AAP;
else else
priv->ReceiveConfig &= ~RCR_AAP; priv->ReceiveConfig &= ~RCR_AAP;
if (WriteIntoReg) if (WriteIntoReg)
write_nic_dword( dev, RCR, priv->ReceiveConfig ); write_nic_dword(dev, RCR, priv->ReceiveConfig);
} }
static u8 MRateToHwRate8190Pci(u8 rate) static u8 MRateToHwRate8190Pci(u8 rate)
{ {
u8 ret = DESC90_RATE1M; u8 ret = DESC90_RATE1M;
...@@ -1148,138 +1161,144 @@ u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority) ...@@ -1148,138 +1161,144 @@ u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
break; break;
default: default:
RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection:" RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection:"
" %d \n", QueueID); " %d\n", QueueID);
break; break;
} }
return QueueSelect; return QueueSelect;
} }
void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
void rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc, struct sk_buff* skb) struct cb_desc *cb_desc, struct sk_buff *skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
struct tx_fwinfo_8190pci *pTxFwInfo = NULL; PCI_DMA_TODEVICE);
pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data; struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
memset(pTxFwInfo,0,sizeof(struct tx_fwinfo_8190pci)); pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data;
pTxFwInfo->TxHT = (cb_desc->data_rate&0x80)?1:0; memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci));
pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate); pTxFwInfo->TxHT = (cb_desc->data_rate & 0x80) ? 1 : 0;
pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur; pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate);
pTxFwInfo->Short = rtl8192_QueryIsShort(pTxFwInfo->TxHT, pTxFwInfo->TxRate, cb_desc); pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
pTxFwInfo->Short = rtl8192_QueryIsShort(pTxFwInfo->TxHT,
if (cb_desc->bAMPDUEnable) { pTxFwInfo->TxRate,
pTxFwInfo->AllowAggregation = 1; cb_desc);
pTxFwInfo->RxMF = cb_desc->ampdu_factor;
pTxFwInfo->RxAMD = cb_desc->ampdu_density; if (cb_desc->bAMPDUEnable) {
} else { pTxFwInfo->AllowAggregation = 1;
pTxFwInfo->AllowAggregation = 0; pTxFwInfo->RxMF = cb_desc->ampdu_factor;
pTxFwInfo->RxMF = 0; pTxFwInfo->RxAMD = cb_desc->ampdu_density;
pTxFwInfo->RxAMD = 0; } else {
} pTxFwInfo->AllowAggregation = 0;
pTxFwInfo->RxMF = 0;
pTxFwInfo->RtsEnable = (cb_desc->bRTSEnable)?1:0; pTxFwInfo->RxAMD = 0;
pTxFwInfo->CtsEnable = (cb_desc->bCTSEnable)?1:0; }
pTxFwInfo->RtsSTBC = (cb_desc->bRTSSTBC)?1:0;
pTxFwInfo->RtsHT= (cb_desc->rts_rate&0x80)?1:0; pTxFwInfo->RtsEnable = (cb_desc->bRTSEnable) ? 1 : 0;
pTxFwInfo->RtsRate = MRateToHwRate8190Pci((u8)cb_desc->rts_rate); pTxFwInfo->CtsEnable = (cb_desc->bCTSEnable) ? 1 : 0;
pTxFwInfo->RtsBandwidth = 0; pTxFwInfo->RtsSTBC = (cb_desc->bRTSSTBC) ? 1 : 0;
pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC; pTxFwInfo->RtsHT = (cb_desc->rts_rate&0x80) ? 1 : 0;
pTxFwInfo->RtsShort = (pTxFwInfo->RtsHT==0)?(cb_desc->bRTSUseShortPreamble?1:0):(cb_desc->bRTSUseShortGI?1:0); pTxFwInfo->RtsRate = MRateToHwRate8190Pci((u8)cb_desc->rts_rate);
if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) pTxFwInfo->RtsBandwidth = 0;
{ pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC;
if (cb_desc->bPacketBW) pTxFwInfo->RtsShort = (pTxFwInfo->RtsHT == 0) ?
{ (cb_desc->bRTSUseShortPreamble ? 1 : 0) :
pTxFwInfo->TxBandwidth = 1; (cb_desc->bRTSUseShortGI ? 1 : 0);
pTxFwInfo->TxSubCarrier = 0; if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) {
} if (cb_desc->bPacketBW) {
else pTxFwInfo->TxBandwidth = 1;
{ pTxFwInfo->TxSubCarrier = 0;
pTxFwInfo->TxBandwidth = 0; } else {
pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC; pTxFwInfo->TxBandwidth = 0;
} pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
} else { }
pTxFwInfo->TxBandwidth = 0; } else {
pTxFwInfo->TxSubCarrier = 0; pTxFwInfo->TxBandwidth = 0;
} pTxFwInfo->TxSubCarrier = 0;
}
memset((u8*)pdesc,0,12);
pdesc->LINIP = 0; memset((u8 *)pdesc, 0, 12);
pdesc->CmdInit = 1; pdesc->LINIP = 0;
pdesc->Offset = sizeof(struct tx_fwinfo_8190pci) + 8; pdesc->CmdInit = 1;
pdesc->PktSize = (u16)skb->len-sizeof(struct tx_fwinfo_8190pci); pdesc->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
pdesc->PktSize = (u16)skb->len-sizeof(struct tx_fwinfo_8190pci);
pdesc->SecCAMID= 0;
pdesc->RATid = cb_desc->RATRIndex; pdesc->SecCAMID = 0;
pdesc->RATid = cb_desc->RATRIndex;
pdesc->NoEnc = 1;
pdesc->SecType = 0x0; pdesc->NoEnc = 1;
if (cb_desc->bHwSec) { pdesc->SecType = 0x0;
static u8 tmp =0; if (cb_desc->bHwSec) {
if (!tmp) { static u8 tmp;
RT_TRACE(COMP_DBG, "==>================hw sec\n"); if (!tmp) {
tmp = 1; RT_TRACE(COMP_DBG, "==>================hw sec\n");
} tmp = 1;
switch (priv->rtllib->pairwise_key_type) { }
case KEY_TYPE_WEP40: switch (priv->rtllib->pairwise_key_type) {
case KEY_TYPE_WEP104: case KEY_TYPE_WEP40:
pdesc->SecType = 0x1; case KEY_TYPE_WEP104:
pdesc->NoEnc = 0; pdesc->SecType = 0x1;
break; pdesc->NoEnc = 0;
case KEY_TYPE_TKIP: break;
pdesc->SecType = 0x2; case KEY_TYPE_TKIP:
pdesc->NoEnc = 0; pdesc->SecType = 0x2;
break; pdesc->NoEnc = 0;
case KEY_TYPE_CCMP: break;
pdesc->SecType = 0x3; case KEY_TYPE_CCMP:
pdesc->NoEnc = 0; pdesc->SecType = 0x3;
break; pdesc->NoEnc = 0;
case KEY_TYPE_NA: break;
pdesc->SecType = 0x0; case KEY_TYPE_NA:
pdesc->NoEnc = 1; pdesc->SecType = 0x0;
break; pdesc->NoEnc = 1;
} break;
} }
}
pdesc->PktId = 0x0;
pdesc->PktId = 0x0;
pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(cb_desc->queue_index, cb_desc->priority);
pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci); pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(
cb_desc->queue_index,
pdesc->DISFB = cb_desc->bTxDisableRateFallBack; cb_desc->priority);
pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate; pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
pdesc->FirstSeg =1; pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
pdesc->LastSeg = 1; pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate;
pdesc->TxBufferSize = skb->len;
pdesc->FirstSeg = 1;
pdesc->TxBuffAddr = cpu_to_le32(mapping); pdesc->LastSeg = 1;
pdesc->TxBufferSize = skb->len;
pdesc->TxBuffAddr = cpu_to_le32(mapping);
} }
void rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry, void rtl8192_tx_fill_cmd_desc(struct net_device *dev,
struct cb_desc *cb_desc, struct sk_buff* skb) struct tx_desc_cmd *entry,
struct cb_desc *cb_desc, struct sk_buff* skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
PCI_DMA_TODEVICE);
memset(entry,0,12);
entry->LINIP = cb_desc->bLastIniPkt; memset(entry, 0, 12);
entry->FirstSeg = 1; entry->LINIP = cb_desc->bLastIniPkt;
entry->LastSeg = 1; entry->FirstSeg = 1;
if (cb_desc->bCmdOrInit == DESC_PACKET_TYPE_INIT) { entry->LastSeg = 1;
entry->CmdInit = DESC_PACKET_TYPE_INIT; if (cb_desc->bCmdOrInit == DESC_PACKET_TYPE_INIT) {
} else { entry->CmdInit = DESC_PACKET_TYPE_INIT;
struct tx_desc * entry_tmp = (struct tx_desc *)entry; } else {
entry_tmp->CmdInit = DESC_PACKET_TYPE_NORMAL; struct tx_desc * entry_tmp = (struct tx_desc *)entry;
entry_tmp->Offset = sizeof(struct tx_fwinfo_8190pci) + 8; entry_tmp->CmdInit = DESC_PACKET_TYPE_NORMAL;
entry_tmp->PktSize = (u16)(cb_desc->pkt_size + entry_tmp->Offset); entry_tmp->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
entry_tmp->QueueSelect = QSLT_CMD; entry_tmp->PktSize = (u16)(cb_desc->pkt_size +
entry_tmp->TxFWInfoSize = 0x08; entry_tmp->Offset);
entry_tmp->RATid = (u8)DESC_PACKET_TYPE_INIT; entry_tmp->QueueSelect = QSLT_CMD;
} entry_tmp->TxFWInfoSize = 0x08;
entry->TxBufferSize = skb->len; entry_tmp->RATid = (u8)DESC_PACKET_TYPE_INIT;
entry->TxBuffAddr = cpu_to_le32(mapping); }
entry->OWN = 1; entry->TxBufferSize = skb->len;
entry->TxBuffAddr = cpu_to_le32(mapping);
entry->OWN = 1;
} }
u8 HwRateToMRate90(bool bIsHT, u8 rate) u8 HwRateToMRate90(bool bIsHT, u8 rate)
...@@ -1288,156 +1307,193 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate) ...@@ -1288,156 +1307,193 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
if (!bIsHT) { if (!bIsHT) {
switch (rate) { switch (rate) {
case DESC90_RATE1M: ret_rate = MGN_1M; break; case DESC90_RATE1M:
case DESC90_RATE2M: ret_rate = MGN_2M; break; ret_rate = MGN_1M;
case DESC90_RATE5_5M: ret_rate = MGN_5_5M; break; break;
case DESC90_RATE11M: ret_rate = MGN_11M; break; case DESC90_RATE2M:
case DESC90_RATE6M: ret_rate = MGN_6M; break; ret_rate = MGN_2M;
case DESC90_RATE9M: ret_rate = MGN_9M; break; break;
case DESC90_RATE12M: ret_rate = MGN_12M; break; case DESC90_RATE5_5M:
case DESC90_RATE18M: ret_rate = MGN_18M; break; ret_rate = MGN_5_5M;
case DESC90_RATE24M: ret_rate = MGN_24M; break; break;
case DESC90_RATE36M: ret_rate = MGN_36M; break; case DESC90_RATE11M:
case DESC90_RATE48M: ret_rate = MGN_48M; break; ret_rate = MGN_11M;
case DESC90_RATE54M: ret_rate = MGN_54M; break; break;
case DESC90_RATE6M:
ret_rate = MGN_6M;
break;
case DESC90_RATE9M:
ret_rate = MGN_9M;
break;
case DESC90_RATE12M:
ret_rate = MGN_12M;
break;
case DESC90_RATE18M:
ret_rate = MGN_18M;
break;
case DESC90_RATE24M:
ret_rate = MGN_24M;
break;
case DESC90_RATE36M:
ret_rate = MGN_36M;
break;
case DESC90_RATE48M:
ret_rate = MGN_48M;
break;
case DESC90_RATE54M:
ret_rate = MGN_54M;
break;
default: default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n", rate, bIsHT); RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported"
break; "Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
break;
} }
} else { } else {
switch (rate) { switch (rate) {
case DESC90_RATEMCS0: ret_rate = MGN_MCS0; break; case DESC90_RATEMCS0:
case DESC90_RATEMCS1: ret_rate = MGN_MCS1; break; ret_rate = MGN_MCS0;
case DESC90_RATEMCS2: ret_rate = MGN_MCS2; break; break;
case DESC90_RATEMCS3: ret_rate = MGN_MCS3; break; case DESC90_RATEMCS1:
case DESC90_RATEMCS4: ret_rate = MGN_MCS4; break; ret_rate = MGN_MCS1;
case DESC90_RATEMCS5: ret_rate = MGN_MCS5; break; break;
case DESC90_RATEMCS6: ret_rate = MGN_MCS6; break; case DESC90_RATEMCS2:
case DESC90_RATEMCS7: ret_rate = MGN_MCS7; break; ret_rate = MGN_MCS2;
case DESC90_RATEMCS8: ret_rate = MGN_MCS8; break; break;
case DESC90_RATEMCS9: ret_rate = MGN_MCS9; break; case DESC90_RATEMCS3:
case DESC90_RATEMCS10: ret_rate = MGN_MCS10; break; ret_rate = MGN_MCS3;
case DESC90_RATEMCS11: ret_rate = MGN_MCS11; break; break;
case DESC90_RATEMCS12: ret_rate = MGN_MCS12; break; case DESC90_RATEMCS4:
case DESC90_RATEMCS13: ret_rate = MGN_MCS13; break; ret_rate = MGN_MCS4;
case DESC90_RATEMCS14: ret_rate = MGN_MCS14; break; break;
case DESC90_RATEMCS15: ret_rate = MGN_MCS15; break; case DESC90_RATEMCS5:
case DESC90_RATEMCS32: ret_rate = (0x80|0x20); break; ret_rate = MGN_MCS5;
break;
case DESC90_RATEMCS6:
ret_rate = MGN_MCS6;
break;
case DESC90_RATEMCS7:
ret_rate = MGN_MCS7;
break;
case DESC90_RATEMCS8:
ret_rate = MGN_MCS8;
break;
case DESC90_RATEMCS9:
ret_rate = MGN_MCS9;
break;
case DESC90_RATEMCS10:
ret_rate = MGN_MCS10;
break;
case DESC90_RATEMCS11:
ret_rate = MGN_MCS11;
break;
case DESC90_RATEMCS12:
ret_rate = MGN_MCS12;
break;
case DESC90_RATEMCS13:
ret_rate = MGN_MCS13;
break;
case DESC90_RATEMCS14:
ret_rate = MGN_MCS14;
break;
case DESC90_RATEMCS15:
ret_rate = MGN_MCS15;
break;
case DESC90_RATEMCS32:
ret_rate = (0x80|0x20);
break;
default: default:
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",rate, bIsHT); RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported "
break; "Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
break;
} }
} }
return ret_rate; return ret_rate;
} }
long long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
rtl8192_signal_scale_mapping(struct r8192_priv * priv,
long currsig
)
{ {
long retsig; long retsig;
if (currsig >= 61 && currsig <= 100) if (currsig >= 61 && currsig <= 100)
{
retsig = 90 + ((currsig - 60) / 4); retsig = 90 + ((currsig - 60) / 4);
}
else if (currsig >= 41 && currsig <= 60) else if (currsig >= 41 && currsig <= 60)
{
retsig = 78 + ((currsig - 40) / 2); retsig = 78 + ((currsig - 40) / 2);
}
else if (currsig >= 31 && currsig <= 40) else if (currsig >= 31 && currsig <= 40)
{
retsig = 66 + (currsig - 30); retsig = 66 + (currsig - 30);
}
else if (currsig >= 21 && currsig <= 30) else if (currsig >= 21 && currsig <= 30)
{
retsig = 54 + (currsig - 20); retsig = 54 + (currsig - 20);
}
else if (currsig >= 5 && currsig <= 20) else if (currsig >= 5 && currsig <= 20)
{
retsig = 42 + (((currsig - 5) * 2) / 3); retsig = 42 + (((currsig - 5) * 2) / 3);
}
else if (currsig == 4) else if (currsig == 4)
{
retsig = 36; retsig = 36;
}
else if (currsig == 3) else if (currsig == 3)
{
retsig = 27; retsig = 27;
}
else if (currsig == 2) else if (currsig == 2)
{
retsig = 18; retsig = 18;
}
else if (currsig == 1) else if (currsig == 1)
{
retsig = 9; retsig = 9;
}
else else
{
retsig = currsig; retsig = currsig;
}
return retsig; return retsig;
} }
#define rx_hal_is_cck_rate(_pdrvinfo)\ #define rx_hal_is_cck_rate(_pdrvinfo)\
(_pdrvinfo->RxRate == DESC90_RATE1M ||\ ((_pdrvinfo->RxRate == DESC90_RATE1M ||\
_pdrvinfo->RxRate == DESC90_RATE2M ||\ _pdrvinfo->RxRate == DESC90_RATE2M ||\
_pdrvinfo->RxRate == DESC90_RATE5_5M ||\ _pdrvinfo->RxRate == DESC90_RATE5_5M ||\
_pdrvinfo->RxRate == DESC90_RATE11M) &&\ _pdrvinfo->RxRate == DESC90_RATE11M) &&\
!_pdrvinfo->RxHT !_pdrvinfo->RxHT)
void rtl8192_query_rxphystatus( void rtl8192_query_rxphystatus(
struct r8192_priv * priv, struct r8192_priv *priv,
struct rtllib_rx_stats * pstats, struct rtllib_rx_stats *pstats,
struct rx_desc *pdesc, struct rx_desc *pdesc,
struct rx_fwinfo *pdrvinfo, struct rx_fwinfo *pdrvinfo,
struct rtllib_rx_stats * precord_stats, struct rtllib_rx_stats *precord_stats,
bool bpacket_match_bssid, bool bpacket_match_bssid,
bool bpacket_toself, bool bpacket_toself,
bool bPacketBeacon, bool bPacketBeacon,
bool bToSelfBA bool bToSelfBA
) )
{ {
struct phy_sts_ofdm_819xpci* pofdm_buf; struct phy_sts_ofdm_819xpci *pofdm_buf;
struct phy_sts_cck_819xpci * pcck_buf; struct phy_sts_cck_819xpci *pcck_buf;
struct phy_ofdm_rx_status_rxsc_sgien_exintfflag * prxsc; struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *prxsc;
u8 *prxpkt; u8 *prxpkt;
u8 i,max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg; u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg;
char rx_pwr[4], rx_pwr_all=0; char rx_pwr[4], rx_pwr_all = 0;
char rx_snrX, rx_evmX; char rx_snrX, rx_evmX;
u8 evm, pwdb_all; u8 evm, pwdb_all;
u32 RSSI, total_rssi=0; u32 RSSI, total_rssi = 0;
u8 is_cck_rate=0; u8 is_cck_rate = 0;
u8 rf_rx_num = 0; u8 rf_rx_num = 0;
static u8 check_reg824;
static u8 check_reg824 = 0; static u32 reg824_bit9;
static u32 reg824_bit9 = 0;
priv->stats.numqry_phystatus++; priv->stats.numqry_phystatus++;
is_cck_rate = rx_hal_is_cck_rate(pdrvinfo); is_cck_rate = rx_hal_is_cck_rate(pdrvinfo);
memset(precord_stats, 0, sizeof(struct rtllib_rx_stats)); memset(precord_stats, 0, sizeof(struct rtllib_rx_stats));
pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID = bpacket_match_bssid; pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID =
bpacket_match_bssid;
pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself; pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself;
pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate; pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate;
pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon; pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA; pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
if (check_reg824 == 0) if (check_reg824 == 0) {
{ reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev,
reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev, rFPGA0_XA_HSSIParameter2, 0x200); rFPGA0_XA_HSSIParameter2, 0x200);
check_reg824 = 1; check_reg824 = 1;
} }
prxpkt = (u8*)pdrvinfo; prxpkt = (u8 *)pdrvinfo;
prxpkt += sizeof(struct rx_fwinfo); prxpkt += sizeof(struct rx_fwinfo);
...@@ -1449,50 +1505,54 @@ void rtl8192_query_rxphystatus( ...@@ -1449,50 +1505,54 @@ void rtl8192_query_rxphystatus(
precord_stats->RxMIMOSignalQuality[0] = -1; precord_stats->RxMIMOSignalQuality[0] = -1;
precord_stats->RxMIMOSignalQuality[1] = -1; precord_stats->RxMIMOSignalQuality[1] = -1;
if (is_cck_rate) if (is_cck_rate) {
{
u8 report; u8 report;
priv->stats.numqry_phystatusCCK++; priv->stats.numqry_phystatusCCK++;
if (!reg824_bit9) if (!reg824_bit9) {
{
report = pcck_buf->cck_agc_rpt & 0xc0; report = pcck_buf->cck_agc_rpt & 0xc0;
report = report>>6; report = report>>6;
switch (report) switch (report) {
{ case 0x3:
case 0x3: rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt &
rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt & 0x3e); 0x3e);
break; break;
case 0x2: case 0x2:
rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt & 0x3e); rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt &
break; 0x3e);
case 0x1: break;
rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt & 0x3e); case 0x1:
break; rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt &
case 0x0: 0x3e);
rx_pwr_all = 8 - (pcck_buf->cck_agc_rpt & 0x3e); break;
break; case 0x0:
rx_pwr_all = 8 - (pcck_buf->cck_agc_rpt & 0x3e);
break;
} }
} } else {
else
{
report = pcck_buf->cck_agc_rpt & 0x60; report = pcck_buf->cck_agc_rpt & 0x60;
report = report>>5; report = report>>5;
switch (report) switch (report) {
{ case 0x3:
case 0x3: rx_pwr_all = -35 -
rx_pwr_all = -35 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ; ((pcck_buf->cck_agc_rpt &
break; 0x1f) << 1);
case 0x2: break;
rx_pwr_all = -23 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1); case 0x2:
break; rx_pwr_all = -23 -
case 0x1: ((pcck_buf->cck_agc_rpt &
rx_pwr_all = -11 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ; 0x1f) << 1);
break; break;
case 0x0: case 0x1:
rx_pwr_all = -8 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ; rx_pwr_all = -11 -
break; ((pcck_buf->cck_agc_rpt &
0x1f) << 1);
break;
case 0x0:
rx_pwr_all = -8 -
((pcck_buf->cck_agc_rpt &
0x1f) << 1);
break;
} }
} }
...@@ -1500,15 +1560,12 @@ void rtl8192_query_rxphystatus( ...@@ -1500,15 +1560,12 @@ void rtl8192_query_rxphystatus(
pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all; pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
pstats->RecvSignalPower = rx_pwr_all; pstats->RecvSignalPower = rx_pwr_all;
if (bpacket_match_bssid) if (bpacket_match_bssid) {
{
u8 sq; u8 sq;
if (pstats->RxPWDBAll > 40) if (pstats->RxPWDBAll > 40) {
{
sq = 100; sq = 100;
}else } else {
{
sq = pcck_buf->sq_rpt; sq = pcck_buf->sq_rpt;
if (pcck_buf->sq_rpt > 64) if (pcck_buf->sq_rpt > 64)
...@@ -1518,20 +1575,21 @@ void rtl8192_query_rxphystatus( ...@@ -1518,20 +1575,21 @@ void rtl8192_query_rxphystatus(
else else
sq = ((64-sq) * 100) / 44; sq = ((64-sq) * 100) / 44;
} }
pstats->SignalQuality = precord_stats->SignalQuality = sq; pstats->SignalQuality = sq;
pstats->RxMIMOSignalQuality[0] = precord_stats->RxMIMOSignalQuality[0] = sq; precord_stats->SignalQuality = sq;
pstats->RxMIMOSignalQuality[1] = precord_stats->RxMIMOSignalQuality[1] = -1; pstats->RxMIMOSignalQuality[0] = sq;
precord_stats->RxMIMOSignalQuality[0] = sq;
pstats->RxMIMOSignalQuality[1] = -1;
precord_stats->RxMIMOSignalQuality[1] = -1;
} }
} } else {
else
{
priv->stats.numqry_phystatusHT++; priv->stats.numqry_phystatusHT++;
for (i=RF90_PATH_A; i<RF90_PATH_MAX; i++) for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
{
if (priv->brfpath_rxenable[i]) if (priv->brfpath_rxenable[i])
rf_rx_num++; rf_rx_num++;
rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i]&0x3F)*2) - 110; rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i] & 0x3F) *
2) - 110;
tmp_rxsnr = pofdm_buf->rxsnr_X[i]; tmp_rxsnr = pofdm_buf->rxsnr_X[i];
rx_snrX = (char)(tmp_rxsnr); rx_snrX = (char)(tmp_rxsnr);
...@@ -1542,284 +1600,294 @@ void rtl8192_query_rxphystatus( ...@@ -1542,284 +1600,294 @@ void rtl8192_query_rxphystatus(
if (priv->brfpath_rxenable[i]) if (priv->brfpath_rxenable[i])
total_rssi += RSSI; total_rssi += RSSI;
if (bpacket_match_bssid) if (bpacket_match_bssid) {
{ pstats->RxMIMOSignalStrength[i] = (u8) RSSI;
pstats->RxMIMOSignalStrength[i] =(u8) RSSI; precord_stats->RxMIMOSignalStrength[i] =
precord_stats->RxMIMOSignalStrength[i] =(u8) RSSI; (u8) RSSI;
} }
} }
rx_pwr_all = (((pofdm_buf->pwdb_all ) >> 1 )& 0x7f) -106; rx_pwr_all = (((pofdm_buf->pwdb_all) >> 1) & 0x7f) - 106;
pwdb_all = rtl819x_query_rxpwrpercentage(rx_pwr_all); pwdb_all = rtl819x_query_rxpwrpercentage(rx_pwr_all);
pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all; pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
pstats->RxPower = precord_stats->RxPower = rx_pwr_all; pstats->RxPower = precord_stats->RxPower = rx_pwr_all;
pstats->RecvSignalPower = rx_pwr_all; pstats->RecvSignalPower = rx_pwr_all;
if (pdrvinfo->RxHT && pdrvinfo->RxRate>=DESC90_RATEMCS8 && if (pdrvinfo->RxHT && pdrvinfo->RxRate >= DESC90_RATEMCS8 &&
pdrvinfo->RxRate<=DESC90_RATEMCS15) pdrvinfo->RxRate <= DESC90_RATEMCS15)
max_spatial_stream = 2; max_spatial_stream = 2;
else else
max_spatial_stream = 1; max_spatial_stream = 1;
for (i=0; i<max_spatial_stream; i++) for (i = 0; i < max_spatial_stream; i++) {
{
tmp_rxevm = pofdm_buf->rxevm_X[i]; tmp_rxevm = pofdm_buf->rxevm_X[i];
rx_evmX = (char)(tmp_rxevm); rx_evmX = (char)(tmp_rxevm);
rx_evmX /= 2; rx_evmX /= 2;
evm = rtl819x_evm_dbtopercentage(rx_evmX); evm = rtl819x_evm_dbtopercentage(rx_evmX);
if (bpacket_match_bssid) if (bpacket_match_bssid) {
{ if (i == 0) {
if (i==0) pstats->SignalQuality = (u8)(evm &
pstats->SignalQuality = precord_stats->SignalQuality = (u8)(evm & 0xff); 0xff);
pstats->RxMIMOSignalQuality[i] = precord_stats->RxMIMOSignalQuality[i] = (u8)(evm & 0xff); precord_stats->SignalQuality = (u8)(evm
& 0xff);
}
pstats->RxMIMOSignalQuality[i] = (u8)(evm &
0xff);
precord_stats->RxMIMOSignalQuality[i] = (u8)(evm
& 0xff);
} }
} }
rxsc_sgien_exflg = pofdm_buf->rxsc_sgien_exflg; rxsc_sgien_exflg = pofdm_buf->rxsc_sgien_exflg;
prxsc = (struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *)&rxsc_sgien_exflg; prxsc = (struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *)
&rxsc_sgien_exflg;
if (pdrvinfo->BW) if (pdrvinfo->BW)
priv->stats.received_bwtype[1+prxsc->rxsc]++; priv->stats.received_bwtype[1+prxsc->rxsc]++;
else else
priv->stats.received_bwtype[0]++; priv->stats.received_bwtype[0]++;
} }
if (is_cck_rate) if (is_cck_rate) {
{ pstats->SignalStrength = precord_stats->SignalStrength =
pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl8192_signal_scale_mapping(priv,(long)pwdb_all)); (u8)(rtl8192_signal_scale_mapping(priv,
(long)pwdb_all));
} } else {
else
{
if (rf_rx_num != 0) if (rf_rx_num != 0)
pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl8192_signal_scale_mapping(priv,(long)(total_rssi/=rf_rx_num))); pstats->SignalStrength = precord_stats->SignalStrength =
(u8)(rtl8192_signal_scale_mapping(priv,
(long)(total_rssi /= rf_rx_num)));
} }
} }
void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_rx_stats * pprevious_stats, struct rtllib_rx_stats * pcurrent_stats) void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
struct rtllib_rx_stats *prev_st,
struct rtllib_rx_stats *curr_st)
{ {
bool bcheck = false; bool bcheck = false;
u8 rfpath; u8 rfpath;
u32 nspatial_stream, tmp_val; u32 ij, tmp_val;
static u32 slide_rssi_index=0, slide_rssi_statistics=0; static u32 slide_rssi_index, slide_rssi_statistics;
static u32 slide_evm_index=0, slide_evm_statistics=0; static u32 slide_evm_index, slide_evm_statistics;
static u32 last_rssi=0, last_evm=0; static u32 last_rssi, last_evm;
static u32 slide_beacon_adc_pwdb_index=0, slide_beacon_adc_pwdb_statistics=0; static u32 slide_beacon_adc_pwdb_index;
static u32 last_beacon_adc_pwdb=0; static u32 slide_beacon_adc_pwdb_statistics;
static u32 last_beacon_adc_pwdb;
struct rtllib_hdr_3addr *hdr; struct rtllib_hdr_3addr *hdr;
u16 sc ; u16 sc;
unsigned int frag,seq; unsigned int frag, seq;
hdr = (struct rtllib_hdr_3addr *)buffer; hdr = (struct rtllib_hdr_3addr *)buffer;
sc = le16_to_cpu(hdr->seq_ctl); sc = le16_to_cpu(hdr->seq_ctl);
frag = WLAN_GET_SEQ_FRAG(sc); frag = WLAN_GET_SEQ_FRAG(sc);
seq = WLAN_GET_SEQ_SEQ(sc); seq = WLAN_GET_SEQ_SEQ(sc);
pcurrent_stats->Seq_Num = seq; curr_st->Seq_Num = seq;
if (!pprevious_stats->bIsAMPDU) if (!prev_st->bIsAMPDU)
bcheck = true; bcheck = true;
if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX) if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
{
slide_rssi_statistics = PHY_RSSI_SLID_WIN_MAX; slide_rssi_statistics = PHY_RSSI_SLID_WIN_MAX;
last_rssi = priv->stats.slide_signal_strength[slide_rssi_index]; last_rssi = priv->stats.slide_signal_strength[slide_rssi_index];
priv->stats.slide_rssi_total -= last_rssi; priv->stats.slide_rssi_total -= last_rssi;
} }
priv->stats.slide_rssi_total += pprevious_stats->SignalStrength; priv->stats.slide_rssi_total += prev_st->SignalStrength;
priv->stats.slide_signal_strength[slide_rssi_index++] = pprevious_stats->SignalStrength; priv->stats.slide_signal_strength[slide_rssi_index++] =
prev_st->SignalStrength;
if (slide_rssi_index >= PHY_RSSI_SLID_WIN_MAX) if (slide_rssi_index >= PHY_RSSI_SLID_WIN_MAX)
slide_rssi_index = 0; slide_rssi_index = 0;
tmp_val = priv->stats.slide_rssi_total/slide_rssi_statistics; tmp_val = priv->stats.slide_rssi_total/slide_rssi_statistics;
priv->stats.signal_strength = rtl819x_translate_todbm(priv, (u8)tmp_val); priv->stats.signal_strength = rtl819x_translate_todbm(priv,
pcurrent_stats->rssi = priv->stats.signal_strength; (u8)tmp_val);
if (!pprevious_stats->bPacketMatchBSSID) curr_st->rssi = priv->stats.signal_strength;
{ if (!prev_st->bPacketMatchBSSID) {
if (!pprevious_stats->bToSelfBA) if (!prev_st->bToSelfBA)
return; return;
} }
if (!bcheck) if (!bcheck)
return; return;
rtl819x_process_cck_rxpathsel(priv,pprevious_stats); rtl819x_process_cck_rxpathsel(priv, prev_st);
priv->stats.num_process_phyinfo++; priv->stats.num_process_phyinfo++;
if (!pprevious_stats->bIsCCK && pprevious_stats->bPacketToSelf) if (!prev_st->bIsCCK && prev_st->bPacketToSelf) {
{ for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) {
for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev,
{ rfpath))
if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev, rfpath))
continue; continue;
RT_TRACE(COMP_DBG,"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath] = %d \n" ,pprevious_stats->RxMIMOSignalStrength[rfpath] ); RT_TRACE(COMP_DBG, "Jacken -> pPreviousstats->RxMIMO"
if (priv->stats.rx_rssi_percentage[rfpath] == 0) "SignalStrength[rfpath] = %d\n",
{ prev_st->RxMIMOSignalStrength[rfpath]);
priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath]; if (priv->stats.rx_rssi_percentage[rfpath] == 0) {
}
if (pprevious_stats->RxMIMOSignalStrength[rfpath] > priv->stats.rx_rssi_percentage[rfpath])
{
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] =
( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) + prev_st->RxMIMOSignalStrength[rfpath];
(pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH);
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] + 1;
} }
else if (prev_st->RxMIMOSignalStrength[rfpath] >
{ priv->stats.rx_rssi_percentage[rfpath]) {
priv->stats.rx_rssi_percentage[rfpath] =
((priv->stats.rx_rssi_percentage[rfpath]
* (RX_SMOOTH - 1)) +
(prev_st->RxMIMOSignalStrength
[rfpath])) / (RX_SMOOTH);
priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath] =
( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) + priv->stats.rx_rssi_percentage[rfpath]
(pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH); + 1;
} else {
priv->stats.rx_rssi_percentage[rfpath] =
((priv->stats.rx_rssi_percentage[rfpath] *
(RX_SMOOTH-1)) +
(prev_st->RxMIMOSignalStrength[rfpath])) /
(RX_SMOOTH);
} }
RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath] = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] ); RT_TRACE(COMP_DBG, "Jacken -> priv->RxStats.RxRSSI"
"Percentage[rfPath] = %d\n",
priv->stats.rx_rssi_percentage[rfpath]);
} }
} }
if (pprevious_stats->bPacketBeacon) if (prev_st->bPacketBeacon) {
{ if (slide_beacon_adc_pwdb_statistics++ >=
if (slide_beacon_adc_pwdb_statistics++ >= PHY_Beacon_RSSI_SLID_WIN_MAX) PHY_Beacon_RSSI_SLID_WIN_MAX) {
{ slide_beacon_adc_pwdb_statistics =
slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX; PHY_Beacon_RSSI_SLID_WIN_MAX;
last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index]; last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb
[slide_beacon_adc_pwdb_index];
priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb; priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb;
} }
priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll; priv->stats.Slide_Beacon_Total += prev_st->RxPWDBAll;
priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll; priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] =
prev_st->RxPWDBAll;
slide_beacon_adc_pwdb_index++; slide_beacon_adc_pwdb_index++;
if (slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX) if (slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX)
slide_beacon_adc_pwdb_index = 0; slide_beacon_adc_pwdb_index = 0;
pprevious_stats->RxPWDBAll = priv->stats.Slide_Beacon_Total/slide_beacon_adc_pwdb_statistics; prev_st->RxPWDBAll = priv->stats.Slide_Beacon_Total /
if (pprevious_stats->RxPWDBAll >= 3) slide_beacon_adc_pwdb_statistics;
pprevious_stats->RxPWDBAll -= 3; if (prev_st->RxPWDBAll >= 3)
prev_st->RxPWDBAll -= 3;
} }
RT_TRACE(COMP_RXDESC, "Smooth %s PWDB = %d\n", RT_TRACE(COMP_RXDESC, "Smooth %s PWDB = %d\n",
pprevious_stats->bIsCCK? "CCK": "OFDM", prev_st->bIsCCK ? "CCK" : "OFDM",
pprevious_stats->RxPWDBAll); prev_st->RxPWDBAll);
if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) if (prev_st->bPacketToSelf || prev_st->bPacketBeacon ||
{ prev_st->bToSelfBA) {
if (priv->undecorated_smoothed_pwdb < 0) if (priv->undecorated_smoothed_pwdb < 0)
{ priv->undecorated_smoothed_pwdb = prev_st->RxPWDBAll;
priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll; if (prev_st->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb) {
}
if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
{
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb =
( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) + (((priv->undecorated_smoothed_pwdb) *
(pprevious_stats->RxPWDBAll)) /(RX_SMOOTH); (RX_SMOOTH-1)) +
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb + 1; (prev_st->RxPWDBAll)) / (RX_SMOOTH);
} priv->undecorated_smoothed_pwdb =
else priv->undecorated_smoothed_pwdb + 1;
{ } else {
priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb =
( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) + (((priv->undecorated_smoothed_pwdb) *
(pprevious_stats->RxPWDBAll)) /(RX_SMOOTH); (RX_SMOOTH-1)) +
(prev_st->RxPWDBAll)) / (RX_SMOOTH);
} }
rtl819x_update_rxsignalstatistics8190pci(priv,pprevious_stats); rtl819x_update_rxsignalstatistics8190pci(priv, prev_st);
} }
if (pprevious_stats->SignalQuality == 0) if (prev_st->SignalQuality != 0) {
{ if (prev_st->bPacketToSelf || prev_st->bPacketBeacon ||
} prev_st->bToSelfBA) {
else if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
{
if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA){
if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX){
slide_evm_statistics = PHY_RSSI_SLID_WIN_MAX; slide_evm_statistics = PHY_RSSI_SLID_WIN_MAX;
last_evm = priv->stats.slide_evm[slide_evm_index]; last_evm =
priv->stats.slide_evm[slide_evm_index];
priv->stats.slide_evm_total -= last_evm; priv->stats.slide_evm_total -= last_evm;
} }
priv->stats.slide_evm_total += pprevious_stats->SignalQuality; priv->stats.slide_evm_total += prev_st->SignalQuality;
priv->stats.slide_evm[slide_evm_index++] = pprevious_stats->SignalQuality; priv->stats.slide_evm[slide_evm_index++] =
prev_st->SignalQuality;
if (slide_evm_index >= PHY_RSSI_SLID_WIN_MAX) if (slide_evm_index >= PHY_RSSI_SLID_WIN_MAX)
slide_evm_index = 0; slide_evm_index = 0;
tmp_val = priv->stats.slide_evm_total/slide_evm_statistics; tmp_val = priv->stats.slide_evm_total /
slide_evm_statistics;
priv->stats.signal_quality = tmp_val; priv->stats.signal_quality = tmp_val;
priv->stats.last_signal_strength_inpercent = tmp_val; priv->stats.last_signal_strength_inpercent = tmp_val;
} }
if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) if (prev_st->bPacketToSelf ||
{ prev_st->bPacketBeacon ||
for (nspatial_stream = 0; nspatial_stream<2 ; nspatial_stream++) prev_st->bToSelfBA) {
{ for (ij = 0; ij < 2; ij++) {
if (pprevious_stats->RxMIMOSignalQuality[nspatial_stream] != -1) if (prev_st->RxMIMOSignalQuality[ij] != -1) {
{ if (priv->stats.rx_evm_percentage[ij] == 0)
if (priv->stats.rx_evm_percentage[nspatial_stream] == 0) priv->stats.rx_evm_percentage[ij] =
{ prev_st->RxMIMOSignalQuality[ij];
priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream]; priv->stats.rx_evm_percentage[ij] =
} ((priv->stats.rx_evm_percentage[ij] *
priv->stats.rx_evm_percentage[nspatial_stream] = (RX_SMOOTH - 1)) +
( (priv->stats.rx_evm_percentage[nspatial_stream]* (RX_SMOOTH-1)) + (prev_st->RxMIMOSignalQuality[ij])) /
(pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (RX_SMOOTH); (RX_SMOOTH);
} }
} }
} }
} }
} }
void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb,
void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct rtllib_rx_stats *pstats,
struct sk_buff *skb, struct rx_desc *pdesc,
struct rtllib_rx_stats * pstats, struct rx_fwinfo *pdrvinfo)
struct rx_desc *pdesc,
struct rx_fwinfo *pdrvinfo)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
bool bpacket_match_bssid, bpacket_toself; bool bpacket_match_bssid, bpacket_toself;
bool bPacketBeacon=false; bool bPacketBeacon = false;
struct rtllib_hdr_3addr *hdr; struct rtllib_hdr_3addr *hdr;
bool bToSelfBA=false; bool bToSelfBA = false;
static struct rtllib_rx_stats previous_stats; static struct rtllib_rx_stats previous_stats;
u16 fc,type; u16 fc, type;
u8 *tmp_buf;
u8 *praddr;
u8* tmp_buf;
u8 *praddr; tmp_buf = skb->data + pstats->RxDrvInfoSize + pstats->RxBufShift;
tmp_buf = skb->data + pstats->RxDrvInfoSize + pstats->RxBufShift; hdr = (struct rtllib_hdr_3addr *)tmp_buf;
fc = le16_to_cpu(hdr->frame_ctl);
hdr = (struct rtllib_hdr_3addr *)tmp_buf; type = WLAN_FC_GET_TYPE(fc);
fc = le16_to_cpu(hdr->frame_ctl); praddr = hdr->addr1;
type = WLAN_FC_GET_TYPE(fc);
praddr = hdr->addr1; bpacket_match_bssid = ((RTLLIB_FTYPE_CTL != type) &&
(!compare_ether_addr(priv->rtllib->
bpacket_match_bssid = ((RTLLIB_FTYPE_CTL != type) && current_network.bssid,
(!compare_ether_addr(priv->rtllib->current_network.bssid, (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :
(fc & RTLLIB_FCTL_TODS)? hdr->addr1 : (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
(fc & RTLLIB_FCTL_FROMDS )? hdr->addr2 : hdr->addr3)) && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));
&& (!pstats->bHwError) && (!pstats->bCRC)&& (!pstats->bICV)); bpacket_toself = bpacket_match_bssid &
bpacket_toself = bpacket_match_bssid & (!compare_ether_addr(praddr, priv->rtllib->dev->dev_addr)); (!compare_ether_addr(praddr,
if (WLAN_FC_GET_FRAMETYPE(fc)== RTLLIB_STYPE_BEACON) priv->rtllib->dev->dev_addr));
{ if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON)
bPacketBeacon = true; bPacketBeacon = true;
} if (bpacket_match_bssid)
if (bpacket_match_bssid) priv->stats.numpacket_matchbssid++;
{ if (bpacket_toself)
priv->stats.numpacket_matchbssid++; priv->stats.numpacket_toself++;
} rtl8192_process_phyinfo(priv, tmp_buf, &previous_stats, pstats);
if (bpacket_toself){ rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,
priv->stats.numpacket_toself++; &previous_stats, bpacket_match_bssid,
} bpacket_toself, bPacketBeacon, bToSelfBA);
rtl8192_process_phyinfo(priv, tmp_buf,&previous_stats, pstats); rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &previous_stats, bpacket_match_bssid,
bpacket_toself ,bPacketBeacon, bToSelfBA);
rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
} }
void rtl8192_UpdateReceivedRateHistogramStatistics( void rtl8192_UpdateReceivedRateHistogramStatistics(struct net_device *dev,
struct net_device *dev, struct rtllib_rx_stats *pstats)
struct rtllib_rx_stats* pstats
)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
u32 rcvType=1; u32 rcvType = 1;
u32 rateIndex; u32 rateIndex;
u32 preamble_guardinterval; u32 preamble_guardinterval;
...@@ -1833,45 +1901,104 @@ void rtl8192_UpdateReceivedRateHistogramStatistics( ...@@ -1833,45 +1901,104 @@ void rtl8192_UpdateReceivedRateHistogramStatistics(
else else
preamble_guardinterval = 0; preamble_guardinterval = 0;
switch (pstats->rate) switch (pstats->rate) {
{ case MGN_1M:
case MGN_1M: rateIndex = 0; break; rateIndex = 0;
case MGN_2M: rateIndex = 1; break; break;
case MGN_5_5M: rateIndex = 2; break; case MGN_2M:
case MGN_11M: rateIndex = 3; break; rateIndex = 1;
case MGN_6M: rateIndex = 4; break; break;
case MGN_9M: rateIndex = 5; break; case MGN_5_5M:
case MGN_12M: rateIndex = 6; break; rateIndex = 2;
case MGN_18M: rateIndex = 7; break; break;
case MGN_24M: rateIndex = 8; break; case MGN_11M:
case MGN_36M: rateIndex = 9; break; rateIndex = 3;
case MGN_48M: rateIndex = 10; break; break;
case MGN_54M: rateIndex = 11; break; case MGN_6M:
case MGN_MCS0: rateIndex = 12; break; rateIndex = 4;
case MGN_MCS1: rateIndex = 13; break; break;
case MGN_MCS2: rateIndex = 14; break; case MGN_9M:
case MGN_MCS3: rateIndex = 15; break; rateIndex = 5;
case MGN_MCS4: rateIndex = 16; break; break;
case MGN_MCS5: rateIndex = 17; break; case MGN_12M:
case MGN_MCS6: rateIndex = 18; break; rateIndex = 6;
case MGN_MCS7: rateIndex = 19; break; break;
case MGN_MCS8: rateIndex = 20; break; case MGN_18M:
case MGN_MCS9: rateIndex = 21; break; rateIndex = 7;
case MGN_MCS10: rateIndex = 22; break; break;
case MGN_MCS11: rateIndex = 23; break; case MGN_24M:
case MGN_MCS12: rateIndex = 24; break; rateIndex = 8;
case MGN_MCS13: rateIndex = 25; break; break;
case MGN_MCS14: rateIndex = 26; break; case MGN_36M:
case MGN_MCS15: rateIndex = 27; break; rateIndex = 9;
default: rateIndex = 28; break; break;
case MGN_48M:
rateIndex = 10;
break;
case MGN_54M:
rateIndex = 11;
break;
case MGN_MCS0:
rateIndex = 12;
break;
case MGN_MCS1:
rateIndex = 13;
break;
case MGN_MCS2:
rateIndex = 14;
break;
case MGN_MCS3:
rateIndex = 15;
break;
case MGN_MCS4:
rateIndex = 16;
break;
case MGN_MCS5:
rateIndex = 17;
break;
case MGN_MCS6:
rateIndex = 18;
break;
case MGN_MCS7:
rateIndex = 19;
break;
case MGN_MCS8:
rateIndex = 20;
break;
case MGN_MCS9:
rateIndex = 21;
break;
case MGN_MCS10:
rateIndex = 22;
break;
case MGN_MCS11:
rateIndex = 23;
break;
case MGN_MCS12:
rateIndex = 24;
break;
case MGN_MCS13:
rateIndex = 25;
break;
case MGN_MCS14:
rateIndex = 26;
break;
case MGN_MCS15:
rateIndex = 27;
break;
default:
rateIndex = 28;
break;
} }
priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++; priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++;
priv->stats.received_rate_histogram[0][rateIndex]++; priv->stats.received_rate_histogram[0][rateIndex]++;
priv->stats.received_rate_histogram[rcvType][rateIndex]++; priv->stats.received_rate_histogram[rcvType][rateIndex]++;
} }
bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats* stats, bool rtl8192_rx_query_status_desc(struct net_device *dev,
struct rx_desc *pdesc, struct sk_buff* skb) struct rtllib_rx_stats *stats,
struct rx_desc *pdesc,
struct sk_buff *skb)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
...@@ -1887,9 +2014,9 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats ...@@ -1887,9 +2014,9 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
stats->bShift = false; stats->bShift = false;
if (pdesc->CRC32) { if (pdesc->CRC32) {
if (pdesc->Length <500) if (pdesc->Length < 500)
priv->stats.rxcrcerrmin++; priv->stats.rxcrcerrmin++;
else if (pdesc->Length >1000) else if (pdesc->Length > 1000)
priv->stats.rxcrcerrmax++; priv->stats.rxcrcerrmax++;
else else
priv->stats.rxcrcerrmid++; priv->stats.rxcrcerrmid++;
...@@ -1903,13 +2030,15 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats ...@@ -1903,13 +2030,15 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift); pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift);
stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT, (u8)pDrvInfo->RxRate); stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT,
(u8)pDrvInfo->RxRate);
stats->bShortPreamble = pDrvInfo->SPLCP; stats->bShortPreamble = pDrvInfo->SPLCP;
rtl8192_UpdateReceivedRateHistogramStatistics(dev, stats); rtl8192_UpdateReceivedRateHistogramStatistics(dev, stats);
stats->bIsAMPDU = (pDrvInfo->PartAggr==1); stats->bIsAMPDU = (pDrvInfo->PartAggr == 1);
stats->bFirstMPDU = (pDrvInfo->PartAggr==1) && (pDrvInfo->FirstAGGR==1); stats->bFirstMPDU = (pDrvInfo->PartAggr == 1) &&
(pDrvInfo->FirstAGGR == 1);
stats->TimeStampLow = pDrvInfo->TSFL; stats->TimeStampLow = pDrvInfo->TSFL;
stats->TimeStampHigh = read_nic_dword(dev, TSFR+4); stats->TimeStampHigh = read_nic_dword(dev, TSFR+4);
...@@ -1921,11 +2050,13 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats ...@@ -1921,11 +2050,13 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
stats->RxIs40MHzPacket = pDrvInfo->BW; stats->RxIs40MHzPacket = pDrvInfo->BW;
rtl8192_TranslateRxSignalStuff(dev,skb, stats, pdesc, pDrvInfo); rtl8192_TranslateRxSignalStuff(dev, skb, stats, pdesc,
pDrvInfo);
if (pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1) if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1)
RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n", RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d,"
pDrvInfo->FirstAGGR, pDrvInfo->PartAggr); " pDrvInfo->PartAggr = %d\n",
pDrvInfo->FirstAGGR, pDrvInfo->PartAggr);
skb_trim(skb, skb->len - 4/*sCrcLng*/); skb_trim(skb, skb->len - 4/*sCrcLng*/);
...@@ -1948,36 +2079,24 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset) ...@@ -1948,36 +2079,24 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
OpMode = RT_OP_MODE_NO_LINK; OpMode = RT_OP_MODE_NO_LINK;
priv->rtllib->SetHwRegHandler(dev, HW_VAR_MEDIA_STATUS, &OpMode); priv->rtllib->SetHwRegHandler(dev, HW_VAR_MEDIA_STATUS, &OpMode);
#if 1 if (!priv->rtllib->bSupportRemoteWakeUp) {
if (!priv->rtllib->bSupportRemoteWakeUp)
{
u1bTmp = 0x0; u1bTmp = 0x0;
write_nic_byte(dev, CMDR, u1bTmp); write_nic_byte(dev, CMDR, u1bTmp);
} }
#else
cmd=read_nic_byte(dev,CMDR);
write_nic_byte(dev, CMDR, cmd &~ (CR_TE|CR_RE));
#endif
mdelay(20); mdelay(20);
if (!reset) if (!reset) {
{
mdelay(150); mdelay(150);
priv->bHwRfOffAction = 2; priv->bHwRfOffAction = 2;
if (!priv->rtllib->bSupportRemoteWakeUp) if (!priv->rtllib->bSupportRemoteWakeUp) {
{ PHY_SetRtl8192eRfOff(dev);
{ ulRegRead = read_nic_dword(dev, CPU_GEN);
PHY_SetRtl8192eRfOff(dev); ulRegRead |= CPU_GEN_SYSTEM_RESET;
} write_nic_dword(dev, CPU_GEN, ulRegRead);
ulRegRead = read_nic_dword(dev,CPU_GEN); } else {
ulRegRead|=CPU_GEN_SYSTEM_RESET;
write_nic_dword(dev,CPU_GEN, ulRegRead);
}
else
{
write_nic_dword(dev, WFCRC0, 0xffffffff); write_nic_dword(dev, WFCRC0, 0xffffffff);
write_nic_dword(dev, WFCRC1, 0xffffffff); write_nic_dword(dev, WFCRC1, 0xffffffff);
write_nic_dword(dev, WFCRC2, 0xffffffff); write_nic_dword(dev, WFCRC2, 0xffffffff);
...@@ -1988,59 +2107,57 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset) ...@@ -1988,59 +2107,57 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
} }
} }
for (i = 0; i < MAX_QUEUE_SIZE; i++) { for (i = 0; i < MAX_QUEUE_SIZE; i++)
skb_queue_purge(&priv->rtllib->skb_waitQ [i]); skb_queue_purge(&priv->rtllib->skb_waitQ[i]);
} for (i = 0; i < MAX_QUEUE_SIZE; i++)
for (i = 0; i < MAX_QUEUE_SIZE; i++) { skb_queue_purge(&priv->rtllib->skb_aggQ[i]);
skb_queue_purge(&priv->rtllib->skb_aggQ [i]);
}
skb_queue_purge(&priv->skb_queue); skb_queue_purge(&priv->skb_queue);
return; return;
} }
void rtl8192_update_ratr_table(struct net_device* dev) void rtl8192_update_ratr_table(struct net_device *dev)
{ {
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
u8* pMcsRate = ieee->dot11HTOperationalRateSet; u8 *pMcsRate = ieee->dot11HTOperationalRateSet;
u32 ratr_value = 0; u32 ratr_value = 0;
u8 rate_index = 0; u8 rate_index = 0;
rtl8192_config_rate(dev, (u16*)(&ratr_value)); rtl8192_config_rate(dev, (u16 *)(&ratr_value));
ratr_value |= (*(u16*)(pMcsRate)) << 12; ratr_value |= (*(u16 *)(pMcsRate)) << 12;
switch (ieee->mode) switch (ieee->mode) {
{ case IEEE_A:
case IEEE_A: ratr_value &= 0x00000FF0;
ratr_value &= 0x00000FF0; break;
break; case IEEE_B:
case IEEE_B: ratr_value &= 0x0000000F;
ratr_value &= 0x0000000F; break;
break; case IEEE_G:
case IEEE_G: case IEEE_G|IEEE_B:
case IEEE_G|IEEE_B: ratr_value &= 0x00000FF7;
ratr_value &= 0x00000FF7; break;
break; case IEEE_N_24G:
case IEEE_N_24G: case IEEE_N_5G:
case IEEE_N_5G: if (ieee->pHTInfo->PeerMimoPs == 0) {
if (ieee->pHTInfo->PeerMimoPs == 0) ratr_value &= 0x0007F007;
ratr_value &= 0x0007F007; } else {
else{ if (priv->rf_type == RF_1T2R)
if (priv->rf_type == RF_1T2R) ratr_value &= 0x000FF007;
ratr_value &= 0x000FF007; else
else ratr_value &= 0x0F81F007;
ratr_value &= 0x0F81F007; }
} break;
break; default:
default: break;
break;
} }
ratr_value &= 0x0FFFFFFF; ratr_value &= 0x0FFFFFFF;
if (ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI40MHz){ if (ieee->pHTInfo->bCurTxBW40MHz &&
ieee->pHTInfo->bCurShortGI40MHz)
ratr_value |= 0x80000000; ratr_value |= 0x80000000;
}else if (!ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI20MHz){ else if (!ieee->pHTInfo->bCurTxBW40MHz &&
ieee->pHTInfo->bCurShortGI20MHz)
ratr_value |= 0x80000000; ratr_value |= 0x80000000;
}
write_nic_dword(dev, RATR0+rate_index*4, ratr_value); write_nic_dword(dev, RATR0+rate_index*4, ratr_value);
write_nic_byte(dev, UFWP, 1); write_nic_byte(dev, UFWP, 1);
} }
...@@ -2077,17 +2194,19 @@ rtl8192_InitializeVariables(struct net_device *dev) ...@@ -2077,17 +2194,19 @@ rtl8192_InitializeVariables(struct net_device *dev)
RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) | RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) |
((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT; ((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT;
priv->irq_mask[0] = (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |\ priv->irq_mask[0] = (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK |
IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |\ IMR_BEDOK | IMR_BKDOK | IMR_HCCADOK |
IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |\ IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 |
IMR_RDU | IMR_RXFOVW | IMR_TXFOVW |
IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
priv->MidHighPwrTHR_L1 = 0x3B; priv->MidHighPwrTHR_L1 = 0x3B;
priv->MidHighPwrTHR_L2 = 0x40; priv->MidHighPwrTHR_L2 = 0x40;
priv->PwrDomainProtect = false; priv->PwrDomainProtect = false;
priv->bfirst_after_down = 0; priv->bfirst_after_down = 0;
} }
void rtl8192_EnableInterrupt(struct net_device *dev) void rtl8192_EnableInterrupt(struct net_device *dev)
...@@ -2095,7 +2214,7 @@ void rtl8192_EnableInterrupt(struct net_device *dev) ...@@ -2095,7 +2214,7 @@ void rtl8192_EnableInterrupt(struct net_device *dev)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
priv->irq_enabled = 1; priv->irq_enabled = 1;
write_nic_dword(dev,INTA_MASK, priv->irq_mask[0]); write_nic_dword(dev, INTA_MASK, priv->irq_mask[0]);
} }
...@@ -2103,7 +2222,7 @@ void rtl8192_DisableInterrupt(struct net_device *dev) ...@@ -2103,7 +2222,7 @@ void rtl8192_DisableInterrupt(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
write_nic_dword(dev,INTA_MASK,0); write_nic_dword(dev, INTA_MASK, 0);
priv->irq_enabled = 0; priv->irq_enabled = 0;
} }
...@@ -2118,18 +2237,21 @@ void rtl8192_ClearInterrupt(struct net_device *dev) ...@@ -2118,18 +2237,21 @@ void rtl8192_ClearInterrupt(struct net_device *dev)
void rtl8192_enable_rx(struct net_device *dev) void rtl8192_enable_rx(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
write_nic_dword(dev, RDQDA,priv->rx_ring_dma[RX_MPDU_QUEUE]); write_nic_dword(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
} }
u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA}; static const u32 TX_DESC_BASE[] = {
BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA
};
void rtl8192_enable_tx(struct net_device *dev) void rtl8192_enable_tx(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
u32 i; u32 i;
for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma); write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
} }
...@@ -2138,16 +2260,17 @@ void rtl8192_beacon_disable(struct net_device *dev) ...@@ -2138,16 +2260,17 @@ void rtl8192_beacon_disable(struct net_device *dev)
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
u32 reg; u32 reg;
reg = read_nic_dword(priv->rtllib->dev,INTA_MASK); reg = read_nic_dword(priv->rtllib->dev, INTA_MASK);
reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
write_nic_dword(priv->rtllib->dev, INTA_MASK, reg); write_nic_dword(priv->rtllib->dev, INTA_MASK, reg);
} }
void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb) void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta,
u32 *p_intb)
{ {
*p_inta = read_nic_dword(dev, ISR) ; *p_inta = read_nic_dword(dev, ISR);
write_nic_dword(dev,ISR,*p_inta); write_nic_dword(dev, ISR, *p_inta);
} }
bool rtl8192_HalRxCheckStuck(struct net_device *dev) bool rtl8192_HalRxCheckStuck(struct net_device *dev)
...@@ -2155,61 +2278,56 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev) ...@@ -2155,61 +2278,56 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
u16 RegRxCounter = read_nic_word(dev, 0x130); u16 RegRxCounter = read_nic_word(dev, 0x130);
bool bStuck = false; bool bStuck = false;
static u8 rx_chk_cnt = 0; static u8 rx_chk_cnt;
u32 SlotIndex = 0, TotalRxStuckCount = 0; u32 SlotIndex = 0, TotalRxStuckCount = 0;
u8 i; u8 i;
u8 SilentResetRxSoltNum = 4; u8 SilentResetRxSoltNum = 4;
RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n", RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d, RxCounter is %d\n",
__func__, RegRxCounter,priv->RxCounter); __func__, RegRxCounter, priv->RxCounter);
rx_chk_cnt++; rx_chk_cnt++;
if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5)) if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5)) {
{
rx_chk_cnt = 0; rx_chk_cnt = 0;
} else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High+5)) && } else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High + 5))
(((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) && && (((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&
(priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M)) || (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M))
((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) && || ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
(priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_20M)))) { (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M)))) {
if (rx_chk_cnt < 2) { if (rx_chk_cnt < 2)
return bStuck; return bStuck;
} else { else
rx_chk_cnt = 0; rx_chk_cnt = 0;
}
} else if ((((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) && } else if ((((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&
(priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) || (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) ||
((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) && ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
(priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M))) && (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M))) &&
priv->undecorated_smoothed_pwdb >= VeryLowRSSI) { priv->undecorated_smoothed_pwdb >= VeryLowRSSI) {
if (rx_chk_cnt < 4) { if (rx_chk_cnt < 4)
return bStuck; return bStuck;
} else { else
rx_chk_cnt = 0; rx_chk_cnt = 0;
}
} else { } else {
if (rx_chk_cnt < 8) { if (rx_chk_cnt < 8)
return bStuck; return bStuck;
} else { else
rx_chk_cnt = 0; rx_chk_cnt = 0;
}
} }
SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum;
if (priv->RxCounter==RegRxCounter) if (priv->RxCounter == RegRxCounter) {
{
priv->SilentResetRxStuckEvent[SlotIndex] = 1; priv->SilentResetRxStuckEvent[SlotIndex] = 1;
for ( i = 0; i < SilentResetRxSoltNum ; i++ ) for (i = 0; i < SilentResetRxSoltNum; i++)
TotalRxStuckCount += priv->SilentResetRxStuckEvent[i]; TotalRxStuckCount += priv->SilentResetRxStuckEvent[i];
if (TotalRxStuckCount == SilentResetRxSoltNum) if (TotalRxStuckCount == SilentResetRxSoltNum) {
{ bStuck = true;
bStuck = true; for (i = 0; i < SilentResetRxSoltNum; i++)
for ( i = 0; i < SilentResetRxSoltNum ; i++ ) TotalRxStuckCount +=
TotalRxStuckCount += priv->SilentResetRxStuckEvent[i]; priv->SilentResetRxStuckEvent[i];
} }
...@@ -2226,10 +2344,10 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev) ...@@ -2226,10 +2344,10 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev)
{ {
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
bool bStuck = false; bool bStuck = false;
u16 RegTxCounter = read_nic_word(dev, 0x128); u16 RegTxCounter = read_nic_word(dev, 0x128);
RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n",
__func__,RegTxCounter,priv->TxCounter); __func__, RegTxCounter, priv->TxCounter);
if (priv->TxCounter == RegTxCounter) if (priv->TxCounter == RegTxCounter)
bStuck = true; bStuck = true;
...@@ -2244,18 +2362,19 @@ bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev) ...@@ -2244,18 +2362,19 @@ bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
if (ieee->rtllib_ap_sec_type && if (ieee->rtllib_ap_sec_type &&
(ieee->rtllib_ap_sec_type(priv->rtllib)&(SEC_ALG_WEP|SEC_ALG_TKIP))) { (ieee->rtllib_ap_sec_type(priv->rtllib)&(SEC_ALG_WEP |
SEC_ALG_TKIP))) {
return false; return false;
} else { } else {
return true; return true;
} }
} }
bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device* dev) bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev)
{ {
bool Reval; bool Reval;
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
struct rtllib_device* ieee = priv->rtllib; struct rtllib_device *ieee = priv->rtllib;
if (ieee->bHalfWirelessN24GMode == true) if (ieee->bHalfWirelessN24GMode == true)
Reval = true; Reval = true;
...@@ -2269,8 +2388,9 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc) ...@@ -2269,8 +2388,9 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
{ {
u8 tmp_Short; u8 tmp_Short;
tmp_Short = (TxHT==1)?((tcb_desc->bUseShortGI)?1:0):((tcb_desc->bUseShortPreamble)?1:0); tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
if (TxHT==1 && TxRate != DESC90_RATEMCS15) ((tcb_desc->bUseShortPreamble) ? 1 : 0);
if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
tmp_Short = 0; tmp_Short = 0;
return tmp_Short; return tmp_Short;
...@@ -2278,12 +2398,12 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc) ...@@ -2278,12 +2398,12 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
void void
ActUpdateChannelAccessSetting( ActUpdateChannelAccessSetting(
struct net_device* dev, struct net_device *dev,
enum wireless_mode WirelessMode, enum wireless_mode WirelessMode,
struct channel_access_setting *ChnlAccessSetting struct channel_access_setting *ChnlAccessSetting
) )
{ {
struct r8192_priv * priv = rtllib_priv(dev); struct r8192_priv *priv = rtllib_priv(dev);
return; return;
...@@ -2295,7 +2415,8 @@ ActUpdateChannelAccessSetting( ...@@ -2295,7 +2415,8 @@ ActUpdateChannelAccessSetting(
else else
SIFS_Timer = priv->SifsTime; SIFS_Timer = priv->SifsTime;
priv->rtllib->SetHwRegHandler( dev, HW_VAR_SIFS, (u8*)&SIFS_Timer); priv->rtllib->SetHwRegHandler(dev, HW_VAR_SIFS,
(u8 *)&SIFS_Timer);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7