wifi: rtw89: pci: mask out unsupported TX channels

8852BE doesn't support some TX channels, so mask them out, or it access
undefined registers.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220927062611.30484-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 3e8e477d32f79f808005ba152e22adb722b51f37..002d3ce0e35b29b65bbce1ad0f71a52081e58c78 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -1093,12 +1093,15 @@ static void __pci_flush_txch(struct rtw89_dev *rtwdev, u8 txch, bool drop)
 static void __rtw89_pci_ops_flush_txchs(struct rtw89_dev *rtwdev, u32 txchs,
                                        bool drop)
 {
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
        u8 i;
 
        for (i = 0; i < RTW89_TXCH_NUM; i++) {
                /* It may be unnecessary to flush FWCMD queue. */
                if (i == RTW89_TXCH_CH12)
                        continue;
+               if (info->tx_dma_ch_mask & BIT(i))
+                       continue;
 
                if (txchs & BIT(i))
                        __pci_flush_txch(rtwdev, i, drop);
@@ -1377,6 +1380,7 @@ static const struct rtw89_pci_bd_ram bd_ram_table[RTW89_TXCH_NUM] = {
 static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev)
 {
        struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
        struct rtw89_pci_tx_ring *tx_ring;
        struct rtw89_pci_rx_ring *rx_ring;
        struct rtw89_pci_dma_ring *bd_ring;
@@ -1388,6 +1392,9 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev)
        int i;
 
        for (i = 0; i < RTW89_TXCH_NUM; i++) {
+               if (info->tx_dma_ch_mask & BIT(i))
+                       continue;
+
                tx_ring = &rtwpci->tx_rings[i];
                bd_ring = &tx_ring->bd_ring;
                bd_ram = &bd_ram_table[i];
@@ -1431,12 +1438,15 @@ static void rtw89_pci_release_tx_ring(struct rtw89_dev *rtwdev,
 static void rtw89_pci_ops_reset(struct rtw89_dev *rtwdev)
 {
        struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
        int txch;
 
        rtw89_pci_reset_trx_rings(rtwdev);
 
        spin_lock_bh(&rtwpci->trx_lock);
        for (txch = 0; txch < RTW89_TXCH_NUM; txch++) {
+               if (info->tx_dma_ch_mask & BIT(txch))
+                       continue;
                if (txch == RTW89_TXCH_CH12) {
                        rtw89_pci_release_fwcmd(rtwdev, rtwpci,
                                                skb_queue_len(&rtwpci->h2c_queue), true);
@@ -2722,10 +2732,13 @@ static void rtw89_pci_free_tx_rings(struct rtw89_dev *rtwdev,
                                    struct pci_dev *pdev)
 {
        struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
        struct rtw89_pci_tx_ring *tx_ring;
        int i;
 
        for (i = 0; i < RTW89_TXCH_NUM; i++) {
+               if (info->tx_dma_ch_mask & BIT(i))
+                       continue;
                tx_ring = &rtwpci->tx_rings[i];
                rtw89_pci_free_tx_wd_ring(rtwdev, pdev, tx_ring);
                rtw89_pci_free_tx_ring(rtwdev, pdev, tx_ring);
@@ -2913,6 +2926,7 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev,
                                    struct pci_dev *pdev)
 {
        struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
        struct rtw89_pci_tx_ring *tx_ring;
        u32 desc_size;
        u32 len;
@@ -2920,6 +2934,8 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev,
        int ret;
 
        for (i = 0; i < RTW89_TXCH_NUM; i++) {
+               if (info->tx_dma_ch_mask & BIT(i))
+                       continue;
                tx_ring = &rtwpci->tx_rings[i];
                desc_size = sizeof(struct rtw89_pci_tx_bd_32);
                len = RTW89_PCI_TXBD_NUM_MAX;

diff --git a/drivers/net/wireless/realtek/rtw89/pci.h b/drivers/net/wireless/realtek/rtw89/pci.h
index af6f6d5c4770605ff9afaaf062a5e42206c01236..391058de47ec5e66361e8a63e6632d4f7b2abe80 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.h
+++ b/drivers/net/wireless/realtek/rtw89/pci.h
@@ -760,6 +760,7 @@ struct rtw89_pci_info {
 
        u32 rpwm_addr;
        u32 cpwm_addr;
+       u32 tx_dma_ch_mask;
        const struct rtw89_pci_bd_idx_addr *bd_idx_addr_low_power;
        const struct rtw89_pci_ch_dma_addr_set *dma_addr_set;
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
index d600100db9eb420a230161396a818fb4cf092e58..48485bd9c149fff02d0c7f5b954a85daf639d153 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
@@ -41,6 +41,7 @@ static const struct rtw89_pci_info rtw8852a_pci_info = {
 
        .rpwm_addr              = R_AX_PCIE_HRPWM,
        .cpwm_addr              = R_AX_CPWM,
+       .tx_dma_ch_mask         = 0,
        .bd_idx_addr_low_power  = NULL,
        .dma_addr_set           = &rtw89_pci_ch_dma_addr_set,
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852be.c b/drivers/net/wireless/realtek/rtw89/rtw8852be.c
new file mode 100644 (file)
index 0000000..4590535
--- /dev/null
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852be.c
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+/* Copyright(c) 2020-2022  Realtek Corporation
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+
+#include "pci.h"
+#include "reg.h"
+
+static const struct rtw89_pci_info rtw8852b_pci_info = {
+       .tx_dma_ch_mask         = BIT(RTW89_TXCH_ACH4) | BIT(RTW89_TXCH_ACH5) |
+                                 BIT(RTW89_TXCH_ACH6) | BIT(RTW89_TXCH_ACH7) |
+                                 BIT(RTW89_TXCH_CH10) | BIT(RTW89_TXCH_CH11),
+};
+
+MODULE_AUTHOR("Realtek Corporation");
+MODULE_DESCRIPTION("Realtek 802.11ax wireless 8852BE driver");
+MODULE_LICENSE("Dual BSD/GPL");

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
index be6b4e4d6491440b416f14279610d7376bfd6230..c7370f5df8b547c44445902db925e856a6b5d0f7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
@@ -50,6 +50,7 @@ static const struct rtw89_pci_info rtw8852c_pci_info = {
 
        .rpwm_addr              = R_AX_PCIE_HRPWM_V1,
        .cpwm_addr              = R_AX_PCIE_CRPWM,
+       .tx_dma_ch_mask         = 0,
        .bd_idx_addr_low_power  = &rtw8852c_bd_idx_addr_low_power,
        .dma_addr_set           = &rtw89_pci_ch_dma_addr_set_v1,