TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: rt2x00: make watchdog param per device

Browse Source 
We can run PCI/MMIO devices together with USB devices in the system.
Make watchdog parameter per device to avoid situation when plugin
USB device change modparam_watchdog for PCI/MMIO device.

Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Tested-by: Shiji Yang <yangshiji66@outlook.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231126195358.500259-1-stf_xl@wp.pl
This commit is contained in:
Stanislaw Gruszka
2023-11-26 20:53:58 +01:00
committed by Kalle Valo
parent 874a0eda00
commit 62ad3b976c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+5 -6
View File
@@ -1353,10 +1353,10 @@ void rt2800_watchdog(struct rt2x00_dev *rt2x00dev)
if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
return;
if (modparam_watchdog & RT2800_WATCHDOG_DMA_BUSY)
if (rt2x00dev->link.watchdog & RT2800_WATCHDOG_DMA_BUSY)
reset = rt2800_watchdog_dma_busy(rt2x00dev);
if (modparam_watchdog & RT2800_WATCHDOG_HANG)
if (rt2x00dev->link.watchdog & RT2800_WATCHDOG_HANG)
reset = rt2800_watchdog_hung(rt2x00dev) || reset;
if (reset)
@@ -12065,14 +12065,13 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
__set_bit(REQUIRE_TASKLET_CONTEXT, &rt2x00dev->cap_flags);
}
rt2x00dev->link.watchdog = modparam_watchdog;
/* USB NICs don't support DMA watchdog as INT_SOURCE_CSR is invalid */
if (rt2x00_is_usb(rt2x00dev))
modparam_watchdog &= ~RT2800_WATCHDOG_DMA_BUSY;
if (modparam_watchdog) {
rt2x00dev->link.watchdog &= ~RT2800_WATCHDOG_DMA_BUSY;
if (rt2x00dev->link.watchdog) {
__set_bit(CAPABILITY_RESTART_HW, &rt2x00dev->cap_flags);
rt2x00dev->link.watchdog_interval = msecs_to_jiffies(100);
} else {
rt2x00dev->link.watchdog_disabled = true;
}
/*
drivers/net/wireless/ralink/rt2x00/rt2x00.h
+1 -1
View File
@@ -334,7 +334,7 @@ struct link {
*/
struct delayed_work watchdog_work;
unsigned int watchdog_interval;
bool watchdog_disabled;
unsigned int watchdog;
/*
* Work structure for scheduling periodic AGC adjustments.
drivers/net/wireless/ralink/rt2x00/rt2x00link.c
+1 -1
View File
@@ -384,7 +384,7 @@ void rt2x00link_start_watchdog(struct rt2x00_dev *rt2x00dev)
struct link *link = &rt2x00dev->link;
if (test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags) &&
rt2x00dev->ops->lib->watchdog && !link->watchdog_disabled)
rt2x00dev->ops->lib->watchdog && link->watchdog)
ieee80211_queue_delayed_work(rt2x00dev->hw,
&link->watchdog_work,
link->watchdog_interval);