Commit 5f8954e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit a52ed486 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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a52ed486

drivers/net/wireless/marvell/mwifiex/init.c

+4 −5
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/marvell/mwifiex/main.h

+1 −2
Original line number Diff line number Diff line
@@ -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"
@@ -1056,7 +1055,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;

};

drivers/net/wireless/marvell/mwifiex/sta_event.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}