Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17de6618 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: prevent external wmi commands during suspend flow"

parents f4fb569e d73c367d

drivers/net/wireless/ath/wil6210/main.c

+3 −1
Original line number Diff line number Diff line
@@ -773,8 +773,10 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) 
	wil6210_disconnect(wil, NULL, WLAN_REASON_DEAUTH_LEAVING, false);

	wil_bcast_fini(wil);



	/* prevent NAPI from being scheduled */

	/* prevent NAPI from being scheduled and prevent wmi commands */

	mutex_lock(&wil->wmi_mutex);

	bitmap_zero(wil->status, wil_status_last);

	mutex_unlock(&wil->wmi_mutex);



	if (wil->scan_request) {

		wil_dbg_misc(wil, "Abort scan_request 0x%p\n",

drivers/net/wireless/ath/wil6210/wmi.c

+4 −0
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len) 
	wil_dbg_wmi(wil, "Head 0x%08x -> 0x%08x\n", r->head, next_head);

	/* wait till FW finish with previous command */

	for (retry = 5; retry > 0; retry--) {

		if (!test_bit(wil_status_fwready, wil->status)) {

			wil_err(wil, "WMI: cannot send command while FW not ready\n");

			return -EAGAIN;

		}

		r->tail = wil_r(wil, RGF_MBOX +

				offsetof(struct wil6210_mbox_ctl, tx.tail));

		if (next_head != r->tail)