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 F3D0F42040; Mon, 6 Jan 2025 15:48:18 +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=1736178499; cv=none; b=saGcmNiZU6YC1QOI9Fn/YZoSqcB5ONjAUARJ5Uvf87ZgS+3x+degtbaaathgKeCxJoJWASqB1HgCWJp0qYUDSBIC+3yJN0o+toKcQMWWaDAyVny2jncyPOM+wJGX6o8FE6UdPOcNkipsLDSI/GK2P/fYWs//IoCZfNiZ1z+8HkE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736178499; c=relaxed/simple; bh=magPaCqBr0sXHlDZ1KPtubazDwuVZKPk8n/XlcrM3Fs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sbTNzKkWSk/tSQKEwnIhsFjGXj3Qxk+S4fbMDtVhJ8DE8CqnUH1MgROnxqdVvGtkhSvcW3yUyz3deSOfvJ8EfAI9otwthH45xxjDY5tQ3C7QXqp83zDO75nFTaeHgSV+UK54Aq7SOTvmZbTzJb/7XqN2a5aVJw3wVi6yAMqesL8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1K13fsrE; 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="1K13fsrE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2432DC4CED2; Mon, 6 Jan 2025 15:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736178498; bh=magPaCqBr0sXHlDZ1KPtubazDwuVZKPk8n/XlcrM3Fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1K13fsrEGzJlT2KNOC00+4X1OvzziNKk7g8sJ2fZr/HGry2ui2MKbggIwVm6+ew8A 9zm8cqEsQHUfQgN4MYhMwYN4clisjmJThWlKA9yl3utMn7GOO0bfWoJOLry+iRWwdc 9G1m5Zc6kYP5TEaoalyFJZMU0uJ1d+a2Mqyw2yrw= 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 5.10 122/138] wifi: mac80211: wake the queues in case of failure in resume Date: Mon, 6 Jan 2025 16:17:26 +0100 Message-ID: <20250106151137.851054642@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151133.209718681@linuxfoundation.org> References: <20250106151133.209718681@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 5.10-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 e49355cbb1ce..0da845d9d486 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2351,6 +2351,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