From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72A3815252D; Mon, 6 Jan 2025 15:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736176969; cv=none; b=Nhy/PmQJRe4o6t5pzuVcZRDgQhPr1nJx+QU1C3g3aTq6QRygMulXrTe+wN3MbhAxhGnZT3ZSJ2xPRqkyMRGF8TpVJbIFgZ8VG88fZhNvp5uYu2xgTJ/jLv0xzcHlrBk051naP7lmFphRPhBqFKdjDOGkmFjZwWbqc41D0MkrbTk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736176969; c=relaxed/simple; bh=qtSrLp1F8KK7tYPSvqRnVcO1MRz0UufTN2me+1TuQjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bebuIcnQ5cZgCpJ/jjuM5r4A1zx7/AtbcAx4OB7hq0UsaGeWgooK+qV3rtytXyp/L3wkzeIPIYjZmvDk+wtHOYrwGP0iu6i6cAXlCJVnPZOuSvIbpkeRiwPAFxJS9HuymzckzrLNpIzLWYFR5LLAKvghXbcGPWVzeO7/mlEbU+E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IoRviTvM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IoRviTvM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73039C4CED2; Mon, 6 Jan 2025 15:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736176968; bh=qtSrLp1F8KK7tYPSvqRnVcO1MRz0UufTN2me+1TuQjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IoRviTvMERji5K2r1Iw2JYdTUGt2RceKrV2gHjEogDw+pvw1/tPan21wPrnoTP8ME ldFnkwqE4f0Gr4ZzzdcTB4mRXtjuuwiSZCS2AFAY54/mgevD1FwgABM0fBdPqXTu+P XX7X/vzdgJ7F0cfvO/EZE9k08YqH3Ll7Wd6hFZ1M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Emmanuel Grumbach , Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.1 53/81] wifi: mac80211: wake the queues in case of failure in resume Date: Mon, 6 Jan 2025 16:16:25 +0100 Message-ID: <20250106151131.436457960@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151129.433047073@linuxfoundation.org> References: <20250106151129.433047073@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Emmanuel Grumbach [ Upstream commit 220bf000530f9b1114fa2a1022a871c7ce8a0b38 ] In case we fail to resume, we'll WARN with "Hardware became unavailable during restart." and we'll wait until user space does something. It'll typically bring the interface down and up to recover. This won't work though because the queues are still stopped on IEEE80211_QUEUE_STOP_REASON_SUSPEND reason. Make sure we clear that reason so that we give a chance to the recovery to succeed. Signed-off-by: Emmanuel Grumbach Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219447 Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20241119173108.cd628f560f97.I76a15fdb92de450e5329940125f3c58916be3942@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 738f1f139a90..e8326e09d1b3 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2436,6 +2436,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) WARN(1, "Hardware became unavailable upon resume. This could be a software issue prior to suspend or a hardware issue.\n"); else WARN(1, "Hardware became unavailable during restart.\n"); + ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP, + IEEE80211_QUEUE_STOP_REASON_SUSPEND, + false); ieee80211_handle_reconfig_failure(local); return res; } -- 2.39.5