rtw89: pci: add struct rtw89_pci_info

Use this struct to implement chip::ops related to PCI interface.

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

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index d203e4c5727d2a4e267e64aadf3602dc418a456a..8b36972744f850109dcdc5a7fb3ab2bcc9c26300 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -13,6 +13,7 @@
 #include <net/mac80211.h>
 
 struct rtw89_dev;
+struct rtw89_pci_info;
 
 extern const struct ieee80211_ops rtw89_ops;
 
@@ -2306,8 +2307,13 @@ struct rtw89_chip_info {
        u8 ps_mode_supported;
 };
 
+union rtw89_bus_info {
+       const struct rtw89_pci_info *pci;
+};
+
 struct rtw89_driver_info {
        const struct rtw89_chip_info *chip;
+       union rtw89_bus_info bus;
 };
 
 enum rtw89_hcifc_mode {
@@ -2858,6 +2864,7 @@ struct rtw89_dev {
        bool dbcc_en;
        struct rtw89_hw_scan_info scan_info;
        const struct rtw89_chip_info *chip;
+       const struct rtw89_pci_info *pci_info;
        struct rtw89_hal hal;
        struct rtw89_mac_info mac;
        struct rtw89_fw_info fw;

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 6481085b958e77627b0ade971fe81cf3fb3f8097..9f2a23e79e5d175db7657b6fc3e1cd09387528ca 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -2937,6 +2937,7 @@ int rtw89_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        info = (const struct rtw89_driver_info *)id->driver_data;
        rtwdev->chip = info->chip;
+       rtwdev->pci_info = info->bus.pci;
 
        ret = rtw89_core_init(rtwdev);
        if (ret) {

diff --git a/drivers/net/wireless/realtek/rtw89/pci.h b/drivers/net/wireless/realtek/rtw89/pci.h
index 7f1ee1544688df97ae634af59290104b2b0e978f..2b8bbfa77d1b3076f4f82f55f7e5015d192ca5d3 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.h
+++ b/drivers/net/wireless/realtek/rtw89/pci.h
@@ -382,6 +382,9 @@ enum rtw89_pcie_clkdly_hw {
        PCIE_CLKDLY_HW_200US = 0x5,
 };
 
+struct rtw89_pci_info {
+};
+
 struct rtw89_pci_bd_ram {
        u8 start_idx;
        u8 max_num;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
index de93280e0f697b82c30f26cbc3d469e9067da392..527c0bba0aa634efcc7213e83383d211276c13e8 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ae.c
@@ -8,8 +8,14 @@
 #include "pci.h"
 #include "rtw8852a.h"
 
+static const struct rtw89_pci_info rtw8852a_pci_info = {
+};
+
 static const struct rtw89_driver_info rtw89_8852ae_info = {
        .chip = &rtw8852a_chip_info,
+       .bus = {
+               .pci = &rtw8852a_pci_info,
+       },
 };
 
 static const struct pci_device_id rtw89_8852ae_id_table[] = {

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
index ee700bba1eb10a68b779d40809298c89079424b7..f3ce71c822bc8d75bde38666e56f713d4fd39105 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852ce.c
@@ -9,8 +9,14 @@
 #include "reg.h"
 #include "rtw8852c.h"
 
+static const struct rtw89_pci_info rtw8852c_pci_info = {
+};
+
 static const struct rtw89_driver_info rtw89_8852ce_info = {
        .chip = &rtw8852c_chip_info,
+       .bus = {
+               .pci = &rtw8852c_pci_info,
+       },
 };
 
 static const struct pci_device_id rtw89_8852ce_id_table[] = {