mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 03:26:51 +00:00
d4c999bb89
backport from wireless-drivers-next, replacing some existing patches in our tree (marked with '=' are those which were already present): f483039cf51a rt2x00: use simple_read_from_buffer() =5c656c71b1bf rt2800: move usb specific txdone/txstatus routines to rt2800lib =0b0d556e0ebb rt2800mmio: use txdone/txstatus routines from lib =5022efb50f62 rt2x00: do not check for txstatus timeout every time on tasklet =adf26a356f13 rt2x00: use different txstatus timeouts when flushing =0240564430c0 rt2800: flush and txstatus rework for rt2800mmio 6eba8fd22352 rt2x00: rt2400pci: mark expected switch fall-through 10bb92217747 rt2x00: rt2500pci: mark expected switch fall-through 916e6bbcfcff rt2x00: rt2800lib: mark expected switch fall-throughs 641dd8068ecb rt2x00: rt61pci: mark expected switch fall-through 750afb08ca71 cross-tree: phase out dma_zalloc_coherent() =c2e28ef7711f rt2x00: reduce tx power to nominal level on RT6352 a4296994eb80 rt2x00: Work around a firmware bug with shared keys 2587791d5758 rt2x00: no need to check return value of debugfs_create functions pending on linux-wireless: rt2x00: remove unneeded check rt2x00: remove confusing AGC register rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 rt2800: comment and simplify AGC init for RT6352 rt2x00: do not print error when queue is full rt2800: partially restore old mmio txstatus behaviour rt2800: new flush implementation for SoC devices rt2800: move txstatus pending routine rt2800mmio: fetch tx status changes rt2800mmio: use timer and work for handling tx statuses timeouts rt2x00: remove last_nostatus_check rt2x00: remove not used entry field rt2x00mmio: remove legacy comment While at it also rename some existing patches now that there are separate folders with patches for each driver to make things a bit nicer to handle. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
From f6a9618198e190a2ba09ce3f0aa8e9ee1763bd38 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Sat, 9 Feb 2019 12:08:34 +0100
|
|
Subject: [PATCH 24/28] rt2800mmio: fetch tx status changes
|
|
|
|
Prepare to use rt2800mmio_fetch_txstatus() in concurrent manner and drop
|
|
return value since is not longer needed.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
|
|
@@ -255,12 +255,12 @@ void rt2800mmio_autowake_tasklet(unsigne
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800mmio_autowake_tasklet);
|
|
|
|
-static bool rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)
|
|
+static void rt2800mmio_fetch_txstatus(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
u32 status;
|
|
- bool more = false;
|
|
+ unsigned long flags;
|
|
|
|
- /* FIXEME: rewrite this comment
|
|
+ /*
|
|
* The TX_FIFO_STATUS interrupt needs special care. We should
|
|
* read TX_STA_FIFO but we should do it immediately as otherwise
|
|
* the register can overflow and we would lose status reports.
|
|
@@ -271,20 +271,21 @@ static bool rt2800mmio_fetch_txstatus(st
|
|
* because we can schedule the tasklet multiple times (when the
|
|
* interrupt fires again during tx status processing).
|
|
*
|
|
- * txstatus tasklet is called with INT_SOURCE_CSR_TX_FIFO_STATUS
|
|
- * disabled so have only one producer and one consumer - we don't
|
|
- * need to lock the kfifo.
|
|
+ * We also read statuses from tx status timeout timer, use
|
|
+ * lock to prevent concurent writes to fifo.
|
|
*/
|
|
+
|
|
+ spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
|
|
+
|
|
while (!kfifo_is_full(&rt2x00dev->txstatus_fifo)) {
|
|
status = rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO);
|
|
if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
|
|
break;
|
|
|
|
kfifo_put(&rt2x00dev->txstatus_fifo, status);
|
|
- more = true;
|
|
}
|
|
|
|
- return more;
|
|
+ spin_unlock_irqrestore(&rt2x00dev->irqmask_lock, flags);
|
|
}
|
|
|
|
void rt2800mmio_txstatus_tasklet(unsigned long data)
|