wil6210 patches
PATCH 8/9 wil6210: check rx_buff_mgmt before accessing it
In reply to Maya ErezFrom: Dedy Lansky <[email protected]>
Make sure rx_buff_mgmt is initialized before accessing it.
--- drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/wil6210/txrx_edma.c +3 -0
@@ -269,6 +269,9 @@ static void wil_move_all_rx_buff_to_free_list(struct wil6210_priv *wil,struct list_head *active = &wil->rx_buff_mgmt.active;dma_addr_t pa; +if (!wil->rx_buff_mgmt.buff_arr) +return ; +while (!list_empty (active)) {struct wil_rx_buff *rx_buff = list_first_entry(active, struct wil_rx_buff, list);
Signature · 1 line
1.9.1
PATCH 7/9 wil6210: fix missed MISC mbox interrupt
In reply to Maya ErezWhen MISC interrupt is triggered due to HALP bit, in parallel to mbox events handling by the MISC threaded IRQ, new mbox interrupt can be missed in the following scenario:
1. MISC ICR is read in the IRQ handler
2. Threaded IRQ is completed and all MISC interrupts are unmasked
3. mbox interrupt is set by FW
4. HALP is masked
The mbox interrupt in step 3 can be missed due to constant high level of ICM.
Masking all MISC IRQs instead of masking only HALP bit in step 4 will guarantee that ICM will drop to 0 and interrupt will be triggered once MISC interrupts will be unmasked.
--- drivers/net/wireless/ath/wil6210/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/interrupt.c +1 -1
@@ -595,7 +595,7 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie)/* no need to handle HALP ICRs until next vote */ wil->halp.handle_icr = false;wil_dbg_irq (wil,"irq_misc: HALP IRQ invoked\n" ); -wil6210_mask_halp (wil); +wil6210_mask_irq_misc (wil, true);complete (&wil->halp.comp); } }
Signature · 1 line
1.9.1
cover wil6210 patches
The following patches include;
- Various wil6210 bug fixes
- Support handling of multiple section in board file
Ahmad Masri (1):
wil6210: fix overwriting max_assoc_sta module param
Alexei Avshalom Lazar (1):
wil6210: fix _desc access in __wil_tx_vring_tso
Dedy Lansky (3):
wil6210: add printout of platform capabilities
wil6210: enhancements for descriptor and status ring debugfs
wil6210: check rx_buff_mgmt before accessing it
Maya Erez (4):
wil6210: fix spurious interrupts in 3-msi
wil6210: add support for multiple sections in brd file
wil6210: fix missed MISC mbox interrupt
wil6210: remove HALP for Talyn devices
drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- drivers/net/wireless/ath/wil6210/debugfs.c | 70 ++++++++---- drivers/net/wireless/ath/wil6210/fw.h | 11 +- drivers/net/wireless/ath/wil6210/fw_inc.c | 148 +++++++++++++++++++------- drivers/net/wireless/ath/wil6210/interrupt.c | 67 +++++++----- drivers/net/wireless/ath/wil6210/main.c | 18 +++- drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 + drivers/net/wireless/ath/wil6210/rx_reorder.c | 2 +- drivers/net/wireless/ath/wil6210/txrx.c | 25 +++-- drivers/net/wireless/ath/wil6210/txrx_edma.c | 10 +- drivers/net/wireless/ath/wil6210/wil6210.h | 33 ++++-- drivers/net/wireless/ath/wil6210/wmi.c | 14 +-- 12 files changed, 275 insertions(+), 129 deletions(-)
Signature · 1 line
1.9.1
PATCH 5/9 wil6210: enhancements for descriptor and status ring debugfs
From: Dedy Lansky <[email protected]>
Add printing of hwhead as part of desc ring and status ring debugfs. Validate wil->rx_buff_mgmt and ring->ctx arrays before accessing them. Dump Tx descriptor content even when it indicates invalid buff_id.
--- drivers/net/wireless/ath/wil6210/debugfs.c | 52 +++++++++++++++++++++++------- drivers/net/wireless/ath/wil6210/wil6210.h | 5 +++ 2 files changed, 45 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/wil6210/debugfs.c +40 -12
@@ -63,7 +63,9 @@ static void wil_print_desc_edma(struct seq_file *s, struct wil6210_priv *wil, &ring->va[idx].rx.enhanced;u16 buff_id =le16_to_cpu (rx_d->mac.buff_id); - has_skb = wil->rx_buff_mgmt.buff_arr[buff_id].skb; +if (wil->rx_buff_mgmt.buff_arr && +wil_val_in_range (buff_id,0 , wil->rx_buff_mgmt.size)) + has_skb = wil->rx_buff_mgmt.buff_arr[buff_id].skb;seq_printf (s,"%c" , (has_skb) ? _h : _s); }else { struct wil_tx_enhanced_desc *d =
@@ -71,9 +73,9 @@ static void wil_print_desc_edma(struct seq_file *s, struct wil6210_priv *wil, &ring->va[idx].tx.enhanced; num_of_descs = (u8 )d->mac.d[2 ]; - has_skb = ring->ctx[idx].skb; + has_skb = ring->ctx && ring->ctx[idx].skb;if (num_of_descs >=1 ) -seq_printf (s,"%c" , ring->ctx[idx].skb ? _h : _s); +seq_printf (s,"%c" , has_skb ? _h : _s);else /* num_of_descs == 0, it's a frag in a list of descs */ seq_printf (s,"%c" , has_skb ?'h' : _s);
@@ -84,7 +86,7 @@ static void wil_print_ring(struct seq_file *s, struct wil6210_priv *wil, const char *name, struct wil_ring *ring, char _s, char _h) { - void __iomem *x = wmi_addr(wil, ring->hwtail); + void __iomem *x;u32 v;seq_printf (s,"RING %s = {\n" , name);
@@ -96,7 +98,21 @@ static void wil_print_ring(struct seq_file *s, struct wil6210_priv *wil,else seq_printf (s," swtail = %d\n" , ring->swtail);seq_printf (s," swhead = %d\n" , ring->swhead); +if (wil->use_enhanced_dma_hw) { +int ring_id = ring->is_rx ? +WIL_RX_DESC_RING_ID : ring - wil->ring_tx; +/* SUBQ_CONS is a table of 32 entries, one for each Q pair. +* lower 16bits are for even ring_id and upper 16bits are for +* odd ring_id +*/ + x =wmi_addr (wil,RGF_DMA_SCM_SUBQ_CONS +4 * (ring_id /2 )); + v =readl_relaxed (x); + + v = (ring_id %2 ? (v >>16 ) : (v &0xffff )); +seq_printf (s," hwhead = %u\n" , v); + }seq_printf (s," hwtail = [0x%08x] -> " , ring->hwtail); + x =wmi_addr (wil, ring->hwtail);if (x) { v =readl (x);seq_printf (s,"0x%08x = %d\n" , v, v);
@@ -188,7 +204,7 @@ static int ring_show(struct seq_file *s, void *data)static void wil_print_sring (struct seq_file *s,struct wil6210_priv *wil,struct wil_status_ring *sring) { -void __iomem *x =wmi_addr (wil, sring->hwtail); +void __iomem *x;int sring_idx = sring - wil->srings;u32 v;
@@ -199,7 +215,19 @@ static void wil_print_sring(struct seq_file *s, struct wil6210_priv *wil,seq_printf (s," size = %d\n" , sring->size);seq_printf (s," elem_size = %zu\n" , sring->elem_size);seq_printf (s," swhead = %d\n" , sring->swhead); +if (wil->use_enhanced_dma_hw) { +/* COMPQ_PROD is a table of 32 entries, one for each Q pair. +* lower 16bits are for even ring_id and upper 16bits are for +* odd ring_id +*/ + x =wmi_addr (wil,RGF_DMA_SCM_COMPQ_PROD +4 * (sring_idx /2 )); + v =readl_relaxed (x); + + v = (sring_idx %2 ? (v >>16 ) : (v &0xffff )); +seq_printf (s," hwhead = %u\n" , v); + }seq_printf (s," hwtail = [0x%08x] -> " , sring->hwtail); + x =wmi_addr (wil, sring->hwtail);if (x) { v =readl_relaxed (x);seq_printf (s,"0x%08x = %d\n" , v, v);
@@ -1091,19 +1119,18 @@ static int txdesc_show(struct seq_file *s, void *data)if (wil->use_enhanced_dma_hw) {if (tx) { - skb = ring->ctx[txdesc_idx].skb; - }else { + skb = ring->ctx ? ring->ctx[txdesc_idx].skb :NULL ; + }else if (wil->rx_buff_mgmt.buff_arr) {struct wil_rx_enhanced_desc *rx_d = (struct wil_rx_enhanced_desc *) &ring->va[txdesc_idx].rx.enhanced;u16 buff_id =le16_to_cpu (rx_d->mac.buff_id);if (!wil_val_in_range (buff_id,0 , - wil->rx_buff_mgmt.size)) { + wil->rx_buff_mgmt.size))seq_printf (s,"invalid buff_id %d\n" , buff_id); -return 0 ; - } - skb = wil->rx_buff_mgmt.buff_arr[buff_id].skb; +else + skb = wil->rx_buff_mgmt.buff_arr[buff_id].skb; } }else { skb = ring->ctx[txdesc_idx].skb;
@@ -1136,7 +1163,7 @@ static int status_msg_show(struct seq_file *s, void *data)struct wil6210_priv *wil = s->private;int sring_idx = dbg_sring_index;struct wil_status_ring *sring; -bool tx = sring_idx == wil->tx_sring_idx ?1 :0 ; +bool tx;u32 status_msg_idx = dbg_status_msg_index;u32 *u;
@@ -1146,6 +1173,7 @@ static int status_msg_show(struct seq_file *s, void *data) } sring = &wil->srings[sring_idx]; + tx = !sring->is_rx;if (!sring->va) {seq_printf (s,"No %cX status ring\n" , tx ?'T' :'R' );
drivers/net/wireless/ath/wil6210/wil6210.h +5 -0
@@ -335,6 +335,11 @@ struct RGF_ICR {#define BIT_BOOT_FROM_ROM BIT(31)/* eDMA */ +#define RGF_SCM_PTRS_SUBQ_RD_PTR (0x8b4000) +#define RGF_SCM_PTRS_COMPQ_RD_PTR (0x8b4100) +#define RGF_DMA_SCM_SUBQ_CONS (0x8b60ec) +#define RGF_DMA_SCM_COMPQ_PROD (0x8b616c) +#define RGF_INT_COUNT_ON_SPECIAL_EVT (0x8b62d8)#define RGF_INT_CTRL_INT_GEN_CFG_0 (0x8bc000)
Signature · 1 line
1.9.1
PATCH 1/9 wil6210: fix spurious interrupts in 3-msi
In reply to Maya ErezInterrupt is set in ICM (ICR & ~IMV) rising trigger. As the driver masks the IRQ after clearing it, there can be a race where an additional spurious interrupt is triggered when the driver unmask the IRQ.
This can happen in case HW triggers an interrupt after the clear and before the mask.
To prevent the second spurious interrupt the driver needs to mask the IRQ before reading and clearing it.
--- drivers/net/wireless/ath/wil6210/interrupt.c | 65 +++++++++++++++++----------- 1 file changed, 40 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/wil6210/interrupt.c +40 -25
@@ -296,21 +296,24 @@ void wil_configure_interrupt_moderation(struct wil6210_priv *wil)static irqreturn_t wil6210_irq_rx (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_RX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_rx (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_RX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_rx (isr);wil_dbg_irq (wil,"ISR RX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err_ratelimited (wil,"spurious IRQ: RX\n" ); +wil6210_unmask_irq_rx (wil);return IRQ_NONE ; } -wil6210_mask_irq_rx (wil); -/* RX_DONE and RX_HTRSH interrupts are the same if interrupt * moderation is not used. Interrupt moderation may cause RX * buffer overflow while RX_DONE is delayed. The required
@@ -355,21 +358,24 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie)static irqreturn_t wil6210_irq_rx_edma (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_INT_GEN_RX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_rx_edma (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_INT_GEN_RX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_rx (isr);wil_dbg_irq (wil,"ISR RX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err (wil,"spurious IRQ: RX\n" ); +wil6210_unmask_irq_rx_edma (wil);return IRQ_NONE ; } -wil6210_mask_irq_rx_edma (wil); -if (likely (isr &BIT_RX_STATUS_IRQ )) {wil_dbg_irq (wil,"RX status ring\n" ); isr &= ~BIT_RX_STATUS_IRQ ;
@@ -403,21 +409,24 @@ static irqreturn_t wil6210_irq_rx_edma(int irq, void *cookie)static irqreturn_t wil6210_irq_tx_edma (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_INT_GEN_TX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_tx_edma (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_INT_GEN_TX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_tx (isr);wil_dbg_irq (wil,"ISR TX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err (wil,"spurious IRQ: TX\n" ); +wil6210_unmask_irq_tx_edma (wil);return IRQ_NONE ; } -wil6210_mask_irq_tx_edma (wil); -if (likely (isr &BIT_TX_STATUS_IRQ )) {wil_dbg_irq (wil,"TX status ring\n" ); isr &= ~BIT_TX_STATUS_IRQ ;
@@ -446,21 +455,24 @@ static irqreturn_t wil6210_irq_tx_edma(int irq, void *cookie)static irqreturn_t wil6210_irq_tx (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_TX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_tx (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_TX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_tx (isr);wil_dbg_irq (wil,"ISR TX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err_ratelimited (wil,"spurious IRQ: TX\n" ); +wil6210_unmask_irq_tx (wil);return IRQ_NONE ; } -wil6210_mask_irq_tx (wil); -if (likely (isr &BIT_DMA_EP_TX_ICR_TX_DONE )) {wil_dbg_irq (wil,"TX done\n" ); isr &= ~BIT_DMA_EP_TX_ICR_TX_DONE ;
@@ -532,20 +544,23 @@ static bool wil_validate_mbox_regs(struct wil6210_priv *wil)static irqreturn_t wil6210_irq_misc (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_MISC_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr; + +wil6210_mask_irq_misc (wil, false); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_MISC_ICR ) + + offsetof(struct RGF_ICR , ICR));trace_wil6210_irq_misc (isr);wil_dbg_irq (wil,"ISR MISC 0x%08x\n" , isr);if (!isr) {wil_err (wil,"spurious IRQ: MISC\n" ); +wil6210_unmask_irq_misc (wil, false);return IRQ_NONE ; } -wil6210_mask_irq_misc (wil, false); -if (isr &ISR_MISC_FW_ERROR ) {u32 fw_assert_code =wil_r (wil, wil->rgf_fw_assert_code_addr); u32 ucode_assert_code =
Signature · 1 line
1.9.1
PATCH 9/9 wil6210: remove HALP for Talyn devices
In reply to Maya ErezIn Talyn the HW is responsible for power management enter / exit flow, hence the deep sleep exit latency is significantly shorter than in Sparrow.
In such a case HALP feature, that is meant to prevent long PCIe blocking accesses, is no longer needed and can be removed for Talyn.
--- drivers/net/wireless/ath/wil6210/main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ath/wil6210/main.c +6 -0
@@ -1940,6 +1940,9 @@ void wil_halp_vote(struct wil6210_priv *wil)unsigned long rc;unsigned long to_jiffies =msecs_to_jiffies (WAIT_FOR_HALP_VOTE_MS ); +if (wil->hw_version >=HW_VER_TALYN_MB ) +return ; +mutex_lock (&wil->halp.lock); wil_dbg_irq(wil, "halp_vote: start, HALP ref_cnt (%d)\n",
@@ -1971,6 +1974,9 @@ void wil_halp_vote(struct wil6210_priv *wil)void wil_halp_unvote (struct wil6210_priv *wil) { +if (wil->hw_version >=HW_VER_TALYN_MB ) +return ; +WARN_ON (wil->halp.ref_cnt ==0 );mutex_lock (&wil->halp.lock);
Signature · 1 line
1.9.1
PATCH 2/9 wil6210: fix _desc access in __wil_tx_vring_tso
In reply to Maya ErezFrom: Alexei Avshalom Lazar <[email protected]>
_desc is defined in __wil_tx_vring_tso() and may not be set in case len is 0, verify _desc is set.
--- drivers/net/wireless/ath/wil6210/txrx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/wil6210/txrx.c +3 -0
@@ -1760,6 +1760,9 @@ static int __wil_tx_vring_tso(struct wil6210_priv *wil, struct wil6210_vif *vif, } } +if (!_desc) + goto mem_error; +/* first descriptor may also be the last. * in this case d pointer is invalid */
Signature · 1 line
1.9.1
PATCH 4/9 wil6210: add support for multiple sections in brd file
In reply to Maya ErezCurrent board file loading procedure assumes that the board file includes only one section.
New board files can include multiple sections.
Add the ability to read multiple addresses and max size from FW file and load multiple sections from the board file into those addresses.
--- drivers/net/wireless/ath/wil6210/fw.h | 11 ++- drivers/net/wireless/ath/wil6210/fw_inc.c | 148 +++++++++++++++++++++-------- drivers/net/wireless/ath/wil6210/main.c | 3 +- drivers/net/wireless/ath/wil6210/wil6210.h | 9 +- 4 files changed, 126 insertions(+), 45 deletions(-)
drivers/net/wireless/ath/wil6210/fw.h +8 -3
@@ -1,6 +1,6 @@/* * Copyright (c) 2014,2016 Qualcomm Atheros, Inc. -* Copyright (c) 2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above
@@ -109,12 +109,17 @@ struct wil_fw_record_concurrency { /* type == wil_fw_type_comment *//* brd file info encoded inside a comment record */ #define WIL_BRD_FILE_MAGIC (0xabcddcbb) + +struct brd_info { +__le32 base_addr; +__le32 max_size_bytes; +} __packed; +struct wil_fw_record_brd_file {/* type == wil_fw_type_comment */ /* identifies brd file record */ struct wil_fw_record_comment_hdr hdr;__le32 version; -__le32 base_addr; -__le32 max_size_bytes; +struct brd_info brd_info[0 ]; } __packed;/* perform action
drivers/net/wireless/ath/wil6210/fw_inc.c +109 -39
190 lines not on this page · raw message
drivers/net/wireless/ath/wil6210/main.c +2 -1
@@ -838,6 +838,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)wmi_event_flush (wil);destroy_workqueue (wil->wq_service);destroy_workqueue (wil->wmi_wq); +kfree (wil->brd_info); }static void wil_shutdown_bl (struct wil6210_priv *wil)
@@ -1709,7 +1710,7 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) rc =wil_request_firmware (wil, wil->wil_fw_name, true);if (rc) goto out; -if (wil->brd_file_addr) +if (wil->num_of_brd_entries) rc =wil_request_board (wil, board_file);else rc =wil_request_firmware (wil, board_file, true);
drivers/net/wireless/ath/wil6210/wil6210.h +7 -2
@@ -913,6 +913,11 @@ struct wil_fw_stats_global {struct wmi_link_stats_global stats; }; +struct wil_brd_info { +u32 file_addr; +u32 file_max_size; +}; +struct wil6210_priv {struct pci_dev *pdev;u32 bar_size;
@@ -927,8 +932,8 @@ struct wil6210_priv {const char *hw_name;const char *wil_fw_name;char *board_file; -u32 brd_file_addr; -u32 brd_file_max_size; +u32 num_of_brd_entries; +struct wil_brd_info *brd_info;DECLARE_BITMAP (hw_capa, hw_capa_last);DECLARE_BITMAP (fw_capabilities,WMI_FW_CAPABILITY_MAX );DECLARE_BITMAP (platform_capa,WIL_PLATFORM_CAPA_MAX );
Signature · 1 line
1.9.1
PATCH 3/9 wil6210: add printout of platform capabilities
In reply to Maya ErezFrom: Dedy Lansky <[email protected]>
Add logging of the platform capabilities after retrieving it from the platform driver.
--- drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/wil6210/pcie_bus.c +2 -0
@@ -142,6 +142,8 @@ int wil_set_capabilities(struct wil6210_priv *wil) min(sizeof(wil->platform_capa), sizeof(platform_capa))); } +wil_info (wil,"platform_capa 0x%lx\n" , *wil->platform_capa); +/* extract FW capabilities from file without loading the FW */ wil_request_firmware (wil, wil->wil_fw_name, false);wil_refresh_fw_capabilities (wil);
Signature · 1 line
1.9.1
PATCH 6/9 wil6210: fix overwriting max_assoc_sta module param
In reply to Maya ErezFrom: Ahmad Masri <[email protected]>
Save the parameter of max_assoc_sta per device.
On fw_ready event calculate the max_assoc_sta and save it per device, do not overwrite the max_assoc_sta module param.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 4 ++-- drivers/net/wireless/ath/wil6210/debugfs.c | 18 +++++++++--------- drivers/net/wireless/ath/wil6210/main.c | 9 +++++---- drivers/net/wireless/ath/wil6210/rx_reorder.c | 2 +- drivers/net/wireless/ath/wil6210/txrx.c | 22 +++++++++++----------- drivers/net/wireless/ath/wil6210/txrx_edma.c | 7 ++++--- drivers/net/wireless/ath/wil6210/wil6210.h | 19 ++++++++++--------- drivers/net/wireless/ath/wil6210/wmi.c | 14 +++++++------- 8 files changed, 49 insertions(+), 46 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +2 -2
@@ -395,7 +395,7 @@ static int wil_find_cid_by_idx(struct wil6210_priv *wil, u8 mid, int idx) {int i; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {if (wil->sta[i].status == wil_sta_unused)continue ;if (wil->sta[i].mid != mid)
@@ -3020,7 +3020,7 @@ static int wil_rf_sector_set_selected(struct wiphy *wiphy, wil, vif->mid,WMI_INVALID_RF_SECTOR_INDEX , sector_type, WIL_CID_ALL);if (rc == -EINVAL ) { -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {if (wil->sta[i].mid != vif->mid)continue ; rc = wil_rf_sector_wmi_set_selected(
drivers/net/wireless/ath/wil6210/debugfs.c +9 -9
@@ -178,7 +178,7 @@ static int ring_show(struct seq_file *s, void *data)snprintf (name,sizeof (name),"tx_%2d" , i); -if (cid < max_assoc_sta) +if (cid < wil->max_assoc_sta) seq_printf(s, "\n%pM CID %d TID %d 1x%s BACK([%u] %u TU A%s) [%3d|%3d] idle %s\n", wil->sta[cid].addr, cid, tid,
@@ -839,7 +839,7 @@ static ssize_t wil_write_back(struct file *file, const char __user *buf, "BACK: del_rx require at least 2 params\n");return -EINVAL ; } -if (p1 <0 || p1 >= max_assoc_sta) { +if (p1 <0 || p1 >= wil->max_assoc_sta) {wil_err (wil,"BACK: invalid CID %d\n" , p1);return -EINVAL ; }
@@ -1290,7 +1290,7 @@ static int bf_show(struct seq_file *s, void *data)memset (&reply,0 ,sizeof (reply)); -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {u32 status; cmd.cid = i;
@@ -1387,7 +1387,7 @@ static int link_show(struct seq_file *s, void *data)if (!sinfo)return -ENOMEM ; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {struct wil_sta_info *p = &wil->sta[i];char *status ="unknown" ;struct wil6210_vif *vif;
@@ -1589,7 +1589,7 @@ static int sta_show(struct seq_file *s, void *data)struct wil6210_priv *wil = s->private;int i, tid, mcs; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {struct wil_sta_info *p = &wil->sta[i];char *status ="unknown" ;u8 aid =0 ;
@@ -1698,7 +1698,7 @@ static int wil_tx_latency_debugfs_show(struct seq_file *s, void *data)struct wil6210_priv *wil = s->private;int i, bin; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {struct wil_sta_info *p = &wil->sta[i];char *status ="unknown" ;u8 aid =0 ;
@@ -1787,7 +1787,7 @@ static ssize_t wil_tx_latency_write(struct file *file, const char __user *buf,size_t sz =sizeof (u64) *WIL_NUM_LATENCY_BINS ; wil->tx_latency_res = val; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {struct wil_sta_info *sta = &wil->sta[i];kfree (sta->tx_latency_bins);
@@ -1872,7 +1872,7 @@ static void wil_link_stats_debugfs_show_vif(struct wil6210_vif *vif, }seq_printf (s,"TSF %lld\n" , vif->fw_stats_tsf); -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {if (wil->sta[i].status == wil_sta_unused)continue ;if (wil->sta[i].mid != vif->mid)
@@ -2488,7 +2488,7 @@ void wil6210_debugfs_remove(struct wil6210_priv *wil) wil->debug =NULL ;kfree (wil->dbg_data.data_arr); -for (i =0 ; i < max_assoc_sta; i++) +for (i =0 ; i < wil->max_assoc_sta; i++)kfree (wil->sta[i].tx_latency_bins);/* free pmc memory without sending command to fw, as it will
drivers/net/wireless/ath/wil6210/main.c +5 -4
@@ -241,7 +241,7 @@ static bool wil_vif_is_connected(struct wil6210_priv *wil, u8 mid) {int i; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {if (wil->sta[i].mid == mid && wil->sta[i].status == wil_sta_connected)return true;
@@ -344,7 +344,7 @@ static void _wil6210_disconnect_complete(struct wil6210_vif *vif,wil_disconnect_cid_complete (vif, cid, reason_code); }else {/* all */ wil_dbg_misc (wil,"Disconnect complete all\n" ); -for (cid =0 ; cid < max_assoc_sta; cid++) +for (cid =0 ; cid < wil->max_assoc_sta; cid++)wil_disconnect_cid_complete (vif, cid, reason_code); }
@@ -456,7 +456,7 @@ static void _wil6210_disconnect(struct wil6210_vif *vif, const u8 *bssid,wil_disconnect_cid (vif, cid, reason_code); }else {/* all */ wil_dbg_misc (wil,"Disconnect all\n" ); -for (cid =0 ; cid < max_assoc_sta; cid++) +for (cid =0 ; cid < wil->max_assoc_sta; cid++)wil_disconnect_cid (vif, cid, reason_code); }
@@ -753,6 +753,7 @@ int wil_priv_init(struct wil6210_priv *wil) wil->reply_mid =U8_MAX ; wil->max_vifs =1 ; + wil->max_assoc_sta = max_assoc_sta;/* edma configuration can be updated via debugfs before allocation */ wil->num_rx_status_rings =WIL_DEFAULT_NUM_RX_STATUS_RINGS ;
@@ -1922,7 +1923,7 @@ int wil_find_cid(struct wil6210_priv *wil, u8 mid, const u8 *mac)int i;int rc = -ENOENT ; -for (i =0 ; i < max_assoc_sta; i++) { +for (i =0 ; i < wil->max_assoc_sta; i++) {if (wil->sta[i].mid == mid && wil->sta[i].status != wil_sta_unused &ðer_addr_equal (wil->sta[i].addr, mac)) {
drivers/net/wireless/ath/wil6210/rx_reorder.c +1 -1
@@ -336,7 +336,7 @@ int wil_addba_rx_request(struct wil6210_priv *wil, u8 mid, u8 cid, u8 tid,might_sleep ();/* sanity checks */ -if (cid >= max_assoc_sta) { +if (cid >= wil->max_assoc_sta) {wil_err (wil,"BACK: invalid CID %d\n" , cid); rc = -EINVAL ; goto out;
drivers/net/wireless/ath/wil6210/txrx.c +11 -11
@@ -411,7 +411,7 @@ static int wil_rx_get_cid_by_skb(struct wil6210_priv *wil, struct sk_buff *skb) ta = hdr->addr2; } -if (max_assoc_sta <=WIL6210_RX_DESC_MAX_CID ) +if (wil->max_assoc_sta <=WIL6210_RX_DESC_MAX_CID )return cid;/* assuming no concurrency between AP interfaces and STA interfaces.
@@ -426,14 +426,14 @@ static int wil_rx_get_cid_by_skb(struct wil6210_priv *wil, struct sk_buff *skb)* to find the real cid, compare transmitter address with the stored * stations mac address in the driver sta array */ -for (i = cid; i < max_assoc_sta; i +=WIL6210_RX_DESC_MAX_CID ) { +for (i = cid; i < wil->max_assoc_sta; i +=WIL6210_RX_DESC_MAX_CID ) {if (wil->sta[i].status != wil_sta_unused &ðer_addr_equal (wil->sta[i].addr, ta)) { cid = i;break ; } } -if (i >= max_assoc_sta) { +if (i >= wil->max_assoc_sta) {wil_err_ratelimited (wil,"Could not find cid for frame with transmit addr = %pM, iftype = %d, frametype = %d, len = %d\n" , ta, vif->wdev.iftype, ftype, skb->len); cid = -ENOENT ;
@@ -1063,7 +1063,7 @@ static int wil_vring_init_tx(struct wil6210_vif *vif, int id, int size, txdata->enabled =0 ;spin_unlock_bh (&txdata->lock);wil_vring_free (wil, vring); - wil->ring2cid_tid[id][0 ] = max_assoc_sta; + wil->ring2cid_tid[id][0 ] = wil->max_assoc_sta; wil->ring2cid_tid[id][1 ] =0 ; out:
@@ -1148,7 +1148,7 @@ static int wil_tx_vring_modify(struct wil6210_vif *vif, int ring_id, int cid, txdata->dot1x_open = false; txdata->enabled =0 ;spin_unlock_bh (&txdata->lock); - wil->ring2cid_tid[ring_id][0 ] = max_assoc_sta; + wil->ring2cid_tid[ring_id][0 ] = wil->max_assoc_sta; wil->ring2cid_tid[ring_id][1 ] =0 ;return rc; }
@@ -1195,7 +1195,7 @@ int wil_vring_init_bcast(struct wil6210_vif *vif, int id, int size)if (rc) goto out; - wil->ring2cid_tid[id][0 ] = max_assoc_sta;/* CID */ + wil->ring2cid_tid[id][0 ] = wil->max_assoc_sta;/* CID */ wil->ring2cid_tid[id][1 ] =0 ;/* TID */ cmd.vring_cfg.tx_sw_ring.ring_mem_base =cpu_to_le64 (vring->pa);
@@ -1243,7 +1243,7 @@ static struct wil_ring *wil_find_tx_ucast(struct wil6210_priv *wil, cid =wil_find_cid (wil, vif->mid, da); -if (cid <0 || cid >= max_assoc_sta) +if (cid <0 || cid >= wil->max_assoc_sta)return NULL ;/* TODO: fix for multiple TID */
@@ -1295,7 +1295,7 @@ static struct wil_ring *wil_find_tx_ring_sta(struct wil6210_priv *wil,continue ; cid = wil->ring2cid_tid[i][0 ]; -if (cid >= max_assoc_sta)/* skip BCAST */ +if (cid >= wil->max_assoc_sta)/* skip BCAST */ continue ; if (!wil->ring_tx_data[i].dot1x_open &&
@@ -1373,7 +1373,7 @@ static struct wil_ring *wil_find_tx_bcast_2(struct wil6210_priv *wil,continue ; cid = wil->ring2cid_tid[i][0 ]; -if (cid >= max_assoc_sta)/* skip BCAST */ +if (cid >= wil->max_assoc_sta)/* skip BCAST */ continue ;if (!wil->ring_tx_data[i].dot1x_open && skb->protocol !=cpu_to_be16 (ETH_P_PAE ))
@@ -1401,7 +1401,7 @@ static struct wil_ring *wil_find_tx_bcast_2(struct wil6210_priv *wil,if (!v2->va || txdata2->mid != vif->mid)continue ; cid = wil->ring2cid_tid[i][0 ]; -if (cid >= max_assoc_sta)/* skip BCAST */ +if (cid >= wil->max_assoc_sta)/* skip BCAST */ continue ;if (!wil->ring_tx_data[i].dot1x_open && skb->protocol !=cpu_to_be16 (ETH_P_PAE ))
@@ -2257,7 +2257,7 @@ int wil_tx_complete(struct wil6210_vif *vif, int ringid) used_before_complete =wil_ring_used_tx (vring); -if (cid < max_assoc_sta) +if (cid < wil->max_assoc_sta) stats = &wil->sta[cid].stats;while (!wil_ring_is_empty (vring)) {
drivers/net/wireless/ath/wil6210/txrx_edma.c +4 -3
@@ -734,7 +734,7 @@ static int wil_ring_init_tx_edma(struct wil6210_vif *vif, int ring_id, txdata->enabled =0 ;spin_unlock_bh (&txdata->lock);wil_ring_free_edma (wil, ring); - wil->ring2cid_tid[ring_id][0 ] = max_assoc_sta; + wil->ring2cid_tid[ring_id][0 ] = wil->max_assoc_sta; wil->ring2cid_tid[ring_id][1 ] =0 ; out:
@@ -944,7 +944,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil, eop =wil_rx_status_get_eop (msg); cid =wil_rx_status_get_cid (msg); -if (unlikely (!wil_val_in_range (cid,0 , max_assoc_sta))) { +if (unlikely (!wil_val_in_range (cid,0 , wil->max_assoc_sta))) {wil_err (wil,"Corrupt cid=%d, sring->swhead=%d\n" , cid, sring->swhead); rxdata->skipping = true;
@@ -1199,7 +1199,8 @@ int wil_tx_sring_handler(struct wil6210_priv *wil, ndev =vif_to_ndev (vif); cid = wil->ring2cid_tid[ring_id][0 ]; - stats = (cid < max_assoc_sta ? &wil->sta[cid].stats :NULL ); + stats = (cid < wil->max_assoc_sta) ? &wil->sta[cid].stats : +NULL ; wil_dbg_txrx(wil, "tx_status: completed desc_ring (%d), num_descs (%d)\n",
drivers/net/wireless/ath/wil6210/wil6210.h +10 -9
@@ -461,15 +461,6 @@ static inline void parse_cidxtid(u8 cidxtid, u8 *cid, u8 *tid) *tid = (cidxtid >>4 ) &0xf ; } -/** -* wil_cid_valid - check cid is valid -* @cid: CID value -*/ -static inline bool wil_cid_valid (u8 cid) -{ -return (cid >=0 && cid < max_assoc_sta); -} -struct wil6210_mbox_ring {u32 base;u16 entry_size;/* max. size of mbox entry, incl. all headers */
@@ -950,6 +941,8 @@ struct wil6210_priv {struct wil6210_vif *vifs[WIL_MAX_VIFS ];struct mutex vif_mutex;/* protects access to VIF entries */ atomic_t connected_vifs; +u32 max_assoc_sta;/* max sta's supported by the driver and the FW */ +/* profile */ struct cfg80211_chan_def monitor_chandef;u32 monitor_flags;
@@ -1147,6 +1140,14 @@ static inline void wil_c(struct wil6210_priv *wil, u32 reg, u32 val)wil_w (wil, reg,wil_r (wil, reg) & ~val); } +/** +* wil_cid_valid - check cid is valid +*/ +static inline bool wil_cid_valid (struct wil6210_priv *wil,u8 cid) +{ +return (cid >=0 && cid < wil->max_assoc_sta); +} +void wil_get_board_file (struct wil6210_priv *wil,char *buf,size_t len);#if defined(CONFIG_DYNAMIC_DEBUG )
drivers/net/wireless/ath/wil6210/wmi.c +7 -7
@@ -806,8 +806,8 @@ static void wmi_evt_ready(struct wil6210_vif *vif, int id, void *d, int len) } } - max_assoc_sta =min_t (uint, max_assoc_sta, fw_max_assoc_sta); -wil_dbg_wmi (wil,"setting max assoc sta to %d\n" , max_assoc_sta); + wil->max_assoc_sta =min_t (uint, max_assoc_sta, fw_max_assoc_sta); +wil_dbg_wmi (wil,"setting max assoc sta to %d\n" , wil->max_assoc_sta);wil_set_recovery_state (wil, fw_recovery_idle);set_bit (wil_status_fwready, wil->status);
@@ -974,7 +974,7 @@ static void wmi_evt_connect(struct wil6210_vif *vif, int id, void *d, int len) evt->assoc_req_len, evt->assoc_resp_len);return ; } -if (evt->cid >= max_assoc_sta) { +if (evt->cid >= wil->max_assoc_sta) {wil_err (wil,"Connect CID invalid : %d\n" , evt->cid);return ; }
@@ -1236,7 +1236,7 @@ static void wmi_evt_ring_en(struct wil6210_vif *vif, int id, void *d, int len)return ; cid = wil->ring2cid_tid[vri][0 ]; -if (!wil_cid_valid (cid)) { +if (!wil_cid_valid (wil, cid)) {wil_err (wil,"invalid cid %d for vring %d\n" , cid, vri);return ; }
@@ -1439,7 +1439,7 @@ static void wil_link_stats_store_basic(struct wil6210_vif *vif,u8 cid = basic->cid;struct wil_sta_info *sta; -if (cid <0 || cid >= max_assoc_sta) { +if (cid <0 || cid >= wil->max_assoc_sta) {wil_err (wil,"invalid cid %d\n" , cid);return ; }
@@ -1589,7 +1589,7 @@ static int wil_find_cid_ringid_sta(struct wil6210_priv *wil,continue ; lcid = wil->ring2cid_tid[i][0 ]; -if (lcid >= max_assoc_sta)/* skip BCAST */ +if (lcid >= wil->max_assoc_sta)/* skip BCAST */ continue ;wil_dbg_wmi (wil,"find sta -> ringid %d cid %d\n" , i, lcid);
@@ -2135,7 +2135,7 @@ int wmi_pcp_start(struct wil6210_vif *vif, .network_type = wmi_nettype, .disable_sec_offload = 1, .channel = chan - 1, - .pcp_max_assoc_sta = max_assoc_sta, + .pcp_max_assoc_sta = wil->max_assoc_sta, .hidden_ssid = hidden_ssid, .is_go = is_go, .ap_sme_offload_mode = disable_ap_sme ?
Signature · 1 line
1.9.1
Re: [PATCH 1/9] wil6210: fix spurious interrupts in 3-msi
In reply to Maya ErezQuoted 7 lines · Maya Erez
Interrupt is set in ICM (ICR & ~IMV) rising trigger. As the driver masks the IRQ after clearing it, there can be a race where an additional spurious interrupt is triggered when the driver unmask the IRQ.
This can happen in case HW triggers an interrupt after the clear and before the mask.
Quoted 5 lines
To prevent the second spurious interrupt the driver needs to mask the IRQ before reading and clearing it.
Signed-off-by Maya Erez <[email protected]>Signed-off-by Kalle Valo <[email protected]>
9 patches applied to ath-next branch of ath.git, thanks.
e10b0eddd523 wil6210: fix spurious interrupts in 3-msi 9c6465979276 wil6210: fix _desc access in __wil_tx_vring_tso 0131d1851338 wil6210: add printout of platform capabilities a7feb56f204f wil6210: add support for multiple sections in brd file 9a874d045473 wil6210: enhancements for descriptor and status ring debugfs ddf7afdde824 wil6210: fix overwriting max_assoc_sta module param 7441be71ba7e wil6210: fix missed MISC mbox interrupt d6a553c0c61b wil6210: check rx_buff_mgmt before accessing it 3d0aa9198446 wil6210: remove HALP for Talyn devices
Signature · 3 lines
https://patchwork.kernel.org/patch/10919277/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches