rtw88: TX path update for latency and efficiency
cover rtw88: TX path update for latency and efficiency
From: Yan-Hsuan Chuang <[email protected]>
This patchset makes the driver transmit with less CPU latency and higher efficiency. Originally, the TX path hold an IRQ lock that will disable all of the IRQs, to wait for the PS state transition. It may sometimes cause the CPU to delay for a long enough time, like several milliseconds. This could lead to some time-sensitive programs to lose their immediacy. We can just use *_bh() locks to not to block the IRQs, and only use *_irqsafe() locks to the ISR related settings.
And, the TX path includes to send reserved pages to the device. But the old reserved page routine did not consider that the driver could possibly run multiple vifs at the same time. So, update the reserved page routine of the TX path to generate reserved pages and associate them to each vif, so we can take multi-vif into consideration.
For the data packets come from TX queue, the driver used to kick off them one by one, while we can do better to kick a bunch of them at once to save some time to access to the IO register and the DMA engine transition
Brian Norris (1):
rtw88: don't hold all IRQs disabled for PS operations
Yan-Hsuan Chuang (4):
rtw88: extract alloc rsvd_page and h2c skb routines
rtw88: associate reserved pages with each vif
rtw88: pci: define a mask for TX/RX BD indexes
rtw88: kick off TX packets once for higher efficiency
drivers/net/wireless/realtek/rtw88/fw.c | 265 ++++++++++++++---- drivers/net/wireless/realtek/rtw88/fw.h | 25 +- drivers/net/wireless/realtek/rtw88/hci.h | 20 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 22 +- drivers/net/wireless/realtek/rtw88/main.c | 9 +- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/pci.c | 199 ++++++++----- drivers/net/wireless/realtek/rtw88/pci.h | 7 +- drivers/net/wireless/realtek/rtw88/tx.c | 131 +++++++-- drivers/net/wireless/realtek/rtw88/tx.h | 10 +- drivers/net/wireless/realtek/rtw88/wow.c | 39 +-- 11 files changed, 516 insertions(+), 212 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/5 rtw88: don't hold all IRQs disabled for PS operations
From: Brian Norris <[email protected]>
This driver generally only needs to ensure that
(a) it doesn't try to process TX interrupts at the same time as power-save operations (and similar)
(b) the device interrupt gets disabled while we're still handling the last set of interrupts
For (a), all the operations (e.g., PS transitions, packet handling) happens in non-atomic contexts (e.g., threaded IRQ).
For (b), we only need mutual exclusion for brief sections (i.e., while we're actually manipulating the interrupt mask/status).
So, we can introduce a separate lock for handling (b), disabling IRQs while we do it. For (a), we can demote the locking to BH only, now that
(b) (the only steps done in atomic context) and that has its own lock.
This helps reduce the amount of time this driver spends with IRQs off. Notably, transitioning out of power-save modes can take >3 milliseconds, and this transition is done under the protection of 'irq_lock'.
--- drivers/net/wireless/realtek/rtw88/pci.c | 54 +++++++++++++++--------- drivers/net/wireless/realtek/rtw88/pci.h | 4 +- 2 files changed, 36 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtw88/pci.c +33 -21
@@ -382,6 +382,7 @@ static int rtw_pci_init(struct rtw_dev *rtwdev) rtwpci->irq_mask[3 ] =IMR_H2CDOK |0 ;spin_lock_init (&rtwpci->irq_lock); +spin_lock_init (&rtwpci->hwirq_lock); ret =rtw_pci_init_trx_ring (rtwdev);return ret;
@@ -472,19 +473,35 @@ static void rtw_pci_reset_trx_ring(struct rtw_dev *rtwdev)static void rtw_pci_enable_interrupt (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) { +unsigned long flags; + +spin_lock_irqsave (&rtwpci->hwirq_lock, flags); +rtw_write32 (rtwdev,RTK_PCI_HIMR0 , rtwpci->irq_mask[0 ]);rtw_write32 (rtwdev,RTK_PCI_HIMR1 , rtwpci->irq_mask[1 ]);rtw_write32 (rtwdev,RTK_PCI_HIMR3 , rtwpci->irq_mask[3 ]); rtwpci->irq_enabled = true; + +spin_unlock_irqrestore (&rtwpci->hwirq_lock, flags); }static void rtw_pci_disable_interrupt (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci) { +unsigned long flags; + +spin_lock_irqsave (&rtwpci->hwirq_lock, flags); + +if (!rtwpci->irq_enabled) + goto out; +rtw_write32 (rtwdev,RTK_PCI_HIMR0 ,0 );rtw_write32 (rtwdev,RTK_PCI_HIMR1 ,0 );rtw_write32 (rtwdev,RTK_PCI_HIMR3 ,0 ); rtwpci->irq_enabled = false; + +out: +spin_unlock_irqrestore (&rtwpci->hwirq_lock, flags); }static void rtw_pci_dma_reset (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci)
@@ -520,11 +537,10 @@ static void rtw_pci_dma_release(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci)static int rtw_pci_start (struct rtw_dev *rtwdev) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -unsigned long flags; -spin_lock_irqsave (&rtwpci->irq_lock, flags); +spin_lock_bh (&rtwpci->irq_lock);rtw_pci_enable_interrupt (rtwdev, rtwpci); -spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +spin_unlock_bh (&rtwpci->irq_lock);return 0 ; }
@@ -532,12 +548,11 @@ static int rtw_pci_start(struct rtw_dev *rtwdev)static void rtw_pci_stop (struct rtw_dev *rtwdev) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -unsigned long flags; -spin_lock_irqsave (&rtwpci->irq_lock, flags); +spin_lock_bh (&rtwpci->irq_lock);rtw_pci_disable_interrupt (rtwdev, rtwpci);rtw_pci_dma_release (rtwdev, rtwpci); -spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +spin_unlock_bh (&rtwpci->irq_lock); }static void rtw_pci_deep_ps_enter (struct rtw_dev *rtwdev)
@@ -590,9 +605,8 @@ static void rtw_pci_deep_ps_leave(struct rtw_dev *rtwdev)static void rtw_pci_deep_ps (struct rtw_dev *rtwdev,bool enter) {struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -unsigned long flags; -spin_lock_irqsave (&rtwpci->irq_lock, flags); +spin_lock_bh (&rtwpci->irq_lock);if (enter && !test_bit (RTW_FLAG_LEISURE_PS_DEEP , rtwdev->flags))rtw_pci_deep_ps_enter (rtwdev);
@@ -600,7 +614,7 @@ static void rtw_pci_deep_ps(struct rtw_dev *rtwdev, bool enter)if (!enter &&test_bit (RTW_FLAG_LEISURE_PS_DEEP , rtwdev->flags))rtw_pci_deep_ps_leave (rtwdev); -spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +spin_unlock_bh (&rtwpci->irq_lock); }static u8 ac_to_hwq[] = {
@@ -683,7 +697,6 @@ static int rtw_pci_xmit(struct rtw_dev *rtwdev,u8 *pkt_desc;struct rtw_pci_tx_buffer_desc *buf_desc;u32 bd_idx; -unsigned long flags; ring = &rtwpci->tx_rings[queue];
@@ -720,7 +733,7 @@ static int rtw_pci_xmit(struct rtw_dev *rtwdev, tx_data->dma = dma; tx_data->sn = pkt_info->sn; -spin_lock_irqsave (&rtwpci->irq_lock, flags); +spin_lock_bh (&rtwpci->irq_lock);rtw_pci_deep_ps_leave (rtwdev);skb_queue_tail (&ring->queue, skb);
@@ -738,7 +751,7 @@ static int rtw_pci_xmit(struct rtw_dev *rtwdev, reg_bcn_work |=BIT_PCI_BCNQ_FLAG ;rtw_write8 (rtwdev,RTK_PCI_TXBD_BCN_WORK , reg_bcn_work); } -spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +spin_unlock_bh (&rtwpci->irq_lock);return 0 ; }
@@ -961,6 +974,10 @@ static void rtw_pci_rx_isr(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci,static void rtw_pci_irq_recognized (struct rtw_dev *rtwdev,struct rtw_pci *rtwpci,u32 *irq_status) { +unsigned long flags; + +spin_lock_irqsave (&rtwpci->hwirq_lock, flags); + irq_status[0 ] =rtw_read32 (rtwdev,RTK_PCI_HISR0 ); irq_status[1 ] =rtw_read32 (rtwdev,RTK_PCI_HISR1 ); irq_status[3 ] =rtw_read32 (rtwdev,RTK_PCI_HISR3 );
@@ -970,6 +987,8 @@ static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,rtw_write32 (rtwdev,RTK_PCI_HISR0 , irq_status[0 ]);rtw_write32 (rtwdev,RTK_PCI_HISR1 , irq_status[1 ]);rtw_write32 (rtwdev,RTK_PCI_HISR3 , irq_status[3 ]); + +spin_unlock_irqrestore (&rtwpci->hwirq_lock, flags); }static irqreturn_t rtw_pci_interrupt_handler (int irq,void *dev)
@@ -977,10 +996,6 @@ static irqreturn_t rtw_pci_interrupt_handler(int irq, void *dev)struct rtw_dev *rtwdev = dev;struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -spin_lock (&rtwpci->irq_lock); -if (!rtwpci->irq_enabled) - goto out; -/* disable RTW PCI interrupt to avoid more interrupts before the end of * thread function *
@@ -990,8 +1005,6 @@ static irqreturn_t rtw_pci_interrupt_handler(int irq, void *dev)* a new HISR flag is set. */ rtw_pci_disable_interrupt (rtwdev, rtwpci); -out: -spin_unlock (&rtwpci->irq_lock);return IRQ_WAKE_THREAD ; }
@@ -1000,10 +1013,9 @@ static irqreturn_t rtw_pci_interrupt_threadfn(int irq, void *dev) {struct rtw_dev *rtwdev = dev;struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv; -unsigned long flags;u32 irq_status[4 ]; -spin_lock_irqsave (&rtwpci->irq_lock, flags); +spin_lock_bh (&rtwpci->irq_lock);rtw_pci_irq_recognized (rtwdev, rtwpci, irq_status);if (irq_status[0 ] &IMR_MGNTDOK )
@@ -1025,7 +1037,7 @@ static irqreturn_t rtw_pci_interrupt_threadfn(int irq, void *dev)/* all of the jobs for this interrupt have been done */ rtw_pci_enable_interrupt (rtwdev, rtwpci); -spin_unlock_irqrestore (&rtwpci->irq_lock, flags); +spin_unlock_bh (&rtwpci->irq_lock);return IRQ_HANDLED ; }
drivers/net/wireless/realtek/rtw88/pci.h +3 -1
@@ -198,7 +198,9 @@ struct rtw_pci_rx_ring {struct rtw_pci {struct pci_dev *pdev; -/* used for pci interrupt */ +/* Used for PCI interrupt. */ +spinlock_t hwirq_lock; +/* Used for PCI TX queueing. */ spinlock_t irq_lock;u32 irq_mask[4 ];bool irq_enabled;
Signature · 1 line
2.17.1
Re: [PATCH 1/5] rtw88: don't hold all IRQs disabled for PS operations
Quoted 18 lines · <[email protected]> wrote:
From: Brian Norris <[email protected]>
This driver generally only needs to ensure that
(a) it doesn't try to process TX interrupts at the same time as power-save operations (and similar)
(b) the device interrupt gets disabled while we're still handling the last set of interruptsFor (a), all the operations (e.g., PS transitions, packet handling) happens in non-atomic contexts (e.g., threaded IRQ).
For (b), we only need mutual exclusion for brief sections (i.e., while we're actually manipulating the interrupt mask/status).
So, we can introduce a separate lock for handling (b), disabling IRQs while we do it. For (a), we can demote the locking to BH only, now that
(b) (the only steps done in atomic context) and that has its own lock.
Quoted 6 lines
This helps reduce the amount of time this driver spends with IRQs off. Notably, transitioning out of power-save modes can take >3 milliseconds, and this transition is done under the protection of '
irq_lock'.Signed-off-by Brian Norris <[email protected]>Signed-off-by Yan-Hsuan Chuang <[email protected]>
5 patches applied to wireless-drivers-next.git, thanks.
57fb39e24775 rtw88: don't hold all IRQs disabled for PS operations da14a0409e3f rtw88: extract alloc rsvd_page and h2c skb routines 895c096dab36 rtw88: associate reserved pages with each vif a5697a65ecd1 rtw88: pci: define a mask for TX/RX BD indexes aaab5d0e6737 rtw88: kick off TX packets once for higher efficiency
Signature · 3 lines
https://patchwork.kernel.org/patch/11433447/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/5 rtw88: extract alloc rsvd_page and h2c skb routines
In reply to [email protected]From: Yan-Hsuan Chuang <[email protected]>
Extract skb allocation routines for rsvd_page and h2c. These routines should also be used by USB and SDIO.
This should not change the logic at all.memset() for pkt_info is unnecessary, just declare as {0}. Also skb_put()/memcpy() can be replaced by skb_put_data().
--- drivers/net/wireless/realtek/rtw88/pci.c | 27 ++---------- drivers/net/wireless/realtek/rtw88/tx.c | 54 ++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw88/tx.h | 8 ++++ 3 files changed, 66 insertions(+), 23 deletions(-)
drivers/net/wireless/realtek/rtw88/pci.c +4 -23
@@ -760,43 +760,24 @@ static int rtw_pci_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, u32 size) {struct sk_buff *skb; -struct rtw_tx_pkt_info pkt_info; -u32 tx_pkt_desc_sz; -u32 length; +struct rtw_tx_pkt_info pkt_info = {0 }; - tx_pkt_desc_sz = rtwdev->chip->tx_pkt_desc_sz; - length = size + tx_pkt_desc_sz; - skb =dev_alloc_skb (length); + skb =rtw_tx_write_data_rsvd_page_get (rtwdev, &pkt_info, buf, size);if (!skb)return -ENOMEM ; -skb_reserve (skb, tx_pkt_desc_sz); -memcpy ((u8 *)skb_put (skb, size), buf, size); -memset (&pkt_info,0 ,sizeof (pkt_info)); - pkt_info.tx_pkt_size = size; - pkt_info.offset = tx_pkt_desc_sz; -return rtw_pci_xmit (rtwdev, &pkt_info, skb,RTW_TX_QUEUE_BCN ); }static int rtw_pci_write_data_h2c (struct rtw_dev *rtwdev,u8 *buf,u32 size) {struct sk_buff *skb; -struct rtw_tx_pkt_info pkt_info; -u32 tx_pkt_desc_sz; -u32 length; +struct rtw_tx_pkt_info pkt_info = {0 }; - tx_pkt_desc_sz = rtwdev->chip->tx_pkt_desc_sz; - length = size + tx_pkt_desc_sz; - skb =dev_alloc_skb (length); + skb =rtw_tx_write_data_h2c_get (rtwdev, &pkt_info, buf, size);if (!skb)return -ENOMEM ; -skb_reserve (skb, tx_pkt_desc_sz); -memcpy ((u8 *)skb_put (skb, size), buf, size); -memset (&pkt_info,0 ,sizeof (pkt_info)); - pkt_info.tx_pkt_size = size; -return rtw_pci_xmit (rtwdev, &pkt_info, skb,RTW_TX_QUEUE_H2C ); }
drivers/net/wireless/realtek/rtw88/tx.c +54 -0
66 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/tx.h +8 -0
@@ -93,5 +93,13 @@ void rtw_tx_report_handle(struct rtw_dev *rtwdev, struct sk_buff *skb);void rtw_rsvd_page_pkt_info_update (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info,struct sk_buff *skb); +struct sk_buff * +rtw_tx_write_data_rsvd_page_get (struct rtw_dev *rtwdev, +struct rtw_tx_pkt_info *pkt_info, +u8 *buf,u32 size); +struct sk_buff * +rtw_tx_write_data_h2c_get (struct rtw_dev *rtwdev, +struct rtw_tx_pkt_info *pkt_info, +u8 *buf,u32 size);#endif
Signature · 1 line
2.17.1
PATCH 3/5 rtw88: associate reserved pages with each vif
In reply to [email protected]From: Yan-Hsuan Chuang <[email protected]>
Each device has only one reserved page shared with all of the vifs, so it seems not reasonable to pass vif as one of the arguments to rtw_fw_download_rsvd_page(). If driver is going to run more than one vif, the content of reserved page could not be built for all of the vifs.
To fix it, let each vif maintain its own reserved page list, and build the final reserved page to download to the firmware from all of the vifs. Hence driver should add reserved pages to each vif according to the vif->type when adding the vif.
For station mode, add reserved page with rtw_add_rsvd_page_sta(). If the station mode is going to suspend in PNO (net-detect) mode, remove the reserved pages used for normal mode, and add new one for wowlan mode with rtw_add_rsvd_page_pno().
For beacon mode, only beacon is required to be added using rtw_add_rsvd_page_bcn().
This would make the code flow simpler as we don't need to add reserved pages when vif is running, just add/remove them when ieee80211_ops::[add|remove]_interface.
When driver is going to download the reserved page, it will collect pages from all of the vifs, this list is maintained by rtwdev, with build_list as the pages' member. That way, we can still build a list of reserved pages to be downloaded. Also we can get the location of the pages from the list that is maintained by rtwdev.
The biggest problem is that the first page should always be beacon, if other type of reserved page is put in the first page, the tx descriptor and offset could be wrong. But station mode vif does not add beacon into its list, so we need to add a dummy page in front of the list, to make sure other pages will not be put in the first page. As the dummy page is allocated when building the list, we must free it before building a new list of reserved pages to firmware.
--- drivers/net/wireless/realtek/rtw88/fw.c | 265 ++++++++++++++---- drivers/net/wireless/realtek/rtw88/fw.h | 25 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 22 +- drivers/net/wireless/realtek/rtw88/main.c | 9 +- drivers/net/wireless/realtek/rtw88/main.h | 1 + drivers/net/wireless/realtek/rtw88/wow.c | 39 +-- 6 files changed, 258 insertions(+), 103 deletions(-)
drivers/net/wireless/realtek/rtw88/fw.c +211 -54
@@ -583,7 +583,7 @@ static u8 rtw_get_rsvd_page_location(struct rtw_dev *rtwdev,struct rtw_rsvd_page *rsvd_pkt;u8 location =0 ; -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {if (type == rsvd_pkt->type) location = rsvd_pkt->page; }
@@ -636,7 +636,7 @@ u8 rtw_get_rsvd_page_probe_req_location(struct rtw_dev *rtwdev,struct rtw_rsvd_page *rsvd_pkt;u8 location =0 ; -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {if (rsvd_pkt->type !=RSVD_PROBE_REQ )continue ; if ((!ssid && !rsvd_pkt->ssid) ||
@@ -653,7 +653,7 @@ u16 rtw_get_rsvd_page_probe_req_size(struct rtw_dev *rtwdev,struct rtw_rsvd_page *rsvd_pkt;u16 size =0 ; -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {if (rsvd_pkt->type !=RSVD_PROBE_REQ )continue ; if ((!ssid && !rsvd_pkt->ssid) ||
@@ -690,25 +690,6 @@ void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev)rtw_fw_send_h2c_command (rtwdev, h2c_pkt); } -static struct sk_buff * -rtw_beacon_get (struct ieee80211_hw *hw,struct ieee80211_vif *vif) -{ -struct sk_buff *skb_new; - -if (vif->type !=NL80211_IFTYPE_AP && - vif->type !=NL80211_IFTYPE_ADHOC && - !ieee80211_vif_is_mesh (vif)) { - skb_new =alloc_skb (1 ,GFP_KERNEL ); -if (!skb_new) -return NULL ; -skb_put (skb_new,1 ); - }else { - skb_new =ieee80211_beacon_get (hw, vif); - } - -return skb_new; -} -static struct sk_buff *rtw_nlo_info_get (struct ieee80211_hw *hw) {struct rtw_dev *rtwdev = hw->priv;
@@ -853,15 +834,31 @@ static struct sk_buff *rtw_lps_pg_info_get(struct ieee80211_hw *hw) }static struct sk_buff *rtw_get_rsvd_page_skb (struct ieee80211_hw *hw, -struct ieee80211_vif *vif,struct rtw_rsvd_page *rsvd_pkt) { +struct ieee80211_vif *vif; +struct rtw_vif *rtwvif;struct sk_buff *skb_new;struct cfg80211_ssid *ssid; +if (rsvd_pkt->type ==RSVD_DUMMY ) { + skb_new =alloc_skb (1 ,GFP_KERNEL ); +if (!skb_new) +return NULL ; + +skb_put (skb_new,1 ); +return skb_new; + } + + rtwvif = rsvd_pkt->rtwvif; +if (!rtwvif) +return NULL ; + + vif =rtwvif_to_vif (rtwvif); +switch (rsvd_pkt->type) {case RSVD_BEACON : - skb_new =rtw_beacon_get (hw, vif); + skb_new =ieee80211_beacon_get (hw, vif);break ;case RSVD_PS_POLL : skb_new =ieee80211_pspoll_get (hw, vif);
@@ -948,6 +945,8 @@ static struct rtw_rsvd_page *rtw_alloc_rsvd_page(struct rtw_dev *rtwdev,if (!rsvd_pkt)return NULL ; +INIT_LIST_HEAD (&rsvd_pkt->vif_list); +INIT_LIST_HEAD (&rsvd_pkt->build_list); rsvd_pkt->type = type; rsvd_pkt->add_txdesc = txdesc;
@@ -955,51 +954,124 @@ static struct rtw_rsvd_page *rtw_alloc_rsvd_page(struct rtw_dev *rtwdev, }static void rtw_insert_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif,struct rtw_rsvd_page *rsvd_pkt) {lockdep_assert_held (&rtwdev->mutex); -list_add_tail (&rsvd_pkt->list, &rtwdev->rsvd_page_list); + +list_add_tail (&rsvd_pkt->vif_list, &rtwvif->rsvd_page_list); } -void rtw_add_rsvd_page (struct rtw_dev *rtwdev,enum rtw_rsvd_packet_type type, -bool txdesc) +static void rtw_add_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif, +enum rtw_rsvd_packet_type type, +bool txdesc) {struct rtw_rsvd_page *rsvd_pkt; rsvd_pkt =rtw_alloc_rsvd_page (rtwdev, type, txdesc); -if (!rsvd_pkt) +if (!rsvd_pkt) { +rtw_err (rtwdev,"failed to alloc rsvd page %d\n" , type);return ; + } -rtw_insert_rsvd_page (rtwdev, rsvd_pkt); + rsvd_pkt->rtwvif = rtwvif; +rtw_insert_rsvd_page (rtwdev, rtwvif, rsvd_pkt); } -void rtw_add_rsvd_page_probe_req (struct rtw_dev *rtwdev, -struct cfg80211_ssid *ssid) +static void rtw_add_rsvd_page_probe_req (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif, +struct cfg80211_ssid *ssid) {struct rtw_rsvd_page *rsvd_pkt; rsvd_pkt =rtw_alloc_rsvd_page (rtwdev,RSVD_PROBE_REQ , true); -if (!rsvd_pkt) +if (!rsvd_pkt) { +rtw_err (rtwdev,"failed to alloc probe req rsvd page\n" );return ; + } + rsvd_pkt->rtwvif = rtwvif; rsvd_pkt->ssid = ssid; -rtw_insert_rsvd_page (rtwdev, rsvd_pkt); +rtw_insert_rsvd_page (rtwdev, rtwvif, rsvd_pkt); } -void rtw_reset_rsvd_page (struct rtw_dev *rtwdev) +void rtw_remove_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) {struct rtw_rsvd_page *rsvd_pkt, *tmp;lockdep_assert_held (&rtwdev->mutex); -list_for_each_entry_safe (rsvd_pkt, tmp, &rtwdev->rsvd_page_list, list) { -if (rsvd_pkt->type ==RSVD_BEACON ) -continue ; -list_del (&rsvd_pkt->list); +/* remove all of the rsvd pages for vif */ +list_for_each_entry_safe (rsvd_pkt, tmp, &rtwvif->rsvd_page_list, + vif_list) { +list_del (&rsvd_pkt->vif_list); +if (!list_empty (&rsvd_pkt->build_list)) +list_del (&rsvd_pkt->build_list);kfree (rsvd_pkt); } } +void rtw_add_rsvd_page_bcn (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) +{ +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); + +if (vif->type !=NL80211_IFTYPE_AP && + vif->type !=NL80211_IFTYPE_ADHOC && + vif->type !=NL80211_IFTYPE_MESH_POINT ) { +rtw_warn (rtwdev,"Cannot add beacon rsvd page for %d\n" , + vif->type); +return ; + } + +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_BEACON , false); +} + +void rtw_add_rsvd_page_pno (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) +{ +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); +struct rtw_wow_param *rtw_wow = &rtwdev->wow; +struct rtw_pno_request *rtw_pno_req = &rtw_wow->pno_req; +struct cfg80211_ssid *ssid; +int i; + +if (vif->type !=NL80211_IFTYPE_STATION ) { +rtw_warn (rtwdev,"Cannot add PNO rsvd page for %d\n" , + vif->type); +return ; + } + +for (i =0 ; i < rtw_pno_req->match_set_cnt; i++) { + ssid = &rtw_pno_req->match_sets[i].ssid; +rtw_add_rsvd_page_probe_req (rtwdev, rtwvif, ssid); + } + +rtw_add_rsvd_page_probe_req (rtwdev, rtwvif,NULL ); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_NLO_INFO , false); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_CH_INFO , true); +} + +void rtw_add_rsvd_page_sta (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) +{ +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); + +if (vif->type !=NL80211_IFTYPE_STATION ) { +rtw_warn (rtwdev,"Cannot add sta rsvd page for %d\n" , + vif->type); +return ; + } + +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_PS_POLL , true); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_QOS_NULL , true); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_NULL , true); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_LPS_PG_DPK , true); +rtw_add_rsvd_page (rtwdev, rtwvif,RSVD_LPS_PG_INFO , true); +} +int rtw_fw_write_data_rsvd_page (struct rtw_dev *rtwdev,u16 pg_addr,u8 *buf,u32 size) {
@@ -1063,8 +1135,72 @@ static int rtw_download_drv_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, u32 size)return rtw_fw_write_data_rsvd_page (rtwdev, pg_addr, buf, size); } -static u8 *rtw_build_rsvd_page (struct rtw_dev *rtwdev, -struct ieee80211_vif *vif,u32 *size) +static void __rtw_build_rsvd_page_reset (struct rtw_dev *rtwdev) +{ +struct rtw_rsvd_page *rsvd_pkt, *tmp; + +list_for_each_entry_safe (rsvd_pkt, tmp, &rtwdev->rsvd_page_list, + build_list) { +list_del_init (&rsvd_pkt->build_list); + +/* Don't free except for the dummy rsvd page, +* others will be freed when removing vif +*/ +if (rsvd_pkt->type ==RSVD_DUMMY ) +kfree (rsvd_pkt); + } +} + +static void rtw_build_rsvd_page_iter (void *data,u8 *mac, +struct ieee80211_vif *vif) +{ +struct rtw_dev *rtwdev = data; +struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; +struct rtw_rsvd_page *rsvd_pkt; + +list_for_each_entry (rsvd_pkt, &rtwvif->rsvd_page_list, vif_list) { +if (rsvd_pkt->type ==RSVD_BEACON ) +list_add (&rsvd_pkt->build_list, + &rtwdev->rsvd_page_list); +else +list_add_tail (&rsvd_pkt->build_list, + &rtwdev->rsvd_page_list); + } +} + +static int __rtw_build_rsvd_page_from_vifs (struct rtw_dev *rtwdev) +{ +struct rtw_rsvd_page *rsvd_pkt; + +__rtw_build_rsvd_page_reset (rtwdev); + +/* gather rsvd page from vifs */ +rtw_iterate_vifs_atomic (rtwdev, rtw_build_rsvd_page_iter, rtwdev); + + rsvd_pkt =list_first_entry_or_null (&rtwdev->rsvd_page_list, + struct rtw_rsvd_page, build_list); +if (!rsvd_pkt) { +WARN (1 ,"Should not have an empty reserved page\n" ); +return -EINVAL ; + } + +/* the first rsvd should be beacon, otherwise add a dummy one */ +if (rsvd_pkt->type !=RSVD_BEACON ) { +struct rtw_rsvd_page *dummy_pkt; + + dummy_pkt =rtw_alloc_rsvd_page (rtwdev,RSVD_DUMMY , false); +if (!dummy_pkt) { +rtw_err (rtwdev,"failed to alloc dummy rsvd page\n" ); +return -ENOMEM ; + } + +list_add (&dummy_pkt->build_list, &rtwdev->rsvd_page_list); + } + +return 0 ; +} + +static u8 *rtw_build_rsvd_page (struct rtw_dev *rtwdev,u32 *size) {struct ieee80211_hw *hw = rtwdev->hw;struct rtw_chip_info *chip = rtwdev->chip;
@@ -1074,13 +1210,21 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,u8 total_page =0 ;u8 page_size, page_margin, tx_desc_sz;u8 *buf; +int ret; page_size = chip->page_size; tx_desc_sz = chip->tx_pkt_desc_sz; page_margin = page_size - tx_desc_sz; -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { - iter =rtw_get_rsvd_page_skb (hw, vif, rsvd_pkt); + ret =__rtw_build_rsvd_page_from_vifs (rtwdev); +if (ret) { +rtw_err (rtwdev, +"failed to build rsvd page from vifs, ret %d\n" , ret); +return NULL ; + } + +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) { + iter =rtw_get_rsvd_page_skb (hw, rsvd_pkt);if (!iter) {rtw_err (rtwdev,"failed to build rsvd packet\n" ); goto release_skb;
@@ -1104,7 +1248,8 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,* is smaller than the actual size of the whole rsvd_page */ if (total_page ==0 ) { -if (rsvd_pkt->type !=RSVD_BEACON ) { +if (rsvd_pkt->type !=RSVD_BEACON && + rsvd_pkt->type !=RSVD_DUMMY ) {rtw_err (rtwdev,"first page should be a beacon\n" ); goto release_skb; }
@@ -1132,7 +1277,7 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,* And that rsvd_pkt does not require tx_desc because when it goes * through TX path, the TX path will generate one for it. */ -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {rtw_rsvd_page_list_to_buf (rtwdev, page_size, page_margin, page, buf, rsvd_pkt);if (page ==0 )
@@ -1148,7 +1293,7 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,return buf; release_skb: -list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, list) { +list_for_each_entry (rsvd_pkt, &rtwdev->rsvd_page_list, build_list) {kfree_skb (rsvd_pkt->skb); rsvd_pkt->skb =NULL ; }
@@ -1156,18 +1301,31 @@ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev,return NULL ; } -static int -rtw_download_beacon (struct rtw_dev *rtwdev,struct ieee80211_vif *vif) +static int rtw_download_beacon (struct rtw_dev *rtwdev) {struct ieee80211_hw *hw = rtwdev->hw; +struct rtw_rsvd_page *rsvd_pkt;struct sk_buff *skb;int ret =0 ; - skb =rtw_beacon_get (hw, vif); + rsvd_pkt =list_first_entry_or_null (&rtwdev->rsvd_page_list, + struct rtw_rsvd_page, build_list); +if (!rsvd_pkt) { +rtw_err (rtwdev,"failed to get rsvd page from build list\n" ); +return -ENOENT ; + } + +if (rsvd_pkt->type !=RSVD_BEACON && + rsvd_pkt->type !=RSVD_DUMMY ) { +rtw_err (rtwdev,"invalid rsvd page type %d, should be beacon or dummy\n" , + rsvd_pkt->type); +return -EINVAL ; + } + + skb =rtw_get_rsvd_page_skb (hw, rsvd_pkt);if (!skb) {rtw_err (rtwdev,"failed to get beacon skb\n" ); - ret = -ENOMEM ; - goto out; +return -ENOMEM ; } ret =rtw_download_drv_rsvd_page (rtwdev, skb->data, skb->len);
@@ -1176,17 +1334,16 @@ rtw_download_beacon(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)dev_kfree_skb (skb); -out:return ret; } -int rtw_fw_download_rsvd_page (struct rtw_dev *rtwdev,struct ieee80211_vif *vif) +int rtw_fw_download_rsvd_page (struct rtw_dev *rtwdev) {u8 *buf;u32 size;int ret; - buf =rtw_build_rsvd_page (rtwdev, vif, &size); + buf =rtw_build_rsvd_page (rtwdev, &size);if (!buf) {rtw_err (rtwdev,"failed to build rsvd page pkt\n" );return -ENOMEM ;
@@ -1203,7 +1360,7 @@ int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)* the beacon again to replace the TX desc header, and we will get * a correct tx_desc for the beacon in the rsvd page. */ - ret =rtw_download_beacon (rtwdev, vif); + ret =rtw_download_beacon (rtwdev);if (ret) {rtw_err (rtwdev,"failed to download beacon\n" ); goto free;
drivers/net/wireless/realtek/rtw88/fw.h +17 -8
@@ -41,6 +41,7 @@ struct rtw_c2h_cmd {enum rtw_rsvd_packet_type {RSVD_BEACON , +RSVD_DUMMY ,RSVD_PS_POLL ,RSVD_PROBE_RESP ,RSVD_NULL ,
@@ -98,7 +99,13 @@ struct rtw_lps_pg_info_hdr { } __packed;struct rtw_rsvd_page { -struct list_head list; +/* associated with each vif */ +struct list_head vif_list; +struct rtw_vif *rtwvif; + +/* associated when build rsvd page */ +struct list_head build_list; +struct sk_buff *skb;enum rtw_rsvd_packet_type type;u8 page;
@@ -502,15 +509,17 @@ void rtw_fw_bt_wifi_control(struct rtw_dev *rtwdev, u8 op_code, u8 *data);void rtw_fw_send_rssi_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si);void rtw_fw_send_ra_info (struct rtw_dev *rtwdev,struct rtw_sta_info *si);void rtw_fw_media_status_report (struct rtw_dev *rtwdev,u8 mac_id,bool conn); -void rtw_add_rsvd_page (struct rtw_dev *rtwdev,enum rtw_rsvd_packet_type type, -bool txdesc); -void rtw_add_rsvd_page_probe_req (struct rtw_dev *rtwdev, -struct cfg80211_ssid *ssid);int rtw_fw_write_data_rsvd_page (struct rtw_dev *rtwdev,u16 pg_addr,u8 *buf,u32 size); -void rtw_reset_rsvd_page (struct rtw_dev *rtwdev); -int rtw_fw_download_rsvd_page (struct rtw_dev *rtwdev, -struct ieee80211_vif *vif); +void rtw_remove_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif); +void rtw_add_rsvd_page_bcn (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif); +void rtw_add_rsvd_page_pno (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif); +void rtw_add_rsvd_page_sta (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif); +int rtw_fw_download_rsvd_page (struct rtw_dev *rtwdev);void rtw_send_rsvd_page_h2c (struct rtw_dev *rtwdev);int rtw_dump_drv_rsvd_page (struct rtw_dev *rtwdev,u32 offset,u32 size,u32 *buf);
drivers/net/wireless/realtek/rtw88/mac80211.c +12 -10
@@ -161,6 +161,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,memset (&rtwvif->bfee,0 ,sizeof (struct rtw_bfee )); rtwvif->conf = &rtw_vif_port[port];rtw_txq_init (rtwdev, vif->txq); +INIT_LIST_HEAD (&rtwvif->rsvd_page_list);mutex_lock (&rtwdev->mutex);
@@ -169,18 +170,24 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,switch (vif->type) {case NL80211_IFTYPE_AP :case NL80211_IFTYPE_MESH_POINT : +rtw_add_rsvd_page_bcn (rtwdev, rtwvif); net_type =RTW_NET_AP_MODE ; bcn_ctrl =BIT_EN_BCN_FUNCTION |BIT_DIS_TSF_UDT ;break ;case NL80211_IFTYPE_ADHOC : +rtw_add_rsvd_page_bcn (rtwdev, rtwvif); net_type =RTW_NET_AD_HOC ; bcn_ctrl =BIT_EN_BCN_FUNCTION |BIT_DIS_TSF_UDT ;break ;case NL80211_IFTYPE_STATION : -default : +rtw_add_rsvd_page_sta (rtwdev, rtwvif); net_type =RTW_NET_NO_LINK ; bcn_ctrl =BIT_EN_BCN_FUNCTION ;break ; +default : +WARN_ON (1 ); +mutex_unlock (&rtwdev->mutex); +return -EINVAL ; }ether_addr_copy (rtwvif->mac_addr, vif->addr);
@@ -211,6 +218,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw,rtw_leave_lps_deep (rtwdev);rtw_txq_cleanup (rtwdev, vif->txq); +rtw_remove_rsvd_page (rtwdev, rtwvif);eth_zero_addr (rtwvif->mac_addr); config |=PORT_SET_MAC_ADDR ;
@@ -342,12 +350,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, chip->ops->phy_calibration (rtwdev); rtwvif->aid = conf->aid; -rtw_add_rsvd_page (rtwdev,RSVD_PS_POLL , true); -rtw_add_rsvd_page (rtwdev,RSVD_QOS_NULL , true); -rtw_add_rsvd_page (rtwdev,RSVD_NULL , true); -rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_DPK , true); -rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_INFO , true); -rtw_fw_download_rsvd_page (rtwdev, vif); +rtw_fw_download_rsvd_page (rtwdev);rtw_send_rsvd_page_h2c (rtwdev);rtw_coex_media_status_notify (rtwdev, conf->assoc);if (rtw_bf_support)
@@ -356,7 +359,6 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,rtw_leave_lps (rtwdev); net_type =RTW_NET_NO_LINK ; rtwvif->aid =0 ; -rtw_reset_rsvd_page (rtwdev);rtw_bf_disassoc (rtwdev, vif, conf); }
@@ -371,7 +373,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, }if (changed &BSS_CHANGED_BEACON ) -rtw_fw_download_rsvd_page (rtwdev, vif); +rtw_fw_download_rsvd_page (rtwdev);if (changed &BSS_CHANGED_MU_GROUPS ) {struct rtw_chip_info *chip = rtwdev->chip;
@@ -556,7 +558,7 @@ static int rtw_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,/* download new cam settings for PG to backup */ if (rtw_fw_lps_deep_mode ==LPS_DEEP_MODE_PG ) -rtw_fw_download_rsvd_page (rtwdev, vif); +rtw_fw_download_rsvd_page (rtwdev); out:mutex_unlock (&rtwdev->mutex);
drivers/net/wireless/realtek/rtw88/main.c +3 -6
@@ -1400,10 +1400,6 @@ int rtw_core_init(struct rtw_dev *rtwdev)else rtwdev->lps_conf.deep_mode = rtw_fw_lps_deep_mode; -mutex_lock (&rtwdev->mutex); -rtw_add_rsvd_page (rtwdev,RSVD_BEACON , false); -mutex_unlock (&rtwdev->mutex); -rtw_stats_init (rtwdev);/* default rx filter setting */
@@ -1446,8 +1442,9 @@ void rtw_core_deinit(struct rtw_dev *rtwdev)skb_queue_purge (&rtwdev->tx_report.queue);spin_unlock_irqrestore (&rtwdev->tx_report.q_lock, flags); -list_for_each_entry_safe (rsvd_pkt, tmp, &rtwdev->rsvd_page_list, list) { -list_del (&rsvd_pkt->list); +list_for_each_entry_safe (rsvd_pkt, tmp, &rtwdev->rsvd_page_list, + build_list) { +list_del (&rsvd_pkt->build_list);kfree (rsvd_pkt); }
drivers/net/wireless/realtek/rtw88/main.h +1 -0
@@ -752,6 +752,7 @@ struct rtw_vif {u8 bssid[ETH_ALEN ];u8 port;u8 bcn_ctrl; +struct list_head rsvd_page_list;struct ieee80211_tx_queue_params tx_params[IEEE80211_NUM_ACS ];const struct rtw_vif_port *conf;
drivers/net/wireless/realtek/rtw88/wow.c +14 -25
@@ -431,50 +431,39 @@ static void rtw_wow_fw_media_status(struct rtw_dev *rtwdev, bool connect)rtw_iterate_stas_atomic (rtwdev, rtw_wow_fw_media_status_iter, &data); } -static void rtw_wow_config_pno_rsvd_page (struct rtw_dev *rtwdev) +static void rtw_wow_config_pno_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) { -struct rtw_wow_param *rtw_wow = &rtwdev->wow; -struct rtw_pno_request *rtw_pno_req = &rtw_wow->pno_req; -struct cfg80211_ssid *ssid; -int i; - -for (i =0 ; i < rtw_pno_req->match_set_cnt; i++) { - ssid = &rtw_pno_req->match_sets[i].ssid; -rtw_add_rsvd_page_probe_req (rtwdev, ssid); - } -rtw_add_rsvd_page_probe_req (rtwdev,NULL ); -rtw_add_rsvd_page (rtwdev,RSVD_NLO_INFO , false); -rtw_add_rsvd_page (rtwdev,RSVD_CH_INFO , true); +rtw_add_rsvd_page_pno (rtwdev, rtwvif); } -static void rtw_wow_config_linked_rsvd_page (struct rtw_dev *rtwdev) +static void rtw_wow_config_linked_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) { -rtw_add_rsvd_page (rtwdev,RSVD_PS_POLL , true); -rtw_add_rsvd_page (rtwdev,RSVD_QOS_NULL , true); -rtw_add_rsvd_page (rtwdev,RSVD_NULL , true); -rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_DPK , true); -rtw_add_rsvd_page (rtwdev,RSVD_LPS_PG_INFO , true); +rtw_add_rsvd_page_sta (rtwdev, rtwvif); } -static void rtw_wow_config_rsvd_page (struct rtw_dev *rtwdev) +static void rtw_wow_config_rsvd_page (struct rtw_dev *rtwdev, +struct rtw_vif *rtwvif) { -rtw_reset_rsvd_page (rtwdev); +rtw_remove_rsvd_page (rtwdev, rtwvif);if (rtw_wow_mgd_linked (rtwdev)) { -rtw_wow_config_linked_rsvd_page (rtwdev); +rtw_wow_config_linked_rsvd_page (rtwdev, rtwvif); }else if (test_bit (RTW_FLAG_WOWLAN , rtwdev->flags) &&rtw_wow_no_link (rtwdev)) { -rtw_wow_config_pno_rsvd_page (rtwdev); +rtw_wow_config_pno_rsvd_page (rtwdev, rtwvif); } }static int rtw_wow_dl_fw_rsvd_page (struct rtw_dev *rtwdev) {struct ieee80211_vif *wow_vif = rtwdev->wow.wow_vif; +struct rtw_vif *rtwvif = (struct rtw_vif *)wow_vif->drv_priv; -rtw_wow_config_rsvd_page (rtwdev); +rtw_wow_config_rsvd_page (rtwdev, rtwvif); -return rtw_fw_download_rsvd_page (rtwdev, wow_vif); +return rtw_fw_download_rsvd_page (rtwdev); }static int rtw_wow_swap_fw (struct rtw_dev *rtwdev,enum rtw_fw_type type)
Signature · 1 line
2.17.1
PATCH 4/5 rtw88: pci: define a mask for TX/RX BD indexes
In reply to [email protected]From: Yan-Hsuan Chuang <[email protected]>
Add a macro TRX_BD_IDX_MASK for access the TX/RX BD indexes.
The hardware has only 12 bits for TX/RX BD indexes, we should not initialize a TX/RX ring or access the TX/RX BD index with a length that is larger than TRX_BD_IDX_MASK.
--- drivers/net/wireless/realtek/rtw88/pci.c | 32 ++++++++++++++++-------- drivers/net/wireless/realtek/rtw88/pci.h | 2 ++ 2 files changed, 23 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw88/pci.c +21 -11
@@ -186,6 +186,11 @@ static int rtw_pci_init_tx_ring(struct rtw_dev *rtwdev,dma_addr_t dma;u8 *head; +if (len >TRX_BD_IDX_MASK ) { +rtw_err (rtwdev,"len %d exceeds maximum TX entries\n" , len); +return -EINVAL ; + } + head =pci_zalloc_consistent (pdev, ring_sz, &dma);if (!head) {rtw_err (rtwdev,"failed to allocate tx ring\n" );
@@ -259,6 +264,11 @@ static int rtw_pci_init_rx_ring(struct rtw_dev *rtwdev,int i, allocated;int ret =0 ; +if (len >TRX_BD_IDX_MASK ) { +rtw_err (rtwdev,"len %d exceeds maximum RX entries\n" , len); +return -EINVAL ; + } + head =pci_zalloc_consistent (pdev, ring_sz, &dma);if (!head) {rtw_err (rtwdev,"failed to allocate rx ring\n" );
@@ -405,56 +415,56 @@ static void rtw_pci_reset_buf_desc(struct rtw_dev *rtwdev) dma = rtwpci->tx_rings[RTW_TX_QUEUE_H2C ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_H2C ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_H2C ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_H2CQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_H2CQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_H2CQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_BK ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_BK ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_BK ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_BK ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_BKQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_BKQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_BKQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_BE ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_BE ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_BE ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_BE ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_BEQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_BEQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_BEQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_VO ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_VO ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_VO ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_VO ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_VOQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_VOQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_VOQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_VI ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_VI ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_VI ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_VI ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_VIQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_VIQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_VIQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_MGMT ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_MGMT ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_MGMT ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_MGMT ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_MGMTQ , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_MGMTQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_MGMTQ , dma); len = rtwpci->tx_rings[RTW_TX_QUEUE_HI0 ].r.len; dma = rtwpci->tx_rings[RTW_TX_QUEUE_HI0 ].r.dma; rtwpci->tx_rings[RTW_TX_QUEUE_HI0 ].r.rp =0 ; rtwpci->tx_rings[RTW_TX_QUEUE_HI0 ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_HI0Q , len); +rtw_write16 (rtwdev,RTK_PCI_TXBD_NUM_HI0Q , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_TXBD_DESA_HI0Q , dma); len = rtwpci->rx_rings[RTW_RX_QUEUE_MPDU ].r.len; dma = rtwpci->rx_rings[RTW_RX_QUEUE_MPDU ].r.dma; rtwpci->rx_rings[RTW_RX_QUEUE_MPDU ].r.rp =0 ; rtwpci->rx_rings[RTW_RX_QUEUE_MPDU ].r.wp =0 ; -rtw_write16 (rtwdev,RTK_PCI_RXBD_NUM_MPDUQ , len &0xfff ); +rtw_write16 (rtwdev,RTK_PCI_RXBD_NUM_MPDUQ , len &TRX_BD_IDX_MASK );rtw_write32 (rtwdev,RTK_PCI_RXBD_DESA_MPDUQ , dma);/* reset read/write point */
@@ -743,7 +753,7 @@ static int rtw_pci_xmit(struct rtw_dev *rtwdev,if (++ring->r.wp >= ring->r.len) ring->r.wp =0 ; bd_idx = rtw_pci_tx_queue_idx_addr[queue]; -rtw_write16 (rtwdev, bd_idx, ring->r.wp &0xfff ); +rtw_write16 (rtwdev, bd_idx, ring->r.wp &TRX_BD_IDX_MASK ); }else {u32 reg_bcn_work;
@@ -821,7 +831,7 @@ static void rtw_pci_tx_isr(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci, bd_idx_addr = rtw_pci_tx_queue_idx_addr[hw_queue]; bd_idx =rtw_read32 (rtwdev, bd_idx_addr); cur_rp = bd_idx >>16 ; - cur_rp &=0xfff ; + cur_rp &=TRX_BD_IDX_MASK ;if (cur_rp >= ring->r.rp) count = cur_rp - ring->r.rp;else
@@ -895,7 +905,7 @@ static void rtw_pci_rx_isr(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci, tmp =rtw_read32 (rtwdev,RTK_PCI_RXBD_IDX_MPDUQ ); cur_wp = tmp >>16 ; - cur_wp &=0xfff ; + cur_wp &=TRX_BD_IDX_MASK ;if (cur_wp >= ring->r.wp) count = cur_wp - ring->r.wp;else
drivers/net/wireless/realtek/rtw88/pci.h +2 -0
@@ -52,6 +52,8 @@#define RTK_PCI_TXBD_DESA_HI0Q 0x340#define RTK_PCI_RXBD_DESA_MPDUQ 0x338 +#define TRX_BD_IDX_MASK GENMASK(11, 0) +/* BCNQ is specialized for rsvd page, does not need to specify a number */ #define RTK_PCI_TXBD_NUM_H2CQ 0x1328#define RTK_PCI_TXBD_NUM_MGMTQ 0x380
Signature · 1 line
2.17.1
PATCH 5/5 rtw88: kick off TX packets once for higher efficiency
In reply to [email protected]From: Yan-Hsuan Chuang <[email protected]>
Driver used to kick off every TX packets, that will waste some time while we can do better to kick off the TX packets once after they are all prepared to be transmitted.
For PCI, it uses DMA engine to transfer the SKBs to the device, and the transition of the state of the DMA engine could be a cost. Driver can save some time to kick off multiple SKBs once so that the DMA engine will have only one transition.
So, split rtw_hci_ops::tx() to rtw_hci_ops::tx_write() and rtw_hci_ops::tx_kick_off() to explicitly kick the SKBs off after they are written to the prepared buffer. For packets come from ieee80211_ops::tx(), write one and then kick it off immediately. For packets queued in TX queue, which come from ieee80211_ops::wake_tx_queue(), we can dequeue them, write them to the buffer, and then kick them off together.
--- drivers/net/wireless/realtek/rtw88/hci.h | 20 ++++-- drivers/net/wireless/realtek/rtw88/pci.c | 92 +++++++++++++++++------- drivers/net/wireless/realtek/rtw88/pci.h | 1 + drivers/net/wireless/realtek/rtw88/tx.c | 77 ++++++++++++++------ drivers/net/wireless/realtek/rtw88/tx.h | 2 +- 5 files changed, 136 insertions(+), 56 deletions(-)
drivers/net/wireless/realtek/rtw88/hci.h +13 -7
@@ -7,9 +7,10 @@/* ops for PCI, USB and SDIO */ struct rtw_hci_ops { -int (*tx)(struct rtw_dev *rtwdev, -struct rtw_tx_pkt_info *pkt_info, -struct sk_buff *skb); +int (*tx_write)(struct rtw_dev *rtwdev, +struct rtw_tx_pkt_info *pkt_info, +struct sk_buff *skb); +void (*tx_kick_off)(struct rtw_dev *rtwdev);int (*setup)(struct rtw_dev *rtwdev);int (*start)(struct rtw_dev *rtwdev);void (*stop)(struct rtw_dev *rtwdev);
@@ -28,11 +29,16 @@ struct rtw_hci_ops {void (*write32)(struct rtw_dev *rtwdev,u32 addr,u32 val); }; -static inline int rtw_hci_tx (struct rtw_dev *rtwdev, -struct rtw_tx_pkt_info *pkt_info, -struct sk_buff *skb) +static inline int rtw_hci_tx_write (struct rtw_dev *rtwdev, +struct rtw_tx_pkt_info *pkt_info, +struct sk_buff *skb) { -return rtwdev->hci.ops->tx (rtwdev, pkt_info, skb); +return rtwdev->hci.ops->tx_write (rtwdev, pkt_info, skb); +} + +static inline void rtw_hci_tx_kick_off (struct rtw_dev *rtwdev) +{ +return rtwdev->hci.ops->tx_kick_off (rtwdev); }static inline int rtw_hci_setup (struct rtw_dev *rtwdev)
drivers/net/wireless/realtek/rtw88/pci.c +67 -25
148 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/pci.h +1 -0
@@ -208,6 +208,7 @@ struct rtw_pci {bool irq_enabled;u16 rx_tag; +DECLARE_BITMAP (tx_queued,RTK_MAX_TX_QUEUE_NUM );struct rtw_pci_tx_ring tx_rings[RTK_MAX_TX_QUEUE_NUM ];struct rtw_pci_rx_ring rx_rings[RTK_MAX_RX_QUEUE_NUM ];u16 link_ctrl;
drivers/net/wireless/realtek/rtw88/tx.c +54 -23
146 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/tx.h +1 -1
@@ -85,7 +85,7 @@ void rtw_txq_cleanup(struct rtw_dev *rtwdev, struct ieee80211_txq *txq);void rtw_tx_tasklet (unsigned long data);void rtw_tx_pkt_info_update (struct rtw_dev *rtwdev,struct rtw_tx_pkt_info *pkt_info, -struct ieee80211_tx_control *control, +struct ieee80211_sta *sta,struct sk_buff *skb);void rtw_tx_fill_tx_desc (struct rtw_tx_pkt_info *pkt_info,struct sk_buff *skb);void rtw_tx_report_enqueue (struct rtw_dev *rtwdev,struct sk_buff *skb,u8 sn);
Signature · 1 line
2.17.1