rtw89: refine PCI and MAC codes into function with attributes
Ping-Ke Shih
maintainercover rtw89: refine PCI and MAC codes into function with attributes
The existing PCI and MAC codes are only used by 8852AE, so many settings are put in single function. To be clear, move the settings into an individual function according to its functionality. Since functions will be shared with chips, add attributes to make it possible to use common functions.
Also, update the settings to the latest version of our internal code.
This patchset is based on
"rtw89: add firmware reset and dump firmware memory and backtrace" and "rtw89: update TX power table and 6G, refine IGI, and add TX/RX descriptors V1"
But no actual function dependency.
Chia-Yuan Li (1):
rtw89: pci: refine pci pre_init function
Ping-Ke Shih (15):
rtw89: pci: add register definition to rtw89_pci_info to generalize
pci code
rtw89: pci: add pci attributes to configure operating mode
rtw89: pci: add LTR setting for v1 chip
rtw89: pci: set address info registers depends on chips
rtw89: pci: add deglitch setting
rtw89: pci: add L1 settings
rtw89: extend dmac_pre_init to support 8852C
rtw89: update STA scheduler parameters for v1 chip
rtw89: add chip_ops::{enable,disable}_bb_rf to support v1 chip
rtw89: Turn on CR protection of CMAC
rtw89: 8852c: update security engine setting
rtw89: update scheduler setting
rtw89: initialize NAV control
rtw89: update TMAC parameters
rtw89: update ptcl_init
drivers/net/wireless/realtek/rtw89/core.c | 7 +- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac.c | 129 ++++- drivers/net/wireless/realtek/rtw89/mac.h | 19 +- drivers/net/wireless/realtek/rtw89/pci.c | 519 +++++++++++++++--- drivers/net/wireless/realtek/rtw89/pci.h | 211 +++++++ drivers/net/wireless/realtek/rtw89/reg.h | 187 +++++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + .../net/wireless/realtek/rtw89/rtw8852ae.c | 30 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 45 ++ .../net/wireless/realtek/rtw89/rtw8852ce.c | 30 + 11 files changed, 1080 insertions(+), 101 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/16 rtw89: pci: refine pci pre_init function
From: Chia-Yuan Li <[email protected]>
The pre_init is used to initialize partial PCI function during PCI probe. It doesn't need to initialize all functions, so probe can be faster.
--- drivers/net/wireless/realtek/rtw89/pci.c | 158 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/pci.h | 16 ++ drivers/net/wireless/realtek/rtw89/reg.h | 31 ++++ .../net/wireless/realtek/rtw89/rtw8852ae.c | 3 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 3 + 5 files changed, 180 insertions(+), 31 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +127 -31
@@ -1437,12 +1437,19 @@ static void rtw89_pci_ctrl_dma_all(struct rtw89_dev *rtwdev, bool enable) B_AX_STOP_PCIEIO);rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , txhci_en | rxhci_en); +if (chip_id ==RTL8852C ) +rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 , +B_AX_STOP_AXI_MST ); }else {if (chip_id !=RTL8852C )rtw89_write32_set (rtwdev, info->dma_stop1_reg,B_AX_STOP_PCIEIO ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 , - txhci_en | rxhci_en); +else +rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 , +B_AX_STOP_AXI_MST ); +if (chip_id ==RTL8852C ) +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , +B_AX_STOP_AXI_MST ); } }
@@ -1865,13 +1872,16 @@ 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 ) -return ; - -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 , -B_AX_PCIE_DIS_WLSUS_AFT_PDN ); +if (rtwdev->chip->chip_id ==RTL8852A || + rtwdev->chip->chip_id ==RTL8852B ) { +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 , +B_AX_PCIE_DIS_WLSUS_AFT_PDN ); + }else if (rtwdev->chip->chip_id ==RTL8852C ) { +rtw89_write32_clr (rtwdev,R_AX_SYS_SDIO_CTRL , +B_AX_PCIE_DIS_L2_CTRL_LDO_HCI ); + } }static int rtw89_pci_dphy_delay (struct rtw89_dev *rtwdev)
@@ -1902,12 +1912,24 @@ static void rtw89_pci_autoload_hang(struct rtw89_dev *rtwdev)static void rtw89_pci_l12_vmain (struct rtw89_dev *rtwdev) { -if (rtwdev->chip->chip_id !=RTL8852C && rtwdev->hal.cv ==CHIP_CAV ) +if (!(rtwdev->chip->chip_id ==RTL8852C && rtwdev->hal.cv ==CHIP_CAV ))return ;rtw89_write32_set (rtwdev,R_AX_SYS_SDIO_CTRL ,B_AX_PCIE_FORCE_PWR_NGAT ); } +static void rtw89_pci_gen2_force_ib (struct rtw89_dev *rtwdev) +{ +if (!(rtwdev->chip->chip_id ==RTL8852C && rtwdev->hal.cv ==CHIP_CAV )) +return ; + +rtw89_write32_set (rtwdev,R_AX_PMC_DBG_CTRL2 , +B_AX_SYSON_DIS_PMCR_AX_WRMSK ); +rtw89_write32_set (rtwdev,R_AX_HCI_BG_CTRL ,B_AX_BG_CLR_ASYNC_M3 ); +rtw89_write32_clr (rtwdev,R_AX_PMC_DBG_CTRL2 , +B_AX_SYSON_DIS_PMCR_AX_WRMSK ); +} +static void rtw89_pci_set_sic (struct rtw89_dev *rtwdev) {if (rtwdev->chip->chip_id ==RTL8852C )
@@ -1917,6 +1939,25 @@ static void rtw89_pci_set_sic(struct rtw89_dev *rtwdev) B_AX_SIC_EN_FORCE_CLKREQ); } +static void rtw89_pci_set_lbc (struct rtw89_dev *rtwdev) +{ +const struct rtw89_pci_info *info = rtwdev->pci_info; +u32 lbc; + +if (rtwdev->chip->chip_id ==RTL8852C ) +return ; + + lbc =rtw89_read32 (rtwdev,R_AX_LBC_WATCHDOG ); +if (info->lbc_en ==MAC_AX_PCIE_ENABLE ) { + lbc =u32_replace_bits (lbc, info->lbc_tmr,B_AX_LBC_TIMER ); + lbc |=B_AX_LBC_FLAG |B_AX_LBC_EN ; +rtw89_write32 (rtwdev,R_AX_LBC_WATCHDOG , lbc); + }else { + lbc &= ~B_AX_LBC_EN ; + } +rtw89_write32_set (rtwdev,R_AX_LBC_WATCHDOG , lbc); +} +static void rtw89_pci_set_io_rcy (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info;
@@ -1957,6 +1998,15 @@ static void rtw89_pci_set_dbg(struct rtw89_dev *rtwdev) B_AX_EN_CHKDSC_NO_RX_STUCK); } +static void rtw89_pci_set_keep_reg (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id ==RTL8852C ) +return ; + +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , +B_AX_PCIE_TXRST_KEEP_REG |B_AX_PCIE_RXRST_KEEP_REG ); +} +static void rtw89_pci_clr_idx_all (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info;
@@ -1979,6 +2029,68 @@ static void rtw89_pci_clr_idx_all(struct rtw89_dev *rtwdev) B_AX_CLR_RXQ_IDX | B_AX_CLR_RPQ_IDX); } +static int rtw89_poll_txdma_ch_idle_pcie (struct rtw89_dev *rtwdev) +{ +const struct rtw89_pci_info *info = rtwdev->pci_info; +u32 ret, check, dma_busy; +u32 dma_busy1 = info->dma_busy1_reg; +u32 dma_busy2 = info->dma_busy2_reg; + + check =B_AX_ACH0_BUSY |B_AX_ACH1_BUSY |B_AX_ACH2_BUSY | +B_AX_ACH3_BUSY |B_AX_ACH4_BUSY |B_AX_ACH5_BUSY | +B_AX_ACH6_BUSY |B_AX_ACH7_BUSY |B_AX_CH8_BUSY | +B_AX_CH9_BUSY |B_AX_CH12_BUSY ; + + ret =read_poll_timeout (rtw89_read32, dma_busy, (dma_busy & check) ==0 , +10 ,100 , false, rtwdev, dma_busy1); +if (ret) +return ret; + + check =B_AX_CH10_BUSY |B_AX_CH11_BUSY ; + + ret =read_poll_timeout (rtw89_read32, dma_busy, (dma_busy & check) ==0 , +10 ,100 , false, rtwdev, dma_busy2); +if (ret) +return ret; + +return 0 ; +} + +static int rtw89_poll_rxdma_ch_idle_pcie (struct rtw89_dev *rtwdev) +{ +const struct rtw89_pci_info *info = rtwdev->pci_info; +u32 ret, check, dma_busy; +u32 dma_busy3 = info->dma_busy3_reg; + + check =B_AX_RXQ_BUSY |B_AX_RPQ_BUSY ; + + ret =read_poll_timeout (rtw89_read32, dma_busy, (dma_busy & check) ==0 , +10 ,100 , false, rtwdev, dma_busy3); +if (ret) +return ret; + +return 0 ; +} + +static int rtw89_pci_poll_dma_all_idle (struct rtw89_dev *rtwdev) +{ +u32 ret; + + ret =rtw89_poll_txdma_ch_idle_pcie (rtwdev); +if (ret) { +rtw89_err (rtwdev,"txdma ch busy\n" ); +return ret; + } + + ret =rtw89_poll_rxdma_ch_idle_pcie (rtwdev); +if (ret) { +rtw89_err (rtwdev,"rxdma ch busy\n" ); +return ret; + } + +return 0 ; +} +static int rtw89_pci_mode_op (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info;
@@ -2083,9 +2195,6 @@ static int rtw89_pci_ops_deinit(struct rtw89_dev *rtwdev)static int rtw89_pci_ops_mac_pre_init (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info; -u32 dma_busy; -u32 check; -u32 lbc;int ret;rtw89_pci_rxdma_prefth (rtwdev);
@@ -2110,34 +2219,21 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)rtw89_pci_power_wake (rtwdev, true);rtw89_pci_autoload_hang (rtwdev);rtw89_pci_l12_vmain (rtwdev); +rtw89_pci_gen2_force_ib (rtwdev);rtw89_pci_set_sic (rtwdev); +rtw89_pci_set_lbc (rtwdev);rtw89_pci_set_io_rcy (rtwdev);rtw89_pci_set_dbg (rtwdev); - -if (rtwdev->chip->chip_id ==RTL8852A ) { -rtw89_write32_clr (rtwdev,R_AX_SYS_SDIO_CTRL , -B_AX_PCIE_AUXCLK_GATE ); - - lbc =rtw89_read32 (rtwdev,R_AX_LBC_WATCHDOG ); - lbc =u32_replace_bits (lbc,RTW89_MAC_LBC_TMR_128US ,B_AX_LBC_TIMER ); - lbc |=B_AX_LBC_FLAG |B_AX_LBC_EN ; -rtw89_write32 (rtwdev,R_AX_LBC_WATCHDOG , lbc); - -rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , -B_AX_PCIE_TXRST_KEEP_REG |B_AX_PCIE_RXRST_KEEP_REG ); - } +rtw89_pci_set_keep_reg (rtwdev);rtw89_write32_set (rtwdev, info->dma_stop1_reg,B_AX_STOP_WPDMA );/* stop DMA activities */ rtw89_pci_ctrl_dma_all (rtwdev, false); -/* check PCI at idle state */ - check =B_AX_PCIEIO_BUSY |B_AX_PCIEIO_TX_BUSY |B_AX_PCIEIO_RX_BUSY ; - ret =read_poll_timeout (rtw89_read32, dma_busy, (dma_busy & check) ==0 , -100 ,3000 , false, rtwdev,R_AX_PCIE_DMA_BUSY1 ); + ret =rtw89_pci_poll_dma_all_idle (rtwdev);if (ret) { -rtw89_err (rtwdev,"failed to poll io busy\n" ); +rtw89_err (rtwdev,"[ERR] poll pcie dma all idle\n" );return ret; }
drivers/net/wireless/realtek/rtw89/pci.h +16 -0
@@ -366,6 +366,19 @@#define B_AX_PCIEIO_TX_BUSY BIT(21)#define B_AX_PCIEIO_BUSY BIT(20)#define B_AX_WPDMA_BUSY BIT(19) +#define B_AX_CH12_BUSY BIT(18) +#define B_AX_CH9_BUSY BIT(17) +#define B_AX_CH8_BUSY BIT(16) +#define B_AX_ACH7_BUSY BIT(15) +#define B_AX_ACH6_BUSY BIT(14) +#define B_AX_ACH5_BUSY BIT(13) +#define B_AX_ACH4_BUSY BIT(12) +#define B_AX_ACH3_BUSY BIT(11) +#define B_AX_ACH2_BUSY BIT(10) +#define B_AX_ACH1_BUSY BIT(9) +#define B_AX_ACH0_BUSY BIT(8) +#define B_AX_RPQ_BUSY BIT(1) +#define B_AX_RXQ_BUSY BIT(0)#define R_AX_PCIE_DMA_BUSY2 0x131C#define B_AX_CH11_BUSY BIT(1)
@@ -628,6 +641,9 @@ struct rtw89_pci_info {u32 txbd_rwptr_clr2_reg;u32 dma_stop1_reg;u32 dma_stop2_reg; +u32 dma_busy1_reg; +u32 dma_busy2_reg; +u32 dma_busy3_reg;const struct rtw89_pci_ch_dma_addr_set *dma_addr_set;
drivers/net/wireless/realtek/rtw89/reg.h +31 -0
@@ -111,6 +111,14 @@#define R_AX_HCI_OPT_CTRL 0x0074#define BIT_WAKE_CTRL BIT(5) +#define R_AX_HCI_BG_CTRL 0x0078 +#define B_AX_IBX_EN_VALUE BIT(15) +#define B_AX_IB_EN_VALUE BIT(14) +#define B_AX_FORCED_IB_EN BIT(4) +#define B_AX_EN_REGBG BIT(3) +#define B_AX_R_AX_BG_LPF BIT(2) +#define B_AX_R_AX_BG GENMASK(1, 0) +#define R_AX_PLATFORM_ENABLE 0x0088#define B_AX_WCPU_EN BIT(1)#define B_AX_PLATFORM_EN BIT(0)
@@ -256,6 +264,21 @@#define B_AX_STOP_ACH1 BIT(9)#define B_AX_STOP_ACH0 BIT(8) +#define R_AX_HAXI_DMA_BUSY1 0x101C +#define B_AX_HAXIIO_BUSY BIT(20) +#define B_AX_WPDMA_BUSY BIT(19) +#define B_AX_CH12_BUSY BIT(18) +#define B_AX_CH9_BUSY BIT(17) +#define B_AX_CH8_BUSY BIT(16) +#define B_AX_ACH7_BUSY BIT(15) +#define B_AX_ACH6_BUSY BIT(14) +#define B_AX_ACH5_BUSY BIT(13) +#define B_AX_ACH4_BUSY BIT(12) +#define B_AX_ACH3_BUSY BIT(11) +#define B_AX_ACH2_BUSY BIT(10) +#define B_AX_ACH1_BUSY BIT(9) +#define B_AX_ACH0_BUSY BIT(8) +#define R_AX_PCIE_DBG_CTRL 0x11C0#define B_AX_DBG_DUMMY_MASK GENMASK(23, 16)#define B_AX_DBG_SEL_MASK GENMASK(15, 13)
@@ -268,6 +291,14 @@#define B_AX_STOP_CH11 BIT(1)#define B_AX_STOP_CH10 BIT(0) +#define R_AX_HAXI_DMA_BUSY2 0x11C8 +#define B_AX_CH11_BUSY BIT(1) +#define B_AX_CH10_BUSY BIT(0) + +#define R_AX_HAXI_DMA_BUSY3 0x1208 +#define B_AX_RPQ_BUSY BIT(1) +#define B_AX_RXQ_BUSY BIT(0) +#define R_AX_HCI_FC_CTRL_V1 0x1700#define R_AX_CH_PAGE_CTRL_V1 0x1704
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +3 -0
@@ -34,6 +34,9 @@ static const struct rtw89_pci_info rtw8852a_pci_info = { .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_busy1_reg = R_AX_PCIE_DMA_BUSY1, + .dma_busy2_reg = R_AX_PCIE_DMA_BUSY2, + .dma_busy3_reg = R_AX_PCIE_DMA_BUSY1, .dma_addr_set = &rtw89_pci_ch_dma_addr_set,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +3 -0
@@ -35,6 +35,9 @@ static const struct rtw89_pci_info rtw8852c_pci_info = { .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_busy1_reg = R_AX_HAXI_DMA_BUSY1, + .dma_busy2_reg = R_AX_HAXI_DMA_BUSY2, + .dma_busy3_reg = R_AX_HAXI_DMA_BUSY3, .dma_addr_set = &rtw89_pci_ch_dma_addr_set_v1,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/16 rtw89: pci: set address info registers depends on chips
In reply to Ping-Ke ShihAddress info registers are used to configure size of DMA address info to point skb->data. With different size, it can support different number of scatters.
--- drivers/net/wireless/realtek/rtw89/pci.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +8 -5
@@ -2348,6 +2348,7 @@ EXPORT_SYMBOL(rtw89_pci_ltr_set_v1);static int rtw89_pci_ops_mac_post_init (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info; +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;int ret; ret = info->ltr_set (rtwdev, true);
@@ -2355,14 +2356,16 @@ static int rtw89_pci_ops_mac_post_init(struct rtw89_dev *rtwdev)rtw89_err (rtwdev,"pci ltr set fail\n" );return ret; } -if (rtwdev->chip->chip_id ==RTL8852A ) { +if (chip_id ==RTL8852A ) {/* ltr sw trigger */ rtw89_write32_set (rtwdev,R_AX_LTR_CTRL_0 ,B_AX_APP_LTR_ACT ); } -/* ADDR info 8-byte mode */ -rtw89_write32_set (rtwdev,R_AX_TX_ADDRESS_INFO_MODE_SETTING , -B_AX_HOST_ADDR_INFO_8B_SEL ); -rtw89_write32_clr (rtwdev,R_AX_PKTIN_SETTING ,B_AX_WD_ADDR_INFO_LENGTH ); +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) { +/* ADDR info 8-byte mode */ +rtw89_write32_set (rtwdev,R_AX_TX_ADDRESS_INFO_MODE_SETTING , +B_AX_HOST_ADDR_INFO_8B_SEL ); +rtw89_write32_clr (rtwdev,R_AX_PKTIN_SETTING ,B_AX_WD_ADDR_INFO_LENGTH ); + }/* enable DMA for all queues */ rtw89_write32_clr (rtwdev, info->dma_stop1_reg,B_AX_TX_STOP1_ALL );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/16 rtw89: pci: add register definition to rtw89_pci_info to generalize pci code
In reply to Ping-Ke ShihThe PCI code of 8852AE and 8852CE are different, but the flow and register names are similar. To reuse the code, add a struct to define register or value accordingly. We also use chip id to control the slightly different flow.
--- drivers/net/wireless/realtek/rtw89/pci.c | 138 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/pci.h | 68 +++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 40 +++++ .../net/wireless/realtek/rtw89/rtw8852ae.c | 11 ++ .../net/wireless/realtek/rtw89/rtw8852ce.c | 11 ++ 5 files changed, 238 insertions(+), 30 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +108 -30
@@ -1426,16 +1426,23 @@ static void rtw89_pci_ops_write32(struct rtw89_dev *rtwdev, u32 addr, u32 data)static void rtw89_pci_ctrl_dma_all (struct rtw89_dev *rtwdev,bool enable) { +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id; +const struct rtw89_pci_info *info = rtwdev->pci_info; +u32 txhci_en = info->txhci_en_bit; +u32 rxhci_en = info->rxhci_en_bit; +if (enable) { +if (chip_id !=RTL8852C ) +rtw89_write32_clr (rtwdev, info->dma_stop1_reg, +B_AX_STOP_PCIEIO );rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , -B_AX_TXHCI_EN |B_AX_RXHCI_EN ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP1 , -B_AX_STOP_PCIEIO ); + txhci_en | rxhci_en); }else { -rtw89_write32_set (rtwdev,R_AX_PCIE_DMA_STOP1 , -B_AX_STOP_PCIEIO ); +if (chip_id !=RTL8852C ) +rtw89_write32_set (rtwdev, info->dma_stop1_reg, +B_AX_STOP_PCIEIO );rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 , -B_AX_TXHCI_EN |B_AX_RXHCI_EN ); + txhci_en | rxhci_en); } }
@@ -1500,6 +1507,28 @@ rtw89_write16_mdio(struct rtw89_dev *rtwdev, u8 addr, u16 data, u8 speed)return 0 ; } +static int +rtw89_write16_mdio_mask (struct rtw89_dev *rtwdev,u8 addr,u16 mask,u16 data,u8 speed) +{ +u32 shift; +int ret; +u16 val; + + ret =rtw89_read16_mdio (rtwdev, addr, speed, &val); +if (!ret) +return ret; + + shift =__ffs (mask); + val &= ~mask; + val |= ((data << shift) & mask); + + ret =rtw89_write16_mdio (rtwdev, addr, val, speed); +if (!ret) +return ret; + +return 0 ; +} +static int rtw89_write16_mdio_set (struct rtw89_dev *rtwdev,u8 addr,u16 mask,u8 speed) {int ret;
@@ -1628,8 +1657,7 @@ static int rtw89_pci_auto_refclk_cal(struct rtw89_dev *rtwdev, bool autook_en)bool l1_flag = false;int ret =0 ; -if ((rtwdev->chip->chip_id ==RTL8852A && rtwdev->hal.cv ==CHIP_CBV ) || - rtwdev->chip->chip_id ==RTL8852C ) +if (rtwdev->chip->chip_id !=RTL8852B )return 0 ; ret =rtw89_pci_read_config_byte (rtwdev,RTW89_PCIE_PHY_RATE , &val8);
@@ -1793,12 +1821,15 @@ static int rtw89_pci_deglitch_setting(struct rtw89_dev *rtwdev)static void rtw89_pci_rxdma_prefth (struct rtw89_dev *rtwdev) { +if (rtwdev->chip->chip_id !=RTL8852A ) +return ; +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_DIS_RXDMA_PRE ); }static void rtw89_pci_l1off_pwroff (struct rtw89_dev *rtwdev) { -if (rtwdev->chip->chip_id ==RTL8852C ) +if (rtwdev->chip->chip_id !=RTL8852A && rtwdev->chip->chip_id !=RTL8852B )return ;rtw89_write32_clr (rtwdev,R_AX_PCIE_PS_CTRL ,B_AX_L1OFF_PWR_OFF_EN );
@@ -1808,7 +1839,7 @@ static u32 rtw89_pci_l2_rxen_lat(struct rtw89_dev *rtwdev) {int ret; -if (rtwdev->chip->chip_id ==RTL8852C ) +if (rtwdev->chip->chip_id !=RTL8852A )return 0 ; ret = rtw89_write16_mdio_clr(rtwdev, RAC_ANA26, B_AX_RXEN,
@@ -1843,6 +1874,40 @@ static void rtw89_pci_hci_ldo(struct rtw89_dev *rtwdev) B_AX_PCIE_DIS_WLSUS_AFT_PDN); } +static int rtw89_pci_dphy_delay (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id !=RTL8852B ) +return 0 ; + +return rtw89_write16_mdio_mask (rtwdev,RAC_REG_REV2 ,BAC_CMU_EN_DLY_MASK , +PCIE_DPHY_DLY_25US ,PCIE_PHY_GEN1 ); +} + +static void rtw89_pci_power_wake (struct rtw89_dev *rtwdev,bool pwr_up) +{ +if (pwr_up) +rtw89_write32_set (rtwdev,R_AX_HCI_OPT_CTRL ,BIT_WAKE_CTRL ); +else +rtw89_write32_clr (rtwdev,R_AX_HCI_OPT_CTRL ,BIT_WAKE_CTRL ); +} + +static void rtw89_pci_autoload_hang (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id !=RTL8852C ) +return ; + +rtw89_write32_set (rtwdev,R_AX_PCIE_BG_CLR ,B_AX_BG_CLR_ASYNC_M3 ); +rtw89_write32_clr (rtwdev,R_AX_PCIE_BG_CLR ,B_AX_BG_CLR_ASYNC_M3 ); +} + +static void rtw89_pci_l12_vmain (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id !=RTL8852C && rtwdev->hal.cv ==CHIP_CAV ) +return ; + +rtw89_write32_set (rtwdev,R_AX_SYS_SDIO_CTRL ,B_AX_PCIE_FORCE_PWR_NGAT ); +} +static void rtw89_pci_set_sic (struct rtw89_dev *rtwdev) {if (rtwdev->chip->chip_id ==RTL8852C )
@@ -1867,19 +1932,23 @@ static void rtw89_pci_set_dbg(struct rtw89_dev *rtwdev)static void rtw89_pci_clr_idx_all (struct rtw89_dev *rtwdev) { +const struct rtw89_pci_info *info = rtwdev->pci_info; +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;u32 val =B_AX_CLR_ACH0_IDX |B_AX_CLR_ACH1_IDX |B_AX_CLR_ACH2_IDX |B_AX_CLR_ACH3_IDX |B_AX_CLR_CH8_IDX |B_AX_CLR_CH9_IDX |B_AX_CLR_CH12_IDX ; +u32 rxbd_rwptr_clr = info->rxbd_rwptr_clr_reg; +u32 txbd_rwptr_clr2 = info->txbd_rwptr_clr2_reg; -if (rtwdev->chip->chip_id ==RTL8852A ) +if (chip_id ==RTL8852A || chip_id ==RTL8852C ) val |=B_AX_CLR_ACH4_IDX |B_AX_CLR_ACH5_IDX |B_AX_CLR_ACH6_IDX |B_AX_CLR_ACH7_IDX ;/* clear DMA indexes */ rtw89_write32_set (rtwdev,R_AX_TXBD_RWPTR_CLR1 , val); -if (rtwdev->chip->chip_id ==RTL8852A ) -rtw89_write32_set (rtwdev,R_AX_TXBD_RWPTR_CLR2 , +if (chip_id ==RTL8852A || chip_id ==RTL8852C ) +rtw89_write32_set (rtwdev, txbd_rwptr_clr2,B_AX_CLR_CH10_IDX |B_AX_CLR_CH11_IDX ); -rtw89_write32_set (rtwdev,R_AX_RXBD_RWPTR_CLR , +rtw89_write32_set (rtwdev, rxbd_rwptr_clr,B_AX_CLR_RXQ_IDX |B_AX_CLR_RPQ_IDX ); }
@@ -1897,6 +1966,7 @@ static int rtw89_pci_ops_deinit(struct rtw89_dev *rtwdev)static int rtw89_pci_ops_mac_pre_init (struct rtw89_dev *rtwdev) { +const struct rtw89_pci_info *info = rtwdev->pci_info;u32 dma_busy;u32 check;u32 lbc;
@@ -1913,6 +1983,7 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)rtw89_pci_aphy_pwrcut (rtwdev);rtw89_pci_hci_ldo (rtwdev); +rtw89_pci_dphy_delay (rtwdev); ret =rtw89_pci_auto_refclk_cal (rtwdev, false);if (ret) {
@@ -1920,21 +1991,26 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)return ret; } +rtw89_pci_power_wake (rtwdev, true); +rtw89_pci_autoload_hang (rtwdev); +rtw89_pci_l12_vmain (rtwdev);rtw89_pci_set_sic (rtwdev);rtw89_pci_set_dbg (rtwdev); -if (rtwdev->chip->chip_id ==RTL8852A ) +if (rtwdev->chip->chip_id ==RTL8852A ) {rtw89_write32_clr (rtwdev,R_AX_SYS_SDIO_CTRL ,B_AX_PCIE_AUXCLK_GATE ); - lbc =rtw89_read32 (rtwdev,R_AX_LBC_WATCHDOG ); - lbc =u32_replace_bits (lbc,RTW89_MAC_LBC_TMR_128US ,B_AX_LBC_TIMER ); - lbc |=B_AX_LBC_FLAG |B_AX_LBC_EN ; -rtw89_write32 (rtwdev,R_AX_LBC_WATCHDOG , lbc); + lbc =rtw89_read32 (rtwdev,R_AX_LBC_WATCHDOG ); + lbc =u32_replace_bits (lbc,RTW89_MAC_LBC_TMR_128US ,B_AX_LBC_TIMER ); + lbc |=B_AX_LBC_FLAG |B_AX_LBC_EN ; +rtw89_write32 (rtwdev,R_AX_LBC_WATCHDOG , lbc); -rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , -B_AX_PCIE_TXRST_KEEP_REG |B_AX_PCIE_RXRST_KEEP_REG ); -rtw89_write32_set (rtwdev,R_AX_PCIE_DMA_STOP1 ,B_AX_STOP_WPDMA ); +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , +B_AX_PCIE_TXRST_KEEP_REG |B_AX_PCIE_RXRST_KEEP_REG ); + } + +rtw89_write32_set (rtwdev, info->dma_stop1_reg,B_AX_STOP_WPDMA );/* stop DMA activities */ rtw89_pci_ctrl_dma_all (rtwdev, false);
@@ -1975,9 +2051,9 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev) }/* enable FW CMD queue to download firmware */ -rtw89_write32_set (rtwdev,R_AX_PCIE_DMA_STOP1 ,B_AX_TX_STOP1_ALL ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP1 ,B_AX_STOP_CH12 ); -rtw89_write32_set (rtwdev,R_AX_PCIE_DMA_STOP2 ,B_AX_TX_STOP2_ALL ); +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 );/* start DMA activities */ rtw89_pci_ctrl_dma_all (rtwdev, true);
@@ -2018,6 +2094,7 @@ static int rtw89_pci_ltr_set(struct rtw89_dev *rtwdev)static int rtw89_pci_ops_mac_post_init (struct rtw89_dev *rtwdev) { +const struct rtw89_pci_info *info = rtwdev->pci_info;int ret; ret =rtw89_pci_ltr_set (rtwdev);
@@ -2035,11 +2112,11 @@ static int rtw89_pci_ops_mac_post_init(struct rtw89_dev *rtwdev)rtw89_write32_clr (rtwdev,R_AX_PKTIN_SETTING ,B_AX_WD_ADDR_INFO_LENGTH );/* enable DMA for all queues */ -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP1 ,B_AX_TX_STOP1_ALL ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP2 ,B_AX_TX_STOP2_ALL ); +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 );/* Release PCI IO */ -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP1 , +rtw89_write32_clr (rtwdev, info->dma_stop1_reg,B_AX_STOP_WPDMA |B_AX_STOP_PCIEIO );return 0 ;
@@ -2767,17 +2844,18 @@ static void rtw89_pci_l1ss_cfg(struct rtw89_dev *rtwdev)static void rtw89_pci_ctrl_dma_all_pcie (struct rtw89_dev *rtwdev,u8 en) { +const struct rtw89_pci_info *info = rtwdev->pci_info;u32 val32;if (en ==MAC_AX_FUNC_EN ) { val32 =B_AX_STOP_PCIEIO ; -rtw89_write32_clr (rtwdev,R_AX_PCIE_DMA_STOP1 , val32); +rtw89_write32_clr (rtwdev, info->dma_stop1_reg, val32); val32 =B_AX_TXHCI_EN |B_AX_RXHCI_EN ;rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 , val32); }else { val32 =B_AX_STOP_PCIEIO ; -rtw89_write32_set (rtwdev,R_AX_PCIE_DMA_STOP1 , val32); +rtw89_write32_set (rtwdev, info->dma_stop1_reg, val32); val32 =B_AX_TXHCI_EN |B_AX_RXHCI_EN ;rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 , val32);
drivers/net/wireless/realtek/rtw89/pci.h +68 -0
103 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +40 -0
@@ -103,10 +103,14 @@#define R_AX_SYS_SDIO_CTRL 0x0070#define B_AX_PCIE_DIS_L2_CTRL_LDO_HCI BIT(15)#define B_AX_PCIE_DIS_WLSUS_AFT_PDN BIT(14) +#define B_AX_PCIE_FORCE_PWR_NGAT BIT(13)#define B_AX_PCIE_CALIB_EN_V1 BIT(12)#define B_AX_PCIE_AUXCLK_GATE BIT(11)#define B_AX_LTE_MUX_CTRL_PATH BIT(26) +#define R_AX_HCI_OPT_CTRL 0x0074 +#define BIT_WAKE_CTRL BIT(5) +#define R_AX_PLATFORM_ENABLE 0x0088#define B_AX_WCPU_EN BIT(1)#define B_AX_PLATFORM_EN BIT(0)
@@ -220,6 +224,38 @@#define R_AX_FILTER_MODEL_ADDR 0x0C04 +#define R_AX_HAXI_INIT_CFG1 0x1000 +#define B_AX_WD_ITVL_IDLE_V1_MASK GENMASK(31, 28) +#define B_AX_WD_ITVL_ACT_V1_MASK GENMASK(27, 24) +#define B_AX_DMA_MODE_MASK GENMASK(19, 18) +#define DMA_MOD_PCIE_1B 0x0 +#define DMA_MOD_PCIE_4B 0x1 +#define DMA_MOD_USB 0x2 +#define DMA_MOD_SDIO 0x3 +#define B_AX_STOP_AXI_MST BIT(17) +#define B_AX_HAXI_RST_KEEP_REG BIT(16) +#define B_AX_RXHCI_EN_V1 BIT(15) +#define B_AX_RXBD_MODE_V1 BIT(14) +#define B_AX_HAXI_MAX_RXDMA_MASK GENMASK(9, 8) +#define B_AX_TXHCI_EN_V1 BIT(7) +#define B_AX_FLUSH_AXI_MST BIT(4) +#define B_AX_RST_BDRAM BIT(3) +#define B_AX_HAXI_MAX_TXDMA_MASK GENMASK(1, 0) + +#define R_AX_HAXI_DMA_STOP1 0x1010 +#define B_AX_STOP_WPDMA BIT(19) +#define B_AX_STOP_CH12 BIT(18) +#define B_AX_STOP_CH9 BIT(17) +#define B_AX_STOP_CH8 BIT(16) +#define B_AX_STOP_ACH7 BIT(15) +#define B_AX_STOP_ACH6 BIT(14) +#define B_AX_STOP_ACH5 BIT(13) +#define B_AX_STOP_ACH4 BIT(12) +#define B_AX_STOP_ACH3 BIT(11) +#define B_AX_STOP_ACH2 BIT(10) +#define B_AX_STOP_ACH1 BIT(9) +#define B_AX_STOP_ACH0 BIT(8) +#define R_AX_PCIE_DBG_CTRL 0x11C0#define B_AX_DBG_DUMMY_MASK GENMASK(23, 16)#define B_AX_DBG_SEL_MASK GENMASK(15, 13)
@@ -228,6 +264,10 @@#define B_AX_ASFF_FULL_NO_STK BIT(1)#define B_AX_EN_STUCK_DBG BIT(0) +#define R_AX_HAXI_DMA_STOP2 0x11C0 +#define B_AX_STOP_CH11 BIT(1) +#define B_AX_STOP_CH10 BIT(0) +#define R_AX_HCI_FC_CTRL_V1 0x1700#define R_AX_CH_PAGE_CTRL_V1 0x1704
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +11 -0
@@ -9,6 +9,17 @@#include "rtw8852a.h" static const struct rtw89_pci_info rtw8852a_pci_info = { + .init_cfg_reg =R_AX_PCIE_INIT_CFG1 , + .txhci_en_bit =B_AX_TXHCI_EN , + .rxhci_en_bit =B_AX_RXHCI_EN , + .rxbd_mode_bit =B_AX_RXBD_MODE , + .exp_ctrl_reg =R_AX_PCIE_EXP_CTRL , + .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_addr_set = &rtw89_pci_ch_dma_addr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +11 -0
@@ -10,6 +10,17 @@#include "rtw8852c.h" static const struct rtw89_pci_info rtw8852c_pci_info = { + .init_cfg_reg =R_AX_HAXI_INIT_CFG1 , + .txhci_en_bit =B_AX_TXHCI_EN_V1 , + .rxhci_en_bit =B_AX_RXHCI_EN_V1 , + .rxbd_mode_bit =B_AX_RXBD_MODE_V1 , + .exp_ctrl_reg =R_AX_HAXI_EXP_CTRL , + .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_addr_set = &rtw89_pci_ch_dma_addr_set_v1, .fill_txaddr_info = rtw89_pci_fill_txaddr_info_v1,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 2/16 rtw89: pci: add pci attributes to configure operating mode
In reply to Ping-Ke ShihRefine operating mode function to support variant chips.
--- drivers/net/wireless/realtek/rtw89/pci.c | 133 ++++++++++++++++-- drivers/net/wireless/realtek/rtw89/pci.h | 114 +++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852ae.c | 15 ++ .../net/wireless/realtek/rtw89/rtw8852ce.c | 15 ++ 4 files changed, 262 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +118 -15
@@ -1917,6 +1917,33 @@ static void rtw89_pci_set_sic(struct rtw89_dev *rtwdev) B_AX_SIC_EN_FORCE_CLKREQ); } +static void rtw89_pci_set_io_rcy (struct rtw89_dev *rtwdev) +{ +const struct rtw89_pci_info *info = rtwdev->pci_info; +u32 val32; + +if (rtwdev->chip->chip_id !=RTL8852C ) +return ; + +if (info->io_rcy_en ==MAC_AX_PCIE_ENABLE ) { + val32 =FIELD_PREP (B_AX_PCIE_WDT_TIMER_M1_MASK , + info->io_rcy_tmr); +rtw89_write32 (rtwdev,R_AX_PCIE_WDT_TIMER_M1 , val32); +rtw89_write32 (rtwdev,R_AX_PCIE_WDT_TIMER_M2 , val32); +rtw89_write32 (rtwdev,R_AX_PCIE_WDT_TIMER_E0 , val32); + +rtw89_write32_set (rtwdev,R_AX_PCIE_IO_RCY_M1 ,B_AX_PCIE_IO_RCY_WDT_MODE_M1 ); +rtw89_write32_set (rtwdev,R_AX_PCIE_IO_RCY_M2 ,B_AX_PCIE_IO_RCY_WDT_MODE_M2 ); +rtw89_write32_set (rtwdev,R_AX_PCIE_IO_RCY_E0 ,B_AX_PCIE_IO_RCY_WDT_MODE_E0 ); + }else { +rtw89_write32_clr (rtwdev,R_AX_PCIE_IO_RCY_M1 ,B_AX_PCIE_IO_RCY_WDT_MODE_M1 ); +rtw89_write32_clr (rtwdev,R_AX_PCIE_IO_RCY_M2 ,B_AX_PCIE_IO_RCY_WDT_MODE_M2 ); +rtw89_write32_clr (rtwdev,R_AX_PCIE_IO_RCY_E0 ,B_AX_PCIE_IO_RCY_WDT_MODE_E0 ); + } + +rtw89_write32_clr (rtwdev,R_AX_PCIE_IO_RCY_S1 ,B_AX_PCIE_IO_RCY_WDT_MODE_S1 ); +} +static void rtw89_pci_set_dbg (struct rtw89_dev *rtwdev) {if (rtwdev->chip->chip_id ==RTL8852C )
@@ -1952,6 +1979,95 @@ static void rtw89_pci_clr_idx_all(struct rtw89_dev *rtwdev) B_AX_CLR_RXQ_IDX | B_AX_CLR_RPQ_IDX); } +static int rtw89_pci_mode_op (struct rtw89_dev *rtwdev) +{ +const struct rtw89_pci_info *info = rtwdev->pci_info; +enum mac_ax_bd_trunc_mode txbd_trunc_mode = info->txbd_trunc_mode; +enum mac_ax_bd_trunc_mode rxbd_trunc_mode = info->rxbd_trunc_mode; +enum mac_ax_rxbd_mode rxbd_mode = info->rxbd_mode; +enum mac_ax_tag_mode tag_mode = info->tag_mode; +enum mac_ax_wd_dma_intvl wd_dma_idle_intvl = info->wd_dma_idle_intvl; +enum mac_ax_wd_dma_intvl wd_dma_act_intvl = info->wd_dma_act_intvl; +enum mac_ax_tx_burst tx_burst = info->tx_burst; +enum mac_ax_rx_burst rx_burst = info->rx_burst; +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id; +u8 cv = rtwdev->hal.cv; +u32 val32; + +if (txbd_trunc_mode ==MAC_AX_BD_TRUNC ) { +if (chip_id ==RTL8852A && cv ==CHIP_CBV ) +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_TX_TRUNC_MODE ); + }else if (txbd_trunc_mode ==MAC_AX_BD_NORM ) { +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) +rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_TX_TRUNC_MODE ); + } + +if (rxbd_trunc_mode ==MAC_AX_BD_TRUNC ) { +if (chip_id ==RTL8852A && cv ==CHIP_CBV ) +rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_RX_TRUNC_MODE ); + }else if (rxbd_trunc_mode ==MAC_AX_BD_NORM ) { +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) +rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_RX_TRUNC_MODE ); + } + +if (rxbd_mode ==MAC_AX_RXBD_PKT ) { +rtw89_write32_clr (rtwdev, info->init_cfg_reg, info->rxbd_mode_bit); + }else if (rxbd_mode ==MAC_AX_RXBD_SEP ) { +rtw89_write32_set (rtwdev, info->init_cfg_reg, info->rxbd_mode_bit); + +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) +rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG2 , +B_AX_PCIE_RX_APPLEN_MASK ,0 ); + } + +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) { +rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_PCIE_MAX_TXDMA_MASK , tx_burst); +rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_PCIE_MAX_RXDMA_MASK , rx_burst); + }else if (chip_id ==RTL8852C ) { +rtw89_write32_mask (rtwdev,R_AX_HAXI_INIT_CFG1 ,B_AX_HAXI_MAX_TXDMA_MASK , tx_burst); +rtw89_write32_mask (rtwdev,R_AX_HAXI_INIT_CFG1 ,B_AX_HAXI_MAX_RXDMA_MASK , rx_burst); + } + +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) { +if (tag_mode ==MAC_AX_TAG_SGL ) { + val32 =rtw89_read32 (rtwdev,R_AX_PCIE_INIT_CFG1 ) & + ~B_AX_LATENCY_CONTROL ; +rtw89_write32 (rtwdev,R_AX_PCIE_INIT_CFG1 , val32); + }else if (tag_mode ==MAC_AX_TAG_MULTI ) { + val32 =rtw89_read32 (rtwdev,R_AX_PCIE_INIT_CFG1 ) | +B_AX_LATENCY_CONTROL ; +rtw89_write32 (rtwdev,R_AX_PCIE_INIT_CFG1 , val32); + } + } + +rtw89_write32_mask (rtwdev, info->exp_ctrl_reg, info->max_tag_num_mask, + info->multi_tag_num); + +if (chip_id ==RTL8852A || chip_id ==RTL8852B ) { +rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG2 ,B_AX_WD_ITVL_IDLE , + wd_dma_idle_intvl); +rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG2 ,B_AX_WD_ITVL_ACT , + wd_dma_act_intvl); + }else if (chip_id ==RTL8852C ) { +rtw89_write32_mask (rtwdev,R_AX_HAXI_INIT_CFG1 ,B_AX_WD_ITVL_IDLE_V1_MASK , + wd_dma_idle_intvl); +rtw89_write32_mask (rtwdev,R_AX_HAXI_INIT_CFG1 ,B_AX_WD_ITVL_ACT_V1_MASK , + wd_dma_act_intvl); + } + +if (txbd_trunc_mode ==MAC_AX_BD_TRUNC ) { +rtw89_write32_set (rtwdev,R_AX_TX_ADDRESS_INFO_MODE_SETTING , +B_AX_HOST_ADDR_INFO_8B_SEL ); +rtw89_write32_clr (rtwdev,R_AX_PKTIN_SETTING ,B_AX_WD_ADDR_INFO_LENGTH ); + }else if (txbd_trunc_mode ==MAC_AX_BD_NORM ) { +rtw89_write32_clr (rtwdev,R_AX_TX_ADDRESS_INFO_MODE_SETTING , +B_AX_HOST_ADDR_INFO_8B_SEL ); +rtw89_write32_set (rtwdev,R_AX_PKTIN_SETTING ,B_AX_WD_ADDR_INFO_LENGTH ); + } + +return 0 ; +} +static int rtw89_pci_ops_deinit (struct rtw89_dev *rtwdev) {if (rtwdev->chip->chip_id ==RTL8852A ) {
@@ -1995,6 +2111,7 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)rtw89_pci_autoload_hang (rtwdev);rtw89_pci_l12_vmain (rtwdev);rtw89_pci_set_sic (rtwdev); +rtw89_pci_set_io_rcy (rtwdev);rtw89_pci_set_dbg (rtwdev);if (rtwdev->chip->chip_id ==RTL8852A ) {
@@ -2025,21 +2142,7 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev) }rtw89_pci_clr_idx_all (rtwdev); - -/* configure TX/RX op modes */ -rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_TX_TRUNC_MODE | -B_AX_RX_TRUNC_MODE ); -rtw89_write32_clr (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_RXBD_MODE ); -rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_PCIE_MAX_TXDMA_MASK ,7 ); -rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_PCIE_MAX_RXDMA_MASK ,3 ); -/* multi-tag mode */ -rtw89_write32_set (rtwdev,R_AX_PCIE_INIT_CFG1 ,B_AX_LATENCY_CONTROL ); -rtw89_write32_mask (rtwdev,R_AX_PCIE_EXP_CTRL ,B_AX_MAX_TAG_NUM , -RTW89_MAC_TAG_NUM_8 ); -rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG2 ,B_AX_WD_ITVL_IDLE , -RTW89_MAC_WD_DMA_INTVL_256NS ); -rtw89_write32_mask (rtwdev,R_AX_PCIE_INIT_CFG2 ,B_AX_WD_ITVL_ACT , -RTW89_MAC_WD_DMA_INTVL_256NS ); +rtw89_pci_mode_op (rtwdev);/* fill TRX BD indexes */ rtw89_pci_ops_reset (rtwdev);
drivers/net/wireless/realtek/rtw89/pci.h +114 -0
126 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +15 -0
@@ -9,6 +9,21 @@#include "rtw8852a.h" static const struct rtw89_pci_info rtw8852a_pci_info = { + .txbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_mode =MAC_AX_RXBD_PKT , + .tag_mode =MAC_AX_TAG_MULTI , + .tx_burst =MAC_AX_TX_BURST_2048B , + .rx_burst =MAC_AX_RX_BURST_128B , + .wd_dma_idle_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .wd_dma_act_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .multi_tag_num =MAC_AX_TAG_NUM_8 , + .lbc_en =MAC_AX_PCIE_ENABLE , + .lbc_tmr =MAC_AX_LBC_TMR_2MS , + .autok_en =MAC_AX_PCIE_DISABLE , + .io_rcy_en =MAC_AX_PCIE_DISABLE , + .io_rcy_tmr =MAC_AX_IO_RCY_ANA_TMR_6MS , + .init_cfg_reg =R_AX_PCIE_INIT_CFG1 , .txhci_en_bit =B_AX_TXHCI_EN , .rxhci_en_bit =B_AX_RXHCI_EN ,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +15 -0
@@ -10,6 +10,21 @@#include "rtw8852c.h" static const struct rtw89_pci_info rtw8852c_pci_info = { + .txbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_mode =MAC_AX_RXBD_PKT , + .tag_mode =MAC_AX_TAG_MULTI , + .tx_burst =MAC_AX_TX_BURST_V1_256B , + .rx_burst =MAC_AX_RX_BURST_V1_128B , + .wd_dma_idle_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .wd_dma_act_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .multi_tag_num =MAC_AX_TAG_NUM_8 , + .lbc_en =MAC_AX_PCIE_ENABLE , + .lbc_tmr =MAC_AX_LBC_TMR_2MS , + .autok_en =MAC_AX_PCIE_DISABLE , + .io_rcy_en =MAC_AX_PCIE_ENABLE , + .io_rcy_tmr =MAC_AX_IO_RCY_ANA_TMR_6MS , + .init_cfg_reg =R_AX_HAXI_INIT_CFG1 , .txhci_en_bit =B_AX_TXHCI_EN_V1 , .rxhci_en_bit =B_AX_RXHCI_EN_V1 ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/16 rtw89: pci: add deglitch setting
In reply to Ping-Ke ShihAdd setting to support 8852ce.
--- drivers/net/wireless/realtek/rtw89/pci.c | 27 ++++++++++++++---------- drivers/net/wireless/realtek/rtw89/pci.h | 3 +++ 2 files changed, 19 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +16 -11
@@ -1809,19 +1809,24 @@ static int rtw89_pci_auto_refclk_cal(struct rtw89_dev *rtwdev, bool autook_en)static int rtw89_pci_deglitch_setting (struct rtw89_dev *rtwdev) { +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;int ret; -if (rtwdev->chip->chip_id !=RTL8852A ) -return 0 ; - - ret =rtw89_write16_mdio_clr (rtwdev,RAC_ANA24 ,B_AX_DEGLITCH , -PCIE_PHY_GEN1 ); -if (ret) -return ret; - ret =rtw89_write16_mdio_clr (rtwdev,RAC_ANA24 ,B_AX_DEGLITCH , -PCIE_PHY_GEN2 ); -if (ret) -return ret; +if (chip_id ==RTL8852A ) { + ret =rtw89_write16_mdio_clr (rtwdev,RAC_ANA24 ,B_AX_DEGLITCH , +PCIE_PHY_GEN1 ); +if (ret) +return ret; + ret =rtw89_write16_mdio_clr (rtwdev,RAC_ANA24 ,B_AX_DEGLITCH , +PCIE_PHY_GEN2 ); +if (ret) +return ret; + }else if (chip_id ==RTL8852C ) { +rtw89_write16_clr (rtwdev,R_RAC_DIRECT_OFFSET_G1 +RAC_ANA24 *2 , +B_AX_DEGLITCH ); +rtw89_write16_clr (rtwdev,R_RAC_DIRECT_OFFSET_G2 +RAC_ANA24 *2 , +B_AX_DEGLITCH ); + }return 0 ; }
drivers/net/wireless/realtek/rtw89/pci.h +3 -0
@@ -80,6 +80,9 @@#define R_AX_PCIE_WDT_TIMER_S1 0x3128#define B_AX_PCIE_WDT_TIMER_S1_MASK GENMASK(31, 0) +#define R_RAC_DIRECT_OFFSET_G1 0x3800 +#define R_RAC_DIRECT_OFFSET_G2 0x3880 +#define RTW89_PCI_WR_RETRY_CNT 20/* Interrupts */
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/16 rtw89: pci: add L1 settings
In reply to Ping-Ke ShihConfigure L1 settings of enter and exit.
--- drivers/net/wireless/realtek/rtw89/pci.c | 18 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/pci.h | 7 +++++++ 2 files changed, 25 insertions(+)
drivers/net/wireless/realtek/rtw89/pci.c +18 -0
@@ -1935,6 +1935,22 @@ static void rtw89_pci_gen2_force_ib(struct rtw89_dev *rtwdev) B_AX_SYSON_DIS_PMCR_AX_WRMSK); } +static void rtw89_pci_l1_ent_lat (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id !=RTL8852C ) +return ; + +rtw89_write32_clr (rtwdev,R_AX_PCIE_PS_CTRL_V1 ,B_AX_SEL_REQ_ENTR_L1 ); +} + +static void rtw89_pci_wd_exit_l1 (struct rtw89_dev *rtwdev) +{ +if (rtwdev->chip->chip_id !=RTL8852C ) +return ; + +rtw89_write32_set (rtwdev,R_AX_PCIE_PS_CTRL_V1 ,B_AX_DMAC0_EXIT_L1_EN ); +} +static void rtw89_pci_set_sic (struct rtw89_dev *rtwdev) {if (rtwdev->chip->chip_id ==RTL8852C )
@@ -2228,6 +2244,8 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)rtw89_pci_autoload_hang (rtwdev);rtw89_pci_l12_vmain (rtwdev);rtw89_pci_gen2_force_ib (rtwdev); +rtw89_pci_l1_ent_lat (rtwdev); +rtw89_pci_wd_exit_l1 (rtwdev);rtw89_pci_set_sic (rtwdev);rtw89_pci_set_lbc (rtwdev);rtw89_pci_set_io_rcy (rtwdev);
drivers/net/wireless/realtek/rtw89/pci.h +7 -0
@@ -38,6 +38,13 @@#define R_AX_MDIO_WDATA 0x10A4#define R_AX_MDIO_RDATA 0x10A6 +#define R_AX_PCIE_PS_CTRL_V1 0x3008 +#define B_AX_CMAC_EXIT_L1_EN BIT(7) +#define B_AX_DMAC0_EXIT_L1_EN BIT(6) +#define B_AX_SEL_XFER_PENDING BIT(3) +#define B_AX_SEL_REQ_ENTR_L1 BIT(2) +#define B_AX_SEL_REQ_EXIT_L1 BIT(0) +#define R_AX_PCIE_BG_CLR 0x303C#define B_AX_BG_CLR_ASYNC_M3 BIT(4)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/16 rtw89: pci: add LTR setting for v1 chip
In reply to Ping-Ke ShihAdd LTR handle to PCI deinit as well.
--- drivers/net/wireless/realtek/rtw89/pci.c | 58 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/pci.h | 3 + drivers/net/wireless/realtek/rtw89/reg.h | 22 +++++++ .../net/wireless/realtek/rtw89/rtw8852ae.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 1 + 5 files changed, 83 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +56 -2
@@ -2182,10 +2182,13 @@ static int rtw89_pci_mode_op(struct rtw89_dev *rtwdev)static int rtw89_pci_ops_deinit (struct rtw89_dev *rtwdev) { +const struct rtw89_pci_info *info = rtwdev->pci_info; +if (rtwdev->chip->chip_id ==RTL8852A ) {/* ltr sw trigger */ rtw89_write32_set (rtwdev,R_AX_LTR_CTRL_0 ,B_AX_APP_LTR_IDLE ); } + info->ltr_set (rtwdev, false);rtw89_pci_ctrl_dma_all (rtwdev, false);rtw89_pci_clr_idx_all (rtwdev);
@@ -2260,10 +2263,13 @@ static int rtw89_pci_ops_mac_pre_init(struct rtw89_dev *rtwdev)return 0 ; } -static int rtw89_pci_ltr_set (struct rtw89_dev *rtwdev) +int rtw89_pci_ltr_set (struct rtw89_dev *rtwdev,bool en) {u32 val; +if (!en) +return 0 ; + val =rtw89_read32 (rtwdev,R_AX_LTR_CTRL_0 );if (rtw89_pci_ltr_is_err_reg_val (val))return -EINVAL ;
@@ -2290,13 +2296,61 @@ static int rtw89_pci_ltr_set(struct rtw89_dev *rtwdev)return 0 ; } +EXPORT_SYMBOL (rtw89_pci_ltr_set); + +int rtw89_pci_ltr_set_v1 (struct rtw89_dev *rtwdev,bool en) +{ +u32 dec_ctrl; +u32 val32; + + val32 =rtw89_read32 (rtwdev,R_AX_LTR_CTRL_0 ); +if (rtw89_pci_ltr_is_err_reg_val (val32)) +return -EINVAL ; + val32 =rtw89_read32 (rtwdev,R_AX_LTR_CTRL_1 ); +if (rtw89_pci_ltr_is_err_reg_val (val32)) +return -EINVAL ; + dec_ctrl =rtw89_read32 (rtwdev,R_AX_LTR_DEC_CTRL ); +if (rtw89_pci_ltr_is_err_reg_val (dec_ctrl)) +return -EINVAL ; + val32 =rtw89_read32 (rtwdev,R_AX_LTR_LATENCY_IDX3 ); +if (rtw89_pci_ltr_is_err_reg_val (val32)) +return -EINVAL ; + val32 =rtw89_read32 (rtwdev,R_AX_LTR_LATENCY_IDX0 ); +if (rtw89_pci_ltr_is_err_reg_val (val32)) +return -EINVAL ; + +if (!en) { + dec_ctrl &= ~(LTR_EN_BITS |B_AX_LTR_IDX_DRV_MASK |B_AX_LTR_HW_DEC_EN ); + dec_ctrl |=FIELD_PREP (B_AX_LTR_IDX_DRV_MASK ,PCIE_LTR_IDX_IDLE ) | +B_AX_LTR_REQ_DRV ; + }else { + dec_ctrl |=B_AX_LTR_HW_DEC_EN ; + } + + dec_ctrl &= ~B_AX_LTR_SPACE_IDX_V1_MASK ; + dec_ctrl |=FIELD_PREP (B_AX_LTR_SPACE_IDX_V1_MASK ,PCI_LTR_SPC_500US ); + +if (en) +rtw89_write32_set (rtwdev,R_AX_LTR_CTRL_0 , +B_AX_LTR_WD_NOEMP_CHK_V1 |B_AX_LTR_HW_EN ); +rtw89_write32_mask (rtwdev,R_AX_LTR_CTRL_0 ,B_AX_LTR_IDLE_TIMER_IDX_MASK , +PCI_LTR_IDLE_TIMER_3_2MS ); +rtw89_write32_mask (rtwdev,R_AX_LTR_CTRL_1 ,B_AX_LTR_RX0_TH_MASK ,0x28 ); +rtw89_write32_mask (rtwdev,R_AX_LTR_CTRL_1 ,B_AX_LTR_RX1_TH_MASK ,0x28 ); +rtw89_write32 (rtwdev,R_AX_LTR_DEC_CTRL , dec_ctrl); +rtw89_write32 (rtwdev,R_AX_LTR_LATENCY_IDX3 ,0x90039003 ); +rtw89_write32 (rtwdev,R_AX_LTR_LATENCY_IDX0 ,0x880b880b ); + +return 0 ; +} +EXPORT_SYMBOL (rtw89_pci_ltr_set_v1);static int rtw89_pci_ops_mac_post_init (struct rtw89_dev *rtwdev) {const struct rtw89_pci_info *info = rtwdev->pci_info;int ret; - ret =rtw89_pci_ltr_set (rtwdev); + ret = info->ltr_set (rtwdev, true);if (ret) {rtw89_err (rtwdev,"pci ltr set fail\n" );return ret;
drivers/net/wireless/realtek/rtw89/pci.h +3 -0
@@ -647,6 +647,7 @@ struct rtw89_pci_info {const struct rtw89_pci_ch_dma_addr_set *dma_addr_set; +int (*ltr_set)(struct rtw89_dev *rtwdev,bool en);u32 (*fill_txaddr_info)(struct rtw89_dev *rtwdev,void *txaddr_info_addr,u32 total_len,dma_addr_t dma,u8 *add_info_nr);
@@ -912,6 +913,8 @@ struct pci_device_id;int rtw89_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id);void rtw89_pci_remove (struct pci_dev *pdev); +int rtw89_pci_ltr_set (struct rtw89_dev *rtwdev,bool en); +int rtw89_pci_ltr_set_v1 (struct rtw89_dev *rtwdev,bool en);u32 rtw89_pci_fill_txaddr_info (struct rtw89_dev *rtwdev,void *txaddr_info_addr,u32 total_len,dma_addr_t dma,u8 *add_info_nr);
drivers/net/wireless/realtek/rtw89/reg.h +22 -0
@@ -299,6 +299,27 @@#define B_AX_RPQ_BUSY BIT(1)#define B_AX_RXQ_BUSY BIT(0) +#define R_AX_LTR_DEC_CTRL 0x1600 +#define B_AX_LTR_IDX_DRV_VLD BIT(16) +#define B_AX_LTR_CURR_IDX_DRV_MASK GENMASK(15, 14) +#define B_AX_LTR_IDX_FW_VLD BIT(13) +#define B_AX_LTR_CURR_IDX_FW_MASK GENMASK(12, 11) +#define B_AX_LTR_IDX_HW_VLD BIT(10) +#define B_AX_LTR_CURR_IDX_HW_MASK GENMASK(9, 8) +#define B_AX_LTR_REQ_DRV BIT(7) +#define B_AX_LTR_IDX_DRV_MASK GENMASK(6, 5) +#define PCIE_LTR_IDX_IDLE 3 +#define B_AX_LTR_DRV_DEC_EN BIT(4) +#define B_AX_LTR_FW_DEC_EN BIT(3) +#define B_AX_LTR_HW_DEC_EN BIT(2) +#define B_AX_LTR_SPACE_IDX_V1_MASK GENMASK(1, 0) +#define LTR_EN_BITS (B_AX_LTR_HW_DEC_EN | B_AX_LTR_FW_DEC_EN | B_AX_LTR_DRV_DEC_EN) + +#define R_AX_LTR_LATENCY_IDX0 0x1604 +#define R_AX_LTR_LATENCY_IDX1 0x1608 +#define R_AX_LTR_LATENCY_IDX2 0x160C +#define R_AX_LTR_LATENCY_IDX3 0x1610 +#define R_AX_HCI_FC_CTRL_V1 0x1700#define R_AX_CH_PAGE_CTRL_V1 0x1704
@@ -440,6 +461,7 @@#define B_AX_APP_LTR_ACT BIT(5)#define B_AX_APP_LTR_IDLE BIT(4)#define B_AX_LTR_EN BIT(1) +#define B_AX_LTR_WD_NOEMP_CHK_V1 BIT(1)#define B_AX_LTR_HW_EN BIT(0)#define R_AX_LTR_CTRL_1 0x8414
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +1 -0
@@ -40,6 +40,7 @@ static const struct rtw89_pci_info rtw8852a_pci_info = { .dma_addr_set = &rtw89_pci_ch_dma_addr_set, + .ltr_set = rtw89_pci_ltr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info, };
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +1 -0
@@ -41,6 +41,7 @@ static const struct rtw89_pci_info rtw8852c_pci_info = { .dma_addr_set = &rtw89_pci_ch_dma_addr_set_v1, + .ltr_set = rtw89_pci_ltr_set_v1, .fill_txaddr_info = rtw89_pci_fill_txaddr_info_v1, };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/16 rtw89: update STA scheduler parameters for v1 chip
In reply to Ping-Ke ShihThe v1 chip has additional setting of STA scheduler, so add it.
--- drivers/net/wireless/realtek/rtw89/mac.c | 16 +++++++++++++++- drivers/net/wireless/realtek/rtw89/reg.h | 9 +++++++++ 2 files changed, 24 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +15 -1
@@ -1636,6 +1636,17 @@ static bool dle_is_txq_empty(struct rtw89_dev *rtwdev)return false; } +static void _patch_ss2f_path (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8852B ) +return ; + +rtw89_write32_mask (rtwdev,R_AX_SS2FINFO_PATH ,B_AX_SS_DEST_QUEUE_MASK , +SS2F_PATH_WLCPU ); +} +static int sta_sch_init (struct rtw89_dev *rtwdev) {u32 p_val;
@@ -1657,7 +1668,10 @@ static int sta_sch_init(struct rtw89_dev *rtwdev)return ret; } -rtw89_write32_set (rtwdev,R_AX_SS_CTRL ,B_AX_SS_WARM_INIT_FLG ); +rtw89_write32_set (rtwdev,R_AX_SS_CTRL ,B_AX_SS_WARM_INIT_FLG | +B_AX_SS_NONEMPTY_SS2FINFO_EN ); + +_patch_ss2f_path (rtwdev);return 0 ; }
drivers/net/wireless/realtek/rtw89/reg.h +9 -0
@@ -801,8 +801,17 @@#define R_AX_SS_CTRL 0x9E10#define B_AX_SS_INIT_DONE_1 BIT(31)#define B_AX_SS_WARM_INIT_FLG BIT(29) +#define B_AX_SS_NONEMPTY_SS2FINFO_EN BIT(28)#define B_AX_SS_EN BIT(0) +#define R_AX_SS2FINFO_PATH 0x9E50 +#define B_AX_SS_UL_REL BIT(31) +#define B_AX_SS_REL_QUEUE_MASK GENMASK(29, 24) +#define B_AX_SS_REL_PORT_MASK GENMASK(18, 16) +#define B_AX_SS_DEST_QUEUE_MASK GENMASK(13, 8) +#define SS2F_PATH_WLCPU 0x0A +#define B_AX_SS_DEST_PORT_MASK GENMASK(2, 0) +#define R_AX_SS_MACID_PAUSE_0 0x9EB0#define B_AX_SS_MACID31_0_PAUSE_SH 0#define B_AX_SS_MACID31_0_PAUSE_MASK GENMASK(31, 0)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/16 rtw89: extend dmac_pre_init to support 8852C
In reply to Ping-Ke ShihDMAC is short for data MAC. 8852C has more settings than 8852A, so add them.
--- drivers/net/wireless/realtek/rtw89/mac.c | 37 +++++++++++++++++++----- drivers/net/wireless/realtek/rtw89/reg.h | 1 + 2 files changed, 31 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +30 -7
@@ -2832,18 +2832,41 @@ static int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason,return 0 ; } -static int rtw89_mac_fw_dl_pre_init (struct rtw89_dev *rtwdev) +static int rtw89_mac_dmac_pre_init (struct rtw89_dev *rtwdev) { +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;u32 val;int ret; - val =B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN |B_AX_DISPATCHER_EN | -B_AX_PKT_BUF_EN ; +if (chip_id ==RTL8852C ) + val =B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN |B_AX_DISPATCHER_EN | +B_AX_PKT_BUF_EN |B_AX_H_AXIDMA_EN ; +else + val =B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN |B_AX_DISPATCHER_EN | +B_AX_PKT_BUF_EN ;rtw89_write32 (rtwdev,R_AX_DMAC_FUNC_EN , val); val =B_AX_DISPATCHER_CLK_EN ;rtw89_write32 (rtwdev,R_AX_DMAC_CLK_EN , val); +if (chip_id !=RTL8852C ) + goto dle; + + val =rtw89_read32 (rtwdev,R_AX_HAXI_INIT_CFG1 ); + val &= ~(B_AX_DMA_MODE_MASK |B_AX_STOP_AXI_MST ); + val |=FIELD_PREP (B_AX_DMA_MODE_MASK ,DMA_MOD_PCIE_1B ) | +B_AX_TXHCI_EN_V1 |B_AX_RXHCI_EN_V1 ; +rtw89_write32 (rtwdev,R_AX_HAXI_INIT_CFG1 , val); + +rtw89_write32_clr (rtwdev,R_AX_HAXI_DMA_STOP1 , +B_AX_STOP_ACH0 |B_AX_STOP_ACH1 |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 |B_AX_STOP_ACH2 ); +rtw89_write32_clr (rtwdev,R_AX_HAXI_DMA_STOP2 ,B_AX_STOP_CH10 |B_AX_STOP_CH11 ); +rtw89_write32_set (rtwdev,R_AX_PLATFORM_ENABLE ,B_AX_AXIDMA_EN ); + +dle: ret =dle_init (rtwdev,RTW89_QTA_DLFW , rtwdev->mac.qta_mode);if (ret) {rtw89_err (rtwdev,"[ERR]DLE pre init %d\n" , ret);
@@ -2901,16 +2924,16 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev)rtw89_mac_hci_func_en (rtwdev); + ret =rtw89_mac_dmac_pre_init (rtwdev); +if (ret) +return ret; +if (rtwdev->hci.ops->mac_pre_init) { ret = rtwdev->hci.ops->mac_pre_init (rtwdev);if (ret)return ret; } - ret =rtw89_mac_fw_dl_pre_init (rtwdev); -if (ret) -return ret; -rtw89_mac_disable_cpu (rtwdev); ret =rtw89_mac_enable_cpu (rtwdev,0 , true);if (ret)
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -120,6 +120,7 @@#define B_AX_R_AX_BG GENMASK(1, 0)#define R_AX_PLATFORM_ENABLE 0x0088 +#define B_AX_AXIDMA_EN BIT(3)#define B_AX_WCPU_EN BIT(1)#define B_AX_PLATFORM_EN BIT(0)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/16 rtw89: add chip_ops::{enable,disable}_bb_rf to support v1 chip
In reply to Ping-Ke ShihThe v1 chip use specific functions to enable and disable BB/RF.
--- drivers/net/wireless/realtek/rtw89/core.c | 7 ++- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac.c | 10 ++++- drivers/net/wireless/realtek/rtw89/mac.h | 19 +++++++- drivers/net/wireless/realtek/rtw89/reg.h | 6 +++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 45 +++++++++++++++++++ 7 files changed, 86 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +5 -2
@@ -2706,8 +2706,11 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)/* efuse process */ /* pre-config BB/RF, BB reset/RFC reset */ -rtw89_mac_disable_bb_rf (rtwdev); -rtw89_mac_enable_bb_rf (rtwdev); +rtw89_chip_disable_bb_rf (rtwdev); + ret =rtw89_chip_enable_bb_rf (rtwdev); +if (ret) +return ret; +rtw89_phy_init_bb_reg (rtwdev);rtw89_phy_init_rf_reg (rtwdev);
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2059,6 +2059,8 @@ struct rtw89_hci_info { };struct rtw89_chip_ops { +int (*enable_bb_rf)(struct rtw89_dev *rtwdev); +void (*disable_bb_rf)(struct rtw89_dev *rtwdev);void (*bb_reset)(struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx);void (*bb_sethw)(struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/mac.c +8 -2
@@ -2904,7 +2904,7 @@ static void rtw89_mac_hci_func_en(struct rtw89_dev *rtwdev) B_AX_HCI_TXDMA_EN | B_AX_HCI_RXDMA_EN); } -void rtw89_mac_enable_bb_rf (struct rtw89_dev *rtwdev) +int rtw89_mac_enable_bb_rf (struct rtw89_dev *rtwdev) {rtw89_write8_set (rtwdev,R_AX_SYS_FUNC_EN ,B_AX_FEN_BBRSTB |B_AX_FEN_BB_GLB_RSTN );
@@ -2912,7 +2912,10 @@ void rtw89_mac_enable_bb_rf(struct rtw89_dev *rtwdev)B_AX_WLRF1_CTRL_7 |B_AX_WLRF1_CTRL_1 | B_AX_WLRF_CTRL_7 | B_AX_WLRF_CTRL_1);rtw89_write8_set (rtwdev,R_AX_PHYREG_SET ,PHYREG_SET_ALL_CYCLE ); + +return 0 ; } +EXPORT_SYMBOL (rtw89_mac_enable_bb_rf);void rtw89_mac_disable_bb_rf (struct rtw89_dev *rtwdev) {
@@ -2923,6 +2926,7 @@ void rtw89_mac_disable_bb_rf(struct rtw89_dev *rtwdev) B_AX_WLRF_CTRL_7 | B_AX_WLRF_CTRL_1);rtw89_write8_clr (rtwdev,R_AX_PHYREG_SET ,PHYREG_SET_ALL_CYCLE ); } +EXPORT_SYMBOL (rtw89_mac_disable_bb_rf);int rtw89_mac_partial_init (struct rtw89_dev *rtwdev) {
@@ -2968,7 +2972,9 @@ int rtw89_mac_init(struct rtw89_dev *rtwdev)if (ret) goto fail; -rtw89_mac_enable_bb_rf (rtwdev); + ret =rtw89_chip_enable_bb_rf (rtwdev); +if (ret) + goto fail; ret =rtw89_mac_sys_init (rtwdev);if (ret)
drivers/net/wireless/realtek/rtw89/mac.h +18 -1
@@ -793,8 +793,23 @@ int rtw89_mac_read_lte(struct rtw89_dev *rtwdev, const u32 offset, u32 *val);int rtw89_mac_add_vif (struct rtw89_dev *rtwdev,struct rtw89_vif *vif);int rtw89_mac_port_update (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);int rtw89_mac_remove_vif (struct rtw89_dev *rtwdev,struct rtw89_vif *vif); -void rtw89_mac_enable_bb_rf (struct rtw89_dev *rtwdev); +int rtw89_mac_enable_bb_rf (struct rtw89_dev *rtwdev);void rtw89_mac_disable_bb_rf (struct rtw89_dev *rtwdev); + +static inline int rtw89_chip_enable_bb_rf (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->enable_bb_rf (rtwdev); +} + +static inline void rtw89_chip_disable_bb_rf (struct rtw89_dev *rtwdev) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + + chip->ops->disable_bb_rf (rtwdev); +} +u32 rtw89_mac_get_err_status (struct rtw89_dev *rtwdev);int rtw89_mac_set_err_status (struct rtw89_dev *rtwdev,u32 err); void rtw89_mac_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
@@ -899,6 +914,8 @@ int rtw89_mac_get_tx_retry_limit(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, u8 *tx_retry);enum rtw89_mac_xtal_si_offset { +XTAL0 =0x0 , +XTAL3 =0x3 ,XTAL_SI_XTAL_SC_XI =0x04 ,#define XTAL_SC_XI_MASK GENMASK(7, 0) XTAL_SI_XTAL_SC_XO = 0x05,
drivers/net/wireless/realtek/rtw89/reg.h +6 -0
@@ -218,6 +218,7 @@#define B_AX_EECS_PULL_LOW_EN BIT(16)#define R_AX_WLRF_CTRL 0x02F0 +#define B_AX_AFC_AFEDIG BIT(17)#define B_AX_WLRF1_CTRL_7 BIT(15)#define B_AX_WLRF1_CTRL_1 BIT(9)#define B_AX_WLRF_CTRL_7 BIT(7)
@@ -231,6 +232,11 @@#define B_AX_USB_HCISYS_PWR_STE_MASK GENMASK(3, 2)#define B_AX_PCIE_HCISYS_PWR_STE_MASK GENMASK(1, 0) +#define R_AX_AFE_OFF_CTRL1 0x0444 +#define B_AX_S1_LDO_VSEL_F_MASK GENMASK(25, 24) +#define B_AX_S1_LDO2PWRCUT_F BIT(23) +#define B_AX_S0_LDO_VSEL_F_MASK GENMASK(22, 21) +#define R_AX_FILTER_MODEL_ADDR 0x0C04#define R_AX_HAXI_INIT_CFG1 0x1000
drivers/net/wireless/realtek/rtw89/rtw8852a.c +2 -0
@@ -1994,6 +1994,8 @@ static void rtw8852a_query_ppdu(struct rtw89_dev *rtwdev, }static const struct rtw89_chip_ops rtw8852a_chip_ops = { + .enable_bb_rf = rtw89_mac_enable_bb_rf, + .disable_bb_rf = rtw89_mac_disable_bb_rf, .bb_reset = rtw8852a_bb_reset, .bb_sethw = rtw8852a_bb_sethw, .read_rf = rtw89_phy_read_rf,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +45 -0
52 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/16 rtw89: Turn on CR protection of CMAC
In reply to Ping-Ke ShihCMAC is Control MAC, and this patch is to turn on CR (control registers) protection.
--- drivers/net/wireless/realtek/rtw89/mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +2 -1
@@ -1119,7 +1119,8 @@ static int cmac_func_en(struct rtw89_dev *rtwdev, u8 mac_idx, bool en) func_en =B_AX_CMAC_EN |B_AX_CMAC_TXEN |B_AX_CMAC_RXEN |B_AX_PHYINTF_EN |B_AX_CMAC_DMA_EN |B_AX_PTCLTOP_EN | -B_AX_SCHEDULER_EN |B_AX_TMAC_EN |B_AX_RMAC_EN ; +B_AX_SCHEDULER_EN |B_AX_TMAC_EN |B_AX_RMAC_EN | +B_AX_CMAC_CRPRT ; ck_en =B_AX_CMAC_CKEN |B_AX_PHYINTF_CKEN |B_AX_CMAC_DMA_CKEN |B_AX_PTCLTOP_CKEN |B_AX_SCHEDULER_CKEN |B_AX_TMAC_CKEN |B_AX_RMAC_CKEN ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/16 rtw89: 8852c: update security engine setting
In reply to Ping-Ke ShihThe security setting of 8852A and 8852C are different, so change the settings accordingly.
--- drivers/net/wireless/realtek/rtw89/mac.c | 8 +++++++- drivers/net/wireless/realtek/rtw89/reg.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +7 -1
@@ -1696,6 +1696,7 @@ static int mpdu_proc_init(struct rtw89_dev *rtwdev)static int sec_eng_init (struct rtw89_dev *rtwdev) { +const struct rtw89_chip_info *chip = rtwdev->chip;u32 val =0 ;int ret;
@@ -1709,7 +1710,8 @@ static int sec_eng_init(struct rtw89_dev *rtwdev)/* init TX encryption */ val |= (B_AX_SEC_TX_ENC |B_AX_SEC_RX_DEC ); val |= (B_AX_MC_DEC |B_AX_BC_DEC ); - val &= ~B_AX_TX_PARTIAL_MODE ; +if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8852B ) + val &= ~B_AX_TX_PARTIAL_MODE ;rtw89_write32 (rtwdev,R_AX_SEC_ENG_CTRL , val);/* init MIC ICV append */
@@ -1719,6 +1721,10 @@ static int sec_eng_init(struct rtw89_dev *rtwdev)/* option init */ rtw89_write32 (rtwdev,R_AX_SEC_MPDU_PROC , val); +if (chip->chip_id ==RTL8852C ) +rtw89_write32_mask (rtwdev,R_AX_SEC_DEBUG1 , +B_AX_TX_TIMEOUT_SEL_MASK ,AX_TX_TO_VAL ); +return 0 ; }
drivers/net/wireless/realtek/rtw89/reg.h +3 -0
@@ -799,6 +799,9 @@#define R_AX_SEC_CAM_RDATA 0x9D14#define R_AX_SEC_CAM_WDATA 0x9D18#define R_AX_SEC_DEBUG 0x9D1C +#define R_AX_SEC_DEBUG1 0x9D1C +#define B_AX_TX_TIMEOUT_SEL_MASK GENMASK(31, 30) +#define AX_TX_TO_VAL 0x2#define R_AX_SEC_TX_DEBUG 0x9D20#define R_AX_SEC_RX_DEBUG 0x9D24#define R_AX_SEC_TRX_PKT_CNT 0x9D28
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 13/16 rtw89: update scheduler setting
In reply to Ping-Ke ShihUpdate IC specific settings accordingly.
--- drivers/net/wireless/realtek/rtw89/mac.c | 11 +++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 12 ++++++++++++ 2 files changed, 23 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +11 -0
@@ -1807,6 +1807,17 @@ static int scheduler_init(struct rtw89_dev *rtwdev, u8 mac_idx)if (ret)return ret; + reg =rtw89_mac_reg_by_idx (R_AX_PREBKF_CFG_1 , mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_SIFS_MACTXEN_T1_MASK ,SIFS_MACTXEN_T1 ); + +if (rtwdev->chip->chip_id ==RTL8852B ) { + reg =rtw89_mac_reg_by_idx (R_AX_SCH_EXT_CTRL , mac_idx); +rtw89_write32_set (rtwdev, reg,B_AX_PORT_RST_TSF_ADV ); + } + + reg =rtw89_mac_reg_by_idx (R_AX_CCA_CFG_0 , mac_idx); +rtw89_write32_clr (rtwdev, reg,B_AX_BTCCA_EN ); + reg =rtw89_mac_reg_by_idx (R_AX_PREBKF_CFG_0 , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PREBKF_TIME_MASK ,SCH_PREBKF_24US );
drivers/net/wireless/realtek/rtw89/reg.h +12 -0
@@ -977,6 +977,14 @@#define R_AX_PREBKF_CFG_0_C1 0xE338#define B_AX_PREBKF_TIME_MASK GENMASK(4, 0) +#define R_AX_PREBKF_CFG_1 0xC33C +#define R_AX_PREBKF_CFG_1_C1 0xE33C +#define B_AX_SIFS_TIMEOUT_TB_AGGR_MASK GENMASK(30, 24) +#define B_AX_SIFS_PREBKF_MASK GENMASK(23, 16) +#define B_AX_SIFS_TIMEOUT_T2_MASK GENMASK(14, 8) +#define B_AX_SIFS_MACTXEN_T1_MASK GENMASK(6, 0) +#define SIFS_MACTXEN_T1 0x47 +#define R_AX_CCA_CFG_0 0xC340#define R_AX_CCA_CFG_0_C1 0xE340#define B_AX_BTCCA_BRK_TXOP_EN BIT(9)
@@ -1076,6 +1084,10 @@#define R_AX_SCH_DBG_C1 0xE3F8#define B_AX_SCHEDULER_DBG_MASK GENMASK(31, 0) +#define R_AX_SCH_EXT_CTRL 0xC3FC +#define R_AX_SCH_EXT_CTRL_C1 0xE3FC +#define B_AX_PORT_RST_TSF_ADV BIT(1) +#define R_AX_PORT_CFG_P0 0xC400#define R_AX_PORT_CFG_P1 0xC440#define R_AX_PORT_CFG_P2 0xC480
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 14/16 rtw89: initialize NAV control
In reply to Ping-Ke ShihConfigure NAV function and its parameters.
--- drivers/net/wireless/realtek/rtw89/mac.c | 17 +++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 10 ++++++++++ 2 files changed, 27 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +17 -0
@@ -1959,6 +1959,16 @@ static int cca_ctrl_init(struct rtw89_dev *rtwdev, u8 mac_idx)return 0 ; } +static int nav_ctrl_init (struct rtw89_dev *rtwdev) +{ +rtw89_write32_set (rtwdev,R_AX_WMAC_NAV_CTL ,B_AX_WMAC_PLCP_UP_NAV_EN | +B_AX_WMAC_TF_UP_NAV_EN | +B_AX_WMAC_NAV_UPPER_EN ); +rtw89_write32_mask (rtwdev,R_AX_WMAC_NAV_CTL ,B_AX_WMAC_NAV_UPPER_MASK ,NAV_12MS ); + +return 0 ; +} +static int spatial_reuse_init (struct rtw89_dev *rtwdev,u8 mac_idx) {u32 reg;
@@ -2174,6 +2184,13 @@ static int cmac_init(struct rtw89_dev *rtwdev, u8 mac_idx)return ret; } + ret =nav_ctrl_init (rtwdev); +if (ret) { +rtw89_err (rtwdev,"[ERR]CMAC%d NAV CTRL init %d\n" , mac_idx, + ret); +return ret; + } + ret =spatial_reuse_init (rtwdev, mac_idx);if (ret) { rtw89_err(rtwdev, "[ERR]CMAC%d Spatial Reuse init %d\n",
drivers/net/wireless/realtek/rtw89/reg.h +10 -0
@@ -1435,6 +1435,16 @@#define R_AX_MAC_LOOPBACK_C1 0xEC20#define B_AX_MACLBK_EN BIT(0) +#define R_AX_WMAC_NAV_CTL 0xCC80 +#define R_AX_WMAC_NAV_CTL_C1 0xEC80 +#define B_AX_WMAC_NAV_UPPER_EN BIT(26) +#define B_AX_WMAC_0P125US_TIMER_MASK GENMASK(25, 18) +#define B_AX_WMAC_PLCP_UP_NAV_EN BIT(17) +#define B_AX_WMAC_TF_UP_NAV_EN BIT(16) +#define B_AX_WMAC_NAV_UPPER_MASK GENMASK(15, 8) +#define NAV_12MS 0xBC +#define B_AX_WMAC_RTS_RST_DUR_MASK GENMASK(7, 0) +#define R_AX_RXTRIG_TEST_USER_2 0xCCB0#define R_AX_RXTRIG_TEST_USER_2_C1 0xECB0#define B_AX_RXTRIG_MACID_MASK GENMASK(31, 24)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 15/16 rtw89: update TMAC parameters
In reply to Ping-Ke ShihTMAC is short for TX MAC, and this patch is to configure FIFO thresholds.
--- drivers/net/wireless/realtek/rtw89/mac.c | 7 ++++++ drivers/net/wireless/realtek/rtw89/reg.h | 29 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +7 -0
@@ -1995,6 +1995,13 @@ static int tmac_init(struct rtw89_dev *rtwdev, u8 mac_idx) reg =rtw89_mac_reg_by_idx (R_AX_MAC_LOOPBACK , mac_idx);rtw89_write32_clr (rtwdev, reg,B_AX_MACLBK_EN ); + reg =rtw89_mac_reg_by_idx (R_AX_TCR0 , mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_TCR_UDF_THSD_MASK ,TCR_UDF_THSD ); + + reg =rtw89_mac_reg_by_idx (R_AX_TXD_FIFO_CTRL , mac_idx); +rtw89_write32_mask (rtwdev, reg,B_AX_TXDFIFO_HIGH_MCS_THRE_MASK ,TXDFIFO_HIGH_MCS_THRE ); +rtw89_write32_mask (rtwdev, reg,B_AX_TXDFIFO_LOW_MCS_THRE_MASK ,TXDFIFO_LOW_MCS_THRE ); +return 0 ; }
drivers/net/wireless/realtek/rtw89/reg.h +29 -0
@@ -1351,6 +1351,24 @@#define R_AX_RXDMA_PKT_INFO_1 0xC818#define R_AX_RXDMA_PKT_INFO_2 0xC81C +#define R_AX_TCR0 0xCA00 +#define R_AX_TCR0_C1 0xEA00 +#define B_AX_TCR_ZLD_NUM_MASK GENMASK(31, 24) +#define B_AX_TCR_UDF_EN BIT(23) +#define B_AX_TCR_UDF_THSD_MASK GENMASK(22, 16) +#define TCR_UDF_THSD 0x6 +#define B_AX_TCR_ERRSTEN_MASK GENMASK(15, 10) +#define B_AX_TCR_VHTSIGA1_TXPS BIT(9) +#define B_AX_TCR_PLCP_ERRHDL_EN BIT(8) +#define B_AX_TCR_PADSEL BIT(7) +#define B_AX_TCR_MASK_SIGBCRC BIT(6) +#define B_AX_TCR_SR_VAL15_ALLOW BIT(5) +#define B_AX_TCR_EN_EOF BIT(4) +#define B_AX_TCR_EN_SCRAM_INC BIT(3) +#define B_AX_TCR_EN_20MST BIT(2) +#define B_AX_TCR_CRC BIT(1) +#define B_AX_TCR_DISGCLK BIT(0) +#define R_AX_TCR1 0xCA04#define R_AX_TCR1_C1 0xEA04#define B_AX_TXDFIFO_THRESHOLD GENMASK(31, 28)
@@ -1374,6 +1392,17 @@#define R_AX_PPWRBIT_SETTING 0xCA0C#define R_AX_PPWRBIT_SETTING_C1 0xEA0C +#define R_AX_TXD_FIFO_CTRL 0xCA1C +#define R_AX_TXD_FIFO_CTRL_C1 0xEA1C +#define B_AX_NON_LEGACY_PPDU_ZLD_USTIMER_MASK GENMASK(28, 24) +#define B_AX_LEGACY_PPDU_ZLD_USTIMER_MASK GENMASK(20, 16) +#define B_AX_TXDFIFO_HIGH_MCS_THRE_MASK GENMASK(15, 12) +#define TXDFIFO_HIGH_MCS_THRE 0x7 +#define B_AX_TXDFIFO_LOW_MCS_THRE_MASK GENMASK(11, 8) +#define TXDFIFO_LOW_MCS_THRE 0x7 +#define B_AX_HIGH_MCS_PHY_RATE_MASK GENMASK(7, 4) +#define B_AX_BW_PHY_RATE_MASK GENMASK(1, 0) +#define R_AX_MACTX_DBG_SEL_CNT 0xCA20#define R_AX_MACTX_DBG_SEL_CNT_C1 0xEA20#define B_AX_MACTX_MPDU_CNT GENMASK(31, 24)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 16/16 rtw89: update ptcl_init
In reply to Ping-Ke Shihptcl_init, standing for protocol initialization, is updated to the latest version.
--- drivers/net/wireless/realtek/rtw89/mac.c | 20 +++++++++++++++----- drivers/net/wireless/realtek/rtw89/reg.h | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +15 -5
@@ -2141,6 +2141,8 @@ static int ptcl_init(struct rtw89_dev *rtwdev, u8 mac_idx) val =rtw89_read32 (rtwdev, reg); val =u32_replace_bits (val,S_AX_CTS2S_TH_1K ,B_AX_HW_CTS2SELF_PKT_LEN_TH_MASK ); + val =u32_replace_bits (val,S_AX_CTS2S_TH_SEC_256B , +B_AX_HW_CTS2SELF_PKT_LEN_TH_TWW_MASK ); val |=B_AX_HW_CTS2SELF_EN ;rtw89_write32 (rtwdev, reg, val);
@@ -2151,11 +2153,19 @@ static int ptcl_init(struct rtw89_dev *rtwdev, u8 mac_idx)rtw89_write32 (rtwdev, reg, val); } - reg =rtw89_mac_reg_by_idx (R_AX_SIFS_SETTING , mac_idx); - val =rtw89_read32 (rtwdev, reg); - val =u32_replace_bits (val,S_AX_CTS2S_TH_SEC_256B ,B_AX_HW_CTS2SELF_PKT_LEN_TH_TWW_MASK ); - val |=B_AX_HW_CTS2SELF_EN ; -rtw89_write32 (rtwdev, reg, val); +if (mac_idx ==RTW89_MAC_0 ) { +rtw89_write8_set (rtwdev,R_AX_PTCL_COMMON_SETTING_0 , +B_AX_CMAC_TX_MODE_0 |B_AX_CMAC_TX_MODE_1 ); +rtw89_write8_clr (rtwdev,R_AX_PTCL_COMMON_SETTING_0 , +B_AX_PTCL_TRIGGER_SS_EN_0 | +B_AX_PTCL_TRIGGER_SS_EN_1 | +B_AX_PTCL_TRIGGER_SS_EN_UL ); +rtw89_write8_mask (rtwdev,R_AX_PTCLRPT_FULL_HDL , +B_AX_SPE_RPT_PATH_MASK ,FWD_TO_WLCPU ); + }else if (mac_idx ==RTW89_MAC_1 ) { +rtw89_write8_mask (rtwdev,R_AX_PTCLRPT_FULL_HDL_C1 , +B_AX_SPE_RPT_PATH_MASK ,FWD_TO_WLCPU ); + }return 0 ; }
drivers/net/wireless/realtek/rtw89/reg.h +24 -0
@@ -1248,6 +1248,18 @@#define R_AX_PORT_HGQ_WINDOW_CFG 0xC5A0#define R_AX_PORT_HGQ_WINDOW_CFG_C1 0xE5A0 +#define R_AX_PTCL_COMMON_SETTING_0 0xC600 +#define R_AX_PTCL_COMMON_SETTING_0_C1 0xE600 +#define B_AX_PCIE_MODE_MASK GENMASK(15, 14) +#define B_AX_CPUMGQ_LIFETIME_EN BIT(8) +#define B_AX_MGQ_LIFETIME_EN BIT(7) +#define B_AX_LIFETIME_EN BIT(6) +#define B_AX_PTCL_TRIGGER_SS_EN_UL BIT(4) +#define B_AX_PTCL_TRIGGER_SS_EN_1 BIT(3) +#define B_AX_PTCL_TRIGGER_SS_EN_0 BIT(2) +#define B_AX_CMAC_TX_MODE_1 BIT(1) +#define B_AX_CMAC_TX_MODE_0 BIT(0) +#define R_AX_AMPDU_AGG_LIMIT 0xC610#define B_AX_AMPDU_MAX_TIME_MASK GENMASK(31, 24)#define B_AX_RA_TRY_RATE_AGG_LMT_MASK GENMASK(23, 16)
@@ -1292,6 +1304,18 @@#define B_AX_PORT_DROP_4_0_MASK GENMASK(20, 16)#define B_AX_MBSSID_DROP_15_0_MASK GENMASK(15, 0) +#define R_AX_PTCLRPT_FULL_HDL 0xC660 +#define R_AX_PTCLRPT_FULL_HDL_C1 0xE660 +#define B_AX_RPT_LATCH_PHY_TIME_MASK GENMASK(15, 12) +#define B_AX_F2PCMD_FWWD_RLS_MODE BIT(9) +#define B_AX_F2PCMD_RPT_EN BIT(8) +#define B_AX_BCN_RPT_PATH_MASK GENMASK(7, 6) +#define B_AX_SPE_RPT_PATH_MASK GENMASK(5, 4) +#define FWD_TO_WLCPU 1 +#define B_AX_TX_RPT_PATH_MASK GENMASK(3, 2) +#define B_AX_F2PCMDRPT_FULL_DROP BIT(1) +#define B_AX_NON_F2PCMDRPT_FULL_DROP BIT(0) +#define R_AX_BT_PLT 0xC67C#define R_AX_BT_PLT_C1 0xE67C#define B_AX_BT_PLT_PKT_CNT_MASK GENMASK(31, 16)
Signature · 1 line
2.25.1
Quoted 11 lines · Ping-Ke Shih
The existing PCI and MAC codes are only used by 8852AE, so many settings are put in single function. To be clear, move the settings into an individual function according to its functionality. Since functions will be shared with chips, add attributes to make it possible to use common functions.
Also, update the settings to the latest version of our internal code.
This patchset is based on
"rtw89: add firmware reset and dump firmware memory and backtrace" and "rtw89: update TX power table and 6G, refine IGI, and add TX/RX descriptors V1"
But no actual function dependency.
The merge window is now open which means wireless-next is closed. I don't mind people submitting few -next patches during the merge window, but there's a limit for that. Currently I see 39 rtw89 patches in patchwork, that's just too much. So please try to limit the number of patches you submit during the merge window.
Usually wireless-next opens few days after -rc1 is released, but there's no fixed schedule.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Pkshih
maintainerQuoted 14 lines · Kalle Valo
Quoted 11 lines · Ping-Ke Shih
The existing PCI and MAC codes are only used by 8852AE, so many settings are put in single function. To be clear, move the settings into an individual function according to its functionality. Since functions will be shared with chips, add attributes to make it possible to use common functions.
Also, update the settings to the latest version of our internal code.
This patchset is based on
"rtw89: add firmware reset and dump firmware memory and backtrace" and "rtw89: update TX power table and 6G, refine IGI, and add TX/RX descriptors V1"
But no actual function dependency.
Quoted 9 lines
The merge window is now open which means wireless-next is closed. I don't mind people submitting few -next patches during the merge window, but there's a limit for that. Currently I see 39 rtw89 patches in patchwork, that's just too much. So please try to limit the number of patches you submit during the merge window.
Usually wireless-next opens few days after -rc1 is released, but there's no fixed schedule.
Got it. I'll stop submitting before queued patches get reviewed. If this patchset is inconvenient to you, please drop it.
Thank you
Ping-Ke
Re: [PATCH 01/16] rtw89: pci: add register definition to rtw89_pci_info to generalize pci code
In reply to Ping-Ke ShihQuoted 6 lines · Ping-Ke Shih
The PCI code of 8852AE and 8852CE are different, but the flow and register names are similar. To reuse the code, add a struct to define register or value accordingly. We also use chip id to control the slightly different flow.
Signed-off-by Ping-Ke Shih <[email protected]>
16 patches applied to wireless-next.git, thanks.
740c431c22fe rtw89: pci: add register definition to rtw89_pci_info to generalize pci code b9467e94b1f2 rtw89: pci: add pci attributes to configure operating mode 1e3f20554815 rtw89: pci: refine pci pre_init function0db862fb025c rtw89: pci: add LTR setting for v1 chipbab9e2391786 rtw89: pci: set address info registers depends on chips 22a66e7c3abe rtw89: pci: add deglitch settinge1e7a574b20f rtw89: pci: add L1 settingsa7d82a7aae65 rtw89: extend dmac_pre_init to support 8852Ccf7b8b808811 rtw89: update STA scheduler parameters for v1 chip 61ebeecb3d67 rtw89: add chip_ops::{enable,disable}_bb_rf to support v1 chip 5cb5562d2a21 rtw89: Turn on CR protection of CMACb61adeed5409 rtw89: 8852c: update security engine settingc49154ff8bcb rtw89: update scheduler setting19cb94273f40 rtw89: initialize NAV control75fd91aa92f9 rtw89: update TMAC parameters9fb4862e913c rtw89: update ptcl_init
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches