mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-05 05:24:20 +00:00
439ac8104b
Import patches from upstream to sync 19.07 with master: 9f3e3323e996 rt2x00: allow to specify watchdog interval 2034afe4db4a rt2800: add helpers for reading dma done index 759c5b599cf4 rt2800: initial watchdog implementation 09db3b000619 rt2800: add pre_reset_hw callback 710e6cc1595e rt2800: do not nullify initialization vector data e403fa31ed71 rt2x00: add restart hw 0f47aeeada2a rt2800: do not enable watchdog by default 41a531ffa4c5 rt2x00usb: fix rx queue hang 3b902fa811cf rt2x00usb: remove unnecessary rx flag checks 1dc244064c47 rt2x00: no need to check return value of debugfs_create functions 706f0182b1ad rt2800usb: Add new rt2800usb device PLANEX GW-USMicroN 95844124385e rt2x00: clear IV's on start to fix AP mode regression 567a9b766b47 rt2x00: do not set IEEE80211_TX_STAT_AMPDU_NO_BACK on tx status 14d5e14c8a6c rt2x00: clear up IV's on key removal 13fa451568ab Revert "rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band" --pending-- rt2800: remove errornous duplicate condition Signed-off-by: Daniel Golle <daniel@makrotopia.org>
152 lines
4.8 KiB
Diff
152 lines
4.8 KiB
Diff
From e403fa31ed71e87de8e5991e23406b8377c9c894 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Sat, 15 Jun 2019 12:00:59 +0200
|
|
Subject: [PATCH 06/15] rt2x00: add restart hw
|
|
|
|
Add ieee80211_restart_hw() to watchdog and debugfs file for testing
|
|
if restart works as expected.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
.../net/wireless/ralink/rt2x00/rt2800lib.c | 4 +++
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00.h | 7 ++++
|
|
.../net/wireless/ralink/rt2x00/rt2x00debug.c | 35 +++++++++++++++++++
|
|
.../net/wireless/ralink/rt2x00/rt2x00dev.c | 10 ++++--
|
|
4 files changed, 54 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -1274,6 +1274,9 @@ void rt2800_watchdog(struct rt2x00_dev *
|
|
|
|
if (hung_rx)
|
|
rt2x00_warn(rt2x00dev, "Watchdog RX hung detected\n");
|
|
+
|
|
+ if (hung_tx || hung_rx)
|
|
+ ieee80211_restart_hw(rt2x00dev->hw);
|
|
}
|
|
EXPORT_SYMBOL_GPL(rt2800_watchdog);
|
|
|
|
@@ -10294,6 +10297,7 @@ int rt2800_probe_hw(struct rt2x00_dev *r
|
|
__set_bit(REQUIRE_TASKLET_CONTEXT, &rt2x00dev->cap_flags);
|
|
}
|
|
|
|
+ __set_bit(CAPABILITY_RESTART_HW, &rt2x00dev->cap_flags);
|
|
rt2x00dev->link.watchdog_interval = msecs_to_jiffies(100);
|
|
|
|
/*
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -723,6 +723,7 @@ enum rt2x00_capability_flags {
|
|
CAPABILITY_VCO_RECALIBRATION,
|
|
CAPABILITY_EXTERNAL_PA_TX0,
|
|
CAPABILITY_EXTERNAL_PA_TX1,
|
|
+ CAPABILITY_RESTART_HW,
|
|
};
|
|
|
|
/*
|
|
@@ -1279,6 +1280,12 @@ rt2x00_has_cap_vco_recalibration(struct
|
|
return rt2x00_has_cap_flag(rt2x00dev, CAPABILITY_VCO_RECALIBRATION);
|
|
}
|
|
|
|
+static inline bool
|
|
+rt2x00_has_cap_restart_hw(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ return rt2x00_has_cap_flag(rt2x00dev, CAPABILITY_RESTART_HW);
|
|
+}
|
|
+
|
|
/**
|
|
* rt2x00queue_map_txskb - Map a skb into DMA for TX purposes.
|
|
* @entry: Pointer to &struct queue_entry
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
|
|
@@ -63,6 +63,7 @@ struct rt2x00debug_intf {
|
|
* - chipset file
|
|
* - device state flags file
|
|
* - device capability flags file
|
|
+ * - hardware restart file
|
|
* - register folder
|
|
* - csr offset/value files
|
|
* - eeprom offset/value files
|
|
@@ -79,6 +80,7 @@ struct rt2x00debug_intf {
|
|
struct dentry *chipset_entry;
|
|
struct dentry *dev_flags;
|
|
struct dentry *cap_flags;
|
|
+ struct dentry *restart_hw;
|
|
struct dentry *register_folder;
|
|
struct dentry *csr_off_entry;
|
|
struct dentry *csr_val_entry;
|
|
@@ -577,6 +579,34 @@ static const struct file_operations rt2x
|
|
.llseek = default_llseek,
|
|
};
|
|
|
|
+static ssize_t rt2x00debug_write_restart_hw(struct file *file,
|
|
+ const char __user *buf,
|
|
+ size_t length,
|
|
+ loff_t *offset)
|
|
+{
|
|
+ struct rt2x00debug_intf *intf = file->private_data;
|
|
+ struct rt2x00_dev *rt2x00dev = intf->rt2x00dev;
|
|
+ static unsigned long last_reset;
|
|
+
|
|
+ if (!rt2x00_has_cap_restart_hw(rt2x00dev))
|
|
+ return -EOPNOTSUPP;
|
|
+
|
|
+ if (time_before(jiffies, last_reset + msecs_to_jiffies(2000)))
|
|
+ return -EBUSY;
|
|
+
|
|
+ last_reset = jiffies;
|
|
+
|
|
+ ieee80211_restart_hw(rt2x00dev->hw);
|
|
+ return length;
|
|
+}
|
|
+
|
|
+static const struct file_operations rt2x00debug_restart_hw = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .write = rt2x00debug_write_restart_hw,
|
|
+ .open = simple_open,
|
|
+ .llseek = generic_file_llseek,
|
|
+};
|
|
+
|
|
static struct dentry *rt2x00debug_create_file_driver(const char *name,
|
|
struct rt2x00debug_intf
|
|
*intf,
|
|
@@ -672,6 +702,10 @@ void rt2x00debug_register(struct rt2x00_
|
|
intf->driver_folder, intf,
|
|
&rt2x00debug_fop_cap_flags);
|
|
|
|
+ intf->restart_hw = debugfs_create_file("restart_hw", 0200,
|
|
+ intf->driver_folder, intf,
|
|
+ &rt2x00debug_restart_hw);
|
|
+
|
|
intf->register_folder =
|
|
debugfs_create_dir("register", intf->driver_folder);
|
|
|
|
@@ -753,6 +787,7 @@ void rt2x00debug_deregister(struct rt2x0
|
|
debugfs_remove(intf->csr_off_entry);
|
|
debugfs_remove(intf->register_folder);
|
|
debugfs_remove(intf->dev_flags);
|
|
+ debugfs_remove(intf->restart_hw);
|
|
debugfs_remove(intf->cap_flags);
|
|
debugfs_remove(intf->chipset_entry);
|
|
debugfs_remove(intf->driver_entry);
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
|
|
@@ -1269,8 +1269,14 @@ int rt2x00lib_start(struct rt2x00_dev *r
|
|
{
|
|
int retval;
|
|
|
|
- if (test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags))
|
|
- return 0;
|
|
+ if (test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags)) {
|
|
+ /*
|
|
+ * This is special case for ieee80211_restart_hw(), otherwise
|
|
+ * mac80211 never call start() two times in row without stop();
|
|
+ */
|
|
+ rt2x00dev->ops->lib->pre_reset_hw(rt2x00dev);
|
|
+ rt2x00lib_stop(rt2x00dev);
|
|
+ }
|
|
|
|
/*
|
|
* If this is the first interface which is added,
|