| Message ID | 20231126195358.500259-1-stf_xl@wp.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 62ad3b976cd7f1cc75458c7df34afb4349ae2429 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rt2x00: make watchdog param per device | expand |
On Sun, 26 Nov 2023 20:53:58 +0100, Stanislaw Gruszka wrote: >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> >--- >Shiji, could you please test it on your setup and give Tested-by: tag ? > Hi! Thanks for fixing it. I've tested it based on OpenWrt main branch and it worked well on MT7620. The watchdog is still working. Tested-by: Shiji Yang <yangshiji66@outlook.com> Regards
stf_xl@wp.pl wrote: > From: Stanislaw Gruszka <stf_xl@wp.pl> > > 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> Patch applied to wireless-next.git, thanks. 62ad3b976cd7 wifi: rt2x00: make watchdog param per device
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 44127a036ac1..f93c7844dd42 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -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) @@ -12058,14 +12058,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; } /* diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h index 62fed38f41c0..82af01448a0a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -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. diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00link.c b/drivers/net/wireless/ralink/rt2x00/rt2x00link.c index 6cf7e7c997c2..fb23d409fba8 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00link.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00link.c @@ -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);