aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/rtl8192cu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/dm.c24
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/hw.c179
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/led.c15
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/mac.c101
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/phy.c121
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/rf.c6
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/sw.c6
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/trx.c36
8 files changed, 231 insertions, 257 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
index f311baee668d..c0016f3194e5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
@@ -52,7 +52,7 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
52 if ((mac->link_state < MAC80211_LINKED) && 52 if ((mac->link_state < MAC80211_LINKED) &&
53 (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) { 53 (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
54 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE, 54 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
55 ("Not connected to any\n")); 55 "Not connected to any\n");
56 56
57 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL; 57 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
58 58
@@ -65,28 +65,28 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
65 undecorated_smoothed_pwdb = 65 undecorated_smoothed_pwdb =
66 rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb; 66 rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
67 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 67 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
68 ("AP Client PWDB = 0x%lx\n", 68 "AP Client PWDB = 0x%lx\n",
69 undecorated_smoothed_pwdb)); 69 undecorated_smoothed_pwdb);
70 } else { 70 } else {
71 undecorated_smoothed_pwdb = 71 undecorated_smoothed_pwdb =
72 rtlpriv->dm.undecorated_smoothed_pwdb; 72 rtlpriv->dm.undecorated_smoothed_pwdb;
73 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 73 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
74 ("STA Default Port PWDB = 0x%lx\n", 74 "STA Default Port PWDB = 0x%lx\n",
75 undecorated_smoothed_pwdb)); 75 undecorated_smoothed_pwdb);
76 } 76 }
77 } else { 77 } else {
78 undecorated_smoothed_pwdb = 78 undecorated_smoothed_pwdb =
79 rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb; 79 rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
80 80
81 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 81 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
82 ("AP Ext Port PWDB = 0x%lx\n", 82 "AP Ext Port PWDB = 0x%lx\n",
83 undecorated_smoothed_pwdb)); 83 undecorated_smoothed_pwdb);
84 } 84 }
85 85
86 if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) { 86 if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
87 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1; 87 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
88 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 88 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
89 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n")); 89 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
90 } else if ((undecorated_smoothed_pwdb < 90 } else if ((undecorated_smoothed_pwdb <
91 (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) && 91 (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
92 (undecorated_smoothed_pwdb >= 92 (undecorated_smoothed_pwdb >=
@@ -94,18 +94,18 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
94 94
95 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1; 95 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
96 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 96 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
97 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n")); 97 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
98 } else if (undecorated_smoothed_pwdb < 98 } else if (undecorated_smoothed_pwdb <
99 (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) { 99 (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
100 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL; 100 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
101 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 101 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
102 ("TXHIGHPWRLEVEL_NORMAL\n")); 102 "TXHIGHPWRLEVEL_NORMAL\n");
103 } 103 }
104 104
105 if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) { 105 if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
106 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, 106 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
107 ("PHY_SetTxPowerLevel8192S() Channel = %d\n", 107 "PHY_SetTxPowerLevel8192S() Channel = %d\n",
108 rtlphy->current_channel)); 108 rtlphy->current_channel);
109 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel); 109 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
110 } 110 }
111 111
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 778c0e6e836b..80bd17d85935 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -494,17 +494,17 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
494 HWSET_MAX_SIZE); 494 HWSET_MAX_SIZE);
495 } else if (rtlefuse->epromtype == EEPROM_93C46) { 495 } else if (rtlefuse->epromtype == EEPROM_93C46) {
496 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 496 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
497 ("RTL819X Not boot from eeprom, check it !!")); 497 "RTL819X Not boot from eeprom, check it !!\n");
498 } 498 }
499 RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, "MAP", 499 RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, "MAP",
500 hwinfo, HWSET_MAX_SIZE); 500 hwinfo, HWSET_MAX_SIZE);
501 eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0])); 501 eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));
502 if (eeprom_id != RTL8190_EEPROM_ID) { 502 if (eeprom_id != RTL8190_EEPROM_ID) {
503 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 503 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
504 ("EEPROM ID(%#x) is invalid!!\n", eeprom_id)); 504 "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
505 rtlefuse->autoload_failflag = true; 505 rtlefuse->autoload_failflag = true;
506 } else { 506 } else {
507 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n")); 507 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
508 rtlefuse->autoload_failflag = false; 508 rtlefuse->autoload_failflag = false;
509 } 509 }
510 if (rtlefuse->autoload_failflag) 510 if (rtlefuse->autoload_failflag)
@@ -518,16 +518,15 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
518 rtlefuse->autoload_failflag, hwinfo); 518 rtlefuse->autoload_failflag, hwinfo);
519 rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]); 519 rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]);
520 rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]); 520 rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
521 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 521 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, " VID = 0x%02x PID = 0x%02x\n",
522 (" VID = 0x%02x PID = 0x%02x\n", 522 rtlefuse->eeprom_vid, rtlefuse->eeprom_did);
523 rtlefuse->eeprom_vid, rtlefuse->eeprom_did));
524 rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; 523 rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
525 rtlefuse->eeprom_version = 524 rtlefuse->eeprom_version =
526 le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]); 525 le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
527 rtlefuse->txpwr_fromeprom = true; 526 rtlefuse->txpwr_fromeprom = true;
528 rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID]; 527 rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
529 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, 528 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
530 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid)); 529 rtlefuse->eeprom_oemid);
531 if (rtlhal->oem_id == RT_CID_DEFAULT) { 530 if (rtlhal->oem_id == RT_CID_DEFAULT) {
532 switch (rtlefuse->eeprom_oemid) { 531 switch (rtlefuse->eeprom_oemid) {
533 case EEPROM_CID_DEFAULT: 532 case EEPROM_CID_DEFAULT:
@@ -579,8 +578,8 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
579 default: 578 default:
580 break; 579 break;
581 } 580 }
582 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 581 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RT Customized ID: 0x%02X\n",
583 ("RT Customized ID: 0x%02X\n", rtlhal->oem_id)); 582 rtlhal->oem_id);
584} 583}
585 584
586void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw) 585void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
@@ -596,11 +595,11 @@ void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
596 tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR); 595 tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
597 rtlefuse->epromtype = (tmp_u1b & BOOT_FROM_EEPROM) ? 596 rtlefuse->epromtype = (tmp_u1b & BOOT_FROM_EEPROM) ?
598 EEPROM_93C46 : EEPROM_BOOT_EFUSE; 597 EEPROM_93C46 : EEPROM_BOOT_EFUSE;
599 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from %s\n", 598 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from %s\n",
600 (tmp_u1b & BOOT_FROM_EEPROM) ? "EERROM" : "EFUSE")); 599 tmp_u1b & BOOT_FROM_EEPROM ? "EERROM" : "EFUSE");
601 rtlefuse->autoload_failflag = (tmp_u1b & EEPROM_EN) ? false : true; 600 rtlefuse->autoload_failflag = (tmp_u1b & EEPROM_EN) ? false : true;
602 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload %s\n", 601 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload %s\n",
603 (tmp_u1b & EEPROM_EN) ? "OK!!" : "ERR!!")); 602 tmp_u1b & EEPROM_EN ? "OK!!" : "ERR!!");
604 _rtl92cu_read_adapter_info(hw); 603 _rtl92cu_read_adapter_info(hw);
605 _rtl92cu_hal_customized_behavior(hw); 604 _rtl92cu_hal_customized_behavior(hw);
606 return; 605 return;
@@ -618,13 +617,12 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
618 do { 617 do {
619 if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) { 618 if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) {
620 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 619 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
621 ("Autoload Done!\n")); 620 "Autoload Done!\n");
622 break; 621 break;
623 } 622 }
624 if (pollingCount++ > 100) { 623 if (pollingCount++ > 100) {
625 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, 624 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
626 ("Failed to polling REG_APS_FSMCO[PFM_ALDN]" 625 "Failed to polling REG_APS_FSMCO[PFM_ALDN] done!\n");
627 " done!\n"));
628 return -ENODEV; 626 return -ENODEV;
629 } 627 }
630 } while (true); 628 } while (true);
@@ -639,8 +637,8 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
639 value8 |= LDV12_EN; 637 value8 |= LDV12_EN;
640 rtl_write_byte(rtlpriv, REG_LDOV12D_CTRL, value8); 638 rtl_write_byte(rtlpriv, REG_LDOV12D_CTRL, value8);
641 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 639 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
642 (" power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x.\n", 640 " power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x\n",
643 value8)); 641 value8);
644 udelay(100); 642 udelay(100);
645 value8 = rtl_read_byte(rtlpriv, REG_SYS_ISO_CTRL); 643 value8 = rtl_read_byte(rtlpriv, REG_SYS_ISO_CTRL);
646 value8 &= ~ISO_MD2PP; 644 value8 &= ~ISO_MD2PP;
@@ -658,8 +656,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
658 } 656 }
659 if (pollingCount++ > 100) { 657 if (pollingCount++ > 100) {
660 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, 658 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
661 ("Failed to polling REG_APS_FSMCO[APFM_ONMAC]" 659 "Failed to polling REG_APS_FSMCO[APFM_ONMAC] done!\n");
662 " done!\n"));
663 return -ENODEV; 660 return -ENODEV;
664 } 661 }
665 } while (true); 662 } while (true);
@@ -877,8 +874,8 @@ static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,
877 hiQ = QUEUE_HIGH; 874 hiQ = QUEUE_HIGH;
878 } 875 }
879 _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ); 876 _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
880 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, 877 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
881 ("Tx queue select :0x%02x..\n", queue_sel)); 878 queue_sel);
882} 879}
883 880
884static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw, 881static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw,
@@ -937,8 +934,8 @@ static void _rtl92cu_init_chipT_queue_priority(struct ieee80211_hw *hw,
937 break; 934 break;
938 } 935 }
939 rtl_write_byte(rtlpriv, (REG_TRXDMA_CTRL+1), hq_sele); 936 rtl_write_byte(rtlpriv, (REG_TRXDMA_CTRL+1), hq_sele);
940 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, 937 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
941 ("Tx queue select :0x%02x..\n", hq_sele)); 938 hq_sele);
942} 939}
943 940
944static void _rtl92cu_init_queue_priority(struct ieee80211_hw *hw, 941static void _rtl92cu_init_queue_priority(struct ieee80211_hw *hw,
@@ -998,7 +995,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
998 995
999 if (err) { 996 if (err) {
1000 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 997 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
1001 ("Failed to init power on!\n")); 998 "Failed to init power on!\n");
1002 return err; 999 return err;
1003 } 1000 }
1004 if (!wmm_enable) { 1001 if (!wmm_enable) {
@@ -1010,7 +1007,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
1010 } 1007 }
1011 if (false == rtl92c_init_llt_table(hw, boundary)) { 1008 if (false == rtl92c_init_llt_table(hw, boundary)) {
1012 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 1009 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
1013 ("Failed to init LLT Table!\n")); 1010 "Failed to init LLT Table!\n");
1014 return -EINVAL; 1011 return -EINVAL;
1015 } 1012 }
1016 _rtl92cu_init_queue_reserved_page(hw, wmm_enable, out_ep_nums, 1013 _rtl92cu_init_queue_reserved_page(hw, wmm_enable, out_ep_nums,
@@ -1043,12 +1040,12 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
1043 struct rtl_hal *rtlhal = rtl_hal(rtlpriv); 1040 struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
1044 1041
1045 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, 1042 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
1046 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n", 1043 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
1047 rtlpriv->sec.pairwise_enc_algorithm, 1044 rtlpriv->sec.pairwise_enc_algorithm,
1048 rtlpriv->sec.group_enc_algorithm)); 1045 rtlpriv->sec.group_enc_algorithm);
1049 if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) { 1046 if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
1050 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 1047 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
1051 ("not open sw encryption\n")); 1048 "not open sw encryption\n");
1052 return; 1049 return;
1053 } 1050 }
1054 sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable; 1051 sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable;
@@ -1059,8 +1056,8 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
1059 if (IS_NORMAL_CHIP(rtlhal->version)) 1056 if (IS_NORMAL_CHIP(rtlhal->version))
1060 sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK); 1057 sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
1061 rtl_write_byte(rtlpriv, REG_CR + 1, 0x02); 1058 rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
1062 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, 1059 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
1063 ("The SECR-value %x\n", sec_reg_value)); 1060 sec_reg_value);
1064 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value); 1061 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
1065} 1062}
1066 1063
@@ -1163,13 +1160,13 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
1163 rtlhal->hw_type = HARDWARE_TYPE_RTL8192CU; 1160 rtlhal->hw_type = HARDWARE_TYPE_RTL8192CU;
1164 err = _rtl92cu_init_mac(hw); 1161 err = _rtl92cu_init_mac(hw);
1165 if (err) { 1162 if (err) {
1166 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("init mac failed!\n")); 1163 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "init mac failed!\n");
1167 return err; 1164 return err;
1168 } 1165 }
1169 err = rtl92c_download_fw(hw); 1166 err = rtl92c_download_fw(hw);
1170 if (err) { 1167 if (err) {
1171 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 1168 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1172 ("Failed to download FW. Init HW without FW now..\n")); 1169 "Failed to download FW. Init HW without FW now..\n");
1173 err = 1; 1170 err = 1;
1174 rtlhal->fw_ready = false; 1171 rtlhal->fw_ready = false;
1175 return err; 1172 return err;
@@ -1280,8 +1277,7 @@ static void _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
1280 } 1277 }
1281 if (retry_cnts >= 100) { 1278 if (retry_cnts >= 100) {
1282 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 1279 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
1283 ("#####=> 8051 reset failed!.." 1280 "#####=> 8051 reset failed!.........................\n");
1284 ".......................\n"););
1285 /* if 8051 reset fail, reset MAC. */ 1281 /* if 8051 reset fail, reset MAC. */
1286 rtl_write_byte(rtlpriv, 1282 rtl_write_byte(rtlpriv,
1287 REG_SYS_FUNC_EN + 1, 1283 REG_SYS_FUNC_EN + 1,
@@ -1495,35 +1491,36 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw,
1495 _rtl92cu_resume_tx_beacon(hw); 1491 _rtl92cu_resume_tx_beacon(hw);
1496 _rtl92cu_disable_bcn_sub_func(hw); 1492 _rtl92cu_disable_bcn_sub_func(hw);
1497 } else { 1493 } else {
1498 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("Set HW_VAR_MEDIA_" 1494 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
1499 "STATUS:No such media status(%x).\n", type)); 1495 "Set HW_VAR_MEDIA_STATUS:No such media status(%x)\n",
1496 type);
1500 } 1497 }
1501 switch (type) { 1498 switch (type) {
1502 case NL80211_IFTYPE_UNSPECIFIED: 1499 case NL80211_IFTYPE_UNSPECIFIED:
1503 bt_msr |= MSR_NOLINK; 1500 bt_msr |= MSR_NOLINK;
1504 ledaction = LED_CTL_LINK; 1501 ledaction = LED_CTL_LINK;
1505 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 1502 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1506 ("Set Network type to NO LINK!\n")); 1503 "Set Network type to NO LINK!\n");
1507 break; 1504 break;
1508 case NL80211_IFTYPE_ADHOC: 1505 case NL80211_IFTYPE_ADHOC:
1509 bt_msr |= MSR_ADHOC; 1506 bt_msr |= MSR_ADHOC;
1510 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 1507 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1511 ("Set Network type to Ad Hoc!\n")); 1508 "Set Network type to Ad Hoc!\n");
1512 break; 1509 break;
1513 case NL80211_IFTYPE_STATION: 1510 case NL80211_IFTYPE_STATION:
1514 bt_msr |= MSR_INFRA; 1511 bt_msr |= MSR_INFRA;
1515 ledaction = LED_CTL_LINK; 1512 ledaction = LED_CTL_LINK;
1516 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 1513 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1517 ("Set Network type to STA!\n")); 1514 "Set Network type to STA!\n");
1518 break; 1515 break;
1519 case NL80211_IFTYPE_AP: 1516 case NL80211_IFTYPE_AP:
1520 bt_msr |= MSR_AP; 1517 bt_msr |= MSR_AP;
1521 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 1518 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
1522 ("Set Network type to AP!\n")); 1519 "Set Network type to AP!\n");
1523 break; 1520 break;
1524 default: 1521 default:
1525 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 1522 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
1526 ("Network type %d not support!\n", type)); 1523 "Network type %d not supported!\n", type);
1527 goto error_out; 1524 goto error_out;
1528 } 1525 }
1529 rtl_write_byte(rtlpriv, (MSR), bt_msr); 1526 rtl_write_byte(rtlpriv, (MSR), bt_msr);
@@ -1684,8 +1681,8 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)
1684 value32 |= TSFRST; 1681 value32 |= TSFRST;
1685 rtl_write_dword(rtlpriv, REG_TCR, value32); 1682 rtl_write_dword(rtlpriv, REG_TCR, value32);
1686 RT_TRACE(rtlpriv, COMP_INIT|COMP_BEACON, DBG_LOUD, 1683 RT_TRACE(rtlpriv, COMP_INIT|COMP_BEACON, DBG_LOUD,
1687 ("SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n", 1684 "SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",
1688 value32)); 1685 value32);
1689 /* TODO: Modify later (Find the right parameters) 1686 /* TODO: Modify later (Find the right parameters)
1690 * NOTE: Fix test chip's bug (about contention windows's randomness) */ 1687 * NOTE: Fix test chip's bug (about contention windows's randomness) */
1691 if ((mac->opmode == NL80211_IFTYPE_ADHOC) || 1688 if ((mac->opmode == NL80211_IFTYPE_ADHOC) ||
@@ -1702,8 +1699,8 @@ void rtl92cu_set_beacon_interval(struct ieee80211_hw *hw)
1702 struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); 1699 struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
1703 u16 bcn_interval = mac->beacon_interval; 1700 u16 bcn_interval = mac->beacon_interval;
1704 1701
1705 RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, 1702 RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, "beacon_interval:%d\n",
1706 ("beacon_interval:%d\n", bcn_interval)); 1703 bcn_interval);
1707 rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval); 1704 rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
1708} 1705}
1709 1706
@@ -1767,7 +1764,7 @@ void rtl92cu_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1767 break; 1764 break;
1768 default: 1765 default:
1769 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 1766 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
1770 ("switch case not process\n")); 1767 "switch case not processed\n");
1771 break; 1768 break;
1772 } 1769 }
1773} 1770}
@@ -1827,8 +1824,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1827 rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]); 1824 rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
1828 rtl_write_byte(rtlpriv, REG_R2T_SIFS+1, val[0]); 1825 rtl_write_byte(rtlpriv, REG_R2T_SIFS+1, val[0]);
1829 rtl_write_byte(rtlpriv, REG_T2T_SIFS+1, val[0]); 1826 rtl_write_byte(rtlpriv, REG_T2T_SIFS+1, val[0]);
1830 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1827 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, "HW_VAR_SIFS\n");
1831 ("HW_VAR_SIFS\n"));
1832 break; 1828 break;
1833 } 1829 }
1834 case HW_VAR_SLOT_TIME:{ 1830 case HW_VAR_SLOT_TIME:{
@@ -1837,7 +1833,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1837 1833
1838 rtl_write_byte(rtlpriv, REG_SLOT, val[0]); 1834 rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
1839 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1835 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
1840 ("HW_VAR_SLOT_TIME %x\n", val[0])); 1836 "HW_VAR_SLOT_TIME %x\n", val[0]);
1841 if (QOS_MODE) { 1837 if (QOS_MODE) {
1842 for (e_aci = 0; e_aci < AC_MAX; e_aci++) 1838 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
1843 rtlpriv->cfg->ops->set_hw_reg(hw, 1839 rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -1901,8 +1897,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1901 min_spacing_to_set); 1897 min_spacing_to_set);
1902 *val = min_spacing_to_set; 1898 *val = min_spacing_to_set;
1903 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1899 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
1904 ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n", 1900 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
1905 mac->min_space_cfg)); 1901 mac->min_space_cfg);
1906 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE, 1902 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
1907 mac->min_space_cfg); 1903 mac->min_space_cfg);
1908 } 1904 }
@@ -1916,8 +1912,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1916 mac->min_space_cfg &= 0x07; 1912 mac->min_space_cfg &= 0x07;
1917 mac->min_space_cfg |= (density_to_set << 3); 1913 mac->min_space_cfg |= (density_to_set << 3);
1918 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1914 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
1919 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n", 1915 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
1920 mac->min_space_cfg)); 1916 mac->min_space_cfg);
1921 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE, 1917 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
1922 mac->min_space_cfg); 1918 mac->min_space_cfg);
1923 break; 1919 break;
@@ -1950,8 +1946,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1950 p_regtoset[index]); 1946 p_regtoset[index]);
1951 } 1947 }
1952 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1948 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
1953 ("Set HW_VAR_AMPDU_FACTOR: %#x\n", 1949 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
1954 factor_toset)); 1950 factor_toset);
1955 } 1951 }
1956 break; 1952 break;
1957 } 1953 }
@@ -1969,8 +1965,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
1969 AC_PARAM_ECW_MAX_OFFSET); 1965 AC_PARAM_ECW_MAX_OFFSET);
1970 u4b_ac_param |= (u32) tx_op << AC_PARAM_TXOP_OFFSET; 1966 u4b_ac_param |= (u32) tx_op << AC_PARAM_TXOP_OFFSET;
1971 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, 1967 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
1972 ("queue:%x, ac_param:%x\n", e_aci, 1968 "queue:%x, ac_param:%x\n",
1973 u4b_ac_param)); 1969 e_aci, u4b_ac_param);
1974 switch (e_aci) { 1970 switch (e_aci) {
1975 case AC1_BK: 1971 case AC1_BK:
1976 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, 1972 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM,
@@ -2020,8 +2016,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
2020 break; 2016 break;
2021 default: 2017 default:
2022 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 2018 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
2023 ("HW_VAR_ACM_CTRL acm set " 2019 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
2024 "failed: eACI is %d\n", acm)); 2020 acm);
2025 break; 2021 break;
2026 } 2022 }
2027 } else { 2023 } else {
@@ -2037,13 +2033,13 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
2037 break; 2033 break;
2038 default: 2034 default:
2039 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 2035 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
2040 ("switch case not process\n")); 2036 "switch case not processed\n");
2041 break; 2037 break;
2042 } 2038 }
2043 } 2039 }
2044 RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE, 2040 RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
2045 ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] " 2041 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
2046 "Write 0x%X\n", acm_ctrl)); 2042 acm_ctrl);
2047 rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl); 2043 rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
2048 break; 2044 break;
2049 } 2045 }
@@ -2051,7 +2047,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
2051 rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]); 2047 rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]);
2052 mac->rx_conf = ((u32 *) (val))[0]; 2048 mac->rx_conf = ((u32 *) (val))[0];
2053 RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG, 2049 RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,
2054 ("### Set RCR(0x%08x) ###\n", mac->rx_conf)); 2050 "### Set RCR(0x%08x) ###\n", mac->rx_conf);
2055 break; 2051 break;
2056 } 2052 }
2057 case HW_VAR_RETRY_LIMIT:{ 2053 case HW_VAR_RETRY_LIMIT:{
@@ -2060,8 +2056,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
2060 rtl_write_word(rtlpriv, REG_RL, 2056 rtl_write_word(rtlpriv, REG_RL,
2061 retry_limit << RETRY_LIMIT_SHORT_SHIFT | 2057 retry_limit << RETRY_LIMIT_SHORT_SHIFT |
2062 retry_limit << RETRY_LIMIT_LONG_SHIFT); 2058 retry_limit << RETRY_LIMIT_LONG_SHIFT);
2063 RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG, ("Set HW_VAR_R" 2059 RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG,
2064 "ETRY_LIMIT(0x%08x)\n", retry_limit)); 2060 "Set HW_VAR_RETRY_LIMIT(0x%08x)\n",
2061 retry_limit);
2065 break; 2062 break;
2066 } 2063 }
2067 case HW_VAR_DUAL_TSF_RST: 2064 case HW_VAR_DUAL_TSF_RST:
@@ -2165,8 +2162,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
2165 rtl_write_word(rtlpriv, REG_RXFLTMAP2, *(u16 *)val); 2162 rtl_write_word(rtlpriv, REG_RXFLTMAP2, *(u16 *)val);
2166 break; 2163 break;
2167 default: 2164 default:
2168 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case " 2165 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
2169 "not process\n")); 2166 "switch case not processed\n");
2170 break; 2167 break;
2171 } 2168 }
2172} 2169}
@@ -2239,8 +2236,8 @@ void rtl92cu_update_hal_rate_table(struct ieee80211_hw *hw,
2239 (shortgi_rate << 4) | (shortgi_rate); 2236 (shortgi_rate << 4) | (shortgi_rate);
2240 } 2237 }
2241 rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value); 2238 rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
2242 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("%x\n", rtl_read_dword(rtlpriv, 2239 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
2243 REG_ARFR0))); 2240 rtl_read_dword(rtlpriv, REG_ARFR0));
2244} 2241}
2245 2242
2246void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level) 2243void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
@@ -2344,17 +2341,16 @@ void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
2344 ratr_bitmap &= 0x0f0ff0ff; 2341 ratr_bitmap &= 0x0f0ff0ff;
2345 break; 2342 break;
2346 } 2343 }
2347 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("ratr_bitmap :%x\n", 2344 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "ratr_bitmap :%x\n",
2348 ratr_bitmap)); 2345 ratr_bitmap);
2349 *(u32 *)&rate_mask = ((ratr_bitmap & 0x0fffffff) | 2346 *(u32 *)&rate_mask = ((ratr_bitmap & 0x0fffffff) |
2350 ratr_index << 28); 2347 ratr_index << 28);
2351 rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80; 2348 rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
2352 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, " 2349 RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
2353 "ratr_val:%x, %x:%x:%x:%x:%x\n", 2350 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
2354 ratr_index, ratr_bitmap, 2351 ratr_index, ratr_bitmap,
2355 rate_mask[0], rate_mask[1], 2352 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],
2356 rate_mask[2], rate_mask[3], 2353 rate_mask[4]);
2357 rate_mask[4]));
2358 rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask); 2354 rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
2359} 2355}
2360 2356
@@ -2404,7 +2400,7 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
2404 e_rfpowerstate_toset = (u1tmp & BIT(7)) ? 2400 e_rfpowerstate_toset = (u1tmp & BIT(7)) ?
2405 ERFOFF : ERFON; 2401 ERFOFF : ERFON;
2406 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, 2402 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
2407 ("pwrdown, 0x5c(BIT7)=%02x\n", u1tmp)); 2403 "pwrdown, 0x5c(BIT7)=%02x\n", u1tmp);
2408 } else { 2404 } else {
2409 rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG, 2405 rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG,
2410 rtl_read_byte(rtlpriv, 2406 rtl_read_byte(rtlpriv,
@@ -2413,27 +2409,26 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
2413 e_rfpowerstate_toset = (u1tmp & BIT(3)) ? 2409 e_rfpowerstate_toset = (u1tmp & BIT(3)) ?
2414 ERFON : ERFOFF; 2410 ERFON : ERFOFF;
2415 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, 2411 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
2416 ("GPIO_IN=%02x\n", u1tmp)); 2412 "GPIO_IN=%02x\n", u1tmp);
2417 } 2413 }
2418 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("N-SS RF =%x\n", 2414 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "N-SS RF =%x\n",
2419 e_rfpowerstate_toset)); 2415 e_rfpowerstate_toset);
2420 } 2416 }
2421 if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) { 2417 if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
2422 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF - HW " 2418 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2423 "Radio ON, RF ON\n")); 2419 "GPIOChangeRF - HW Radio ON, RF ON\n");
2424 ppsc->hwradiooff = false; 2420 ppsc->hwradiooff = false;
2425 actuallyset = true; 2421 actuallyset = true;
2426 } else if ((!ppsc->hwradiooff) && (e_rfpowerstate_toset == 2422 } else if ((!ppsc->hwradiooff) && (e_rfpowerstate_toset ==
2427 ERFOFF)) { 2423 ERFOFF)) {
2428 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF - HW" 2424 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2429 " Radio OFF\n")); 2425 "GPIOChangeRF - HW Radio OFF\n");
2430 ppsc->hwradiooff = true; 2426 ppsc->hwradiooff = true;
2431 actuallyset = true; 2427 actuallyset = true;
2432 } else { 2428 } else {
2433 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD , 2429 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
2434 ("pHalData->bHwRadioOff and eRfPowerStateToSet do not" 2430 "pHalData->bHwRadioOff and eRfPowerStateToSet do not match: pHalData->bHwRadioOff %x, eRfPowerStateToSet %x\n",
2435 " match: pHalData->bHwRadioOff %x, eRfPowerStateToSet " 2431 ppsc->hwradiooff, e_rfpowerstate_toset);
2436 "%x\n", ppsc->hwradiooff, e_rfpowerstate_toset));
2437 } 2432 }
2438 if (actuallyset) { 2433 if (actuallyset) {
2439 ppsc->hwradiooff = true; 2434 ppsc->hwradiooff = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
index 2ff9d8314e7b..65fd04424623 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
@@ -47,8 +47,8 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
47 u8 ledcfg; 47 u8 ledcfg;
48 struct rtl_priv *rtlpriv = rtl_priv(hw); 48 struct rtl_priv *rtlpriv = rtl_priv(hw);
49 49
50 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, 50 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
51 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin)); 51 REG_LEDCFG2, pled->ledpin);
52 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2); 52 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
53 switch (pled->ledpin) { 53 switch (pled->ledpin) {
54 case LED_PIN_GPIO0: 54 case LED_PIN_GPIO0:
@@ -62,7 +62,7 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
62 break; 62 break;
63 default: 63 default:
64 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 64 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
65 ("switch case not process\n")); 65 "switch case not processed\n");
66 break; 66 break;
67 } 67 }
68 pled->ledon = true; 68 pled->ledon = true;
@@ -74,8 +74,8 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
74 struct rtl_usb_priv *usbpriv = rtl_usbpriv(hw); 74 struct rtl_usb_priv *usbpriv = rtl_usbpriv(hw);
75 u8 ledcfg; 75 u8 ledcfg;
76 76
77 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, 77 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
78 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin)); 78 REG_LEDCFG2, pled->ledpin);
79 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2); 79 ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
80 switch (pled->ledpin) { 80 switch (pled->ledpin) {
81 case LED_PIN_GPIO0: 81 case LED_PIN_GPIO0:
@@ -95,7 +95,7 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
95 break; 95 break;
96 default: 96 default:
97 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 97 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
98 ("switch case not process\n")); 98 "switch case not processed\n");
99 break; 99 break;
100 } 100 }
101 pled->ledon = false; 101 pled->ledon = false;
@@ -136,7 +136,6 @@ void rtl92cu_led_control(struct ieee80211_hw *hw,
136 ledaction == LED_CTL_POWER_ON)) { 136 ledaction == LED_CTL_POWER_ON)) {
137 return; 137 return;
138 } 138 }
139 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n", 139 RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
140 ledaction));
141 _rtl92cu_sw_led_control(hw, ledaction); 140 _rtl92cu_sw_led_control(hw, ledaction);
142} 141}
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 487ee908d7c5..9f09844d7d50 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -88,67 +88,59 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
88 switch (rtlhal->version) { 88 switch (rtlhal->version) {
89 case VERSION_NORMAL_TSMC_CHIP_92C_1T2R: 89 case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:
90 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 90 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
91 ("Chip Version ID: VERSION_B_CHIP_92C.\n")); 91 "Chip Version ID: VERSION_B_CHIP_92C\n");
92 break; 92 break;
93 case VERSION_NORMAL_TSMC_CHIP_92C: 93 case VERSION_NORMAL_TSMC_CHIP_92C:
94 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 94 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
95 ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C.\n")); 95 "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C\n");
96 break; 96 break;
97 case VERSION_NORMAL_TSMC_CHIP_88C: 97 case VERSION_NORMAL_TSMC_CHIP_88C:
98 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 98 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
99 ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_88C.\n")); 99 "Chip Version ID: VERSION_NORMAL_TSMC_CHIP_88C\n");
100 break; 100 break;
101 case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT: 101 case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT:
102 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 102 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
103 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_i" 103 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_i92C_1T2R_A_CUT\n");
104 "92C_1T2R_A_CUT.\n"));
105 break; 104 break;
106 case VERSION_NORMAL_UMC_CHIP_92C_A_CUT: 105 case VERSION_NORMAL_UMC_CHIP_92C_A_CUT:
107 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 106 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
108 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_" 107 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_A_CUT\n");
109 "92C_A_CUT.\n"));
110 break; 108 break;
111 case VERSION_NORMAL_UMC_CHIP_88C_A_CUT: 109 case VERSION_NORMAL_UMC_CHIP_88C_A_CUT:
112 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 110 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
113 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP" 111 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_88C_A_CUT\n");
114 "_88C_A_CUT.\n"));
115 break; 112 break;
116 case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT: 113 case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT:
117 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 114 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
118 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP" 115 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT\n");
119 "_92C_1T2R_B_CUT.\n"));
120 break; 116 break;
121 case VERSION_NORMAL_UMC_CHIP_92C_B_CUT: 117 case VERSION_NORMAL_UMC_CHIP_92C_B_CUT:
122 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 118 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
123 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP" 119 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_92C_B_CUT\n");
124 "_92C_B_CUT.\n"));
125 break; 120 break;
126 case VERSION_NORMAL_UMC_CHIP_88C_B_CUT: 121 case VERSION_NORMAL_UMC_CHIP_88C_B_CUT:
127 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 122 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
128 ("Chip Version ID: VERSION_NORMAL_UMC_CHIP" 123 "Chip Version ID: VERSION_NORMAL_UMC_CHIP_88C_B_CUT\n");
129 "_88C_B_CUT.\n"));
130 break; 124 break;
131 case VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT: 125 case VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT:
132 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 126 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
133 ("Chip Version ID: VERSION_NORMA_UMC_CHIP" 127 "Chip Version ID: VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT\n");
134 "_8723_1T1R_A_CUT.\n"));
135 break; 128 break;
136 case VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT: 129 case VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT:
137 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 130 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
138 ("Chip Version ID: VERSION_NORMA_UMC_CHIP" 131 "Chip Version ID: VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT\n");
139 "_8723_1T1R_B_CUT.\n"));
140 break; 132 break;
141 case VERSION_TEST_CHIP_92C: 133 case VERSION_TEST_CHIP_92C:
142 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 134 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
143 ("Chip Version ID: VERSION_TEST_CHIP_92C.\n")); 135 "Chip Version ID: VERSION_TEST_CHIP_92C\n");
144 break; 136 break;
145 case VERSION_TEST_CHIP_88C: 137 case VERSION_TEST_CHIP_88C:
146 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 138 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
147 ("Chip Version ID: VERSION_TEST_CHIP_88C.\n")); 139 "Chip Version ID: VERSION_TEST_CHIP_88C\n");
148 break; 140 break;
149 default: 141 default:
150 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 142 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
151 ("Chip Version ID: ???????????????.\n")); 143 "Chip Version ID: ???????????????\n");
152 break; 144 break;
153 } 145 }
154 if (IS_92C_SERIAL(rtlhal->version)) 146 if (IS_92C_SERIAL(rtlhal->version))
@@ -157,15 +149,15 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
157 else 149 else
158 rtlphy->rf_type = RF_1T1R; 150 rtlphy->rf_type = RF_1T1R;
159 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, 151 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
160 ("Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ? 152 "Chip RF Type: %s\n",
161 "RF_2T2R" : "RF_1T1R")); 153 rtlphy->rf_type == RF_2T2R ? "RF_2T2R" : "RF_1T1R");
162 if (get_rf_type(rtlphy) == RF_1T1R) 154 if (get_rf_type(rtlphy) == RF_1T1R)
163 rtlpriv->dm.rfpath_rxenable[0] = true; 155 rtlpriv->dm.rfpath_rxenable[0] = true;
164 else 156 else
165 rtlpriv->dm.rfpath_rxenable[0] = 157 rtlpriv->dm.rfpath_rxenable[0] =
166 rtlpriv->dm.rfpath_rxenable[1] = true; 158 rtlpriv->dm.rfpath_rxenable[1] = true;
167 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("VersionID = 0x%4x\n", 159 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
168 rtlhal->version)); 160 rtlhal->version);
169} 161}
170 162
171/** 163/**
@@ -192,9 +184,8 @@ bool rtl92c_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
192 break; 184 break;
193 if (count > POLLING_LLT_THRESHOLD) { 185 if (count > POLLING_LLT_THRESHOLD) {
194 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 186 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
195 ("Failed to polling write LLT done at" 187 "Failed to polling write LLT done at address %d! _LLT_OP_VALUE(%x)\n",
196 " address %d! _LLT_OP_VALUE(%x)\n", 188 address, _LLT_OP_VALUE(value));
197 address, _LLT_OP_VALUE(value)));
198 status = false; 189 status = false;
199 break; 190 break;
200 } 191 }
@@ -272,7 +263,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
272 u8 cam_offset = 0; 263 u8 cam_offset = 0;
273 u8 clear_number = 5; 264 u8 clear_number = 5;
274 265
275 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n")); 266 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
276 for (idx = 0; idx < clear_number; idx++) { 267 for (idx = 0; idx < clear_number; idx++) {
277 rtl_cam_mark_invalid(hw, cam_offset + idx); 268 rtl_cam_mark_invalid(hw, cam_offset + idx);
278 rtl_cam_empty_entry(hw, cam_offset + idx); 269 rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -298,7 +289,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
298 break; 289 break;
299 default: 290 default:
300 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 291 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
301 ("iillegal switch case\n")); 292 "illegal switch case\n");
302 enc_algo = CAM_TKIP; 293 enc_algo = CAM_TKIP;
303 break; 294 break;
304 } 295 }
@@ -317,18 +308,18 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
317 } 308 }
318 if (rtlpriv->sec.key_len[key_index] == 0) { 309 if (rtlpriv->sec.key_len[key_index] == 0) {
319 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 310 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
320 ("delete one entry\n")); 311 "delete one entry\n");
321 rtl_cam_delete_one_entry(hw, p_macaddr, entry_id); 312 rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
322 } else { 313 } else {
323 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, 314 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
324 ("The insert KEY length is %d\n", 315 "The insert KEY length is %d\n",
325 rtlpriv->sec.key_len[PAIRWISE_KEYIDX])); 316 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
326 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, 317 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
327 ("The insert KEY is %x %x\n", 318 "The insert KEY is %x %x\n",
328 rtlpriv->sec.key_buf[0][0], 319 rtlpriv->sec.key_buf[0][0],
329 rtlpriv->sec.key_buf[0][1])); 320 rtlpriv->sec.key_buf[0][1]);
330 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 321 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
331 ("add one entry\n")); 322 "add one entry\n");
332 if (is_pairwise) { 323 if (is_pairwise) {
333 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD, 324 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
334 "Pairwise Key content", 325 "Pairwise Key content",
@@ -336,7 +327,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
336 rtlpriv->sec. 327 rtlpriv->sec.
337 key_len[PAIRWISE_KEYIDX]); 328 key_len[PAIRWISE_KEYIDX]);
338 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 329 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
339 ("set Pairwiase key\n")); 330 "set Pairwise key\n");
340 331
341 rtl_cam_add_one_entry(hw, macaddr, key_index, 332 rtl_cam_add_one_entry(hw, macaddr, key_index,
342 entry_id, enc_algo, 333 entry_id, enc_algo,
@@ -345,7 +336,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
345 key_buf[key_index]); 336 key_buf[key_index]);
346 } else { 337 } else {
347 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 338 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
348 ("set group key\n")); 339 "set group key\n");
349 if (mac->opmode == NL80211_IFTYPE_ADHOC) { 340 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
350 rtl_cam_add_one_entry(hw, 341 rtl_cam_add_one_entry(hw,
351 rtlefuse->dev_addr, 342 rtlefuse->dev_addr,
@@ -421,8 +412,8 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
421 AC_PARAM_ECW_MAX_OFFSET; 412 AC_PARAM_ECW_MAX_OFFSET;
422 u4b_ac_param |= (u32) le16_to_cpu(mac->ac[aci].tx_op) << 413 u4b_ac_param |= (u32) le16_to_cpu(mac->ac[aci].tx_op) <<
423 AC_PARAM_TXOP_OFFSET; 414 AC_PARAM_TXOP_OFFSET;
424 RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD, 415 RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD, "queue:%x, ac_param:%x\n",
425 ("queue:%x, ac_param:%x\n", aci, u4b_ac_param)); 416 aci, u4b_ac_param);
426 switch (aci) { 417 switch (aci) {
427 case AC1_BK: 418 case AC1_BK:
428 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, u4b_ac_param); 419 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, u4b_ac_param);
@@ -453,14 +444,14 @@ void rtl92c_set_mac_addr(struct ieee80211_hw *hw, const u8 *addr)
453 for (i = 0 ; i < ETH_ALEN ; i++) 444 for (i = 0 ; i < ETH_ALEN ; i++)
454 rtl_write_byte(rtlpriv, (REG_MACID + i), *(addr+i)); 445 rtl_write_byte(rtlpriv, (REG_MACID + i), *(addr+i));
455 446
456 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("MAC Address: %02X-%02X-%02X-" 447 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
457 "%02X-%02X-%02X\n", 448 "MAC Address: %02X-%02X-%02X-%02X-%02X-%02X\n",
458 rtl_read_byte(rtlpriv, REG_MACID), 449 rtl_read_byte(rtlpriv, REG_MACID),
459 rtl_read_byte(rtlpriv, REG_MACID+1), 450 rtl_read_byte(rtlpriv, REG_MACID+1),
460 rtl_read_byte(rtlpriv, REG_MACID+2), 451 rtl_read_byte(rtlpriv, REG_MACID+2),
461 rtl_read_byte(rtlpriv, REG_MACID+3), 452 rtl_read_byte(rtlpriv, REG_MACID+3),
462 rtl_read_byte(rtlpriv, REG_MACID+4), 453 rtl_read_byte(rtlpriv, REG_MACID+4),
463 rtl_read_byte(rtlpriv, REG_MACID+5))); 454 rtl_read_byte(rtlpriv, REG_MACID+5));
464} 455}
465 456
466void rtl92c_init_driver_info_size(struct ieee80211_hw *hw, u8 size) 457void rtl92c_init_driver_info_size(struct ieee80211_hw *hw, u8 size)
@@ -478,26 +469,26 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
478 case NL80211_IFTYPE_UNSPECIFIED: 469 case NL80211_IFTYPE_UNSPECIFIED:
479 value = NT_NO_LINK; 470 value = NT_NO_LINK;
480 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 471 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
481 ("Set Network type to NO LINK!\n")); 472 "Set Network type to NO LINK!\n");
482 break; 473 break;
483 case NL80211_IFTYPE_ADHOC: 474 case NL80211_IFTYPE_ADHOC:
484 value = NT_LINK_AD_HOC; 475 value = NT_LINK_AD_HOC;
485 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 476 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
486 ("Set Network type to Ad Hoc!\n")); 477 "Set Network type to Ad Hoc!\n");
487 break; 478 break;
488 case NL80211_IFTYPE_STATION: 479 case NL80211_IFTYPE_STATION:
489 value = NT_LINK_AP; 480 value = NT_LINK_AP;
490 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 481 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
491 ("Set Network type to STA!\n")); 482 "Set Network type to STA!\n");
492 break; 483 break;
493 case NL80211_IFTYPE_AP: 484 case NL80211_IFTYPE_AP:
494 value = NT_AS_AP; 485 value = NT_AS_AP;
495 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 486 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
496 ("Set Network type to AP!\n")); 487 "Set Network type to AP!\n");
497 break; 488 break;
498 default: 489 default:
499 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 490 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
500 ("Network type %d not support!\n", type)); 491 "Network type %d not supported!\n", type);
501 return -EOPNOTSUPP; 492 return -EOPNOTSUPP;
502 } 493 }
503 rtl_write_byte(rtlpriv, (REG_CR + 2), value); 494 rtl_write_byte(rtlpriv, (REG_CR + 2), value);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index df491d38eccc..e7ea2bae2105 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -44,9 +44,9 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
44 u32 original_value, readback_value, bitshift; 44 u32 original_value, readback_value, bitshift;
45 struct rtl_phy *rtlphy = &(rtlpriv->phy); 45 struct rtl_phy *rtlphy = &(rtlpriv->phy);
46 46
47 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), " 47 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
48 "rfpath(%#x), bitmask(%#x)\n", 48 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
49 regaddr, rfpath, bitmask)); 49 regaddr, rfpath, bitmask);
50 if (rtlphy->rf_mode != RF_OP_BY_FW) { 50 if (rtlphy->rf_mode != RF_OP_BY_FW) {
51 original_value = _rtl92c_phy_rf_serial_read(hw, 51 original_value = _rtl92c_phy_rf_serial_read(hw,
52 rfpath, regaddr); 52 rfpath, regaddr);
@@ -57,9 +57,8 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
57 bitshift = _rtl92c_phy_calculate_bit_shift(bitmask); 57 bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
58 readback_value = (original_value & bitmask) >> bitshift; 58 readback_value = (original_value & bitmask) >> bitshift;
59 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, 59 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
60 ("regaddr(%#x), rfpath(%#x), " 60 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
61 "bitmask(%#x), original_value(%#x)\n", 61 regaddr, rfpath, bitmask, original_value);
62 regaddr, rfpath, bitmask, original_value));
63 return readback_value; 62 return readback_value;
64} 63}
65 64
@@ -72,8 +71,8 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
72 u32 original_value, bitshift; 71 u32 original_value, bitshift;
73 72
74 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, 73 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
75 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n", 74 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
76 regaddr, bitmask, data, rfpath)); 75 regaddr, bitmask, data, rfpath);
77 if (rtlphy->rf_mode != RF_OP_BY_FW) { 76 if (rtlphy->rf_mode != RF_OP_BY_FW) {
78 if (bitmask != RFREG_OFFSET_MASK) { 77 if (bitmask != RFREG_OFFSET_MASK) {
79 original_value = _rtl92c_phy_rf_serial_read(hw, 78 original_value = _rtl92c_phy_rf_serial_read(hw,
@@ -97,9 +96,9 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
97 } 96 }
98 _rtl92c_phy_fw_rf_serial_write(hw, rfpath, regaddr, data); 97 _rtl92c_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
99 } 98 }
100 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), " 99 RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
101 "bitmask(%#x), data(%#x), rfpath(%#x)\n", 100 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
102 regaddr, bitmask, data, rfpath)); 101 regaddr, bitmask, data, rfpath);
103} 102}
104 103
105bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw) 104bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw)
@@ -152,11 +151,10 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
152 u32 arraylength; 151 u32 arraylength;
153 u32 *ptrarray; 152 u32 *ptrarray;
154 153
155 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n")); 154 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
156 arraylength = rtlphy->hwparam_tables[MAC_REG].length ; 155 arraylength = rtlphy->hwparam_tables[MAC_REG].length ;
157 ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata; 156 ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
158 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 157 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
159 ("Img:RTL8192CEMAC_2T_ARRAY\n"));
160 for (i = 0; i < arraylength; i = i + 2) 158 for (i = 0; i < arraylength; i = i + 2)
161 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]); 159 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
162 return true; 160 return true;
@@ -202,10 +200,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
202 phy_regarray_table[i + 1]); 200 phy_regarray_table[i + 1]);
203 udelay(1); 201 udelay(1);
204 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 202 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
205 ("The phy_regarray_table[0] is %x" 203 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
206 " Rtl819XPHY_REGArray[1] is %x\n", 204 phy_regarray_table[i],
207 phy_regarray_table[i], 205 phy_regarray_table[i + 1]);
208 phy_regarray_table[i + 1]));
209 } 206 }
210 } else if (configtype == BASEBAND_CONFIG_AGC_TAB) { 207 } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
211 for (i = 0; i < agctab_arraylen; i = i + 2) { 208 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -213,10 +210,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
213 agctab_array_table[i + 1]); 210 agctab_array_table[i + 1]);
214 udelay(1); 211 udelay(1);
215 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 212 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
216 ("The agctab_array_table[0] is " 213 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
217 "%x Rtl819XPHY_REGArray[1] is %x\n", 214 agctab_array_table[i],
218 agctab_array_table[i], 215 agctab_array_table[i + 1]);
219 agctab_array_table[i + 1]));
220 } 216 }
221 } 217 }
222 return true; 218 return true;
@@ -255,7 +251,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
255 } 251 }
256 } else { 252 } else {
257 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, 253 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
258 ("configtype != BaseBand_Config_PHY_REG\n")); 254 "configtype != BaseBand_Config_PHY_REG\n");
259 } 255 }
260 return true; 256 return true;
261} 257}
@@ -277,20 +273,20 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
277 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length; 273 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;
278 radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata; 274 radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;
279 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 275 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
280 ("Radio_A:RTL8192CERADIOA_2TARRAY\n")); 276 "Radio_A:RTL8192CERADIOA_2TARRAY\n");
281 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 277 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
282 ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n")); 278 "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
283 } else { 279 } else {
284 radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length; 280 radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;
285 radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata; 281 radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;
286 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length; 282 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;
287 radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata; 283 radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;
288 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 284 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
289 ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n")); 285 "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
290 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 286 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
291 ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n")); 287 "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
292 } 288 }
293 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath)); 289 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
294 switch (rfpath) { 290 switch (rfpath) {
295 case RF90_PATH_A: 291 case RF90_PATH_A:
296 for (i = 0; i < radioa_arraylen; i = i + 2) { 292 for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -338,11 +334,11 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
338 break; 334 break;
339 case RF90_PATH_C: 335 case RF90_PATH_C:
340 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 336 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
341 ("switch case not process\n")); 337 "switch case not processed\n");
342 break; 338 break;
343 case RF90_PATH_D: 339 case RF90_PATH_D:
344 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 340 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
345 ("switch case not process\n")); 341 "switch case not processed\n");
346 break; 342 break;
347 } 343 }
348 return true; 344 return true;
@@ -357,10 +353,9 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
357 u8 reg_bw_opmode; 353 u8 reg_bw_opmode;
358 u8 reg_prsr_rsc; 354 u8 reg_prsr_rsc;
359 355
360 RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, 356 RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
361 ("Switch to %s bandwidth\n", 357 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
362 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ? 358 "20MHz" : "40MHz");
363 "20MHz" : "40MHz"));
364 if (is_hal_stop(rtlhal)) { 359 if (is_hal_stop(rtlhal)) {
365 rtlphy->set_bwmode_inprogress = false; 360 rtlphy->set_bwmode_inprogress = false;
366 return; 361 return;
@@ -381,7 +376,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
381 break; 376 break;
382 default: 377 default:
383 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 378 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
384 ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw)); 379 "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
385 break; 380 break;
386 } 381 }
387 switch (rtlphy->current_chan_bw) { 382 switch (rtlphy->current_chan_bw) {
@@ -403,12 +398,12 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
403 break; 398 break;
404 default: 399 default:
405 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 400 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
406 ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw)); 401 "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
407 break; 402 break;
408 } 403 }
409 rtl92cu_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw); 404 rtl92cu_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
410 rtlphy->set_bwmode_inprogress = false; 405 rtlphy->set_bwmode_inprogress = false;
411 RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n")); 406 RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
412} 407}
413 408
414void rtl92cu_bb_block_on(struct ieee80211_hw *hw) 409void rtl92cu_bb_block_on(struct ieee80211_hw *hw)
@@ -480,7 +475,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
480 do { 475 do {
481 InitializeCount++; 476 InitializeCount++;
482 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 477 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
483 ("IPS Set eRf nic enable\n")); 478 "IPS Set eRf nic enable\n");
484 rtstatus = rtl_ps_enable_nic(hw); 479 rtstatus = rtl_ps_enable_nic(hw);
485 } while ((rtstatus != true) 480 } while ((rtstatus != true)
486 && (InitializeCount < 10)); 481 && (InitializeCount < 10));
@@ -488,10 +483,9 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
488 RT_RF_OFF_LEVL_HALT_NIC); 483 RT_RF_OFF_LEVL_HALT_NIC);
489 } else { 484 } else {
490 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 485 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
491 ("Set ERFON sleeped:%d ms\n", 486 "Set ERFON sleeped:%d ms\n",
492 jiffies_to_msecs(jiffies - 487 jiffies_to_msecs(jiffies -
493 ppsc-> 488 ppsc->last_sleep_jiffies));
494 last_sleep_jiffies)));
495 ppsc->last_awake_jiffies = jiffies; 489 ppsc->last_awake_jiffies = jiffies;
496 rtl92ce_phy_set_rf_on(hw); 490 rtl92ce_phy_set_rf_on(hw);
497 } 491 }
@@ -513,27 +507,25 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
513 continue; 507 continue;
514 } else { 508 } else {
515 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 509 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
516 ("eRf Off/Sleep: %d times " 510 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
517 "TcbBusyQueue[%d] " 511 i + 1,
518 "=%d before doze!\n", (i + 1), 512 queue_id,
519 queue_id, 513 skb_queue_len(&ring->queue));
520 skb_queue_len(&ring->queue)));
521 udelay(10); 514 udelay(10);
522 i++; 515 i++;
523 } 516 }
524 if (i >= MAX_DOZE_WAITING_TIMES_9x) { 517 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
525 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 518 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
526 ("\nERFOFF: %d times " 519 "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
527 "TcbBusyQueue[%d] = %d !\n", 520 MAX_DOZE_WAITING_TIMES_9x,
528 MAX_DOZE_WAITING_TIMES_9x, 521 queue_id,
529 queue_id, 522 skb_queue_len(&ring->queue));
530 skb_queue_len(&ring->queue)));
531 break; 523 break;
532 } 524 }
533 } 525 }
534 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) { 526 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
535 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 527 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
536 ("IPS Set eRf nic disable\n")); 528 "IPS Set eRf nic disable\n");
537 rtl_ps_disable_nic(hw); 529 rtl_ps_disable_nic(hw);
538 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); 530 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
539 } else { 531 } else {
@@ -557,33 +549,30 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
557 continue; 549 continue;
558 } else { 550 } else {
559 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 551 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
560 ("eRf Off/Sleep: %d times " 552 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
561 "TcbBusyQueue[%d] =%d before " 553 i + 1, queue_id,
562 "doze!\n", (i + 1), queue_id, 554 skb_queue_len(&ring->queue));
563 skb_queue_len(&ring->queue)));
564 udelay(10); 555 udelay(10);
565 i++; 556 i++;
566 } 557 }
567 if (i >= MAX_DOZE_WAITING_TIMES_9x) { 558 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
568 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 559 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
569 ("\n ERFSLEEP: %d times " 560 "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
570 "TcbBusyQueue[%d] = %d !\n", 561 MAX_DOZE_WAITING_TIMES_9x,
571 MAX_DOZE_WAITING_TIMES_9x, 562 queue_id,
572 queue_id, 563 skb_queue_len(&ring->queue));
573 skb_queue_len(&ring->queue)));
574 break; 564 break;
575 } 565 }
576 } 566 }
577 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, 567 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
578 ("Set ERFSLEEP awaked:%d ms\n", 568 "Set ERFSLEEP awaked:%d ms\n",
579 jiffies_to_msecs(jiffies - 569 jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
580 ppsc->last_awake_jiffies)));
581 ppsc->last_sleep_jiffies = jiffies; 570 ppsc->last_sleep_jiffies = jiffies;
582 _rtl92c_phy_set_rf_sleep(hw); 571 _rtl92c_phy_set_rf_sleep(hw);
583 break; 572 break;
584 default: 573 default:
585 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 574 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
586 ("switch case not process\n")); 575 "switch case not processed\n");
587 bresult = false; 576 bresult = false;
588 break; 577 break;
589 } 578 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index 1e851aae58db..7b48ee9acb15 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
@@ -56,7 +56,7 @@ void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
56 break; 56 break;
57 default: 57 default:
58 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 58 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
59 ("unknown bandwidth: %#X\n", bandwidth)); 59 "unknown bandwidth: %#X\n", bandwidth);
60 break; 60 break;
61 } 61 }
62} 62}
@@ -482,11 +482,11 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
482 } 482 }
483 if (rtstatus != true) { 483 if (rtstatus != true) {
484 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, 484 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
485 ("Radio[%d] Fail!!", rfpath)); 485 "Radio[%d] Fail!!", rfpath);
486 goto phy_rf_cfg_fail; 486 goto phy_rf_cfg_fail;
487 } 487 }
488 } 488 }
489 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n")); 489 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
490 return rtstatus; 490 return rtstatus;
491phy_rf_cfg_fail: 491phy_rf_cfg_fail:
492 return rtstatus; 492 return rtstatus;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 6d2ca773bbc7..dee7aab4faa6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -65,7 +65,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
65 rtlpriv->rtlhal.pfirmware = vmalloc(0x4000); 65 rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
66 if (!rtlpriv->rtlhal.pfirmware) { 66 if (!rtlpriv->rtlhal.pfirmware) {
67 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 67 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
68 ("Can't alloc buffer for fw.\n")); 68 "Can't alloc buffer for fw\n");
69 return 1; 69 return 1;
70 } 70 }
71 /* request fw */ 71 /* request fw */
@@ -73,12 +73,12 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
73 rtlpriv->io.dev); 73 rtlpriv->io.dev);
74 if (err) { 74 if (err) {
75 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 75 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
76 ("Failed to request firmware!\n")); 76 "Failed to request firmware!\n");
77 return 1; 77 return 1;
78 } 78 }
79 if (firmware->size > 0x4000) { 79 if (firmware->size > 0x4000) {
80 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 80 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
81 ("Firmware is too big!\n")); 81 "Firmware is too big!\n");
82 release_firmware(firmware); 82 release_firmware(firmware);
83 return 1; 83 return 1;
84 } 84 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 128cfcd09fa9..b875af75b893 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -108,7 +108,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
108 108
109 if (bwificfg) { /* for WMM */ 109 if (bwificfg) { /* for WMM */
110 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 110 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
111 ("USB Chip-B & WMM Setting.....\n")); 111 "USB Chip-B & WMM Setting.....\n");
112 ep_map->ep_mapping[RTL_TXQ_BE] = 2; 112 ep_map->ep_mapping[RTL_TXQ_BE] = 2;
113 ep_map->ep_mapping[RTL_TXQ_BK] = 3; 113 ep_map->ep_mapping[RTL_TXQ_BK] = 3;
114 ep_map->ep_mapping[RTL_TXQ_VI] = 3; 114 ep_map->ep_mapping[RTL_TXQ_VI] = 3;
@@ -118,7 +118,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
118 ep_map->ep_mapping[RTL_TXQ_HI] = 2; 118 ep_map->ep_mapping[RTL_TXQ_HI] = 2;
119 } else { /* typical setting */ 119 } else { /* typical setting */
120 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 120 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
121 ("USB typical Setting.....\n")); 121 "USB typical Setting.....\n");
122 ep_map->ep_mapping[RTL_TXQ_BE] = 3; 122 ep_map->ep_mapping[RTL_TXQ_BE] = 3;
123 ep_map->ep_mapping[RTL_TXQ_BK] = 3; 123 ep_map->ep_mapping[RTL_TXQ_BK] = 3;
124 ep_map->ep_mapping[RTL_TXQ_VI] = 2; 124 ep_map->ep_mapping[RTL_TXQ_VI] = 2;
@@ -135,7 +135,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg,
135 struct rtl_priv *rtlpriv = rtl_priv(hw); 135 struct rtl_priv *rtlpriv = rtl_priv(hw);
136 if (bwificfg) { /* for WMM */ 136 if (bwificfg) { /* for WMM */
137 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 137 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
138 ("USB 3EP Setting for WMM.....\n")); 138 "USB 3EP Setting for WMM.....\n");
139 ep_map->ep_mapping[RTL_TXQ_BE] = 5; 139 ep_map->ep_mapping[RTL_TXQ_BE] = 5;
140 ep_map->ep_mapping[RTL_TXQ_BK] = 3; 140 ep_map->ep_mapping[RTL_TXQ_BK] = 3;
141 ep_map->ep_mapping[RTL_TXQ_VI] = 3; 141 ep_map->ep_mapping[RTL_TXQ_VI] = 3;
@@ -145,7 +145,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg,
145 ep_map->ep_mapping[RTL_TXQ_HI] = 2; 145 ep_map->ep_mapping[RTL_TXQ_HI] = 2;
146 } else { /* typical setting */ 146 } else { /* typical setting */
147 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 147 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
148 ("USB 3EP Setting for typical.....\n")); 148 "USB 3EP Setting for typical.....\n");
149 ep_map->ep_mapping[RTL_TXQ_BE] = 5; 149 ep_map->ep_mapping[RTL_TXQ_BE] = 5;
150 ep_map->ep_mapping[RTL_TXQ_BK] = 5; 150 ep_map->ep_mapping[RTL_TXQ_BK] = 5;
151 ep_map->ep_mapping[RTL_TXQ_VI] = 3; 151 ep_map->ep_mapping[RTL_TXQ_VI] = 3;
@@ -270,23 +270,23 @@ static enum rtl_desc_qsel _rtl8192cu_mq_to_descq(struct ieee80211_hw *hw,
270 case 0: /* VO */ 270 case 0: /* VO */
271 qsel = QSLT_VO; 271 qsel = QSLT_VO;
272 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, 272 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
273 ("VO queue, set qsel = 0x%x\n", QSLT_VO)); 273 "VO queue, set qsel = 0x%x\n", QSLT_VO);
274 break; 274 break;
275 case 1: /* VI */ 275 case 1: /* VI */
276 qsel = QSLT_VI; 276 qsel = QSLT_VI;
277 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, 277 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
278 ("VI queue, set qsel = 0x%x\n", QSLT_VI)); 278 "VI queue, set qsel = 0x%x\n", QSLT_VI);
279 break; 279 break;
280 case 3: /* BK */ 280 case 3: /* BK */
281 qsel = QSLT_BK; 281 qsel = QSLT_BK;
282 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, 282 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
283 ("BK queue, set qsel = 0x%x\n", QSLT_BK)); 283 "BK queue, set qsel = 0x%x\n", QSLT_BK);
284 break; 284 break;
285 case 2: /* BE */ 285 case 2: /* BE */
286 default: 286 default:
287 qsel = QSLT_BE; 287 qsel = QSLT_BE;
288 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, 288 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
289 ("BE queue, set qsel = 0x%x\n", QSLT_BE)); 289 "BE queue, set qsel = 0x%x\n", QSLT_BE);
290 break; 290 break;
291 } 291 }
292out: 292out:
@@ -422,17 +422,17 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
422 bv = ieee80211_is_probe_resp(fc); 422 bv = ieee80211_is_probe_resp(fc);
423 if (bv) 423 if (bv)
424 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 424 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
425 ("Got probe response frame.\n")); 425 "Got probe response frame\n");
426 if (ieee80211_is_beacon(fc)) 426 if (ieee80211_is_beacon(fc))
427 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 427 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got beacon frame\n");
428 ("Got beacon frame.\n"));
429 if (ieee80211_is_data(fc)) 428 if (ieee80211_is_data(fc))
430 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Got data frame.\n")); 429 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got data frame\n");
431 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 430 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
432 ("Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:" 431 "Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X\n",
433 "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1], 432 fc,
434 (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4], 433 (u32)hdr->addr1[0], (u32)hdr->addr1[1],
435 (u32)hdr->addr1[5])); 434 (u32)hdr->addr1[2], (u32)hdr->addr1[3],
435 (u32)hdr->addr1[4], (u32)hdr->addr1[5]);
436 memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status)); 436 memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status));
437 ieee80211_rx_irqsafe(hw, skb); 437 ieee80211_rx_irqsafe(hw, skb);
438} 438}
@@ -594,7 +594,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
594 if (ieee80211_is_data_qos(fc)) { 594 if (ieee80211_is_data_qos(fc)) {
595 if (mac->rdg_en) { 595 if (mac->rdg_en) {
596 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, 596 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
597 ("Enable RDG function.\n")); 597 "Enable RDG function\n");
598 SET_TX_DESC_RDG_ENABLE(txdesc, 1); 598 SET_TX_DESC_RDG_ENABLE(txdesc, 1);
599 SET_TX_DESC_HTC(txdesc, 1); 599 SET_TX_DESC_HTC(txdesc, 1);
600 } 600 }
@@ -620,7 +620,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
620 SET_TX_DESC_BMC(txdesc, 1); 620 SET_TX_DESC_BMC(txdesc, 1);
621 _rtl_fill_usb_tx_desc(txdesc); 621 _rtl_fill_usb_tx_desc(txdesc);
622 _rtl_tx_desc_checksum(txdesc); 622 _rtl_tx_desc_checksum(txdesc);
623 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, (" %s ==>\n", __func__)); 623 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, " %s ==>\n", __func__);
624} 624}
625 625
626void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, 626void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-14 07:34:38 -0400