]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: rtw88: Rename the RTW_WCPU_11{AC,N} enums
authorBitterblue Smith <rtl8821cerfe2@gmail.com>
Sat, 7 Jun 2025 17:59:53 +0000 (20:59 +0300)
committerPing-Ke Shih <pkshih@realtek.com>
Tue, 10 Jun 2025 02:19:45 +0000 (10:19 +0800)
The RTW_WCPU_11AC and RTW_WCPU_11N enums are used to identify two
types of microcontrollers used in Realtek chips, but these names are
misleading. The "11AC" type was also used in 11n devices (e.g.
RTL8733BU, not supported by rtw88), and the "11N" type was also used
in 11ac devices (RTL8821AU, RTL8812AU).

Rename RTW_WCPU_11AC to RTW_WCPU_3081 and RTW_WCPU_11N to RTW_WCPU_8051.
(8051 is well known. It's less clear what 3081 is, but the out of tree
drivers use this name.)

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/bfb1099c-db52-4b25-b111-17ab712e9404@gmail.com
14 files changed:
drivers/net/wireless/realtek/rtw88/fw.c
drivers/net/wireless/realtek/rtw88/mac.c
drivers/net/wireless/realtek/rtw88/main.c
drivers/net/wireless/realtek/rtw88/main.h
drivers/net/wireless/realtek/rtw88/pci.c
drivers/net/wireless/realtek/rtw88/rtw8703b.c
drivers/net/wireless/realtek/rtw88/rtw8723d.c
drivers/net/wireless/realtek/rtw88/rtw8812a.c
drivers/net/wireless/realtek/rtw88/rtw8814a.c
drivers/net/wireless/realtek/rtw88/rtw8821a.c
drivers/net/wireless/realtek/rtw88/rtw8821c.c
drivers/net/wireless/realtek/rtw88/rtw8822b.c
drivers/net/wireless/realtek/rtw88/rtw8822c.c
drivers/net/wireless/realtek/rtw88/sdio.c

index 4fc78b88208037bfe2ac9dc3e0f38e6a9c5399a0..c68a9fff68082e460bab23509c13cdc30c6b7c36 100644 (file)
@@ -521,7 +521,7 @@ rtw_fw_send_general_info(struct rtw_dev *rtwdev)
        u8 h2c_pkt[H2C_PKT_SIZE] = {0};
        u16 total_size = H2C_PKT_HDR_SIZE + 4;
 
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return;
 
        rtw_h2c_pkt_set_header(h2c_pkt, H2C_PKT_GENERAL_INFO);
@@ -544,7 +544,7 @@ rtw_fw_send_phydm_info(struct rtw_dev *rtwdev)
        u16 total_size = H2C_PKT_HDR_SIZE + 8;
        u8 fw_rf_type = 0;
 
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return;
 
        if (hal->rf_type == RF_1T1R)
@@ -1480,7 +1480,7 @@ int rtw_fw_write_data_rsvd_page(struct rtw_dev *rtwdev, u16 pg_addr,
 
        bckp[2] = rtw_read8(rtwdev, REG_BCN_CTRL);
 
-       if (rtw_chip_wcpu_11n(rtwdev)) {
+       if (rtw_chip_wcpu_8051(rtwdev)) {
                rtw_write32_set(rtwdev, REG_DWBCN0_CTRL, BIT_BCN_VALID);
        } else {
                pg_addr &= BIT_MASK_BCN_HEAD_1_V1;
@@ -1509,7 +1509,7 @@ int rtw_fw_write_data_rsvd_page(struct rtw_dev *rtwdev, u16 pg_addr,
                goto restore;
        }
 
-       if (rtw_chip_wcpu_11n(rtwdev)) {
+       if (rtw_chip_wcpu_8051(rtwdev)) {
                bcn_valid_addr = REG_DWBCN0_CTRL;
                bcn_valid_mask = BIT_BCN_VALID;
        } else {
index f66d1b302dc509c6d661705fdfd111b000f82908..011b81c82f3bafc14d16927ad8acb3bc675dd023 100644 (file)
@@ -41,7 +41,7 @@ void rtw_set_channel_mac(struct rtw_dev *rtwdev, u8 channel, u8 bw,
        }
        rtw_write32(rtwdev, REG_WMAC_TRXPTCL_CTL, value32);
 
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return;
 
        value32 = rtw_read32(rtwdev, REG_AFE_CTRL1) & ~(BIT_MAC_CLK_SEL);
@@ -67,7 +67,7 @@ static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)
 
        rtw_write8(rtwdev, REG_RSV_CTRL, 0);
 
-       if (rtw_chip_wcpu_11n(rtwdev)) {
+       if (rtw_chip_wcpu_8051(rtwdev)) {
                if (rtw_read32(rtwdev, REG_SYS_CFG1) & BIT_LDO)
                        rtw_write8(rtwdev, REG_LDO_SWR_CTRL, LDO_SEL);
                else
@@ -278,7 +278,7 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
        bool cur_pwr;
        int ret;
 
-       if (rtw_chip_wcpu_11ac(rtwdev)) {
+       if (rtw_chip_wcpu_3081(rtwdev)) {
                rpwm = rtw_read8(rtwdev, rtwdev->hci.rpwm_addr);
 
                /* Check FW still exist or not */
@@ -369,7 +369,7 @@ static int __rtw_mac_init_system_cfg_legacy(struct rtw_dev *rtwdev)
 
 static int rtw_mac_init_system_cfg(struct rtw_dev *rtwdev)
 {
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return __rtw_mac_init_system_cfg_legacy(rtwdev);
 
        return __rtw_mac_init_system_cfg(rtwdev);
@@ -981,7 +981,7 @@ out:
 static
 int _rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw)
 {
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return __rtw_download_firmware_legacy(rtwdev, fw);
 
        return __rtw_download_firmware(rtwdev, fw);
@@ -1122,7 +1122,7 @@ static int txdma_queue_mapping(struct rtw_dev *rtwdev)
 
        rtw_write8(rtwdev, REG_CR, 0);
        rtw_write8(rtwdev, REG_CR, MAC_TRX_ENABLE);
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                rtw_write32(rtwdev, REG_H2CQ_CSR, BIT_H2CQ_FULL);
 
        if (rtw_hci_type(rtwdev) == RTW_HCI_TYPE_SDIO) {
@@ -1145,7 +1145,7 @@ int rtw_set_trx_fifo_info(struct rtw_dev *rtwdev)
        /* config rsvd page num */
        fifo->rsvd_drv_pg_num = chip->rsvd_drv_pg_num;
        fifo->txff_pg_num = chip->txff_size / chip->page_size;
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                fifo->rsvd_pg_num = fifo->rsvd_drv_pg_num;
        else
                fifo->rsvd_pg_num = fifo->rsvd_drv_pg_num +
@@ -1163,7 +1163,7 @@ int rtw_set_trx_fifo_info(struct rtw_dev *rtwdev)
        fifo->rsvd_boundary = fifo->txff_pg_num - fifo->rsvd_pg_num;
 
        cur_pg_addr = fifo->txff_pg_num;
-       if (rtw_chip_wcpu_11ac(rtwdev)) {
+       if (rtw_chip_wcpu_3081(rtwdev)) {
                cur_pg_addr -= csi_buf_pg_num;
                fifo->rsvd_csibuf_addr = cur_pg_addr;
                cur_pg_addr -= RSVD_PG_FW_TXBUF_NUM;
@@ -1292,7 +1292,7 @@ static int priority_queue_cfg(struct rtw_dev *rtwdev)
 
        pubq_num = fifo->acq_pg_num - pg_tbl->hq_num - pg_tbl->lq_num -
                   pg_tbl->nq_num - pg_tbl->exq_num - pg_tbl->gapq_num;
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return __priority_queue_cfg_legacy(rtwdev, pg_tbl, pubq_num);
        else
                return __priority_queue_cfg(rtwdev, pg_tbl, pubq_num);
@@ -1308,7 +1308,7 @@ static int init_h2c(struct rtw_dev *rtwdev)
        u32 h2cq_free;
        u32 wp, rp;
 
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                return 0;
 
        h2cq_addr = fifo->rsvd_h2cq_addr << TX_PAGE_SIZE_SHIFT;
@@ -1375,7 +1375,7 @@ static int rtw_drv_info_cfg(struct rtw_dev *rtwdev)
        u8 value8;
 
        rtw_write8(rtwdev, REG_RX_DRVINFO_SZ, PHY_STATUS_SIZE);
-       if (rtw_chip_wcpu_11ac(rtwdev)) {
+       if (rtw_chip_wcpu_3081(rtwdev)) {
                value8 = rtw_read8(rtwdev, REG_TRXFF_BNDY + 1);
                value8 &= 0xF0;
                /* For rxdesc len = 0 issue */
index 26b1479d3521319b7b8542c632d6de1674129b90..3ec3689fae3db9b76f84bc5f2ccb0368a103737c 100644 (file)
@@ -1766,7 +1766,7 @@ static void __update_firmware_info_legacy(struct rtw_dev *rtwdev,
 static void update_firmware_info(struct rtw_dev *rtwdev,
                                 struct rtw_fw_state *fw)
 {
-       if (rtw_chip_wcpu_11n(rtwdev))
+       if (rtw_chip_wcpu_8051(rtwdev))
                __update_firmware_info_legacy(rtwdev, fw);
        else
                __update_firmware_info(rtwdev, fw);
index b0f1fabe95545e3926a0c43e611c3502268cca12..89b72d2a9f993cea2d2c934e4a603de814736ed6 100644 (file)
@@ -1173,8 +1173,8 @@ struct rtw_pwr_track_tbl {
 };
 
 enum rtw_wlan_cpu {
-       RTW_WCPU_11AC,
-       RTW_WCPU_11N,
+       RTW_WCPU_3081,
+       RTW_WCPU_8051,
 };
 
 enum rtw_fw_fifo_sel {
@@ -2166,14 +2166,14 @@ static inline void rtw_chip_efuse_grant_off(struct rtw_dev *rtwdev)
                rtwdev->chip->ops->efuse_grant(rtwdev, false);
 }
 
-static inline bool rtw_chip_wcpu_11n(struct rtw_dev *rtwdev)
+static inline bool rtw_chip_wcpu_8051(struct rtw_dev *rtwdev)
 {
-       return rtwdev->chip->wlan_cpu == RTW_WCPU_11N;
+       return rtwdev->chip->wlan_cpu == RTW_WCPU_8051;
 }
 
-static inline bool rtw_chip_wcpu_11ac(struct rtw_dev *rtwdev)
+static inline bool rtw_chip_wcpu_3081(struct rtw_dev *rtwdev)
 {
-       return rtwdev->chip->wlan_cpu == RTW_WCPU_11AC;
+       return rtwdev->chip->wlan_cpu == RTW_WCPU_3081;
 }
 
 static inline bool rtw_chip_has_rx_ldpc(struct rtw_dev *rtwdev)
index 6655de2b9726ec72f237dac02e4289de11da53e6..56b16186d3aa4b23ac67a263cf2167501a0bf93d 100644 (file)
@@ -405,7 +405,7 @@ static void rtw_pci_reset_buf_desc(struct rtw_dev *rtwdev)
        dma = rtwpci->tx_rings[RTW_TX_QUEUE_BCN].r.dma;
        rtw_write32(rtwdev, RTK_PCI_TXBD_DESA_BCNQ, dma);
 
-       if (!rtw_chip_wcpu_11n(rtwdev)) {
+       if (!rtw_chip_wcpu_8051(rtwdev)) {
                len = rtwpci->tx_rings[RTW_TX_QUEUE_H2C].r.len;
                dma = rtwpci->tx_rings[RTW_TX_QUEUE_H2C].r.dma;
                rtwpci->tx_rings[RTW_TX_QUEUE_H2C].r.rp = 0;
@@ -467,7 +467,7 @@ static void rtw_pci_reset_buf_desc(struct rtw_dev *rtwdev)
        rtw_write32(rtwdev, RTK_PCI_TXBD_RWPTR_CLR, 0xffffffff);
 
        /* reset H2C Queue index in a single write */
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                rtw_write32_set(rtwdev, RTK_PCI_TXBD_H2CQ_CSR,
                                BIT_CLR_H2CQ_HOST_IDX | BIT_CLR_H2CQ_HW_IDX);
 }
@@ -487,7 +487,7 @@ static void rtw_pci_enable_interrupt(struct rtw_dev *rtwdev,
 
        rtw_write32(rtwdev, RTK_PCI_HIMR0, rtwpci->irq_mask[0] & ~imr0_unmask);
        rtw_write32(rtwdev, RTK_PCI_HIMR1, rtwpci->irq_mask[1]);
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                rtw_write32(rtwdev, RTK_PCI_HIMR3, rtwpci->irq_mask[3]);
 
        rtwpci->irq_enabled = true;
@@ -507,7 +507,7 @@ static void rtw_pci_disable_interrupt(struct rtw_dev *rtwdev,
 
        rtw_write32(rtwdev, RTK_PCI_HIMR0, 0);
        rtw_write32(rtwdev, RTK_PCI_HIMR1, 0);
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                rtw_write32(rtwdev, RTK_PCI_HIMR3, 0);
 
        rtwpci->irq_enabled = false;
@@ -1125,7 +1125,7 @@ static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,
 
        irq_status[0] = rtw_read32(rtwdev, RTK_PCI_HISR0);
        irq_status[1] = rtw_read32(rtwdev, RTK_PCI_HISR1);
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                irq_status[3] = rtw_read32(rtwdev, RTK_PCI_HISR3);
        else
                irq_status[3] = 0;
@@ -1134,7 +1134,7 @@ static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,
        irq_status[3] &= rtwpci->irq_mask[3];
        rtw_write32(rtwdev, RTK_PCI_HISR0, irq_status[0]);
        rtw_write32(rtwdev, RTK_PCI_HISR1, irq_status[1]);
-       if (rtw_chip_wcpu_11ac(rtwdev))
+       if (rtw_chip_wcpu_3081(rtwdev))
                rtw_write32(rtwdev, RTK_PCI_HISR3, irq_status[3]);
 
        spin_unlock_irqrestore(&rtwpci->hwirq_lock, flags);
index 9e6700c43a63126f8bad431a2eeff1e5b7158e69..03475af973b521a48dba5c7590cf878d6bcc3eaa 100644 (file)
@@ -1882,7 +1882,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = {
        .id = RTW_CHIP_TYPE_8703B,
 
        .fw_name = "rtw88/rtw8703b_fw.bin",
-       .wlan_cpu = RTW_WCPU_11N,
+       .wlan_cpu = RTW_WCPU_8051,
        .tx_pkt_desc_sz = 40,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index 31876e708f9ef651a450c3fc6d436fa4b841dede..bf69f5b06ce26916722c205ac45cffc0fcd19d99 100644 (file)
@@ -2116,7 +2116,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = {
        .ops = &rtw8723d_ops,
        .id = RTW_CHIP_TYPE_8723D,
        .fw_name = "rtw88/rtw8723d_fw.bin",
-       .wlan_cpu = RTW_WCPU_11N,
+       .wlan_cpu = RTW_WCPU_8051,
        .tx_pkt_desc_sz = 40,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index c2ef41767ff937be3fea90ae872922acd6be46a7..03b441639611f0d2d6e7bafdbc40b62b8452e714 100644 (file)
@@ -1038,7 +1038,7 @@ const struct rtw_chip_info rtw8812a_hw_spec = {
        .ops = &rtw8812a_ops,
        .id = RTW_CHIP_TYPE_8812A,
        .fw_name = "rtw88/rtw8812a_fw.bin",
-       .wlan_cpu = RTW_WCPU_11N,
+       .wlan_cpu = RTW_WCPU_8051,
        .tx_pkt_desc_sz = 40,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index 44dd3090484b8a1b6070880115d0da7e34a42388..4a1f850d05c87d3764dc770e5f8293a9ef3b72dc 100644 (file)
@@ -2180,7 +2180,7 @@ const struct rtw_chip_info rtw8814a_hw_spec = {
        .ops = &rtw8814a_ops,
        .id = RTW_CHIP_TYPE_8814A,
        .fw_name = "rtw88/rtw8814a_fw.bin",
-       .wlan_cpu = RTW_WCPU_11AC,
+       .wlan_cpu = RTW_WCPU_3081,
        .tx_pkt_desc_sz = 40,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index 413aec694c33a3e6522904a38a3f873e7c87f350..1d02ea400b2e6f7f7b88eede1997e56d71eeeff6 100644 (file)
@@ -1138,7 +1138,7 @@ const struct rtw_chip_info rtw8821a_hw_spec = {
        .ops = &rtw8821a_ops,
        .id = RTW_CHIP_TYPE_8821A,
        .fw_name = "rtw88/rtw8821a_fw.bin",
-       .wlan_cpu = RTW_WCPU_11N,
+       .wlan_cpu = RTW_WCPU_8051,
        .tx_pkt_desc_sz = 40,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index 413130a30ca911fc7198e8a3f3dd084c1aed5403..a2a358d6033f6128eae72bb41bfcd487f700ab7e 100644 (file)
@@ -1973,7 +1973,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = {
        .ops = &rtw8821c_ops,
        .id = RTW_CHIP_TYPE_8821C,
        .fw_name = "rtw88/rtw8821c_fw.bin",
-       .wlan_cpu = RTW_WCPU_11AC,
+       .wlan_cpu = RTW_WCPU_3081,
        .tx_pkt_desc_sz = 48,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index ab199eaea3c7641a06331950ce8e7866d7f91829..9c31c859ccbacc8ee91612dc84c8190aadfe442b 100644 (file)
@@ -2513,7 +2513,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = {
        .ops = &rtw8822b_ops,
        .id = RTW_CHIP_TYPE_8822B,
        .fw_name = "rtw88/rtw8822b_fw.bin",
-       .wlan_cpu = RTW_WCPU_11AC,
+       .wlan_cpu = RTW_WCPU_3081,
        .tx_pkt_desc_sz = 48,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index 017d959de3ce70e50b90dbd304d3417e5c23109e..f813ce10172d73e45cbdb9a3777b9589b62e7823 100644 (file)
@@ -5332,7 +5332,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = {
        .ops = &rtw8822c_ops,
        .id = RTW_CHIP_TYPE_8822C,
        .fw_name = "rtw88/rtw8822c_fw.bin",
-       .wlan_cpu = RTW_WCPU_11AC,
+       .wlan_cpu = RTW_WCPU_3081,
        .tx_pkt_desc_sz = 48,
        .tx_buf_desc_sz = 16,
        .rx_pkt_desc_sz = 24,
index e733ed846123e6c297492a8c930a7679f6a22daa..cc2d4fef35879a734fdf79436152c9de0eba6629 100644 (file)
@@ -547,7 +547,7 @@ static int rtw_sdio_check_free_txpg(struct rtw_dev *rtwdev, u8 queue,
 {
        unsigned int pages_free, pages_needed;
 
-       if (rtw_chip_wcpu_11n(rtwdev)) {
+       if (rtw_chip_wcpu_8051(rtwdev)) {
                u32 free_txpg;
 
                free_txpg = rtw_sdio_read32(rtwdev, REG_SDIO_FREE_TXPG);
@@ -1030,7 +1030,7 @@ static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev)
        u32 rx_len, hisr, total_rx_bytes = 0;
 
        do {
-               if (rtw_chip_wcpu_11n(rtwdev))
+               if (rtw_chip_wcpu_8051(rtwdev))
                        rx_len = rtw_read16(rtwdev, REG_SDIO_RX0_REQ_LEN);
                else
                        rx_len = rtw_read32(rtwdev, REG_SDIO_RX0_REQ_LEN);
@@ -1042,7 +1042,7 @@ static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev)
 
                total_rx_bytes += rx_len;
 
-               if (rtw_chip_wcpu_11n(rtwdev)) {
+               if (rtw_chip_wcpu_8051(rtwdev)) {
                        /* Stop if no more RX requests are pending, even if
                         * rx_len could be greater than zero in the next
                         * iteration. This is needed because the RX buffer may
@@ -1054,7 +1054,7 @@ static void rtw_sdio_rx_isr(struct rtw_dev *rtwdev)
                         */
                        hisr = rtw_read32(rtwdev, REG_SDIO_HISR);
                } else {
-                       /* RTW_WCPU_11AC chips have improved hardware or
+                       /* RTW_WCPU_3081 chips have improved hardware or
                         * firmware and can use rx_len unconditionally.
                         */
                        hisr = REG_SDIO_HISR_RX_REQUEST;