wifi: rtw89: adjust PCI handle for coming chip RTL8922DE
Ping-Ke Shih
maintainercover wifi: rtw89: adjust PCI handle for coming chip RTL8922DE
The RTL8922DE is the next WiFi 7 chip. Because of changes of PCI interrupt, PCI TX/RX buffer rings, TX completion report and DMA channel, use this patchset to adjust PCI handlers accordingly.
Ping-Ke Shih (10):
wifi: rtw89: pci: move chip ISR definition out from chip generation
wifi: rtw89: pci: prepare interrupt related registers and functions
for 8922DE
wifi: rtw89: pci: use RDU status of R_BE_PCIE_DMA_IMR_0_V1 instead for
8922DE wifi: rtw89: pci: add struct rtw89_{tx,rx}_rings to put related fields
wifi: rtw89: pci: define TX/RX buffer descriptor pool
wifi: rtw89: pci: add group BD address design
wifi: rtw89: pci: abstract RPP parser
wifi: rtw89: pci: add RPP parser v1
wifi: rtw89: abstract getting function of DMA channel
wifi: rtw89: add getting function of DMA channel v1
drivers/net/wireless/realtek/rtw89/core.c | 68 ++- drivers/net/wireless/realtek/rtw89/core.h | 11 + drivers/net/wireless/realtek/rtw89/pci.c | 451 ++++++++++++++---- drivers/net/wireless/realtek/rtw89/pci.h | 119 ++++- drivers/net/wireless/realtek/rtw89/pci_be.c | 18 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + .../net/wireless/realtek/rtw89/rtw8851be.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ae.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852be.c | 4 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bte.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + .../net/wireless/realtek/rtw89/rtw8922ae.c | 4 + drivers/net/wireless/realtek/rtw89/txrx.h | 37 -- 18 files changed, 581 insertions(+), 153 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/10 wifi: rtw89: pci: move chip ISR definition out from chip generation
The existing WiFi 6 chips can share the same ISR (interrupt status registers), but the coming WiFi 7 chip 8922DE can't share the same definition with existing WiFi 7 chip, so move the definition to an individual struct.
Don't change logic at all.
--- drivers/net/wireless/realtek/rtw89/pci.c | 19 +++++++++++-------- drivers/net/wireless/realtek/rtw89/pci.h | 7 ++++++- drivers/net/wireless/realtek/rtw89/pci_be.c | 5 ++++- .../net/wireless/realtek/rtw89/rtw8851be.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ae.c | 1 + .../net/wireless/realtek/rtw89/rtw8852be.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bte.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 1 + .../net/wireless/realtek/rtw89/rtw8922ae.c | 1 + 9 files changed, 27 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +11 -8
@@ -885,7 +885,7 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)struct rtw89_dev *rtwdev = dev;struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;const struct rtw89_pci_info *info = rtwdev->pci_info; -const struct rtw89_pci_gen_def *gen_def = info->gen_def; +const struct rtw89_pci_isr_def *isr_def = info->isr_def;struct rtw89_pci_isrs isrs;unsigned long flags;
@@ -893,13 +893,13 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)rtw89_chip_recognize_intrs (rtwdev, rtwpci, &isrs);spin_unlock_irqrestore (&rtwpci->irq_lock, flags); -if (unlikely (isrs.isrs[0 ] & gen_def->isr_rdu)) +if (unlikely (isrs.isrs[0 ] & isr_def->isr_rdu))rtw89_pci_isr_rxd_unavail (rtwdev, rtwpci); -if (unlikely (isrs.halt_c2h_isrs & gen_def->isr_halt_c2h)) +if (unlikely (isrs.halt_c2h_isrs & isr_def->isr_halt_c2h))rtw89_ser_notify (rtwdev,rtw89_mac_get_err_status (rtwdev)); -if (unlikely (isrs.halt_c2h_isrs & gen_def->isr_wdt_timeout)) +if (unlikely (isrs.halt_c2h_isrs & isr_def->isr_wdt_timeout))rtw89_ser_notify (rtwdev,MAC_AX_ERR_L2_ERR_WDT_TIMEOUT_INT );if (unlikely (rtwpci->under_recovery))
@@ -4228,18 +4228,18 @@ static int rtw89_pci_napi_poll(struct napi_struct *napi, int budget) struct rtw89_dev *rtwdev = container_of(napi, struct rtw89_dev, napi);struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;const struct rtw89_pci_info *info = rtwdev->pci_info; -const struct rtw89_pci_gen_def *gen_def = info->gen_def; +const struct rtw89_pci_isr_def *isr_def = info->isr_def;unsigned long flags;int work_done; rtwdev->napi_budget_countdown = budget; -rtw89_write32 (rtwdev, gen_def->isr_clear_rpq.addr, gen_def->isr_clear_rpq.data); +rtw89_write32 (rtwdev, isr_def->isr_clear_rpq.addr, isr_def->isr_clear_rpq.data); work_done =rtw89_pci_poll_rpq_dma (rtwdev, rtwpci, rtwdev->napi_budget_countdown);if (work_done == budget)return budget; -rtw89_write32 (rtwdev, gen_def->isr_clear_rxq.addr, gen_def->isr_clear_rxq.data); +rtw89_write32 (rtwdev, isr_def->isr_clear_rxq.addr, isr_def->isr_clear_rxq.data); work_done +=rtw89_pci_poll_rxq_dma (rtwdev, rtwpci, rtwdev->napi_budget_countdown);if (work_done < budget &&napi_complete_done (napi, work_done)) {spin_lock_irqsave (&rtwpci->irq_lock, flags);
@@ -4394,14 +4394,17 @@ const struct pci_error_handlers rtw89_pci_err_handler = { };EXPORT_SYMBOL (rtw89_pci_err_handler); -const struct rtw89_pci_gen_def rtw89_pci_gen_ax = { +const struct rtw89_pci_isr_def rtw89_pci_isr_ax = { .isr_rdu =B_AX_RDU_INT , .isr_halt_c2h =B_AX_HALT_C2H_INT_EN , .isr_wdt_timeout =B_AX_WDT_TIMEOUT_INT_EN , .isr_clear_rpq = {R_AX_PCIE_HISR00 ,B_AX_RPQDMA_INT |B_AX_RPQBD_FULL_INT }, .isr_clear_rxq = {R_AX_PCIE_HISR00 ,B_AX_RXP1DMA_INT |B_AX_RXDMA_INT |B_AX_RDU_INT }, +}; +EXPORT_SYMBOL (rtw89_pci_isr_ax); +const struct rtw89_pci_gen_def rtw89_pci_gen_ax = { .mac_pre_init = rtw89_pci_ops_mac_pre_init_ax, .mac_pre_deinit = rtw89_pci_ops_mac_pre_deinit_ax, .mac_post_init = rtw89_pci_ops_mac_post_init_ax,
drivers/net/wireless/realtek/rtw89/pci.h +6 -1
@@ -1267,13 +1267,15 @@ struct rtw89_pci_bd_ram {u8 min_num; }; -struct rtw89_pci_gen_def { +struct rtw89_pci_isr_def {u32 isr_rdu;u32 isr_halt_c2h;u32 isr_wdt_timeout;struct rtw89_reg2_def isr_clear_rpq;struct rtw89_reg2_def isr_clear_rxq; +}; +struct rtw89_pci_gen_def {int (*mac_pre_init)(struct rtw89_dev *rtwdev);int (*mac_pre_deinit)(struct rtw89_dev *rtwdev);int (*mac_post_init)(struct rtw89_dev *rtwdev);
@@ -1311,6 +1313,7 @@ struct rtw89_pci_ssid_quirk {struct rtw89_pci_info {const struct rtw89_pci_gen_def *gen_def; +const struct rtw89_pci_isr_def *isr_def;enum mac_ax_bd_trunc_mode txbd_trunc_mode;enum mac_ax_bd_trunc_mode rxbd_trunc_mode;enum mac_ax_rxbd_mode rxbd_mode;
@@ -1628,6 +1631,8 @@ extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_v1;extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_be;extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_dual[RTW89_TXCH_NUM ];extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_single[RTW89_TXCH_NUM ]; +extern const struct rtw89_pci_isr_def rtw89_pci_isr_ax; +extern const struct rtw89_pci_isr_def rtw89_pci_isr_be;extern const struct rtw89_pci_gen_def rtw89_pci_gen_ax;extern const struct rtw89_pci_gen_def rtw89_pci_gen_be;
drivers/net/wireless/realtek/rtw89/pci_be.c +4 -1
@@ -665,13 +665,16 @@ static int __maybe_unused rtw89_pci_resume_be(struct device *dev)SIMPLE_DEV_PM_OPS (rtw89_pm_ops_be, rtw89_pci_suspend_be, rtw89_pci_resume_be);EXPORT_SYMBOL (rtw89_pm_ops_be); -const struct rtw89_pci_gen_def rtw89_pci_gen_be = { +const struct rtw89_pci_isr_def rtw89_pci_isr_be = { .isr_rdu =B_BE_RDU_CH1_INT_V1 |B_BE_RDU_CH0_INT_V1 , .isr_halt_c2h =B_BE_HALT_C2H_INT , .isr_wdt_timeout =B_BE_WDT_TIMEOUT_INT , .isr_clear_rpq = {R_BE_PCIE_DMA_ISR ,B_BE_PCIE_RX_RPQ0_ISR_V1 }, .isr_clear_rxq = {R_BE_PCIE_DMA_ISR ,B_BE_PCIE_RX_RX0P2_ISR_V1 }, +}; +EXPORT_SYMBOL (rtw89_pci_isr_be); +const struct rtw89_pci_gen_def rtw89_pci_gen_be = { .mac_pre_init = rtw89_pci_ops_mac_pre_init_be, .mac_pre_deinit = rtw89_pci_ops_mac_pre_deinit_be, .mac_post_init = rtw89_pci_ops_mac_post_init_be,
drivers/net/wireless/realtek/rtw89/rtw8851be.c +1 -0
@@ -11,6 +11,7 @@static const struct rtw89_pci_info rtw8851b_pci_info = { .gen_def = &rtw89_pci_gen_ax, + .isr_def = &rtw89_pci_isr_ax, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +1 -0
@@ -11,6 +11,7 @@static const struct rtw89_pci_info rtw8852a_pci_info = { .gen_def = &rtw89_pci_gen_ax, + .isr_def = &rtw89_pci_isr_ax, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
drivers/net/wireless/realtek/rtw89/rtw8852be.c +1 -0
@@ -11,6 +11,7 @@static const struct rtw89_pci_info rtw8852b_pci_info = { .gen_def = &rtw89_pci_gen_ax, + .isr_def = &rtw89_pci_isr_ax, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
drivers/net/wireless/realtek/rtw89/rtw8852bte.c +1 -0
@@ -17,6 +17,7 @@ static const struct rtw89_pci_ssid_quirk rtw8852bt_pci_ssid_quirks[] = {static const struct rtw89_pci_info rtw8852bt_pci_info = { .gen_def = &rtw89_pci_gen_ax, + .isr_def = &rtw89_pci_isr_ax, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +1 -0
@@ -20,6 +20,7 @@ static const struct rtw89_pci_bd_idx_addr rtw8852c_bd_idx_addr_low_power = {static const struct rtw89_pci_info rtw8852c_pci_info = { .gen_def = &rtw89_pci_gen_ax, + .isr_def = &rtw89_pci_isr_ax, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
drivers/net/wireless/realtek/rtw89/rtw8922ae.c +1 -0
@@ -17,6 +17,7 @@ static const struct rtw89_pci_ssid_quirk rtw8922a_pci_ssid_quirks[] = {static const struct rtw89_pci_info rtw8922a_pci_info = { .gen_def = &rtw89_pci_gen_be, + .isr_def = &rtw89_pci_isr_be, .txbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_trunc_mode =MAC_AX_BD_TRUNC , .rxbd_mode =MAC_AX_RXBD_PKT ,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/10] wifi: rtw89: pci: move chip ISR definition out from chip generation
Quoted 8 lines · Ping-Ke Shih
The existing WiFi 6 chips can share the same ISR (interrupt status registers), but the coming WiFi 7 chip 8922DE can't share the same definition with existing WiFi 7 chip, so move the definition to an individual struct.
Don't change logic at all.
Signed-off-by Ping-Ke Shih <[email protected]>
10 patch(es) applied to rtw-next branch of rtw.git, thanks.
5cc73513f9b2 wifi: rtw89: pci: move chip ISR definition out from chip generation 862132fbfc89 wifi: rtw89: pci: prepare interrupt related registers and functions for 8922DE d6303028ae55 wifi: rtw89: pci: use RDU status of R_BE_PCIE_DMA_IMR_0_V1 instead for 8922DE 7bd90ec75e76 wifi: rtw89: pci: add struct rtw89_{tx,rx}_rings to put related fields a86a0fea192c wifi: rtw89: pci: define TX/RX buffer descriptor pool 2d7514829950 wifi: rtw89: pci: add group BD address design83d823ab27da wifi: rtw89: pci: abstract RPP parser110f3c11f440 wifi: rtw89: pci: add RPP parser v1571ce803c282 wifi: rtw89: abstract getting function of DMA channel e83a2a996b5c wifi: rtw89: add getting function of DMA channel v1
Ping-Ke Shih
maintainerPATCH 2/10 wifi: rtw89: pci: prepare interrupt related registers and functions for 8922DE
In reply to Ping-Ke ShihThe 8922DE is very similar to 8922AE except to RDU (RX desc unavailable) registers. The following patch will adjust to read this status from another register to reduce one reading IO, so create a set of functions ahead.
--- drivers/net/wireless/realtek/rtw89/pci.c | 85 +++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/pci.h | 15 ++++ drivers/net/wireless/realtek/rtw89/pci_be.c | 9 +++ 3 files changed, 109 insertions(+)
drivers/net/wireless/realtek/rtw89/pci.c +85 -0
@@ -797,6 +797,27 @@ void rtw89_pci_recognize_intrs_v2(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_pci_recognize_intrs_v2); +void rtw89_pci_recognize_intrs_v3 (struct rtw89_dev *rtwdev, +struct rtw89_pci *rtwpci, +struct rtw89_pci_isrs *isrs) +{ + isrs->ind_isrs =rtw89_read32 (rtwdev,R_BE_PCIE_HISR ) & rtwpci->ind_intrs; + isrs->halt_c2h_isrs = isrs->ind_isrs &B_BE_HS0ISR_IND_INT ? +rtw89_read32 (rtwdev,R_BE_HISR0 ) & rtwpci->halt_c2h_intrs :0 ; + isrs->isrs[0 ] = isrs->ind_isrs &B_BE_HCI_AXIDMA_INT ? +rtw89_read32 (rtwdev,R_BE_HAXI_HISR00 ) & rtwpci->intrs[0 ] :0 ; + isrs->isrs[1 ] =rtw89_read32 (rtwdev,R_BE_PCIE_DMA_ISR ) & rtwpci->intrs[1 ]; + +if (isrs->halt_c2h_isrs) +rtw89_write32 (rtwdev,R_BE_HISR0 , isrs->halt_c2h_isrs); +if (isrs->isrs[0 ]) +rtw89_write32 (rtwdev,R_BE_HAXI_HISR00 , isrs->isrs[0 ]); +if (isrs->isrs[1 ]) +rtw89_write32 (rtwdev,R_BE_PCIE_DMA_ISR , isrs->isrs[1 ]); +rtw89_write32 (rtwdev,R_BE_PCIE_HISR , isrs->ind_isrs); +} +EXPORT_SYMBOL (rtw89_pci_recognize_intrs_v3); +void rtw89_pci_enable_intr (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci) {rtw89_write32 (rtwdev,R_AX_HIMR0 , rtwpci->halt_c2h_intrs);
@@ -844,6 +865,22 @@ void rtw89_pci_disable_intr_v2(struct rtw89_dev *rtwdev, struct rtw89_pci *rtwpc }EXPORT_SYMBOL (rtw89_pci_disable_intr_v2); +void rtw89_pci_enable_intr_v3 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci) +{ +rtw89_write32 (rtwdev,R_BE_HIMR0 , rtwpci->halt_c2h_intrs); +rtw89_write32 (rtwdev,R_BE_HAXI_HIMR00 , rtwpci->intrs[0 ]); +rtw89_write32 (rtwdev,R_BE_PCIE_DMA_IMR_0_V1 , rtwpci->intrs[1 ]); +rtw89_write32 (rtwdev,R_BE_PCIE_HIMR0 , rtwpci->ind_intrs); +} +EXPORT_SYMBOL (rtw89_pci_enable_intr_v3); + +void rtw89_pci_disable_intr_v3 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci) +{ +rtw89_write32 (rtwdev,R_BE_PCIE_HIMR0 ,0 ); +rtw89_write32 (rtwdev,R_BE_PCIE_DMA_IMR_0_V1 ,0 ); +} +EXPORT_SYMBOL (rtw89_pci_disable_intr_v3); +static void rtw89_pci_ops_recovery_start (struct rtw89_dev *rtwdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
@@ -3776,6 +3813,54 @@ void rtw89_pci_config_intr_mask_v2(struct rtw89_dev *rtwdev) }EXPORT_SYMBOL (rtw89_pci_config_intr_mask_v2); +static void rtw89_pci_recovery_intr_mask_v3 (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; + + rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 ; + rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; + rtwpci->intrs[0 ] =0 ; + rtwpci->intrs[1 ] =0 ; +} + +static void rtw89_pci_default_intr_mask_v3 (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; + + rtwpci->ind_intrs =B_BE_HCI_AXIDMA_INT_EN0 | +B_BE_HS0_IND_INT_EN0 ; + rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; + rtwpci->intrs[0 ] =B_BE_RDU_CH1_INT_EN_V2 | +B_BE_RDU_CH0_INT_EN_V2 ; + rtwpci->intrs[1 ] =B_BE_PCIE_RX_RX0P2_IMR0_V1 | +B_BE_PCIE_RX_RPQ0_IMR0_V1 ; +} + +static void rtw89_pci_low_power_intr_mask_v3 (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; + + rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 | +B_BE_HS1_IND_INT_EN0 ; + rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; + rtwpci->intrs[0 ] =0 ; + rtwpci->intrs[1 ] =B_BE_PCIE_RX_RX0P2_IMR0_V1 | +B_BE_PCIE_RX_RPQ0_IMR0_V1 ; +} + +void rtw89_pci_config_intr_mask_v3 (struct rtw89_dev *rtwdev) +{ +struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; + +if (rtwpci->under_recovery) +rtw89_pci_recovery_intr_mask_v3 (rtwdev); +else if (rtwpci->low_power) +rtw89_pci_low_power_intr_mask_v3 (rtwdev); +else +rtw89_pci_default_intr_mask_v3 (rtwdev); +} +EXPORT_SYMBOL (rtw89_pci_config_intr_mask_v3); +static int rtw89_pci_request_irq (struct rtw89_dev *rtwdev,struct pci_dev *pdev) {
drivers/net/wireless/realtek/rtw89/pci.h +15 -0
@@ -426,9 +426,13 @@#define B_BE_RDU_CH4_INT_IMR_V1 BIT(29)#define B_BE_RDU_CH3_INT_IMR_V1 BIT(28)#define B_BE_RDU_CH2_INT_IMR_V1 BIT(27) +#define B_BE_RDU_CH1_INT_EN_V2 BIT(27)#define B_BE_RDU_CH1_INT_IMR_V1 BIT(26) +#define B_BE_RDU_CH0_INT_EN_V2 BIT(26)#define B_BE_RDU_CH0_INT_IMR_V1 BIT(25) +#define B_BE_RXDMA_STUCK_INT_EN_V2 BIT(25)#define B_BE_RXDMA_STUCK_INT_EN_V1 BIT(24) +#define B_BE_TXDMA_STUCK_INT_EN_V2 BIT(24)#define B_BE_TXDMA_STUCK_INT_EN_V1 BIT(23)#define B_BE_TXDMA_CH14_INT_EN_V1 BIT(22)#define B_BE_TXDMA_CH13_INT_EN_V1 BIT(21)
@@ -459,9 +463,13 @@#define B_BE_RDU_CH4_INT_V1 BIT(29)#define B_BE_RDU_CH3_INT_V1 BIT(28)#define B_BE_RDU_CH2_INT_V1 BIT(27) +#define B_BE_RDU_CH1_INT_V2 BIT(27)#define B_BE_RDU_CH1_INT_V1 BIT(26) +#define B_BE_RDU_CH0_INT_V2 BIT(26)#define B_BE_RDU_CH0_INT_V1 BIT(25) +#define B_BE_RXDMA_STUCK_INT_V2 BIT(25)#define B_BE_RXDMA_STUCK_INT_V1 BIT(24) +#define B_BE_TXDMA_STUCK_INT_V2 BIT(24)#define B_BE_TXDMA_STUCK_INT_V1 BIT(23)#define B_BE_TXDMA_CH14_INT_V1 BIT(22)#define B_BE_TXDMA_CH13_INT_V1 BIT(21)
@@ -1633,6 +1641,7 @@ extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_dual[RTW89_TXCH_NUM];extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_single[RTW89_TXCH_NUM ];extern const struct rtw89_pci_isr_def rtw89_pci_isr_ax;extern const struct rtw89_pci_isr_def rtw89_pci_isr_be; +extern const struct rtw89_pci_isr_def rtw89_pci_isr_be_v1;extern const struct rtw89_pci_gen_def rtw89_pci_gen_ax;extern const struct rtw89_pci_gen_def rtw89_pci_gen_be;
@@ -1655,12 +1664,15 @@ void rtw89_pci_ctrl_dma_all(struct rtw89_dev *rtwdev, bool enable);void rtw89_pci_config_intr_mask (struct rtw89_dev *rtwdev);void rtw89_pci_config_intr_mask_v1 (struct rtw89_dev *rtwdev);void rtw89_pci_config_intr_mask_v2 (struct rtw89_dev *rtwdev); +void rtw89_pci_config_intr_mask_v3 (struct rtw89_dev *rtwdev);void rtw89_pci_enable_intr (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_disable_intr (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_enable_intr_v1 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_disable_intr_v1 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_enable_intr_v2 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_disable_intr_v2 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci); +void rtw89_pci_enable_intr_v3 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci); +void rtw89_pci_disable_intr_v3 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void rtw89_pci_recognize_intrs (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci,struct rtw89_pci_isrs *isrs);
@@ -1670,6 +1682,9 @@ void rtw89_pci_recognize_intrs_v1(struct rtw89_dev *rtwdev,void rtw89_pci_recognize_intrs_v2 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci,struct rtw89_pci_isrs *isrs); +void rtw89_pci_recognize_intrs_v3 (struct rtw89_dev *rtwdev, +struct rtw89_pci *rtwpci, +struct rtw89_pci_isrs *isrs); static inline u32 rtw89_chip_fill_txaddr_info(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/pci_be.c +9 -0
@@ -674,6 +674,15 @@ const struct rtw89_pci_isr_def rtw89_pci_isr_be = { };EXPORT_SYMBOL (rtw89_pci_isr_be); +const struct rtw89_pci_isr_def rtw89_pci_isr_be_v1 = { + .isr_rdu =B_BE_RDU_CH1_INT_V2 |B_BE_RDU_CH0_INT_V2 , + .isr_halt_c2h =B_BE_HALT_C2H_INT , + .isr_wdt_timeout =B_BE_WDT_TIMEOUT_INT , + .isr_clear_rpq = {R_BE_PCIE_DMA_ISR ,B_BE_PCIE_RX_RPQ0_ISR_V1 }, + .isr_clear_rxq = {R_BE_PCIE_DMA_ISR ,B_BE_PCIE_RX_RX0P2_ISR_V1 }, +}; +EXPORT_SYMBOL (rtw89_pci_isr_be_v1); +const struct rtw89_pci_gen_def rtw89_pci_gen_be = { .mac_pre_init = rtw89_pci_ops_mac_pre_init_be, .mac_pre_deinit = rtw89_pci_ops_mac_pre_deinit_be,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/10 wifi: rtw89: pci: use RDU status of R_BE_PCIE_DMA_IMR_0_V1 instead for 8922DE
In reply to Ping-Ke ShihThe original RDU status of R_BE_HAXI_HIMR00 needs additional IO to get the status. The new WiFi 7 8922DE add the status to R_BE_PCIE_DMA_IMR_0_V1 which is read already, so we can reduce one reading IO.
After the changes, interrupt behavior of RTL8922DE in low power mode is the same as normal mode, so remove the configuration function for low power mode.
--- drivers/net/wireless/realtek/rtw89/pci.c | 33 +++++++-------------- drivers/net/wireless/realtek/rtw89/pci.h | 16 ++++++++++ drivers/net/wireless/realtek/rtw89/pci_be.c | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +10 -23
@@ -804,14 +804,16 @@ void rtw89_pci_recognize_intrs_v3(struct rtw89_dev *rtwdev, isrs->ind_isrs =rtw89_read32 (rtwdev,R_BE_PCIE_HISR ) & rtwpci->ind_intrs; isrs->halt_c2h_isrs = isrs->ind_isrs &B_BE_HS0ISR_IND_INT ?rtw89_read32 (rtwdev,R_BE_HISR0 ) & rtwpci->halt_c2h_intrs :0 ; - isrs->isrs[0 ] = isrs->ind_isrs &B_BE_HCI_AXIDMA_INT ? -rtw89_read32 (rtwdev,R_BE_HAXI_HISR00 ) & rtwpci->intrs[0 ] :0 ; isrs->isrs[1 ] =rtw89_read32 (rtwdev,R_BE_PCIE_DMA_ISR ) & rtwpci->intrs[1 ]; +/* isrs[0] is not used, so borrow to store RDU status to share common +* flow in rtw89_pci_interrupt_threadfn(). +*/ + isrs->isrs[0 ] = isrs->isrs[1 ] & (B_BE_PCIE_RDU_CH1_INT | +B_BE_PCIE_RDU_CH0_INT ); +if (isrs->halt_c2h_isrs)rtw89_write32 (rtwdev,R_BE_HISR0 , isrs->halt_c2h_isrs); -if (isrs->isrs[0 ]) -rtw89_write32 (rtwdev,R_BE_HAXI_HISR00 , isrs->isrs[0 ]);if (isrs->isrs[1 ])rtw89_write32 (rtwdev,R_BE_PCIE_DMA_ISR , isrs->isrs[1 ]);rtw89_write32 (rtwdev,R_BE_PCIE_HISR , isrs->ind_isrs);
@@ -868,7 +870,6 @@ EXPORT_SYMBOL(rtw89_pci_disable_intr_v2);void rtw89_pci_enable_intr_v3 (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci) {rtw89_write32 (rtwdev,R_BE_HIMR0 , rtwpci->halt_c2h_intrs); -rtw89_write32 (rtwdev,R_BE_HAXI_HIMR00 , rtwpci->intrs[0 ]);rtw89_write32 (rtwdev,R_BE_PCIE_DMA_IMR_0_V1 , rtwpci->intrs[1 ]);rtw89_write32 (rtwdev,R_BE_PCIE_HIMR0 , rtwpci->ind_intrs); }
@@ -3827,24 +3828,12 @@ static void rtw89_pci_default_intr_mask_v3(struct rtw89_dev *rtwdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; - rtwpci->ind_intrs =B_BE_HCI_AXIDMA_INT_EN0 | -B_BE_HS0_IND_INT_EN0 ; - rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; - rtwpci->intrs[0 ] =B_BE_RDU_CH1_INT_EN_V2 | -B_BE_RDU_CH0_INT_EN_V2 ; - rtwpci->intrs[1 ] =B_BE_PCIE_RX_RX0P2_IMR0_V1 | -B_BE_PCIE_RX_RPQ0_IMR0_V1 ; -} - -static void rtw89_pci_low_power_intr_mask_v3 (struct rtw89_dev *rtwdev) -{ -struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; - - rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 | -B_BE_HS1_IND_INT_EN0 ; + rtwpci->ind_intrs =B_BE_HS0_IND_INT_EN0 ; rtwpci->halt_c2h_intrs =B_BE_HALT_C2H_INT_EN |B_BE_WDT_TIMEOUT_INT_EN ; rtwpci->intrs[0 ] =0 ; - rtwpci->intrs[1 ] =B_BE_PCIE_RX_RX0P2_IMR0_V1 | + rtwpci->intrs[1 ] =B_BE_PCIE_RDU_CH1_IMR | +B_BE_PCIE_RDU_CH0_IMR | +B_BE_PCIE_RX_RX0P2_IMR0_V1 |B_BE_PCIE_RX_RPQ0_IMR0_V1 ; }
@@ -3854,8 +3843,6 @@ void rtw89_pci_config_intr_mask_v3(struct rtw89_dev *rtwdev)if (rtwpci->under_recovery)rtw89_pci_recovery_intr_mask_v3 (rtwdev); -else if (rtwpci->low_power) -rtw89_pci_low_power_intr_mask_v3 (rtwdev);else rtw89_pci_default_intr_mask_v3 (rtwdev); }
drivers/net/wireless/realtek/rtw89/pci.h +16 -0
@@ -372,6 +372,14 @@#define B_BE_HS0ISR_IND_INT BIT(0)#define R_BE_PCIE_DMA_IMR_0_V1 0x30B8 +#define B_BE_PCIE_RDU_CH7_IMR BIT(31) +#define B_BE_PCIE_RDU_CH6_IMR BIT(30) +#define B_BE_PCIE_RDU_CH5_IMR BIT(29) +#define B_BE_PCIE_RDU_CH4_IMR BIT(28) +#define B_BE_PCIE_RDU_CH3_IMR BIT(27) +#define B_BE_PCIE_RDU_CH2_IMR BIT(26) +#define B_BE_PCIE_RDU_CH1_IMR BIT(25) +#define B_BE_PCIE_RDU_CH0_IMR BIT(24)#define B_BE_PCIE_RX_RX1P1_IMR0_V1 BIT(23)#define B_BE_PCIE_RX_RX0P1_IMR0_V1 BIT(22)#define B_BE_PCIE_RX_ROQ1_IMR0_V1 BIT(21)
@@ -397,6 +405,14 @@#define B_BE_PCIE_TX_CH0_IMR0 BIT(0)#define R_BE_PCIE_DMA_ISR 0x30BC +#define B_BE_PCIE_RDU_CH7_INT BIT(31) +#define B_BE_PCIE_RDU_CH6_INT BIT(30) +#define B_BE_PCIE_RDU_CH5_INT BIT(29) +#define B_BE_PCIE_RDU_CH4_INT BIT(28) +#define B_BE_PCIE_RDU_CH3_INT BIT(27) +#define B_BE_PCIE_RDU_CH2_INT BIT(26) +#define B_BE_PCIE_RDU_CH1_INT BIT(25) +#define B_BE_PCIE_RDU_CH0_INT BIT(24)#define B_BE_PCIE_RX_RX1P1_ISR_V1 BIT(23)#define B_BE_PCIE_RX_RX0P1_ISR_V1 BIT(22)#define B_BE_PCIE_RX_ROQ1_ISR_V1 BIT(21)
drivers/net/wireless/realtek/rtw89/pci_be.c +1 -1
@@ -675,7 +675,7 @@ const struct rtw89_pci_isr_def rtw89_pci_isr_be = {EXPORT_SYMBOL (rtw89_pci_isr_be);const struct rtw89_pci_isr_def rtw89_pci_isr_be_v1 = { - .isr_rdu =B_BE_RDU_CH1_INT_V2 |B_BE_RDU_CH0_INT_V2 , + .isr_rdu =B_BE_PCIE_RDU_CH1_INT |B_BE_PCIE_RDU_CH0_INT , .isr_halt_c2h =B_BE_HALT_C2H_INT , .isr_wdt_timeout =B_BE_WDT_TIMEOUT_INT , .isr_clear_rpq = {R_BE_PCIE_DMA_ISR ,B_BE_PCIE_RX_RPQ0_ISR_V1 },
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/10 wifi: rtw89: pci: add struct rtw89_{tx,rx}_rings to put related fields
In reply to Ping-Ke ShihThe new hardware design will expect a continual memory region across all rings, so a new field will be added to describe the region. To help the changes, add struct and make changes ahead.
Don't change logic at all.
--- drivers/net/wireless/realtek/rtw89/pci.c | 48 ++++++++++----------- drivers/net/wireless/realtek/rtw89/pci.h | 12 +++++- drivers/net/wireless/realtek/rtw89/pci_be.c | 4 +- 3 files changed, 36 insertions(+), 28 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +24 -24
@@ -134,7 +134,7 @@ static void rtw89_pci_release_fwcmd(struct rtw89_dev *rtwdev,static void rtw89_pci_reclaim_tx_fwcmd (struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci) { -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[RTW89_TXCH_CH12 ]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[RTW89_TXCH_CH12 ];u32 cnt; cnt =rtw89_pci_txbd_recalc (rtwdev, tx_ring);
@@ -440,7 +440,7 @@ static int rtw89_pci_poll_rxq_dma(struct rtw89_dev *rtwdev,int countdown = rtwdev->napi_budget_countdown;u32 cnt; - rx_ring = &rtwpci->rx_rings[RTW89_RXCH_RXQ ]; + rx_ring = &rtwpci->rx.rings[RTW89_RXCH_RXQ ]; cnt =rtw89_pci_rxbd_recalc (rtwdev, rx_ring);if (!cnt)
@@ -588,7 +588,7 @@ static void rtw89_pci_release_rpp(struct rtw89_dev *rtwdev,return ; } - tx_ring = &rtwpci->tx_rings[txch]; + tx_ring = &rtwpci->tx.rings[txch]; wd_ring = &tx_ring->wd_ring; txwd = &wd_ring->pages[seq];
@@ -694,7 +694,7 @@ static int rtw89_pci_poll_rpq_dma(struct rtw89_dev *rtwdev,u32 cnt;int work_done; - rx_ring = &rtwpci->rx_rings[RTW89_RXCH_RPQ ]; + rx_ring = &rtwpci->rx.rings[RTW89_RXCH_RPQ ];spin_lock_bh (&rtwpci->trx_lock);
@@ -724,7 +724,7 @@ static void rtw89_pci_isr_rxd_unavail(struct rtw89_dev *rtwdev,int i;for (i =0 ; i <RTW89_RXCH_NUM ; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i]; bd_ring = &rx_ring->bd_ring; reg_idx =rtw89_read32 (rtwdev, bd_ring->addr.idx);
@@ -1139,7 +1139,7 @@ staticu32 __rtw89_pci_check_and_reclaim_tx_fwcmd_resource (struct rtw89_dev *rtwdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[RTW89_TXCH_CH12 ]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[RTW89_TXCH_CH12 ];u32 cnt;spin_lock_bh (&rtwpci->trx_lock);
@@ -1155,7 +1155,7 @@ u32 __rtw89_pci_check_and_reclaim_tx_resource_noio(struct rtw89_dev *rtwdev, u8 txch) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[txch]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[txch];struct rtw89_pci_tx_wd_ring *wd_ring = &tx_ring->wd_ring;u32 cnt;
@@ -1172,7 +1172,7 @@ static u32 __rtw89_pci_check_and_reclaim_tx_resource(struct rtw89_dev *rtwdev, u8 txch) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[txch]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[txch];struct rtw89_pci_tx_wd_ring *wd_ring = &tx_ring->wd_ring;const struct rtw89_chip_info *chip = rtwdev->chip;u32 bd_cnt, wd_cnt, min_cnt =0 ;
@@ -1180,7 +1180,7 @@ static u32 __rtw89_pci_check_and_reclaim_tx_resource(struct rtw89_dev *rtwdev,enum rtw89_debug_mask debug_mask;u32 cnt; - rx_ring = &rtwpci->rx_rings[RTW89_RXCH_RPQ ]; + rx_ring = &rtwpci->rx.rings[RTW89_RXCH_RPQ ];spin_lock_bh (&rtwpci->trx_lock); bd_cnt =rtw89_pci_get_avail_txbd_num (tx_ring);
@@ -1265,7 +1265,7 @@ static void rtw89_pci_tx_bd_ring_update(struct rtw89_dev *rtwdev, struct rtw89_pstatic void rtw89_pci_ops_tx_kick_off (struct rtw89_dev *rtwdev,u8 txch) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[txch]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[txch];if (rtwdev->hci.paused) {set_bit (txch, rtwpci->kick_map);
@@ -1285,7 +1285,7 @@ static void rtw89_pci_tx_kick_off_pending(struct rtw89_dev *rtwdev)if (!test_and_clear_bit (txch, rtwpci->kick_map))continue ; - tx_ring = &rtwpci->tx_rings[txch]; + tx_ring = &rtwpci->tx.rings[txch];__rtw89_pci_tx_kick_off (rtwdev, tx_ring); } }
@@ -1293,7 +1293,7 @@ static void rtw89_pci_tx_kick_off_pending(struct rtw89_dev *rtwdev)static void __pci_flush_txch (struct rtw89_dev *rtwdev,u8 txch,bool drop) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[txch]; +struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx.rings[txch];struct rtw89_pci_dma_ring *bd_ring = &tx_ring->bd_ring;u32 cur_idx, cur_rp;u8 i;
@@ -1559,7 +1559,7 @@ static int rtw89_pci_tx_write(struct rtw89_dev *rtwdev, struct rtw89_core_tx_reqreturn -EINVAL ; } - tx_ring = &rtwpci->tx_rings[txch]; + tx_ring = &rtwpci->tx.rings[txch];spin_lock_bh (&rtwpci->trx_lock); n_avail_txbd =rtw89_pci_get_avail_txbd_num (tx_ring);
@@ -1665,7 +1665,7 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev)if (info->tx_dma_ch_mask &BIT (i))continue ; - tx_ring = &rtwpci->tx_rings[i]; + tx_ring = &rtwpci->tx.rings[i]; bd_ring = &tx_ring->bd_ring; bd_ram = bd_ram_table ? &bd_ram_table[i] :NULL ; addr_num = bd_ring->addr.num;
@@ -1687,7 +1687,7 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev) }for (i =0 ; i <RTW89_RXCH_NUM ; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i]; bd_ring = &rx_ring->bd_ring; addr_num = bd_ring->addr.num; addr_idx = bd_ring->addr.idx;
@@ -1736,7 +1736,7 @@ void rtw89_pci_ops_reset(struct rtw89_dev *rtwdev) skb_queue_len(&rtwpci->h2c_queue), true);continue ; } -rtw89_pci_release_tx_ring (rtwdev, &rtwpci->tx_rings[txch]); +rtw89_pci_release_tx_ring (rtwdev, &rtwpci->tx.rings[txch]); }spin_unlock_bh (&rtwpci->trx_lock); }
@@ -1812,14 +1812,14 @@ void rtw89_pci_switch_bd_idx_addr(struct rtw89_dev *rtwdev, bool low_power)return ;for (i =0 ; i <RTW89_TXCH_NUM ; i++) { - tx_ring = &rtwpci->tx_rings[i]; + tx_ring = &rtwpci->tx.rings[i]; tx_ring->bd_ring.addr.idx = low_power ? bd_idx_addr->tx_bd_addrs[i] : dma_addr_set->tx[i].idx; }for (i =0 ; i <RTW89_RXCH_NUM ; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i]; rx_ring->bd_ring.addr.idx = low_power ? bd_idx_addr->rx_bd_addrs[i] : dma_addr_set->rx[i].idx;
@@ -3272,7 +3272,7 @@ static void rtw89_pci_free_tx_rings(struct rtw89_dev *rtwdev,for (i =0 ; i <RTW89_TXCH_NUM ; i++) {if (info->tx_dma_ch_mask &BIT (i))continue ; - tx_ring = &rtwpci->tx_rings[i]; + tx_ring = &rtwpci->tx.rings[i];rtw89_pci_free_tx_wd_ring (rtwdev, pdev, tx_ring);rtw89_pci_free_tx_ring (rtwdev, pdev, tx_ring); }
@@ -3318,7 +3318,7 @@ static void rtw89_pci_free_rx_rings(struct rtw89_dev *rtwdev,int i;for (i =0 ; i <RTW89_RXCH_NUM ; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i];rtw89_pci_free_rx_ring (rtwdev, pdev, rx_ring); } }
@@ -3470,7 +3470,7 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev,for (i =0 ; i <RTW89_TXCH_NUM ; i++) {if (info->tx_dma_ch_mask &BIT (i))continue ; - tx_ring = &rtwpci->tx_rings[i]; + tx_ring = &rtwpci->tx.rings[i]; desc_size =sizeof (struct rtw89_pci_tx_bd_32 ); len =RTW89_PCI_TXBD_NUM_MAX ; ret = rtw89_pci_alloc_tx_ring(rtwdev, pdev, tx_ring,
@@ -3486,7 +3486,7 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev, err_free: tx_allocated = i;for (i =0 ; i < tx_allocated; i++) { - tx_ring = &rtwpci->tx_rings[i]; + tx_ring = &rtwpci->tx.rings[i];rtw89_pci_free_tx_ring (rtwdev, pdev, tx_ring); }
@@ -3588,7 +3588,7 @@ static int rtw89_pci_alloc_rx_rings(struct rtw89_dev *rtwdev,int ret;for (i =0 ; i <RTW89_RXCH_NUM ; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i]; desc_size =sizeof (struct rtw89_pci_rx_bd_32 ); len =RTW89_PCI_RXBD_NUM_MAX ; ret = rtw89_pci_alloc_rx_ring(rtwdev, pdev, rx_ring,
@@ -3604,7 +3604,7 @@ static int rtw89_pci_alloc_rx_rings(struct rtw89_dev *rtwdev, err_free: rx_allocated = i;for (i =0 ; i < rx_allocated; i++) { - rx_ring = &rtwpci->rx_rings[i]; + rx_ring = &rtwpci->rx.rings[i];rtw89_pci_free_rx_ring (rtwdev, pdev, rx_ring); }
drivers/net/wireless/realtek/rtw89/pci.h +10 -2
@@ -1524,6 +1524,10 @@ struct rtw89_pci_tx_ring {u64 tx_mac_id_drop; }; +struct rtw89_pci_tx_rings { +struct rtw89_pci_tx_ring rings[RTW89_TXCH_NUM ]; +}; +struct rtw89_pci_rx_ring {struct rtw89_pci_dma_ring bd_ring;struct sk_buff *buf[RTW89_PCI_RXBD_NUM_MAX ];
@@ -1533,6 +1537,10 @@ struct rtw89_pci_rx_ring { u32 target_rx_tag:13; }; +struct rtw89_pci_rx_rings { +struct rtw89_pci_rx_ring rings[RTW89_RXCH_NUM ]; +}; +struct rtw89_pci_isrs {u32 ind_isrs;u32 halt_c2h_isrs;
@@ -1550,8 +1558,8 @@ struct rtw89_pci {bool low_power;bool under_recovery;bool enable_dac; -struct rtw89_pci_tx_ring tx_rings[RTW89_TXCH_NUM ]; -struct rtw89_pci_rx_ring rx_rings[RTW89_RXCH_NUM ]; +struct rtw89_pci_tx_rings tx; +struct rtw89_pci_rx_rings rx;struct sk_buff_head h2c_queue;struct sk_buff_head h2c_release_queue;DECLARE_BITMAP (kick_map,RTW89_TXCH_NUM );
drivers/net/wireless/realtek/rtw89/pci_be.c +2 -2
@@ -175,10 +175,10 @@ static void rtw89_pci_clr_idx_all_be(struct rtw89_dev *rtwdev)rtw89_write32 (rtwdev,R_BE_RXBD_RWPTR_CLR1_V1 ,B_BE_CLR_RXQ0_IDX |B_BE_CLR_RPQ0_IDX ); - rx_ring = &rtwpci->rx_rings[RTW89_RXCH_RXQ ]; + rx_ring = &rtwpci->rx.rings[RTW89_RXCH_RXQ ];rtw89_write16 (rtwdev,R_BE_RXQ0_RXBD_IDX_V1 , rx_ring->bd_ring.len -1 ); - rx_ring = &rtwpci->rx_rings[RTW89_RXCH_RPQ ]; + rx_ring = &rtwpci->rx.rings[RTW89_RXCH_RPQ ];rtw89_write16 (rtwdev,R_BE_RPQ0_RXBD_IDX_V1 , rx_ring->bd_ring.len -1 ); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/10 wifi: rtw89: pci: define TX/RX buffer descriptor pool
In reply to Ping-Ke ShihBuffer descriptor (BD) is a helper of DMA for each ring. The new hardware design expects a continual memory across all rings, so allocate a pool and assign to each ring rather than allocate a buffer for a ring individually.
--- drivers/net/wireless/realtek/rtw89/pci.c | 115 +++++++++++++---------- drivers/net/wireless/realtek/rtw89/pci.h | 8 ++ 2 files changed, 75 insertions(+), 48 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +67 -48
@@ -3249,15 +3249,6 @@ static void rtw89_pci_free_tx_ring(struct rtw89_dev *rtwdev,struct pci_dev *pdev, struct rtw89_pci_tx_ring *tx_ring) { - int ring_sz; -u8 *head; -dma_addr_t dma; - - head = tx_ring->bd_ring.head; - dma = tx_ring->bd_ring.dma; - ring_sz = tx_ring->bd_ring.desc_size * tx_ring->bd_ring.len; -dma_free_coherent (&pdev->dev, ring_sz, head, dma); - tx_ring->bd_ring.head = NULL; }
@@ -3265,6 +3256,7 @@ static void rtw89_pci_free_tx_rings(struct rtw89_dev *rtwdev, struct pci_dev *pdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +struct rtw89_pci_dma_pool *bd_pool = &rtwpci->tx.bd_pool;const struct rtw89_pci_info *info = rtwdev->pci_info;struct rtw89_pci_tx_ring *tx_ring;int i;
@@ -3276,6 +3268,8 @@ static void rtw89_pci_free_tx_rings(struct rtw89_dev *rtwdev,rtw89_pci_free_tx_wd_ring (rtwdev, pdev, tx_ring);rtw89_pci_free_tx_ring (rtwdev, pdev, tx_ring); } + +dma_free_coherent (&pdev->dev, bd_pool->size, bd_pool->head, bd_pool->dma); } static void rtw89_pci_free_rx_ring(struct rtw89_dev *rtwdev,
@@ -3286,8 +3280,6 @@ static void rtw89_pci_free_rx_ring(struct rtw89_dev *rtwdev,struct sk_buff *skb;dma_addr_t dma;u32 buf_sz; -u8 *head; -int ring_sz = rx_ring->bd_ring.desc_size * rx_ring->bd_ring.len;int i; buf_sz = rx_ring->buf_sz;
@@ -3303,10 +3295,6 @@ static void rtw89_pci_free_rx_ring(struct rtw89_dev *rtwdev, rx_ring->buf[i] =NULL ; } - head = rx_ring->bd_ring.head; - dma = rx_ring->bd_ring.dma; -dma_free_coherent (&pdev->dev, ring_sz, head, dma); - rx_ring->bd_ring.head =NULL ; }
@@ -3314,6 +3302,7 @@ static void rtw89_pci_free_rx_rings(struct rtw89_dev *rtwdev, struct pci_dev *pdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +struct rtw89_pci_dma_pool *bd_pool = &rtwpci->rx.bd_pool;struct rtw89_pci_rx_ring *rx_ring;int i;
@@ -3321,6 +3310,8 @@ static void rtw89_pci_free_rx_rings(struct rtw89_dev *rtwdev, rx_ring = &rtwpci->rx.rings[i];rtw89_pci_free_rx_ring (rtwdev, pdev, rx_ring); } + +dma_free_coherent (&pdev->dev, bd_pool->size, bd_pool->head, bd_pool->dma); } static void rtw89_pci_free_trx_rings(struct rtw89_dev *rtwdev,
@@ -3412,12 +3403,10 @@ static int rtw89_pci_alloc_tx_ring(struct rtw89_dev *rtwdev,struct pci_dev *pdev, struct rtw89_pci_tx_ring *tx_ring, u32 desc_size, u32 len, - enum rtw89_tx_channel txch) + enum rtw89_tx_channel txch, + void *head, dma_addr_t dma) { const struct rtw89_pci_ch_dma_addr *txch_addr; -int ring_sz = desc_size * len; -u8 *head; -dma_addr_t dma;int ret; ret =rtw89_pci_alloc_tx_wd_ring (rtwdev, pdev, tx_ring, txch);
@@ -3432,12 +3421,6 @@ static int rtw89_pci_alloc_tx_ring(struct rtw89_dev *rtwdev, goto err_free_wd_ring; } - head =dma_alloc_coherent (&pdev->dev, ring_sz, &dma,GFP_KERNEL ); -if (!head) { - ret = -ENOMEM ; - goto err_free_wd_ring; - } -INIT_LIST_HEAD (&tx_ring->busy_pages); tx_ring->bd_ring.head = head; tx_ring->bd_ring.dma = dma;
@@ -3460,25 +3443,48 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev, struct pci_dev *pdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +struct rtw89_pci_dma_pool *bd_pool = &rtwpci->tx.bd_pool;const struct rtw89_pci_info *info = rtwdev->pci_info;struct rtw89_pci_tx_ring *tx_ring; +u32 i, tx_allocated; +dma_addr_t dma;u32 desc_size; +u32 ring_sz; +u32 pool_sz; +u32 ch_num; +void *head;u32 len; -u32 i, tx_allocated;int ret; +BUILD_BUG_ON (RTW89_PCI_TXBD_NUM_MAX %16 ); + + desc_size =sizeof (struct rtw89_pci_tx_bd_32 ); + len =RTW89_PCI_TXBD_NUM_MAX ; + ch_num =RTW89_TXCH_NUM -hweight32 (info->tx_dma_ch_mask); + ring_sz = desc_size * len; + pool_sz = ring_sz * ch_num; + + head =dma_alloc_coherent (&pdev->dev, pool_sz, &dma,GFP_KERNEL ); +if (!head) +return -ENOMEM ; + + bd_pool->head = head; + bd_pool->dma = dma; + bd_pool->size = pool_sz; +for (i =0 ; i <RTW89_TXCH_NUM ; i++) {if (info->tx_dma_ch_mask &BIT (i))continue ; tx_ring = &rtwpci->tx.rings[i]; - desc_size =sizeof (struct rtw89_pci_tx_bd_32 ); - len =RTW89_PCI_TXBD_NUM_MAX ; ret =rtw89_pci_alloc_tx_ring (rtwdev, pdev, tx_ring, - desc_size, len, i); + desc_size, len, i, head, dma);if (ret) {rtw89_err (rtwdev,"failed to alloc tx ring %d\n" , i); goto err_free; } + + head += ring_sz; + dma += ring_sz; }return 0 ;
@@ -3490,20 +3496,20 @@ static int rtw89_pci_alloc_tx_rings(struct rtw89_dev *rtwdev,rtw89_pci_free_tx_ring (rtwdev, pdev, tx_ring); } +dma_free_coherent (&pdev->dev, bd_pool->size, bd_pool->head, bd_pool->dma); +return ret; }static int rtw89_pci_alloc_rx_ring (struct rtw89_dev *rtwdev,struct pci_dev *pdev,struct rtw89_pci_rx_ring *rx_ring, -u32 desc_size,u32 len,u32 rxch) +u32 desc_size,u32 len,u32 rxch, +void *head,dma_addr_t dma) {const struct rtw89_pci_info *info = rtwdev->pci_info;const struct rtw89_pci_ch_dma_addr *rxch_addr;struct sk_buff *skb; -u8 *head; -dma_addr_t dma; -int ring_sz = desc_size * len;int buf_sz =RTW89_PCI_RX_BUF_SIZE ;int i, allocated;int ret;
@@ -3514,12 +3520,6 @@ static int rtw89_pci_alloc_rx_ring(struct rtw89_dev *rtwdev,return ret; } - head =dma_alloc_coherent (&pdev->dev, ring_sz, &dma,GFP_KERNEL ); -if (!head) { - ret = -ENOMEM ; - goto err; - } - rx_ring->bd_ring.head = head; rx_ring->bd_ring.dma = dma; rx_ring->bd_ring.len = len;
@@ -3568,12 +3568,8 @@ static int rtw89_pci_alloc_rx_ring(struct rtw89_dev *rtwdev, rx_ring->buf[i] =NULL ; } - head = rx_ring->bd_ring.head; - dma = rx_ring->bd_ring.dma; -dma_free_coherent (&pdev->dev, ring_sz, head, dma); - rx_ring->bd_ring.head =NULL ; -err: +return ret; }
@@ -3581,22 +3577,43 @@ static int rtw89_pci_alloc_rx_rings(struct rtw89_dev *rtwdev, struct pci_dev *pdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; +struct rtw89_pci_dma_pool *bd_pool = &rtwpci->rx.bd_pool;struct rtw89_pci_rx_ring *rx_ring; +int i, rx_allocated; +dma_addr_t dma;u32 desc_size; +u32 ring_sz; +u32 pool_sz; +void *head;u32 len; -int i, rx_allocated;int ret; + desc_size =sizeof (struct rtw89_pci_rx_bd_32 ); + len =RTW89_PCI_RXBD_NUM_MAX ; + ring_sz = desc_size * len; + pool_sz = ring_sz *RTW89_RXCH_NUM ; + + head =dma_alloc_coherent (&pdev->dev, pool_sz, &dma,GFP_KERNEL ); +if (!head) +return -ENOMEM ; + + bd_pool->head = head; + bd_pool->dma = dma; + bd_pool->size = pool_sz; +for (i =0 ; i <RTW89_RXCH_NUM ; i++) { rx_ring = &rtwpci->rx.rings[i]; - desc_size =sizeof (struct rtw89_pci_rx_bd_32 ); - len =RTW89_PCI_RXBD_NUM_MAX ; + ret =rtw89_pci_alloc_rx_ring (rtwdev, pdev, rx_ring, - desc_size, len, i); + desc_size, len, i, + head, dma);if (ret) {rtw89_err (rtwdev,"failed to alloc rx ring %d\n" , i); goto err_free; } + + head += ring_sz; + dma += ring_sz; }return 0 ;
@@ -3608,6 +3625,8 @@ static int rtw89_pci_alloc_rx_rings(struct rtw89_dev *rtwdev,rtw89_pci_free_rx_ring (rtwdev, pdev, rx_ring); } +dma_free_coherent (&pdev->dev, bd_pool->size, bd_pool->head, bd_pool->dma); +return ret; }
drivers/net/wireless/realtek/rtw89/pci.h +8 -0
@@ -1495,6 +1495,12 @@ struct rtw89_pci_dma_ring {u32 rp;/* hw idx */ }; +struct rtw89_pci_dma_pool { +void *head; +dma_addr_t dma; +u32 size; +}; +struct rtw89_pci_tx_wd_ring {void *head;dma_addr_t dma;
@@ -1526,6 +1532,7 @@ struct rtw89_pci_tx_ring {struct rtw89_pci_tx_rings {struct rtw89_pci_tx_ring rings[RTW89_TXCH_NUM ]; +struct rtw89_pci_dma_pool bd_pool; };struct rtw89_pci_rx_ring {
@@ -1539,6 +1546,7 @@ struct rtw89_pci_rx_ring {struct rtw89_pci_rx_rings {struct rtw89_pci_rx_ring rings[RTW89_RXCH_NUM ]; +struct rtw89_pci_dma_pool bd_pool; };struct rtw89_pci_isrs {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/10 wifi: rtw89: pci: add group BD address design
In reply to Ping-Ke ShihThe newly designed group BD address is to use the same starting DMA address with offset as below picture:
Original DMA memory Group BD address
+--------+ (*1) +---------+ (*2) +--------+ | CH 0 -|-------> | | <-------|- CH 0 | <-+--+--+--+ +--------+ | | | | | | | | | CH 1 -|-------> | | | CH 1 -|---+ | | | +--------+ | | | | | | | | CH 2 -|-------> | | | CH 2 -|------+ | | +--------+ | | | | | | | CH 3 -|-------> | | | CH 3 -|---------+ | +--------+ | | | | | | : -|-------> | | | : -|------------+ +--------+ | | +--------+ (*3; offset from CH 0) | CH 8 -|-------> | | <-------|- CH 8 | <-+ +--------+ | | | | | (offset from CH 8) | : -|-------> | | | : -|---+ +--------+ +---------+ +--------+
Compare (*1) and (*2), for original design, each DMA channel has individual DMA address, so it is not necessary to allocate continual DMA address across channels. For group BD address, only two DMA address are set, and each channel set the offset (*3) from base address.
The element number and offset of a channel are encoded rather than a raw number, so add a function to translate numbers into hardware format.
--- drivers/net/wireless/realtek/rtw89/pci.c | 141 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/pci.h | 34 ++++- .../net/wireless/realtek/rtw89/rtw8851be.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ae.c | 1 + .../net/wireless/realtek/rtw89/rtw8852be.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bte.c | 1 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 1 + .../net/wireless/realtek/rtw89/rtw8922ae.c | 1 + 8 files changed, 172 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +133 -8
@@ -988,6 +988,24 @@ static irqreturn_t rtw89_pci_interrupt_handler(int irq, void *dev)return irqret; } +#define DEF_TXCHADDRS_TYPE3(gen, ch_idx, txch, v...) \ + [RTW89_TXCH_##ch_idx] = { \ + .num = R_##gen##_##txch##_TXBD_CFG, \ + .idx = R_##gen##_##txch##_TXBD_IDX ##v, \ + .bdram = 0, \ + .desa_l = 0, \ + .desa_h = 0, \ + } + +#define DEF_TXCHADDRS_TYPE3_GRP_BASE(gen, ch_idx, txch, grp, v...) \ + [RTW89_TXCH_##ch_idx] = { \ + .num = R_##gen##_##txch##_TXBD_CFG, \ + .idx = R_##gen##_##txch##_TXBD_IDX ##v, \ + .bdram = 0, \ + .desa_l = R_##gen##_##grp##_TXBD_DESA_L, \ + .desa_h = R_##gen##_##grp##_TXBD_DESA_H, \ + } + #define DEF_TXCHADDRS_TYPE2(gen, ch_idx, txch, v...) \ [RTW89_TXCH_##ch_idx] = { \ .num = R_##gen##_##txch##_TXBD_NUM ##v, \
@@ -1015,6 +1033,22 @@ static irqreturn_t rtw89_pci_interrupt_handler(int irq, void *dev) .desa_h = R_AX_##txch##_TXBD_DESA_H ##v, \ } +#define DEF_RXCHADDRS_TYPE3(gen, ch_idx, rxch, v...) \ + [RTW89_RXCH_##ch_idx] = { \ + .num = R_##gen##_RX_##rxch##_RXBD_CONFIG, \ + .idx = R_##gen##_##ch_idx##0_RXBD_IDX ##v, \ + .desa_l = 0, \ + .desa_h = 0, \ + } + +#define DEF_RXCHADDRS_TYPE3_GRP_BASE(gen, ch_idx, rxch, grp, v...) \ + [RTW89_RXCH_##ch_idx] = { \ + .num = R_##gen##_RX_##rxch##_RXBD_CONFIG, \ + .idx = R_##gen##_##ch_idx##0_RXBD_IDX ##v, \ + .desa_l = R_##gen##_##grp##_RXBD_DESA_L, \ + .desa_h = R_##gen##_##grp##_RXBD_DESA_H, \ + } + #define DEF_RXCHADDRS(gen, ch_idx, rxch, v...) \ [RTW89_RXCH_##ch_idx] = { \ .num = R_##gen##_##rxch##_RXBD_NUM ##v, \
@@ -1092,8 +1126,36 @@ const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_be = { };EXPORT_SYMBOL (rtw89_pci_ch_dma_addr_set_be); +const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_be_v1 = { + .tx = { +DEF_TXCHADDRS_TYPE3_GRP_BASE (BE ,ACH0 ,CH0 ,ACQ , _V1), +/* no CH1 */ +DEF_TXCHADDRS_TYPE3 (BE ,ACH2 ,CH2 , _V1), +/* no CH3 */ +DEF_TXCHADDRS_TYPE3 (BE ,ACH4 ,CH4 , _V1), +/* no CH5 */ +DEF_TXCHADDRS_TYPE3 (BE ,ACH6 ,CH6 , _V1), +/* no CH7 */ +DEF_TXCHADDRS_TYPE3_GRP_BASE (BE ,CH8 ,CH8 ,NACQ , _V1), +/* no CH9 */ +DEF_TXCHADDRS_TYPE3 (BE ,CH10 ,CH10 , _V1), +/* no CH11 */ +DEF_TXCHADDRS_TYPE3 (BE ,CH12 ,CH12 , _V1), + }, + .rx = { +DEF_RXCHADDRS_TYPE3_GRP_BASE (BE ,RXQ ,CH0 ,HOST0 , _V1), +DEF_RXCHADDRS_TYPE3 (BE ,RPQ ,CH1 , _V1), + }, +}; +EXPORT_SYMBOL (rtw89_pci_ch_dma_addr_set_be_v1); + +#undef DEF_TXCHADDRS_TYPE3 +#undef DEF_TXCHADDRS_TYPE3_GRP_BASE +#undef DEF_TXCHADDRS_TYPE2#undef DEF_TXCHADDRS_TYPE1#undef DEF_TXCHADDRS +#undef DEF_RXCHADDRS_TYPE3 +#undef DEF_RXCHADDRS_TYPE3_GRP_BASE#undef DEF_RXCHADDRS static int rtw89_pci_get_txch_addrs(struct rtw89_dev *rtwdev,
@@ -1645,6 +1707,41 @@ static void rtw89_pci_init_wp_16sel(struct rtw89_dev *rtwdev) } } +static u16 rtw89_pci_enc_bd_cfg (struct rtw89_dev *rtwdev,u16 bd_num, +u32 dma_offset) +{ +u16 dma_offset_sel; +u16 num_sel; + +/* B_BE_TX_NUM_SEL_MASK, B_BE_RX_NUM_SEL_MASK: +* 0 -> 0 +* 1 -> 64 = 2^6 +* 2 -> 128 = 2^7 +* ... +* 7 -> 4096 = 2^12 +*/ + num_sel =ilog2 (bd_num) -5 ; + +if (hweight16 (bd_num) !=1 ) +rtw89_warn (rtwdev,"bd_num %u is not power of 2\n" , bd_num); + +/* B_BE_TX_START_OFFSET_MASK, B_BE_RX_START_OFFSET_MASK: +* 0 -> 0 = 0 * 2^9 +* 1 -> 512 = 1 * 2^9 +* 2 -> 1024 = 2 * 2^9 +* 3 -> 1536 = 3 * 2^9 +* ... +* 255 -> 130560 = 255 * 2^9 +*/ + dma_offset_sel = dma_offset >>9 ; + +if (dma_offset %512 ) +rtw89_warn (rtwdev,"offset %u is not multiple of 512\n" , dma_offset); + +return u16_encode_bits (num_sel,B_BE_TX_NUM_SEL_MASK ) | +u16_encode_bits (dma_offset_sel,B_BE_TX_START_OFFSET_MASK ); +} +static void rtw89_pci_reset_trx_rings (struct rtw89_dev *rtwdev) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
@@ -1654,10 +1751,12 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev)struct rtw89_pci_rx_ring *rx_ring;struct rtw89_pci_dma_ring *bd_ring;const struct rtw89_pci_bd_ram *bd_ram; +dma_addr_t group_dma_base =0 ; +u16 num_or_offset; +u32 addr_desa_l; +u32 addr_bdram;u32 addr_num;u32 addr_idx; -u32 addr_bdram; -u32 addr_desa_l;u32 val32;int i;
@@ -1674,7 +1773,18 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev) bd_ring->wp =0 ; bd_ring->rp =0 ; -rtw89_write16 (rtwdev, addr_num, bd_ring->len); +if (info->group_bd_addr) { +if (addr_desa_l) + group_dma_base = bd_ring->dma; + + num_or_offset = +rtw89_pci_enc_bd_cfg (rtwdev, bd_ring->len, + bd_ring->dma - group_dma_base); + }else { + num_or_offset = bd_ring->len; + } +rtw89_write16 (rtwdev, addr_num, num_or_offset); +if (addr_bdram && bd_ram) { val32 =FIELD_PREP (BDRAM_SIDX_MASK , bd_ram->start_idx) | FIELD_PREP(BDRAM_MAX_MASK, bd_ram->max_num) |
@@ -1682,8 +1792,10 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev)rtw89_write32 (rtwdev, addr_bdram, val32); } -rtw89_write32 (rtwdev, addr_desa_l, bd_ring->dma); -rtw89_write32 (rtwdev, addr_desa_l +4 ,upper_32_bits (bd_ring->dma)); +if (addr_desa_l) { +rtw89_write32 (rtwdev, addr_desa_l, bd_ring->dma); +rtw89_write32 (rtwdev, addr_desa_l +4 ,upper_32_bits (bd_ring->dma)); + } }for (i =0 ; i <RTW89_RXCH_NUM ; i++) {
@@ -1701,9 +1813,22 @@ static void rtw89_pci_reset_trx_rings(struct rtw89_dev *rtwdev) rx_ring->diliver_desc.ready = false; rx_ring->target_rx_tag =0 ; -rtw89_write16 (rtwdev, addr_num, bd_ring->len); -rtw89_write32 (rtwdev, addr_desa_l, bd_ring->dma); -rtw89_write32 (rtwdev, addr_desa_l +4 ,upper_32_bits (bd_ring->dma)); +if (info->group_bd_addr) { +if (addr_desa_l) + group_dma_base = bd_ring->dma; + + num_or_offset = +rtw89_pci_enc_bd_cfg (rtwdev, bd_ring->len, + bd_ring->dma - group_dma_base); + }else { + num_or_offset = bd_ring->len; + } +rtw89_write16 (rtwdev, addr_num, num_or_offset); + +if (addr_desa_l) { +rtw89_write32 (rtwdev, addr_desa_l, bd_ring->dma); +rtw89_write32 (rtwdev, addr_desa_l +4 ,upper_32_bits (bd_ring->dma)); + }if (info->rx_ring_eq_is_full)rtw89_write16 (rtwdev, addr_idx, bd_ring->wp);
drivers/net/wireless/realtek/rtw89/pci.h +33 -1
@@ -808,9 +808,25 @@#define R_BE_CH13_TXBD_NUM_V1 0xB04C#define R_BE_CH14_TXBD_NUM_V1 0xB04E +#define R_BE_CH0_TXBD_CFG 0xB030 +#define R_BE_CH2_TXBD_CFG 0xB034 +#define R_BE_CH4_TXBD_CFG 0xB038 +#define R_BE_CH6_TXBD_CFG 0xB03C +#define R_BE_CH8_TXBD_CFG 0xB040 +#define R_BE_CH10_TXBD_CFG 0xB044 +#define R_BE_CH12_TXBD_CFG 0xB048 +#define B_BE_TX_FLAG BIT(14) +#define B_BE_TX_START_OFFSET_MASK GENMASK(12, 4) +#define B_BE_TX_NUM_SEL_MASK GENMASK(2, 0) +#define R_BE_RXQ0_RXBD_NUM_V1 0xB050#define R_BE_RPQ0_RXBD_NUM_V1 0xB052 +#define R_BE_RX_CH0_RXBD_CONFIG 0xB050 +#define R_BE_RX_CH1_RXBD_CONFIG 0xB052 +#define B_BE_RX_START_OFFSET_MASK GENMASK(11, 4) +#define B_BE_RX_NUM_SEL_MASK GENMASK(2, 0) +#define R_BE_CH0_TXBD_IDX_V1 0xB100#define R_BE_CH1_TXBD_IDX_V1 0xB104#define R_BE_CH2_TXBD_IDX_V1 0xB108
@@ -861,11 +877,25 @@#define R_BE_CH14_TXBD_DESA_L_V1 0xB270#define R_BE_CH14_TXBD_DESA_H_V1 0xB274 +#define R_BE_ACQ_TXBD_DESA_L 0xB200 +#define B_BE_TX_ACQ_DESA_L_MASK GENMASK(31, 3) +#define R_BE_ACQ_TXBD_DESA_H 0xB204 +#define B_BE_TX_ACQ_DESA_H_MASK GENMASK(7, 0) +#define R_BE_NACQ_TXBD_DESA_L 0xB240 +#define B_BE_TX_NACQ_DESA_L_MASK GENMASK(31, 3) +#define R_BE_NACQ_TXBD_DESA_H 0xB244 +#define B_BE_TX_NACQ_DESA_H_MASK GENMASK(7, 0) +#define R_BE_RXQ0_RXBD_DESA_L_V1 0xB300#define R_BE_RXQ0_RXBD_DESA_H_V1 0xB304#define R_BE_RPQ0_RXBD_DESA_L_V1 0xB308#define R_BE_RPQ0_RXBD_DESA_H_V1 0xB30C +#define R_BE_HOST0_RXBD_DESA_L 0xB300 +#define B_BE_RX_HOST0_DESA_L_MASK GENMASK(31, 3) +#define R_BE_HOST0_RXBD_DESA_H 0xB304 +#define B_BE_RX_HOST0_DESA_H_MASK GENMASK(7, 0) +#define R_BE_WP_ADDR_H_SEL0_3_V1 0xB420#define R_BE_WP_ADDR_H_SEL4_7_V1 0xB424#define R_BE_WP_ADDR_H_SEL8_11_V1 0xB428
@@ -1273,7 +1303,7 @@ struct rtw89_pci_bd_idx_addr { };struct rtw89_pci_ch_dma_addr { -u32 num; +u32 num;/* also `offset` addr for group_bd_addr design */ u32 idx;u32 bdram;u32 desa_l;
@@ -1355,6 +1385,7 @@ struct rtw89_pci_info {bool rx_ring_eq_is_full;bool check_rx_tag;bool no_rxbd_fs; +bool group_bd_addr;u32 init_cfg_reg;u32 txhci_en_bit;
@@ -1669,6 +1700,7 @@ extern const struct pci_error_handlers rtw89_pci_err_handler;extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set;extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_v1;extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_be; +extern const struct rtw89_pci_ch_dma_addr_set rtw89_pci_ch_dma_addr_set_be_v1;extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_dual[RTW89_TXCH_NUM ];extern const struct rtw89_pci_bd_ram rtw89_bd_ram_table_single[RTW89_TXCH_NUM ];extern const struct rtw89_pci_isr_def rtw89_pci_isr_ax;
drivers/net/wireless/realtek/rtw89/rtw8851be.c +1 -0
@@ -29,6 +29,7 @@ static const struct rtw89_pci_info rtw8851b_pci_info = { .rx_ring_eq_is_full = false, .check_rx_tag = false, .no_rxbd_fs = false, + .group_bd_addr = false, .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +1 -0
@@ -29,6 +29,7 @@ static const struct rtw89_pci_info rtw8852a_pci_info = { .rx_ring_eq_is_full = false, .check_rx_tag = false, .no_rxbd_fs = false, + .group_bd_addr = false, .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
drivers/net/wireless/realtek/rtw89/rtw8852be.c +1 -0
@@ -29,6 +29,7 @@ static const struct rtw89_pci_info rtw8852b_pci_info = { .rx_ring_eq_is_full = false, .check_rx_tag = false, .no_rxbd_fs = false, + .group_bd_addr = false, .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
drivers/net/wireless/realtek/rtw89/rtw8852bte.c +1 -0
@@ -35,6 +35,7 @@ static const struct rtw89_pci_info rtw8852bt_pci_info = { .rx_ring_eq_is_full = false, .check_rx_tag = false, .no_rxbd_fs = false, + .group_bd_addr = false, .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +1 -0
@@ -38,6 +38,7 @@ static const struct rtw89_pci_info rtw8852c_pci_info = { .rx_ring_eq_is_full = false, .check_rx_tag = false, .no_rxbd_fs = false, + .group_bd_addr = false, .init_cfg_reg = R_AX_HAXI_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN_V1,
drivers/net/wireless/realtek/rtw89/rtw8922ae.c +1 -0
@@ -35,6 +35,7 @@ static const struct rtw89_pci_info rtw8922a_pci_info = { .rx_ring_eq_is_full = true, .check_rx_tag = true, .no_rxbd_fs = true, + .group_bd_addr = false, .init_cfg_reg = R_BE_HAXI_INIT_CFG1, .txhci_en_bit = B_BE_TXDMA_EN,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/10 wifi: rtw89: pci: abstract RPP parser
In reply to Ping-Ke ShihRPP is short for release report of payload, which carries information assisting TX completion. Since coming chips change the format, abstract the parser ahead.
Don't change logic at all.
--- drivers/net/wireless/realtek/rtw89/pci.c | 46 +++++++++++-------- drivers/net/wireless/realtek/rtw89/pci.h | 12 +++++ .../net/wireless/realtek/rtw89/rtw8851be.c | 2 + .../net/wireless/realtek/rtw89/rtw8852ae.c | 2 + .../net/wireless/realtek/rtw89/rtw8852be.c | 2 + .../net/wireless/realtek/rtw89/rtw8852bte.c | 2 + .../net/wireless/realtek/rtw89/rtw8852ce.c | 2 + .../net/wireless/realtek/rtw89/rtw8922ae.c | 2 + 8 files changed, 52 insertions(+), 18 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +28 -18
@@ -568,31 +568,40 @@ static void rtw89_pci_release_txwd_skb(struct rtw89_dev *rtwdev,rtw89_pci_enqueue_txwd (tx_ring, txwd); } -static void rtw89_pci_release_rpp (struct rtw89_dev *rtwdev, -struct rtw89_pci_rpp_fmt *rpp) +void rtw89_pci_parse_rpp (struct rtw89_dev *rtwdev,void *_rpp, +struct rtw89_pci_rpp_info *rpp_info) +{ +const struct rtw89_pci_rpp_fmt *rpp = _rpp; + + rpp_info->seq =le32_get_bits (rpp->dword,RTW89_PCI_RPP_SEQ ); + rpp_info->qsel =le32_get_bits (rpp->dword,RTW89_PCI_RPP_QSEL ); + rpp_info->tx_status =le32_get_bits (rpp->dword,RTW89_PCI_RPP_TX_STATUS ); + rpp_info->txch =rtw89_core_get_ch_dma (rtwdev, rpp_info->qsel); +} +EXPORT_SYMBOL (rtw89_pci_parse_rpp); + +static void rtw89_pci_release_rpp (struct rtw89_dev *rtwdev,void *rpp) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -struct rtw89_pci_tx_ring *tx_ring; +const struct rtw89_pci_info *info = rtwdev->pci_info; +struct rtw89_pci_rpp_info rpp_info = {};struct rtw89_pci_tx_wd_ring *wd_ring; +struct rtw89_pci_tx_ring *tx_ring;struct rtw89_pci_tx_wd *txwd; -u16 seq; -u8 qsel, tx_status, txch; - seq =le32_get_bits (rpp->dword,RTW89_PCI_RPP_SEQ ); - qsel =le32_get_bits (rpp->dword,RTW89_PCI_RPP_QSEL ); - tx_status =le32_get_bits (rpp->dword,RTW89_PCI_RPP_TX_STATUS ); - txch =rtw89_core_get_ch_dma (rtwdev, qsel); + info->parse_rpp (rtwdev, rpp, &rpp_info); -if (txch ==RTW89_TXCH_CH12 ) { +if (rpp_info.txch ==RTW89_TXCH_CH12 ) {rtw89_warn (rtwdev,"should no fwcmd release report\n" );return ; } - tx_ring = &rtwpci->tx.rings[txch]; + tx_ring = &rtwpci->tx.rings[rpp_info.txch]; wd_ring = &tx_ring->wd_ring; - txwd = &wd_ring->pages[seq]; + txwd = &wd_ring->pages[rpp_info.seq]; -rtw89_pci_release_txwd_skb (rtwdev, tx_ring, txwd, seq, tx_status); +rtw89_pci_release_txwd_skb (rtwdev, tx_ring, txwd, rpp_info.seq, + rpp_info.tx_status); } static void rtw89_pci_release_pending_txwd_skb(struct rtw89_dev *rtwdev,
@@ -617,13 +626,14 @@ static u32 rtw89_pci_release_tx_skbs(struct rtw89_dev *rtwdev, u32 max_cnt) {struct rtw89_pci_dma_ring *bd_ring = &rx_ring->bd_ring; -struct rtw89_pci_rx_info *rx_info; -struct rtw89_pci_rpp_fmt *rpp; +const struct rtw89_pci_info *info = rtwdev->pci_info;struct rtw89_rx_desc_info desc_info = {}; +struct rtw89_pci_rx_info *rx_info;struct sk_buff *skb; -u32 cnt =0 ; -u32 rpp_size =sizeof (struct rtw89_pci_rpp_fmt ); +void *rpp;u32 rxinfo_size =sizeof (struct rtw89_pci_rxbd_info ); +u32 rpp_size = info->rpp_fmt_size; +u32 cnt =0 ;u32 skb_idx;u32 offset;int ret;
@@ -649,7 +659,7 @@ static u32 rtw89_pci_release_tx_skbs(struct rtw89_dev *rtwdev,/* first segment has RX desc */ offset = desc_info.offset + desc_info.rxd_len;for (; offset + rpp_size <= rx_info->len; offset += rpp_size) { - rpp = (struct rtw89_pci_rpp_fmt *)(skb->data + offset); + rpp = skb->data + offset;rtw89_pci_release_rpp (rtwdev, rpp); }
drivers/net/wireless/realtek/rtw89/pci.h +12 -0
@@ -1365,6 +1365,13 @@ struct rtw89_pci_ssid_quirk {unsigned long bitmap;/* bitmap of rtw89_quirks */ }; +struct rtw89_pci_rpp_info { +u16 seq; +u8 qsel; +u8 tx_status; +u8 txch; +}; +struct rtw89_pci_info {const struct rtw89_pci_gen_def *gen_def;const struct rtw89_pci_isr_def *isr_def;
@@ -1386,6 +1393,7 @@ struct rtw89_pci_info {bool check_rx_tag;bool no_rxbd_fs;bool group_bd_addr; +u32 rpp_fmt_size;u32 init_cfg_reg;u32 txhci_en_bit;
@@ -1415,6 +1423,8 @@ struct rtw89_pci_info {u32 (*fill_txaddr_info)(struct rtw89_dev *rtwdev,void *txaddr_info_addr,u32 total_len,dma_addr_t dma,u8 *add_info_nr); +void (*parse_rpp)(struct rtw89_dev *rtwdev,void *rpp, +struct rtw89_pci_rpp_info *rpp_info);void (*config_intr_mask)(struct rtw89_dev *rtwdev);void (*enable_intr)(struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);void (*disable_intr)(struct rtw89_dev *rtwdev,struct rtw89_pci *rtwpci);
@@ -1724,6 +1734,8 @@ u32 rtw89_pci_fill_txaddr_info(struct rtw89_dev *rtwdev,u32 rtw89_pci_fill_txaddr_info_v1 (struct rtw89_dev *rtwdev,void *txaddr_info_addr,u32 total_len,dma_addr_t dma,u8 *add_info_nr); +void rtw89_pci_parse_rpp (struct rtw89_dev *rtwdev,void *_rpp, +struct rtw89_pci_rpp_info *rpp_info);void rtw89_pci_ctrl_dma_all (struct rtw89_dev *rtwdev,bool enable);void rtw89_pci_config_intr_mask (struct rtw89_dev *rtwdev);void rtw89_pci_config_intr_mask_v1 (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/rtw8851be.c +2 -0
@@ -30,6 +30,7 @@ static const struct rtw89_pci_info rtw8851b_pci_info = { .check_rx_tag = false, .no_rxbd_fs = false, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
@@ -59,6 +60,7 @@ static const struct rtw89_pci_info rtw8851b_pci_info = { .ltr_set = rtw89_pci_ltr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask, .enable_intr = rtw89_pci_enable_intr, .disable_intr = rtw89_pci_disable_intr,
drivers/net/wireless/realtek/rtw89/rtw8852ae.c +2 -0
@@ -30,6 +30,7 @@ static const struct rtw89_pci_info rtw8852a_pci_info = { .check_rx_tag = false, .no_rxbd_fs = false, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
@@ -57,6 +58,7 @@ static const struct rtw89_pci_info rtw8852a_pci_info = { .ltr_set = rtw89_pci_ltr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask, .enable_intr = rtw89_pci_enable_intr, .disable_intr = rtw89_pci_disable_intr,
drivers/net/wireless/realtek/rtw89/rtw8852be.c +2 -0
@@ -30,6 +30,7 @@ static const struct rtw89_pci_info rtw8852b_pci_info = { .check_rx_tag = false, .no_rxbd_fs = false, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
@@ -59,6 +60,7 @@ static const struct rtw89_pci_info rtw8852b_pci_info = { .ltr_set = rtw89_pci_ltr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask, .enable_intr = rtw89_pci_enable_intr, .disable_intr = rtw89_pci_disable_intr,
drivers/net/wireless/realtek/rtw89/rtw8852bte.c +2 -0
@@ -36,6 +36,7 @@ static const struct rtw89_pci_info rtw8852bt_pci_info = { .check_rx_tag = false, .no_rxbd_fs = false, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_AX_PCIE_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN,
@@ -65,6 +66,7 @@ static const struct rtw89_pci_info rtw8852bt_pci_info = { .ltr_set = rtw89_pci_ltr_set, .fill_txaddr_info = rtw89_pci_fill_txaddr_info, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask, .enable_intr = rtw89_pci_enable_intr, .disable_intr = rtw89_pci_disable_intr,
drivers/net/wireless/realtek/rtw89/rtw8852ce.c +2 -0
@@ -39,6 +39,7 @@ static const struct rtw89_pci_info rtw8852c_pci_info = { .check_rx_tag = false, .no_rxbd_fs = false, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_AX_HAXI_INIT_CFG1, .txhci_en_bit = B_AX_TXHCI_EN_V1,
@@ -66,6 +67,7 @@ static const struct rtw89_pci_info rtw8852c_pci_info = { .ltr_set = rtw89_pci_ltr_set_v1, .fill_txaddr_info = rtw89_pci_fill_txaddr_info_v1, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask_v1, .enable_intr = rtw89_pci_enable_intr_v1, .disable_intr = rtw89_pci_disable_intr_v1,
drivers/net/wireless/realtek/rtw89/rtw8922ae.c +2 -0
@@ -36,6 +36,7 @@ static const struct rtw89_pci_info rtw8922a_pci_info = { .check_rx_tag = true, .no_rxbd_fs = true, .group_bd_addr = false, + .rpp_fmt_size = sizeof(struct rtw89_pci_rpp_fmt), .init_cfg_reg = R_BE_HAXI_INIT_CFG1, .txhci_en_bit = B_BE_TXDMA_EN,
@@ -63,6 +64,7 @@ static const struct rtw89_pci_info rtw8922a_pci_info = { .ltr_set = rtw89_pci_ltr_set_v2, .fill_txaddr_info = rtw89_pci_fill_txaddr_info_v1, + .parse_rpp = rtw89_pci_parse_rpp, .config_intr_mask = rtw89_pci_config_intr_mask_v2, .enable_intr = rtw89_pci_enable_intr_v2, .disable_intr = rtw89_pci_disable_intr_v2,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/10 wifi: rtw89: pci: add RPP parser v1
In reply to Ping-Ke ShihThe new format contains more information including TX DMA channel, actual TX link and etc.
--- drivers/net/wireless/realtek/rtw89/pci.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw89/pci.h | 15 +++++++++++++++ 2 files changed, 27 insertions(+)
drivers/net/wireless/realtek/rtw89/pci.c +12 -0
@@ -580,6 +580,18 @@ void rtw89_pci_parse_rpp(struct rtw89_dev *rtwdev, void *_rpp, }EXPORT_SYMBOL (rtw89_pci_parse_rpp); +void rtw89_pci_parse_rpp_v1 (struct rtw89_dev *rtwdev,void *_rpp, +struct rtw89_pci_rpp_info *rpp_info) +{ +const struct rtw89_pci_rpp_fmt_v1 *rpp = _rpp; + + rpp_info->seq =le32_get_bits (rpp->w0,RTW89_PCI_RPP_W0_PCIE_SEQ_V1_MASK ); + rpp_info->qsel =le32_get_bits (rpp->w1,RTW89_PCI_RPP_W1_QSEL_V1_MASK ); + rpp_info->tx_status =le32_get_bits (rpp->w0,RTW89_PCI_RPP_W0_TX_STATUS_V1_MASK ); + rpp_info->txch =le32_get_bits (rpp->w0,RTW89_PCI_RPP_W0_DMA_CH_MASK ); +} +EXPORT_SYMBOL (rtw89_pci_parse_rpp_v1); +static void rtw89_pci_release_rpp (struct rtw89_dev *rtwdev,void *rpp) {struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
drivers/net/wireless/realtek/rtw89/pci.h +15 -0
@@ -1498,6 +1498,19 @@ struct rtw89_pci_rpp_fmt {__le32 dword; } __packed; +#define RTW89_PCI_RPP_W0_MACID_V1_MASK GENMASK(9, 0) +#define RTW89_PCI_RPP_W0_DMA_CH_MASK GENMASK(13, 10) +#define RTW89_PCI_RPP_W0_TX_STATUS_V1_MASK GENMASK(16, 14) +#define RTW89_PCI_RPP_W0_PCIE_SEQ_V1_MASK GENMASK(31, 17) +#define RTW89_PCI_RPP_W1_QSEL_V1_MASK GENMASK(5, 0) +#define RTW89_PCI_RPP_W1_TID_IND BIT(6) +#define RTW89_PCI_RPP_W1_CHANGE_LINK BIT(7) + +struct rtw89_pci_rpp_fmt_v1 { +__le32 w0; +__le32 w1; +} __packed; +struct rtw89_pci_rx_bd_32 {__le16 buf_size;__le16 opt;
@@ -1736,6 +1749,8 @@ u32 rtw89_pci_fill_txaddr_info_v1(struct rtw89_dev *rtwdev, dma_addr_t dma, u8 *add_info_nr);void rtw89_pci_parse_rpp (struct rtw89_dev *rtwdev,void *_rpp,struct rtw89_pci_rpp_info *rpp_info); +void rtw89_pci_parse_rpp_v1 (struct rtw89_dev *rtwdev,void *_rpp, +struct rtw89_pci_rpp_info *rpp_info);void rtw89_pci_ctrl_dma_all (struct rtw89_dev *rtwdev,bool enable);void rtw89_pci_config_intr_mask (struct rtw89_dev *rtwdev);void rtw89_pci_config_intr_mask_v1 (struct rtw89_dev *rtwdev);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/10 wifi: rtw89: abstract getting function of DMA channel
In reply to Ping-Ke ShihThe mapping function from QSEL (almost equivalent EDCA queue) to PCI DMA channel. Since coming chips change the definition, abstract this function as a chip_ops.
Don't change logic at all.
--- drivers/net/wireless/realtek/rtw89/core.c | 46 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 10 ++++ drivers/net/wireless/realtek/rtw89/pci.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + drivers/net/wireless/realtek/rtw89/txrx.h | 37 --------------- 10 files changed, 59 insertions(+), 42 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +42 -4
@@ -699,6 +699,44 @@ static void rtw89_core_tx_update_llc_hdr(struct rtw89_dev *rtwdev, desc_info->hdr_llc_len >>=1 ;/* in unit of 2 bytes */ } +u8 rtw89_core_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel) +{ +switch (qsel) { +default : +rtw89_warn (rtwdev,"Cannot map qsel to dma: %d\n" , qsel); + fallthrough; +case RTW89_TX_QSEL_BE_0 : +case RTW89_TX_QSEL_BE_1 : +case RTW89_TX_QSEL_BE_2 : +case RTW89_TX_QSEL_BE_3 : +return RTW89_TXCH_ACH0 ; +case RTW89_TX_QSEL_BK_0 : +case RTW89_TX_QSEL_BK_1 : +case RTW89_TX_QSEL_BK_2 : +case RTW89_TX_QSEL_BK_3 : +return RTW89_TXCH_ACH1 ; +case RTW89_TX_QSEL_VI_0 : +case RTW89_TX_QSEL_VI_1 : +case RTW89_TX_QSEL_VI_2 : +case RTW89_TX_QSEL_VI_3 : +return RTW89_TXCH_ACH2 ; +case RTW89_TX_QSEL_VO_0 : +case RTW89_TX_QSEL_VO_1 : +case RTW89_TX_QSEL_VO_2 : +case RTW89_TX_QSEL_VO_3 : +return RTW89_TXCH_ACH3 ; +case RTW89_TX_QSEL_B0_MGMT : +return RTW89_TXCH_CH8 ; +case RTW89_TX_QSEL_B0_HI : +return RTW89_TXCH_CH9 ; +case RTW89_TX_QSEL_B1_MGMT : +return RTW89_TXCH_CH10 ; +case RTW89_TX_QSEL_B1_HI : +return RTW89_TXCH_CH11 ; + } +} +EXPORT_SYMBOL (rtw89_core_get_ch_dma); +static void rtw89_core_tx_update_mgmt_info (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req)
@@ -712,7 +750,7 @@ rtw89_core_tx_update_mgmt_info(struct rtw89_dev *rtwdev,u8 qsel, ch_dma; qsel =rtw89_core_get_qsel_mgmt (rtwdev, tx_req); - ch_dma =rtw89_core_get_ch_dma (rtwdev, qsel); + ch_dma =rtw89_chip_get_ch_dma (rtwdev, qsel); desc_info->qsel = qsel; desc_info->ch_dma = ch_dma;
@@ -929,7 +967,7 @@ rtw89_core_tx_update_data_info(struct rtw89_dev *rtwdev, tid = skb->priority &IEEE80211_QOS_CTL_TAG1D_MASK ; tid_indicate =rtw89_core_get_tid_indicate (rtwdev, tid); qsel = desc_info->hiq ?RTW89_TX_QSEL_B0_HI :rtw89_core_get_qsel (rtwdev, tid); - ch_dma =rtw89_core_get_ch_dma (rtwdev, qsel); + ch_dma =rtw89_chip_get_ch_dma (rtwdev, qsel); desc_info->ch_dma = ch_dma; desc_info->tid_indicate = tid_indicate;
@@ -1079,7 +1117,7 @@ void rtw89_core_tx_kick_off(struct rtw89_dev *rtwdev, u8 qsel) {u8 ch_dma; - ch_dma =rtw89_core_get_ch_dma (rtwdev, qsel); + ch_dma =rtw89_chip_get_ch_dma (rtwdev, qsel);rtw89_hci_tx_kick_off (rtwdev, ch_dma); }
@@ -3664,7 +3702,7 @@ static u32 rtw89_check_and_reclaim_tx_resource(struct rtw89_dev *rtwdev, u8 tid)u8 qsel, ch_dma; qsel =rtw89_core_get_qsel (rtwdev, tid); - ch_dma =rtw89_core_get_ch_dma (rtwdev, qsel); + ch_dma =rtw89_chip_get_ch_dma (rtwdev, qsel);return rtw89_hci_check_and_reclaim_tx_resource (rtwdev, ch_dma); }
drivers/net/wireless/realtek/rtw89/core.h +10 -0
@@ -3760,6 +3760,7 @@ struct rtw89_chip_ops {void (*fill_txdesc_fwcmd)(struct rtw89_dev *rtwdev,struct rtw89_tx_desc_info *desc_info,void *txdesc); +u8 (*get_ch_dma)(struct rtw89_dev *rtwdev,u8 qsel);int (*cfg_ctrl_path)(struct rtw89_dev *rtwdev,bool wl);int (*mac_cfg_gnt)(struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg);
@@ -7197,6 +7198,14 @@ void rtw89_chip_fill_txdesc_fwcmd(struct rtw89_dev *rtwdev, chip->ops->fill_txdesc_fwcmd (rtwdev, desc_info, txdesc); } +static inline +u8 rtw89_chip_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->get_ch_dma (rtwdev, qsel); +} +static inline void rtw89_chip_mac_cfg_gnt (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg)
@@ -7441,6 +7450,7 @@ void rtw89_core_fill_txdesc_fwcmd_v1(struct rtw89_dev *rtwdev,void rtw89_core_fill_txdesc_fwcmd_v2 (struct rtw89_dev *rtwdev,struct rtw89_tx_desc_info *desc_info,void *txdesc); +u8 rtw89_core_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel);void rtw89_core_rx (struct rtw89_dev *rtwdev,struct rtw89_rx_desc_info *desc_info,struct sk_buff *skb);
drivers/net/wireless/realtek/rtw89/pci.c +1 -1
@@ -576,7 +576,7 @@ void rtw89_pci_parse_rpp(struct rtw89_dev *rtwdev, void *_rpp, rpp_info->seq =le32_get_bits (rpp->dword,RTW89_PCI_RPP_SEQ ); rpp_info->qsel =le32_get_bits (rpp->dword,RTW89_PCI_RPP_QSEL ); rpp_info->tx_status =le32_get_bits (rpp->dword,RTW89_PCI_RPP_TX_STATUS ); - rpp_info->txch =rtw89_core_get_ch_dma (rtwdev, rpp_info->qsel); + rpp_info->txch =rtw89_chip_get_ch_dma (rtwdev, rpp_info->qsel); }EXPORT_SYMBOL (rtw89_pci_parse_rpp);
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2537,6 +2537,7 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc, .fill_txdesc = rtw89_core_fill_txdesc, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, .mac_cfg_gnt = rtw89_mac_cfg_gnt, .stop_sch_tx = rtw89_mac_stop_sch_tx,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2178,6 +2178,7 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc, .fill_txdesc = rtw89_core_fill_txdesc, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, .mac_cfg_gnt = rtw89_mac_cfg_gnt, .stop_sch_tx = rtw89_mac_stop_sch_tx,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -842,6 +842,7 @@ static const struct rtw89_chip_ops rtw8852b_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc, .fill_txdesc = rtw89_core_fill_txdesc, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, .mac_cfg_gnt = rtw89_mac_cfg_gnt, .stop_sch_tx = rtw89_mac_stop_sch_tx,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -708,6 +708,7 @@ static const struct rtw89_chip_ops rtw8852bt_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc, .fill_txdesc = rtw89_core_fill_txdesc, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, .mac_cfg_gnt = rtw89_mac_cfg_gnt, .stop_sch_tx = rtw89_mac_stop_sch_tx,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2962,6 +2962,7 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc, .fill_txdesc = rtw89_core_fill_txdesc_v1, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc_fwcmd_v1, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path_v1, .mac_cfg_gnt = rtw89_mac_cfg_gnt_v1, .stop_sch_tx = rtw89_mac_stop_sch_tx_v1,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2817,6 +2817,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc_v2, .fill_txdesc = rtw89_core_fill_txdesc_v2, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc_fwcmd_v2, + .get_ch_dma = rtw89_core_get_ch_dma, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path_v2, .mac_cfg_gnt = rtw89_mac_cfg_gnt_v2, .stop_sch_tx = rtw89_mac_stop_sch_tx_v2,
drivers/net/wireless/realtek/rtw89/txrx.h +0 -37
@@ -732,43 +732,6 @@ rtw89_core_get_qsel_mgmt(struct rtw89_dev *rtwdev, struct rtw89_core_tx_requestreturn RTW89_TX_QSEL_B0_MGMT ; } -static inline u8 rtw89_core_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel) -{ -switch (qsel) { -default : -rtw89_warn (rtwdev,"Cannot map qsel to dma: %d\n" , qsel); - fallthrough; -case RTW89_TX_QSEL_BE_0 : -case RTW89_TX_QSEL_BE_1 : -case RTW89_TX_QSEL_BE_2 : -case RTW89_TX_QSEL_BE_3 : -return RTW89_TXCH_ACH0 ; -case RTW89_TX_QSEL_BK_0 : -case RTW89_TX_QSEL_BK_1 : -case RTW89_TX_QSEL_BK_2 : -case RTW89_TX_QSEL_BK_3 : -return RTW89_TXCH_ACH1 ; -case RTW89_TX_QSEL_VI_0 : -case RTW89_TX_QSEL_VI_1 : -case RTW89_TX_QSEL_VI_2 : -case RTW89_TX_QSEL_VI_3 : -return RTW89_TXCH_ACH2 ; -case RTW89_TX_QSEL_VO_0 : -case RTW89_TX_QSEL_VO_1 : -case RTW89_TX_QSEL_VO_2 : -case RTW89_TX_QSEL_VO_3 : -return RTW89_TXCH_ACH3 ; -case RTW89_TX_QSEL_B0_MGMT : -return RTW89_TXCH_CH8 ; -case RTW89_TX_QSEL_B0_HI : -return RTW89_TXCH_CH9 ; -case RTW89_TX_QSEL_B1_MGMT : -return RTW89_TXCH_CH10 ; -case RTW89_TX_QSEL_B1_HI : -return RTW89_TXCH_CH11 ; - } -} -static inline u8 rtw89_core_get_tid_indicate (struct rtw89_dev *rtwdev,u8 tid) {switch (tid) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/10 wifi: rtw89: add getting function of DMA channel v1
In reply to Ping-Ke ShihThe coming RTL8922DE uses new mapping of DMA channel. Add it accordingly.
--- drivers/net/wireless/realtek/rtw89/core.c | 22 ++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + 2 files changed, 23 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +22 -0
@@ -737,6 +737,28 @@ u8 rtw89_core_get_ch_dma(struct rtw89_dev *rtwdev, u8 qsel) }EXPORT_SYMBOL (rtw89_core_get_ch_dma); +u8 rtw89_core_get_ch_dma_v1 (struct rtw89_dev *rtwdev,u8 qsel) +{ +switch (qsel) { +default : +rtw89_warn (rtwdev,"Cannot map qsel to dma v1: %d\n" , qsel); + fallthrough; +case RTW89_TX_QSEL_BE_0 : +case RTW89_TX_QSEL_BK_0 : +return RTW89_TXCH_ACH0 ; +case RTW89_TX_QSEL_VI_0 : +case RTW89_TX_QSEL_VO_0 : +return RTW89_TXCH_ACH2 ; +case RTW89_TX_QSEL_B0_MGMT : +case RTW89_TX_QSEL_B0_HI : +return RTW89_TXCH_CH8 ; +case RTW89_TX_QSEL_B1_MGMT : +case RTW89_TX_QSEL_B1_HI : +return RTW89_TXCH_CH10 ; + } +} +EXPORT_SYMBOL (rtw89_core_get_ch_dma_v1); +static void rtw89_core_tx_update_mgmt_info (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -7451,6 +7451,7 @@ void rtw89_core_fill_txdesc_fwcmd_v2(struct rtw89_dev *rtwdev,struct rtw89_tx_desc_info *desc_info, void *txdesc);u8 rtw89_core_get_ch_dma (struct rtw89_dev *rtwdev,u8 qsel); +u8 rtw89_core_get_ch_dma_v1 (struct rtw89_dev *rtwdev,u8 qsel);void rtw89_core_rx (struct rtw89_dev *rtwdev,struct rtw89_rx_desc_info *desc_info,struct sk_buff *skb);
Signature · 1 line
2.25.1