Revert "mwifiex: fix sleep in atomic context bugs caused by dev_coredumpv"

commit f8043a20f8e127b1cdd34386c3285c5e00e3fbe8 upstream.

This reverts commit b1ac17142ca2cd45458d4385559d9d3ce3987150 as it
causes build problems in linux-next.  It needs to be reintroduced in a
way that can allow the api to evolve and not require a "flag day" to
catch all users.

Link: https://lore.kernel.org/r/20220623160723.7a44b573@canb.auug.org.au
Cc: Duoming Zhou <duoming@zju.edu.cn>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index e5bb240eb3ed2dd2c9e66ea96c15bbd3c656687d..f006a3d72b4046f435739e9218e3be6bf7001adc 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -63,10 +63,9 @@ static void wakeup_timer_fn(struct timer_list *t)
                adapter->if_ops.card_reset(adapter);
 }
 
-static void fw_dump_work(struct work_struct *work)
+static void fw_dump_timer_fn(struct timer_list *t)
 {
-       struct mwifiex_adapter *adapter =
-               container_of(work, struct mwifiex_adapter, devdump_work.work);
+       struct mwifiex_adapter *adapter = from_timer(adapter, t, devdump_timer);
 
        mwifiex_upload_device_dump(adapter);
 }
@@ -322,7 +321,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
        adapter->active_scan_triggered = false;
        timer_setup(&adapter->wakeup_timer, wakeup_timer_fn, 0);
        adapter->devdump_len = 0;
-       INIT_DELAYED_WORK(&adapter->devdump_work, fw_dump_work);
+       timer_setup(&adapter->devdump_timer, fw_dump_timer_fn, 0);
 }
 
 /*
@@ -401,7 +400,7 @@ static void
 mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
 {
        del_timer(&adapter->wakeup_timer);
-       cancel_delayed_work_sync(&adapter->devdump_work);
+       del_timer_sync(&adapter->devdump_timer);
        mwifiex_cancel_all_pending_cmd(adapter);
        wake_up_interruptible(&adapter->cmd_wait_q.wait);
        wake_up_interruptible(&adapter->hs_activate_wait_q);

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 3357cb7a5230690e8e17d43a7049346967f5b534..f4e3dce10d654f78f84d5712f973c3f247954fcb 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -49,7 +49,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/of_irq.h>
-#include <linux/workqueue.h>
 
 #include "decl.h"
 #include "ioctl.h"
@@ -1054,7 +1053,7 @@ struct mwifiex_adapter {
        /* Device dump data/length */
        void *devdump_data;
        int devdump_len;
-       struct delayed_work devdump_work;
+       struct timer_list devdump_timer;
 
        bool ignore_btcoex_events;
 };

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c
index 4d93386494c509ce6312001318bfe486c57406f9..7d42c5d2dbf652bc1e85ede2befd40975e664a7c 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_event.c
@@ -623,8 +623,8 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,
                 * transmission event get lost, in this cornel case,
                 * user would still get partial of the dump.
                 */
-               schedule_delayed_work(&adapter->devdump_work,
-                                     msecs_to_jiffies(MWIFIEX_TIMER_10S));
+               mod_timer(&adapter->devdump_timer,
+                         jiffies + msecs_to_jiffies(MWIFIEX_TIMER_10S));
        }
 
        /* Overflow check */
@@ -643,7 +643,7 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,
        return;
 
 upload_dump:
-       cancel_delayed_work_sync(&adapter->devdump_work);
+       del_timer_sync(&adapter->devdump_timer);
        mwifiex_upload_device_dump(adapter);
 }