.. | .. |
---|
1 | | -/****************************************************************************** |
---|
2 | | - * |
---|
3 | | - * Copyright(c) 2009-2014 Realtek Corporation. |
---|
4 | | - * |
---|
5 | | - * This program is free software; you can redistribute it and/or modify it |
---|
6 | | - * under the terms of version 2 of the GNU General Public License as |
---|
7 | | - * published by the Free Software Foundation. |
---|
8 | | - * |
---|
9 | | - * This program is distributed in the hope that it will be useful, but WITHOUT |
---|
10 | | - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
---|
11 | | - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
---|
12 | | - * more details. |
---|
13 | | - * |
---|
14 | | - * The full GNU General Public License is included in this distribution in the |
---|
15 | | - * file called LICENSE. |
---|
16 | | - * |
---|
17 | | - * Contact Information: |
---|
18 | | - * wlanfae <wlanfae@realtek.com> |
---|
19 | | - * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park, |
---|
20 | | - * Hsinchu 300, Taiwan. |
---|
21 | | - * |
---|
22 | | - * Larry Finger <Larry.Finger@lwfinger.net> |
---|
23 | | - * |
---|
24 | | - *****************************************************************************/ |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0 |
---|
| 2 | +/* Copyright(c) 2009-2014 Realtek Corporation.*/ |
---|
25 | 3 | |
---|
26 | 4 | #include "../wifi.h" |
---|
27 | 5 | #include "../efuse.h" |
---|
.. | .. |
---|
59 | 37 | struct rtl_tx_desc *entry = &ring->desc[ring->idx]; |
---|
60 | 38 | struct sk_buff *skb = __skb_dequeue(&ring->queue); |
---|
61 | 39 | |
---|
62 | | - pci_unmap_single(rtlpci->pdev, |
---|
63 | | - rtlpriv->cfg->ops->get_desc( |
---|
64 | | - hw, |
---|
65 | | - (u8 *)entry, true, HW_DESC_TXBUFF_ADDR), |
---|
66 | | - skb->len, PCI_DMA_TODEVICE); |
---|
| 40 | + dma_unmap_single(&rtlpci->pdev->dev, |
---|
| 41 | + rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry, |
---|
| 42 | + true, HW_DESC_TXBUFF_ADDR), |
---|
| 43 | + skb->len, DMA_TO_DEVICE); |
---|
67 | 44 | kfree_skb(skb); |
---|
68 | 45 | ring->idx = (ring->idx + 1) % ring->entries; |
---|
69 | 46 | } |
---|
.. | .. |
---|
168 | 145 | if (content & IMR_CPWM) { |
---|
169 | 146 | rtl_write_word(rtlpriv, isr_regaddr, 0x0100); |
---|
170 | 147 | rtlhal->fw_ps_state = FW_PS_STATE_RF_ON; |
---|
171 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
172 | | - "Receive CPWM INT!!! Set pHalData->FwPSState = %X\n", |
---|
173 | | - rtlhal->fw_ps_state); |
---|
| 148 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
| 149 | + "Receive CPWM INT!!! Set pHalData->FwPSState = %X\n", |
---|
| 150 | + rtlhal->fw_ps_state); |
---|
174 | 151 | } |
---|
175 | 152 | } |
---|
176 | 153 | |
---|
.. | .. |
---|
319 | 296 | *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state; |
---|
320 | 297 | break; |
---|
321 | 298 | case HW_VAR_FWLPS_RF_ON:{ |
---|
322 | | - enum rf_pwrstate rfState; |
---|
| 299 | + enum rf_pwrstate rfstate; |
---|
323 | 300 | u32 val_rcr; |
---|
324 | 301 | |
---|
325 | 302 | rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE, |
---|
326 | | - (u8 *)(&rfState)); |
---|
327 | | - if (rfState == ERFOFF) { |
---|
| 303 | + (u8 *)(&rfstate)); |
---|
| 304 | + if (rfstate == ERFOFF) { |
---|
328 | 305 | *((bool *)(val)) = true; |
---|
329 | 306 | } else { |
---|
330 | 307 | val_rcr = rtl_read_dword(rtlpriv, REG_RCR); |
---|
.. | .. |
---|
353 | 330 | case HAL_DEF_WOWLAN: |
---|
354 | 331 | break; |
---|
355 | 332 | default: |
---|
356 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
357 | | - "switch case %#x not processed\n", variable); |
---|
| 333 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
| 334 | + "switch case %#x not processed\n", variable); |
---|
358 | 335 | break; |
---|
359 | 336 | } |
---|
360 | 337 | } |
---|
.. | .. |
---|
458 | 435 | case HW_VAR_SLOT_TIME:{ |
---|
459 | 436 | u8 e_aci; |
---|
460 | 437 | |
---|
461 | | - RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
462 | | - "HW_VAR_SLOT_TIME %x\n", val[0]); |
---|
| 438 | + rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
| 439 | + "HW_VAR_SLOT_TIME %x\n", val[0]); |
---|
463 | 440 | |
---|
464 | 441 | rtl_write_byte(rtlpriv, REG_SLOT, val[0]); |
---|
465 | 442 | |
---|
.. | .. |
---|
501 | 478 | |
---|
502 | 479 | *val = min_spacing_to_set; |
---|
503 | 480 | |
---|
504 | | - RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
505 | | - "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n", |
---|
506 | | - mac->min_space_cfg); |
---|
| 481 | + rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
| 482 | + "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n", |
---|
| 483 | + mac->min_space_cfg); |
---|
507 | 484 | |
---|
508 | 485 | rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE, |
---|
509 | 486 | mac->min_space_cfg); |
---|
.. | .. |
---|
516 | 493 | density_to_set = *((u8 *)val); |
---|
517 | 494 | mac->min_space_cfg |= (density_to_set << 3); |
---|
518 | 495 | |
---|
519 | | - RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
520 | | - "Set HW_VAR_SHORTGI_DENSITY: %#x\n", |
---|
521 | | - mac->min_space_cfg); |
---|
| 496 | + rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
| 497 | + "Set HW_VAR_SHORTGI_DENSITY: %#x\n", |
---|
| 498 | + mac->min_space_cfg); |
---|
522 | 499 | |
---|
523 | 500 | rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE, |
---|
524 | 501 | mac->min_space_cfg); |
---|
.. | .. |
---|
556 | 533 | |
---|
557 | 534 | } |
---|
558 | 535 | |
---|
559 | | - RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
560 | | - "Set HW_VAR_AMPDU_FACTOR: %#x\n", |
---|
561 | | - factor_toset); |
---|
| 536 | + rtl_dbg(rtlpriv, COMP_MLME, DBG_LOUD, |
---|
| 537 | + "Set HW_VAR_AMPDU_FACTOR: %#x\n", |
---|
| 538 | + factor_toset); |
---|
562 | 539 | } |
---|
563 | 540 | } |
---|
564 | 541 | break; |
---|
.. | .. |
---|
593 | 570 | acm_ctrl |= ACMHW_VOQEN; |
---|
594 | 571 | break; |
---|
595 | 572 | default: |
---|
596 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
597 | | - "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n", |
---|
598 | | - acm); |
---|
| 573 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 574 | + "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n", |
---|
| 575 | + acm); |
---|
599 | 576 | break; |
---|
600 | 577 | } |
---|
601 | 578 | } else { |
---|
.. | .. |
---|
610 | 587 | acm_ctrl &= (~ACMHW_VOQEN); |
---|
611 | 588 | break; |
---|
612 | 589 | default: |
---|
613 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
614 | | - "switch case %#x not processed\n", |
---|
615 | | - e_aci); |
---|
| 590 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
| 591 | + "switch case %#x not processed\n", |
---|
| 592 | + e_aci); |
---|
616 | 593 | break; |
---|
617 | 594 | } |
---|
618 | 595 | } |
---|
619 | 596 | |
---|
620 | | - RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE, |
---|
621 | | - "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", |
---|
622 | | - acm_ctrl); |
---|
| 597 | + rtl_dbg(rtlpriv, COMP_QOS, DBG_TRACE, |
---|
| 598 | + "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", |
---|
| 599 | + acm_ctrl); |
---|
623 | 600 | rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl); |
---|
624 | 601 | } |
---|
625 | 602 | break; |
---|
.. | .. |
---|
727 | 704 | } |
---|
728 | 705 | break; |
---|
729 | 706 | default: |
---|
730 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
731 | | - "switch case %#x not processed\n", variable); |
---|
| 707 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
| 708 | + "switch case %#x not processed\n", variable); |
---|
732 | 709 | break; |
---|
733 | 710 | } |
---|
734 | 711 | } |
---|
.. | .. |
---|
764 | 741 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
765 | 742 | unsigned short i; |
---|
766 | 743 | u8 txpktbuf_bndy; |
---|
767 | | - u8 maxPage; |
---|
| 744 | + u8 maxpage; |
---|
768 | 745 | bool status; |
---|
769 | 746 | |
---|
770 | | - maxPage = 255; |
---|
| 747 | + maxpage = 255; |
---|
771 | 748 | txpktbuf_bndy = 245; |
---|
772 | 749 | |
---|
773 | 750 | rtl_write_dword(rtlpriv, REG_TRXFF_BNDY, |
---|
.. | .. |
---|
792 | 769 | if (!status) |
---|
793 | 770 | return status; |
---|
794 | 771 | |
---|
795 | | - for (i = txpktbuf_bndy; i < maxPage; i++) { |
---|
| 772 | + for (i = txpktbuf_bndy; i < maxpage; i++) { |
---|
796 | 773 | status = _rtl8723be_llt_write(hw, i, (i + 1)); |
---|
797 | 774 | if (!status) |
---|
798 | 775 | return status; |
---|
799 | 776 | } |
---|
800 | 777 | |
---|
801 | | - status = _rtl8723be_llt_write(hw, maxPage, txpktbuf_bndy); |
---|
| 778 | + status = _rtl8723be_llt_write(hw, maxpage, txpktbuf_bndy); |
---|
802 | 779 | if (!status) |
---|
803 | 780 | return status; |
---|
804 | 781 | |
---|
.. | .. |
---|
843 | 820 | if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, |
---|
844 | 821 | PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK, |
---|
845 | 822 | RTL8723_NIC_ENABLE_FLOW)) { |
---|
846 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
847 | | - "init MAC Fail as power on failure\n"); |
---|
| 823 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 824 | + "init MAC Fail as power on failure\n"); |
---|
848 | 825 | return false; |
---|
849 | 826 | } |
---|
850 | 827 | |
---|
.. | .. |
---|
881 | 858 | rtl_write_word(rtlpriv, REG_CR, 0x2ff); |
---|
882 | 859 | |
---|
883 | 860 | if (!rtlhal->mac_func_enable) { |
---|
884 | | - if (_rtl8723be_llt_table_init(hw) == false) |
---|
| 861 | + if (!_rtl8723be_llt_table_init(hw)) |
---|
885 | 862 | return false; |
---|
886 | 863 | } |
---|
887 | 864 | |
---|
.. | .. |
---|
1143 | 1120 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
1144 | 1121 | u8 sec_reg_value; |
---|
1145 | 1122 | |
---|
1146 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
---|
1147 | | - "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n", |
---|
1148 | | - rtlpriv->sec.pairwise_enc_algorithm, |
---|
1149 | | - rtlpriv->sec.group_enc_algorithm); |
---|
| 1123 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, |
---|
| 1124 | + "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n", |
---|
| 1125 | + rtlpriv->sec.pairwise_enc_algorithm, |
---|
| 1126 | + rtlpriv->sec.group_enc_algorithm); |
---|
1150 | 1127 | |
---|
1151 | 1128 | if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) { |
---|
1152 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
1153 | | - "not open hw encryption\n"); |
---|
| 1129 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 1130 | + "not open hw encryption\n"); |
---|
1154 | 1131 | return; |
---|
1155 | 1132 | } |
---|
1156 | 1133 | |
---|
.. | .. |
---|
1165 | 1142 | |
---|
1166 | 1143 | rtl_write_byte(rtlpriv, REG_CR + 1, 0x02); |
---|
1167 | 1144 | |
---|
1168 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
1169 | | - "The SECR-value %x\n", sec_reg_value); |
---|
| 1145 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 1146 | + "The SECR-value %x\n", sec_reg_value); |
---|
1170 | 1147 | |
---|
1171 | 1148 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value); |
---|
1172 | 1149 | } |
---|
.. | .. |
---|
1230 | 1207 | */ |
---|
1231 | 1208 | tmp = rtl_read_byte(rtlpriv, REG_DBI_CTRL + 3); |
---|
1232 | 1209 | if ((tmp & BIT(0)) || (tmp & BIT(1))) { |
---|
1233 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
1234 | | - "CheckPcieDMAHang8723BE(): true!!\n"); |
---|
| 1210 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 1211 | + "CheckPcieDMAHang8723BE(): true!!\n"); |
---|
1235 | 1212 | return true; |
---|
1236 | 1213 | } |
---|
1237 | 1214 | return false; |
---|
.. | .. |
---|
1244 | 1221 | bool release_mac_rx_pause; |
---|
1245 | 1222 | u8 backup_pcie_dma_pause; |
---|
1246 | 1223 | |
---|
1247 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
1248 | | - "ResetPcieInterfaceDMA8723BE()\n"); |
---|
| 1224 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 1225 | + "ResetPcieInterfaceDMA8723BE()\n"); |
---|
1249 | 1226 | |
---|
1250 | 1227 | /* Revise Note: Follow the document "PCIe RX DMA Hang Reset Flow_v03" |
---|
1251 | 1228 | * released by SD1 Alan. |
---|
.. | .. |
---|
1397 | 1374 | |
---|
1398 | 1375 | err = rtl8723_download_fw(hw, true, FW_8723B_POLLING_TIMEOUT_COUNT); |
---|
1399 | 1376 | if (err) { |
---|
1400 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
1401 | | - "Failed to download FW. Init HW without FW now..\n"); |
---|
| 1377 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 1378 | + "Failed to download FW. Init HW without FW now..\n"); |
---|
1402 | 1379 | err = 1; |
---|
1403 | 1380 | goto exit; |
---|
1404 | 1381 | } |
---|
.. | .. |
---|
1482 | 1459 | |
---|
1483 | 1460 | value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG1); |
---|
1484 | 1461 | if ((value32 & (CHIP_8723B)) != CHIP_8723B) |
---|
1485 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "unknown chip version\n"); |
---|
| 1462 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "unknown chip version\n"); |
---|
1486 | 1463 | else |
---|
1487 | 1464 | version = (enum version_8723e)CHIP_8723B; |
---|
1488 | 1465 | |
---|
.. | .. |
---|
1498 | 1475 | if (((value32 & EXT_VENDOR_ID) >> 18) == 0x01) |
---|
1499 | 1476 | version = (enum version_8723e)(version | CHIP_VENDOR_SMIC); |
---|
1500 | 1477 | |
---|
1501 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
1502 | | - "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ? |
---|
1503 | | - "RF_2T2R" : "RF_1T1R"); |
---|
| 1478 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 1479 | + "Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ? |
---|
| 1480 | + "RF_2T2R" : "RF_1T1R"); |
---|
1504 | 1481 | |
---|
1505 | 1482 | return version; |
---|
1506 | 1483 | } |
---|
.. | .. |
---|
1516 | 1493 | switch (type) { |
---|
1517 | 1494 | case NL80211_IFTYPE_UNSPECIFIED: |
---|
1518 | 1495 | mode = MSR_NOLINK; |
---|
1519 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
1520 | | - "Set Network type to NO LINK!\n"); |
---|
| 1496 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
| 1497 | + "Set Network type to NO LINK!\n"); |
---|
1521 | 1498 | break; |
---|
1522 | 1499 | case NL80211_IFTYPE_ADHOC: |
---|
1523 | 1500 | case NL80211_IFTYPE_MESH_POINT: |
---|
1524 | 1501 | mode = MSR_ADHOC; |
---|
1525 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
1526 | | - "Set Network type to Ad Hoc!\n"); |
---|
| 1502 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
| 1503 | + "Set Network type to Ad Hoc!\n"); |
---|
1527 | 1504 | break; |
---|
1528 | 1505 | case NL80211_IFTYPE_STATION: |
---|
1529 | 1506 | mode = MSR_INFRA; |
---|
1530 | 1507 | ledaction = LED_CTL_LINK; |
---|
1531 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
1532 | | - "Set Network type to STA!\n"); |
---|
| 1508 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
| 1509 | + "Set Network type to STA!\n"); |
---|
1533 | 1510 | break; |
---|
1534 | 1511 | case NL80211_IFTYPE_AP: |
---|
1535 | 1512 | mode = MSR_AP; |
---|
1536 | 1513 | ledaction = LED_CTL_LINK; |
---|
1537 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
1538 | | - "Set Network type to AP!\n"); |
---|
| 1514 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE, |
---|
| 1515 | + "Set Network type to AP!\n"); |
---|
1539 | 1516 | break; |
---|
1540 | 1517 | default: |
---|
1541 | 1518 | pr_err("Network type %d not support!\n", type); |
---|
.. | .. |
---|
1560 | 1537 | _rtl8723be_resume_tx_beacon(hw); |
---|
1561 | 1538 | _rtl8723be_disable_bcn_sub_func(hw); |
---|
1562 | 1539 | } else { |
---|
1563 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
1564 | | - "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n", |
---|
1565 | | - mode); |
---|
| 1540 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 1541 | + "Set HW_VAR_MEDIA_STATUS: No such media status(%x).\n", |
---|
| 1542 | + mode); |
---|
1566 | 1543 | } |
---|
1567 | 1544 | |
---|
1568 | 1545 | rtl_write_byte(rtlpriv, MSR, bt_msr | mode); |
---|
.. | .. |
---|
1724 | 1701 | struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); |
---|
1725 | 1702 | u16 bcn_interval = mac->beacon_interval; |
---|
1726 | 1703 | |
---|
1727 | | - RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, |
---|
1728 | | - "beacon_interval:%d\n", bcn_interval); |
---|
| 1704 | + rtl_dbg(rtlpriv, COMP_BEACON, DBG_DMESG, |
---|
| 1705 | + "beacon_interval:%d\n", bcn_interval); |
---|
1729 | 1706 | rtl8723be_disable_interrupt(hw); |
---|
1730 | 1707 | rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval); |
---|
1731 | 1708 | rtl8723be_enable_interrupt(hw); |
---|
.. | .. |
---|
1737 | 1714 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
1738 | 1715 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
---|
1739 | 1716 | |
---|
1740 | | - RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, |
---|
1741 | | - "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr); |
---|
| 1717 | + rtl_dbg(rtlpriv, COMP_INTR, DBG_LOUD, |
---|
| 1718 | + "add_msr:%x, rm_msr:%x\n", add_msr, rm_msr); |
---|
1742 | 1719 | |
---|
1743 | 1720 | if (add_msr) |
---|
1744 | 1721 | rtlpci->irq_mask[0] |= add_msr; |
---|
.. | .. |
---|
1769 | 1746 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
1770 | 1747 | u32 path, addr = EEPROM_TX_PWR_INX, group, cnt = 0; |
---|
1771 | 1748 | |
---|
1772 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
1773 | | - "hal_ReadPowerValueFromPROM8723BE(): PROMContent[0x%x]=0x%x\n", |
---|
1774 | | - (addr + 1), hwinfo[addr + 1]); |
---|
| 1749 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 1750 | + "hal_ReadPowerValueFromPROM8723BE(): PROMContent[0x%x]=0x%x\n", |
---|
| 1751 | + (addr + 1), hwinfo[addr + 1]); |
---|
1775 | 1752 | if (0xFF == hwinfo[addr + 1]) /*YJ,add,120316*/ |
---|
1776 | 1753 | autoload_fail = true; |
---|
1777 | 1754 | |
---|
1778 | 1755 | if (autoload_fail) { |
---|
1779 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
1780 | | - "auto load fail : Use Default value!\n"); |
---|
| 1756 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 1757 | + "auto load fail : Use Default value!\n"); |
---|
1781 | 1758 | for (path = 0; path < MAX_RF_PATH; path++) { |
---|
1782 | 1759 | /* 2.4G default value */ |
---|
1783 | 1760 | for (group = 0 ; group < MAX_CHNL_GROUP_24G; group++) { |
---|
.. | .. |
---|
2121 | 2098 | rtlefuse->board_type |= BIT(2); /* ODM_BOARD_BT */ |
---|
2122 | 2099 | |
---|
2123 | 2100 | rtlhal->board_type = rtlefuse->board_type; |
---|
2124 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
2125 | | - "board_type = 0x%x\n", rtlefuse->board_type); |
---|
| 2101 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 2102 | + "board_type = 0x%x\n", rtlefuse->board_type); |
---|
2126 | 2103 | |
---|
2127 | 2104 | rtlhal->package_type = _rtl8723be_read_package_type(hw); |
---|
2128 | 2105 | |
---|
.. | .. |
---|
2259 | 2236 | default: |
---|
2260 | 2237 | break; |
---|
2261 | 2238 | } |
---|
2262 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
---|
2263 | | - "RT Customized ID: 0x%02X\n", rtlhal->oem_id); |
---|
| 2239 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, |
---|
| 2240 | + "RT Customized ID: 0x%02X\n", rtlhal->oem_id); |
---|
2264 | 2241 | } |
---|
2265 | 2242 | |
---|
2266 | 2243 | void rtl8723be_read_eeprom_info(struct ieee80211_hw *hw) |
---|
.. | .. |
---|
2277 | 2254 | else |
---|
2278 | 2255 | rtlpriv->dm.rfpath_rxenable[0] = |
---|
2279 | 2256 | rtlpriv->dm.rfpath_rxenable[1] = true; |
---|
2280 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n", |
---|
2281 | | - rtlhal->version); |
---|
| 2257 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n", |
---|
| 2258 | + rtlhal->version); |
---|
2282 | 2259 | tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR); |
---|
2283 | 2260 | if (tmp_u1b & BIT(4)) { |
---|
2284 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n"); |
---|
| 2261 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n"); |
---|
2285 | 2262 | rtlefuse->epromtype = EEPROM_93C46; |
---|
2286 | 2263 | } else { |
---|
2287 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n"); |
---|
| 2264 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n"); |
---|
2288 | 2265 | rtlefuse->epromtype = EEPROM_BOOT_EFUSE; |
---|
2289 | 2266 | } |
---|
2290 | 2267 | if (tmp_u1b & BIT(5)) { |
---|
2291 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n"); |
---|
| 2268 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n"); |
---|
2292 | 2269 | rtlefuse->autoload_failflag = false; |
---|
2293 | 2270 | _rtl8723be_read_adapter_info(hw, false); |
---|
2294 | 2271 | } else { |
---|
.. | .. |
---|
2439 | 2416 | |
---|
2440 | 2417 | sta_entry->ratr_index = ratr_index; |
---|
2441 | 2418 | |
---|
2442 | | - RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, |
---|
2443 | | - "ratr_bitmap :%x\n", ratr_bitmap); |
---|
| 2419 | + rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, |
---|
| 2420 | + "ratr_bitmap :%x\n", ratr_bitmap); |
---|
2444 | 2421 | *(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) | |
---|
2445 | 2422 | (ratr_index << 28); |
---|
2446 | 2423 | rate_mask[0] = macid; |
---|
.. | .. |
---|
2453 | 2430 | rate_mask[5] = (u8)((ratr_bitmap & 0x00ff0000) >> 16); |
---|
2454 | 2431 | rate_mask[6] = (u8)((ratr_bitmap & 0xff000000) >> 24); |
---|
2455 | 2432 | |
---|
2456 | | - RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, |
---|
2457 | | - "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x:%x:%x\n", |
---|
2458 | | - ratr_index, ratr_bitmap, |
---|
2459 | | - rate_mask[0], rate_mask[1], |
---|
2460 | | - rate_mask[2], rate_mask[3], |
---|
2461 | | - rate_mask[4], rate_mask[5], |
---|
2462 | | - rate_mask[6]); |
---|
| 2433 | + rtl_dbg(rtlpriv, COMP_RATR, DBG_DMESG, |
---|
| 2434 | + "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x:%x:%x\n", |
---|
| 2435 | + ratr_index, ratr_bitmap, |
---|
| 2436 | + rate_mask[0], rate_mask[1], |
---|
| 2437 | + rate_mask[2], rate_mask[3], |
---|
| 2438 | + rate_mask[4], rate_mask[5], |
---|
| 2439 | + rate_mask[6]); |
---|
2463 | 2440 | rtl8723be_fill_h2c_cmd(hw, H2C_8723B_RA_MASK, 7, rate_mask); |
---|
2464 | 2441 | _rtl8723be_set_bcn_ctrl_reg(hw, BIT(3), 0); |
---|
2465 | 2442 | } |
---|
.. | .. |
---|
2522 | 2499 | e_rfpowerstate_toset = (u1tmp & BIT(1)) ? ERFON : ERFOFF; |
---|
2523 | 2500 | |
---|
2524 | 2501 | if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) { |
---|
2525 | | - RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
---|
2526 | | - "GPIOChangeRF - HW Radio ON, RF ON\n"); |
---|
| 2502 | + rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG, |
---|
| 2503 | + "GPIOChangeRF - HW Radio ON, RF ON\n"); |
---|
2527 | 2504 | |
---|
2528 | 2505 | e_rfpowerstate_toset = ERFON; |
---|
2529 | 2506 | ppsc->hwradiooff = false; |
---|
2530 | 2507 | b_actuallyset = true; |
---|
2531 | 2508 | } else if (!ppsc->hwradiooff && (e_rfpowerstate_toset == ERFOFF)) { |
---|
2532 | | - RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
---|
2533 | | - "GPIOChangeRF - HW Radio OFF, RF OFF\n"); |
---|
| 2509 | + rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG, |
---|
| 2510 | + "GPIOChangeRF - HW Radio OFF, RF OFF\n"); |
---|
2534 | 2511 | |
---|
2535 | 2512 | e_rfpowerstate_toset = ERFOFF; |
---|
2536 | 2513 | ppsc->hwradiooff = true; |
---|
.. | .. |
---|
2581 | 2558 | u8 cam_offset = 0; |
---|
2582 | 2559 | u8 clear_number = 5; |
---|
2583 | 2560 | |
---|
2584 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n"); |
---|
| 2561 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n"); |
---|
2585 | 2562 | |
---|
2586 | 2563 | for (idx = 0; idx < clear_number; idx++) { |
---|
2587 | 2564 | rtl_cam_mark_invalid(hw, cam_offset + idx); |
---|
.. | .. |
---|
2609 | 2586 | enc_algo = CAM_AES; |
---|
2610 | 2587 | break; |
---|
2611 | 2588 | default: |
---|
2612 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
2613 | | - "switch case %#x not processed\n", enc_algo); |
---|
| 2589 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_LOUD, |
---|
| 2590 | + "switch case %#x not processed\n", enc_algo); |
---|
2614 | 2591 | enc_algo = CAM_TKIP; |
---|
2615 | 2592 | break; |
---|
2616 | 2593 | } |
---|
.. | .. |
---|
2640 | 2617 | } |
---|
2641 | 2618 | |
---|
2642 | 2619 | if (rtlpriv->sec.key_len[key_index] == 0) { |
---|
2643 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
2644 | | - "delete one entry, entry_id is %d\n", |
---|
2645 | | - entry_id); |
---|
| 2620 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 2621 | + "delete one entry, entry_id is %d\n", |
---|
| 2622 | + entry_id); |
---|
2646 | 2623 | if (mac->opmode == NL80211_IFTYPE_AP) |
---|
2647 | 2624 | rtl_cam_del_entry(hw, p_macaddr); |
---|
2648 | 2625 | rtl_cam_delete_one_entry(hw, p_macaddr, entry_id); |
---|
2649 | 2626 | } else { |
---|
2650 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
2651 | | - "add one entry\n"); |
---|
| 2627 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 2628 | + "add one entry\n"); |
---|
2652 | 2629 | if (is_pairwise) { |
---|
2653 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
2654 | | - "set Pairwise key\n"); |
---|
| 2630 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 2631 | + "set Pairwise key\n"); |
---|
2655 | 2632 | |
---|
2656 | 2633 | rtl_cam_add_one_entry(hw, macaddr, key_index, |
---|
2657 | 2634 | entry_id, enc_algo, |
---|
2658 | 2635 | CAM_CONFIG_NO_USEDK, |
---|
2659 | 2636 | rtlpriv->sec.key_buf[key_index]); |
---|
2660 | 2637 | } else { |
---|
2661 | | - RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
2662 | | - "set group key\n"); |
---|
| 2638 | + rtl_dbg(rtlpriv, COMP_SEC, DBG_DMESG, |
---|
| 2639 | + "set group key\n"); |
---|
2663 | 2640 | |
---|
2664 | 2641 | if (mac->opmode == NL80211_IFTYPE_ADHOC) { |
---|
2665 | 2642 | rtl_cam_add_one_entry(hw, |
---|