wifi: rtw89: pci: concentrate control function of TX DMA channel

Different chips use different register and mask for
tx dma channels, so concentrate them.

Signed-off-by: Chin-Yen Lee <timlee@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220912071706.13619-4-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 7f348bcf640c830f3bbdbfdb93b6f99a830f9370..ff33962747fa0e8d6a1b9e6652009fa4b2a7cbc0 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -169,6 +169,23 @@ static int rtw89_pci_rxbd_info_update(struct rtw89_dev *rtwdev,
        return 0;
 }
 
+static void rtw89_pci_ctrl_txdma_ch_pcie(struct rtw89_dev *rtwdev, bool enable)
+{
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
+       const struct rtw89_reg_def *dma_stop1 = &info->dma_stop1;
+       const struct rtw89_reg_def *dma_stop2 = &info->dma_stop2;
+
+       if (enable) {
+               rtw89_write32_clr(rtwdev, dma_stop1->addr, dma_stop1->mask);
+               if (dma_stop2->addr)
+                       rtw89_write32_clr(rtwdev, dma_stop2->addr, dma_stop2->mask);
+       } else {
+               rtw89_write32_set(rtwdev, dma_stop1->addr, dma_stop1->mask);
+               if (dma_stop2->addr)
+                       rtw89_write32_set(rtwdev, dma_stop2->addr, dma_stop2->mask);
+       }
+}
+
 static bool
 rtw89_skb_put_rx_data(struct rtw89_dev *rtwdev, bool fs, bool ls,
                      struct sk_buff *new,
@@ -2443,7 +2460,7 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)
        rtw89_pci_set_dbg(rtwdev);
        rtw89_pci_set_keep_reg(rtwdev);
 
-       rtw89_write32_set(rtwdev, info->dma_stop1_reg, B_AX_STOP_WPDMA);
+       rtw89_write32_set(rtwdev, info->dma_stop1.addr, B_AX_STOP_WPDMA);
 
        /* stop DMA activities */
        rtw89_pci_ctrl_dma_all(rtwdev, false);
@@ -2466,10 +2483,9 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)
                return ret;
        }
 
-       /* enable FW CMD queue to download firmware */
-       rtw89_write32_set(rtwdev, info->dma_stop1_reg, B_AX_TX_STOP1_ALL);
-       rtw89_write32_clr(rtwdev, info->dma_stop1_reg, B_AX_STOP_CH12);
-       rtw89_write32_set(rtwdev, info->dma_stop2_reg, B_AX_TX_STOP2_ALL);
+       /* disable all channels except to FW CMD channel to download firmware */
+       rtw89_pci_ctrl_txdma_ch_pcie(rtwdev, false);
+       rtw89_write32_clr(rtwdev, info->dma_stop1.addr, B_AX_STOP_CH12);
 
        /* start DMA activities */
        rtw89_pci_ctrl_dma_all(rtwdev, true);
@@ -2582,11 +2598,10 @@ static int rtw89_pci_ops_mac_post_init(struct rtw89_dev *rtwdev)
        }
 
        /* enable DMA for all queues */
-       rtw89_write32_clr(rtwdev, info->dma_stop1_reg, B_AX_TX_STOP1_ALL);
-       rtw89_write32_clr(rtwdev, info->dma_stop2_reg, B_AX_TX_STOP2_ALL);
+       rtw89_pci_ctrl_txdma_ch_pcie(rtwdev, true);
 
        /* Release PCI IO */
-       rtw89_write32_clr(rtwdev, info->dma_stop1_reg,
+       rtw89_write32_clr(rtwdev, info->dma_stop1.addr,
                          B_AX_STOP_WPDMA | B_AX_STOP_PCIEIO);
 
        return 0;

diff --git a/drivers/net/wireless/realtek/rtw89/pci.h b/drivers/net/wireless/realtek/rtw89/pci.h
index 1365bbb547989e417ca7c8f01c09a21ef40423fe..af6f6d5c4770605ff9afaaf062a5e42206c01236 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.h
+++ b/drivers/net/wireless/realtek/rtw89/pci.h
@@ -410,6 +410,16 @@
 #define B_AX_STOP_RPQ                  BIT(1)
 #define B_AX_STOP_RXQ                  BIT(0)
 #define B_AX_TX_STOP1_ALL              GENMASK(18, 8)
+#define B_AX_TX_STOP1_MASK             (B_AX_STOP_ACH0 | B_AX_STOP_ACH1 | \
+                                        B_AX_STOP_ACH2 | B_AX_STOP_ACH3 | \
+                                        B_AX_STOP_ACH4 | B_AX_STOP_ACH5 | \
+                                        B_AX_STOP_ACH6 | B_AX_STOP_ACH7 | \
+                                        B_AX_STOP_CH8 | B_AX_STOP_CH9 | \
+                                        B_AX_STOP_CH12)
+#define B_AX_TX_STOP1_MASK_V1          (B_AX_STOP_ACH0 | B_AX_STOP_ACH1 | \
+                                        B_AX_STOP_ACH2 | B_AX_STOP_ACH3 | \
+                                        B_AX_STOP_CH8 | B_AX_STOP_CH9 | \
+                                        B_AX_STOP_CH12)
 
 #define R_AX_PCIE_DMA_STOP2    0x1310
 #define B_AX_STOP_CH11                 BIT(1)
@@ -742,8 +752,8 @@ struct rtw89_pci_info {
        u32 max_tag_num_mask;
        u32 rxbd_rwptr_clr_reg;
        u32 txbd_rwptr_clr2_reg;
-       u32 dma_stop1_reg;
-       u32 dma_stop2_reg;
+       struct rtw89_reg_def dma_stop1;
+       struct rtw89_reg_def dma_stop2;
        u32 dma_busy1_reg;
        u32 dma_busy2_reg;
        u32 dma_busy3_reg;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
index 190c4aefb02e3c994c78958cb3b4da54bdc2ac08..d600100db9eb420a230161396a818fb4cf092e58 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
@@ -33,8 +33,8 @@ static const struct rtw89_pci_info rtw8852a_pci_info = {
        .max_tag_num_mask       = B_AX_MAX_TAG_NUM,
        .rxbd_rwptr_clr_reg     = R_AX_RXBD_RWPTR_CLR,
        .txbd_rwptr_clr2_reg    = R_AX_TXBD_RWPTR_CLR2,
-       .dma_stop1_reg          = R_AX_PCIE_DMA_STOP1,
-       .dma_stop2_reg          = R_AX_PCIE_DMA_STOP2,
+       .dma_stop1              = {R_AX_PCIE_DMA_STOP1, B_AX_TX_STOP1_MASK},
+       .dma_stop2              = {R_AX_PCIE_DMA_STOP2, B_AX_TX_STOP2_ALL},
        .dma_busy1_reg          = R_AX_PCIE_DMA_BUSY1,
        .dma_busy2_reg          = R_AX_PCIE_DMA_BUSY2,
        .dma_busy3_reg          = R_AX_PCIE_DMA_BUSY1,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
index fc039449401306e28cf0180c0dacb5982575d0c1..be6b4e4d6491440b416f14279610d7376bfd6230 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
@@ -42,8 +42,8 @@ static const struct rtw89_pci_info rtw8852c_pci_info = {
        .max_tag_num_mask       = B_AX_MAX_TAG_NUM_V1_MASK,
        .rxbd_rwptr_clr_reg     = R_AX_RXBD_RWPTR_CLR_V1,
        .txbd_rwptr_clr2_reg    = R_AX_TXBD_RWPTR_CLR2_V1,
-       .dma_stop1_reg          = R_AX_HAXI_DMA_STOP1,
-       .dma_stop2_reg          = R_AX_HAXI_DMA_STOP2,
+       .dma_stop1              = {R_AX_HAXI_DMA_STOP1, B_AX_TX_STOP1_MASK},
+       .dma_stop2              = {R_AX_HAXI_DMA_STOP2, B_AX_TX_STOP2_ALL},
        .dma_busy1_reg          = R_AX_HAXI_DMA_BUSY1,
        .dma_busy2_reg          = R_AX_HAXI_DMA_BUSY2,
        .dma_busy3_reg          = R_AX_HAXI_DMA_BUSY3,