mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 13:34:27 -04: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>
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 5022efb50f625d11fdf18b1fee0f64ebb1863664 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Wed, 26 Sep 2018 12:24:55 +0200
|
|
Subject: [PATCH 04/28] rt2x00: do not check for txstatus timeout every time on
|
|
tasklet
|
|
|
|
Do not check for tx status timeout everytime we perform txstatus tasklet.
|
|
Perform check once per half a second.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +++++++
|
|
drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 3 ++-
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 1 +
|
|
4 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -1158,11 +1158,18 @@ bool rt2800_txstatus_timeout(struct rt2x
|
|
struct data_queue *queue;
|
|
struct queue_entry *entry;
|
|
|
|
+ if (time_before(jiffies,
|
|
+ rt2x00dev->last_nostatus_check + msecs_to_jiffies(500)))
|
|
+ return false;
|
|
+
|
|
+ rt2x00dev->last_nostatus_check = jiffies;
|
|
+
|
|
tx_queue_for_each(rt2x00dev, queue) {
|
|
entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
|
|
if (rt2800_entry_txstatus_timeout(entry))
|
|
return true;
|
|
}
|
|
+
|
|
return false;
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
|
|
@@ -197,7 +197,8 @@ void rt2800mmio_txstatus_tasklet(unsigne
|
|
|
|
rt2800_txdone(rt2x00dev);
|
|
|
|
- rt2800_txdone_nostatus(rt2x00dev);
|
|
+ if (rt2800_txstatus_timeout(rt2x00dev))
|
|
+ rt2800_txdone_nostatus(rt2x00dev);
|
|
|
|
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
rt2800mmio_enable_interrupt(rt2x00dev,
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -980,6 +980,8 @@ struct rt2x00_dev {
|
|
*/
|
|
DECLARE_KFIFO_PTR(txstatus_fifo, u32);
|
|
|
|
+ unsigned long last_nostatus_check;
|
|
+
|
|
/*
|
|
* Timer to ensure tx status reports are read (rt2800usb).
|
|
*/
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
|
|
@@ -1039,6 +1039,7 @@ void rt2x00queue_start_queues(struct rt2
|
|
*/
|
|
tx_queue_for_each(rt2x00dev, queue)
|
|
rt2x00queue_start_queue(queue);
|
|
+ rt2x00dev->last_nostatus_check = jiffies;
|
|
|
|
rt2x00queue_start_queue(rt2x00dev->rx);
|
|
}
|