wifi: rtw89: pci: update PCI related settings to support 8851B

Many settings of 8851B are like 8852A or 8852B. Change them to proper
settings as hardware design.

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

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index fbe4d11ca920a3de3d13e7fc089926998a183b15..70b4754667c9883bbd642268d75791a2592540c2 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -1917,9 +1917,10 @@ __get_target(struct rtw89_dev *rtwdev, u16 *target, enum rtw89_pcie_phy phy_rate
 
 static int rtw89_pci_autok_x(struct rtw89_dev *rtwdev)
 {
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
        int ret;
 
-       if (rtwdev->chip->chip_id != RTL8852B)
+       if (chip_id != RTL8852B && chip_id != RTL8851B)
                return 0;
 
        ret = rtw89_write16_mdio_mask(rtwdev, RAC_REG_FLD_0, BAC_AUTOK_N_MASK,
@@ -1929,13 +1930,14 @@ static int rtw89_pci_autok_x(struct rtw89_dev *rtwdev)
 
 static int rtw89_pci_auto_refclk_cal(struct rtw89_dev *rtwdev, bool autook_en)
 {
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
        enum rtw89_pcie_phy phy_rate;
        u16 val16, mgn_set, div_set, tar;
        u8 val8, bdr_ori;
        bool l1_flag = false;
        int ret = 0;
 
-       if (rtwdev->chip->chip_id != RTL8852B)
+       if (chip_id != RTL8852B && chip_id != RTL8851B)
                return 0;
 
        ret = rtw89_pci_read_config_byte(rtwdev, RTW89_PCIE_PHY_RATE, &val8);
@@ -2112,7 +2114,9 @@ static void rtw89_pci_rxdma_prefth(struct rtw89_dev *rtwdev)
 
 static void rtw89_pci_l1off_pwroff(struct rtw89_dev *rtwdev)
 {
-       if (rtwdev->chip->chip_id != RTL8852A && rtwdev->chip->chip_id != RTL8852B)
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
+
+       if (chip_id != RTL8852A && chip_id != RTL8852B && chip_id != RTL8851B)
                return;
 
        rtw89_write32_clr(rtwdev, R_AX_PCIE_PS_CTRL, B_AX_L1OFF_PWR_OFF_EN);
@@ -2140,7 +2144,9 @@ static u32 rtw89_pci_l2_rxen_lat(struct rtw89_dev *rtwdev)
 
 static void rtw89_pci_aphy_pwrcut(struct rtw89_dev *rtwdev)
 {
-       if (rtwdev->chip->chip_id != RTL8852A && rtwdev->chip->chip_id != RTL8852B)
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
+
+       if (chip_id != RTL8852A && chip_id != RTL8852B && chip_id != RTL8851B)
                return;
 
        rtw89_write32_clr(rtwdev, R_AX_SYS_PW_CTRL, B_AX_PSUS_OFF_CAPC_EN);
@@ -2148,8 +2154,9 @@ static void rtw89_pci_aphy_pwrcut(struct rtw89_dev *rtwdev)
 
 static void rtw89_pci_hci_ldo(struct rtw89_dev *rtwdev)
 {
-       if (rtwdev->chip->chip_id == RTL8852A ||
-           rtwdev->chip->chip_id == RTL8852B) {
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
+
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                rtw89_write32_set(rtwdev, R_AX_SYS_SDIO_CTRL,
                                  B_AX_PCIE_DIS_L2_CTRL_LDO_HCI);
                rtw89_write32_clr(rtwdev, R_AX_SYS_SDIO_CTRL,
@@ -2162,7 +2169,9 @@ static void rtw89_pci_hci_ldo(struct rtw89_dev *rtwdev)
 
 static int rtw89_pci_dphy_delay(struct rtw89_dev *rtwdev)
 {
-       if (rtwdev->chip->chip_id != RTL8852B)
+       enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
+
+       if (chip_id != RTL8852B && chip_id != RTL8851B)
                return 0;
 
        return rtw89_write16_mdio_mask(rtwdev, RAC_REG_REV2, BAC_CMU_EN_DLY_MASK,
@@ -3402,7 +3411,7 @@ static void rtw89_pci_clkreq_set(struct rtw89_dev *rtwdev, bool enable)
        if (ret)
                rtw89_err(rtwdev, "failed to set CLKREQ Delay\n");
 
-       if (chip_id == RTL8852A || chip_id == RTL8852B) {
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                if (enable)
                        ret = rtw89_pci_config_byte_set(rtwdev,
                                                        RTW89_PCIE_L1_CTRL,
@@ -3447,7 +3456,7 @@ static void rtw89_pci_aspm_set(struct rtw89_dev *rtwdev, bool enable)
        if (ret)
                rtw89_err(rtwdev, "failed to read ASPM Delay\n");
 
-       if (chip_id == RTL8852A || chip_id == RTL8852B) {
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                if (enable)
                        ret = rtw89_pci_config_byte_set(rtwdev,
                                                        RTW89_PCIE_L1_CTRL,
@@ -3527,7 +3536,7 @@ static void rtw89_pci_l1ss_set(struct rtw89_dev *rtwdev, bool enable)
        enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;
        int ret;
 
-       if (chip_id == RTL8852A || chip_id == RTL8852B) {
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                if (enable)
                        ret = rtw89_pci_config_byte_set(rtwdev,
                                                        RTW89_PCIE_TIMER_CTRL,
@@ -3726,7 +3735,7 @@ static int __maybe_unused rtw89_pci_suspend(struct device *dev)
        rtw89_write32_set(rtwdev, R_AX_RSV_CTRL, B_AX_WLOCK_1C_BIT6);
        rtw89_write32_set(rtwdev, R_AX_RSV_CTRL, B_AX_R_DIS_PRST);
        rtw89_write32_clr(rtwdev, R_AX_RSV_CTRL, B_AX_WLOCK_1C_BIT6);
-       if (chip_id == RTL8852A || chip_id == RTL8852B) {
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                rtw89_write32_clr(rtwdev, R_AX_SYS_SDIO_CTRL,
                                  B_AX_PCIE_DIS_L2_CTRL_LDO_HCI);
                rtw89_write32_set(rtwdev, R_AX_PCIE_INIT_CFG1,
@@ -3760,7 +3769,7 @@ static int __maybe_unused rtw89_pci_resume(struct device *dev)
        rtw89_write32_set(rtwdev, R_AX_RSV_CTRL, B_AX_WLOCK_1C_BIT6);
        rtw89_write32_clr(rtwdev, R_AX_RSV_CTRL, B_AX_R_DIS_PRST);
        rtw89_write32_clr(rtwdev, R_AX_RSV_CTRL, B_AX_WLOCK_1C_BIT6);
-       if (chip_id == RTL8852A || chip_id == RTL8852B) {
+       if (chip_id == RTL8852A || chip_id == RTL8852B || chip_id == RTL8851B) {
                rtw89_write32_set(rtwdev, R_AX_SYS_SDIO_CTRL,
                                  B_AX_PCIE_DIS_L2_CTRL_LDO_HCI);
                rtw89_write32_clr(rtwdev, R_AX_PCIE_INIT_CFG1,