wifi: rtw89: pci: reset BDRAM according to chip gen

Configure callback of reset BDRAM (buffer descriptor RAM) by chip gen.
Refine the one of 802.11ax chip gen and drop a redundant duplicate of it
in 802.11ax chip gen. Then, assign right callback of rst_bdram for HCI ops
which needs to do callback according to chip gen.

Signed-off-by: Zong-Zhe Yang <kevin_yang@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/20231110012319.12727-2-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 74828dd37715caba87f0d15aba9de02fd4c2ab49..bac9ec2236da53feb2909250064eb2a884557270 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -19,22 +19,18 @@ MODULE_PARM_DESC(disable_clkreq, "Set Y to disable PCI clkreq support");
 MODULE_PARM_DESC(disable_aspm_l1, "Set Y to disable PCI ASPM L1 support");
 MODULE_PARM_DESC(disable_aspm_l1ss, "Set Y to disable PCI L1SS support");
 
-static int rtw89_pci_rst_bdram_pcie(struct rtw89_dev *rtwdev)
+static int rtw89_pci_rst_bdram_ax(struct rtw89_dev *rtwdev)
 {
        u32 val;
        int ret;
 
-       rtw89_write32(rtwdev, R_AX_PCIE_INIT_CFG1,
-                     rtw89_read32(rtwdev, R_AX_PCIE_INIT_CFG1) | B_AX_RST_BDRAM);
+       rtw89_write32_set(rtwdev, R_AX_PCIE_INIT_CFG1, B_AX_RST_BDRAM);
 
        ret = read_poll_timeout_atomic(rtw89_read32, val, !(val & B_AX_RST_BDRAM),
                                       1, RTW89_PCI_POLL_BDRAM_RST_CNT, false,
                                       rtwdev, R_AX_PCIE_INIT_CFG1);
 
-       if (ret)
-               return -EBUSY;
-
-       return 0;
+       return ret;
 }
 
 static u32 rtw89_pci_dma_recalc(struct rtw89_dev *rtwdev,
@@ -2608,7 +2604,7 @@ static int rtw89_pci_ops_mac_pre_init_ax(struct rtw89_dev *rtwdev)
        /* fill TRX BD indexes */
        rtw89_pci_ops_reset(rtwdev);
 
-       ret = rtw89_pci_rst_bdram_pcie(rtwdev);
+       ret = rtw89_pci_rst_bdram_ax(rtwdev);
        if (ret) {
                rtw89_warn(rtwdev, "reset bdram busy\n");
                return ret;
@@ -3691,22 +3687,6 @@ static int rtw89_pci_lv1rst_stop_dma(struct rtw89_dev *rtwdev)
        return ret;
 }
 
-
-
-static int rtw89_pci_rst_bdram(struct rtw89_dev *rtwdev)
-{
-       int ret = 0;
-       u32 val32, sts;
-
-       val32 = B_AX_RST_BDRAM;
-       rtw89_write32_set(rtwdev, R_AX_PCIE_INIT_CFG1, val32);
-
-       ret = read_poll_timeout_atomic(rtw89_read32, sts,
-                                      (sts & B_AX_RST_BDRAM) == 0x0, 1, 100,
-                                      true, rtwdev, R_AX_PCIE_INIT_CFG1);
-       return ret;
-}
-
 static int rtw89_pci_lv1rst_start_dma(struct rtw89_dev *rtwdev)
 {
        u32 ret;
@@ -3718,7 +3698,7 @@ static int rtw89_pci_lv1rst_start_dma(struct rtw89_dev *rtwdev)
        rtw89_mac_ctrl_hci_dma_trx(rtwdev, true);
        rtw89_pci_clr_idx_all(rtwdev);
 
-       ret = rtw89_pci_rst_bdram(rtwdev);
+       ret = rtw89_pci_rst_bdram_ax(rtwdev);
        if (ret)
                return ret;
 
@@ -3858,6 +3838,7 @@ const struct rtw89_pci_gen_def rtw89_pci_gen_ax = {
        .mac_post_init = rtw89_pci_ops_mac_post_init_ax,
 
        .clr_idx_all = rtw89_pci_clr_idx_all_ax,
+       .rst_bdram = rtw89_pci_rst_bdram_ax,
 };
 EXPORT_SYMBOL(rtw89_pci_gen_ax);
 
@@ -3899,7 +3880,7 @@ static const struct rtw89_hci_ops rtw89_pci_ops = {
        .clear          = rtw89_pci_clear_resource,
        .disable_intr   = rtw89_pci_disable_intr_lock,
        .enable_intr    = rtw89_pci_enable_intr_lock,
-       .rst_bdram      = rtw89_pci_rst_bdram_pcie,
+       .rst_bdram      = rtw89_pci_reset_bdram,
 };
 
 int rtw89_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

diff --git a/drivers/net/wireless/realtek/rtw89/pci.h b/drivers/net/wireless/realtek/rtw89/pci.h
index 37398e416e583ef781a0245fdee972e05773304a..e3a4a61196603834878eda4b94125b972ff7835b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.h
+++ b/drivers/net/wireless/realtek/rtw89/pci.h
@@ -1041,6 +1041,7 @@ struct rtw89_pci_gen_def {
        int (*mac_post_init)(struct rtw89_dev *rtwdev);
 
        void (*clr_idx_all)(struct rtw89_dev *rtwdev);
+       int (*rst_bdram)(struct rtw89_dev *rtwdev);
 };
 
 struct rtw89_pci_info {
@@ -1475,4 +1476,12 @@ static inline void rtw89_pci_clr_idx_all(struct rtw89_dev *rtwdev)
        gen_def->clr_idx_all(rtwdev);
 }
 
+static inline int rtw89_pci_reset_bdram(struct rtw89_dev *rtwdev)
+{
+       const struct rtw89_pci_info *info = rtwdev->pci_info;
+       const struct rtw89_pci_gen_def *gen_def = info->gen_def;
+
+       return gen_def->rst_bdram(rtwdev);
+}
+
 #endif

diff --git a/drivers/net/wireless/realtek/rtw89/pci_be.c b/drivers/net/wireless/realtek/rtw89/pci_be.c
index f3aab34a3a2485a1f9e9f178ddfc561cef56a29d..7d552b1a2d5e9fda0659e6e5a5876a096f6e3157 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci_be.c
+++ b/drivers/net/wireless/realtek/rtw89/pci_be.c
@@ -425,5 +425,6 @@ const struct rtw89_pci_gen_def rtw89_pci_gen_be = {
        .mac_post_init = rtw89_pci_ops_mac_post_init_be,
 
        .clr_idx_all = rtw89_pci_clr_idx_all_be,
+       .rst_bdram = rtw89_pci_rst_bdram_be,
 };
 EXPORT_SYMBOL(rtw89_pci_gen_be);