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 C478333FE; Tue, 3 Dec 2024 15:04: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=1733238289; cv=none; b=uLoS5gxbutluJhZHxytj2d5Sc9mGVnqu2M13cTUnot0IOsTRDsX91DTCAZfYZ51GrVJoRvvY8QxZK6ffpBwj6BT2EVlAcisUHVhp1ZndX7SmURNgRIGuIwtT7B5a3t31tCa94N/RW9jFZwAI8YQ/94Wa2CVuHXKrpYmg/1CX69w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733238289; c=relaxed/simple; bh=R6rPoCmZTqyNcbOdoFtcyWQtSb361QVaxm1x0ZnZn40=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pZaOsVuGkXZfwa47djQuhx84GjTVqgK2764++SVtkb98UrB2B+XyIbQjsKu0ffONfsineIlFc9Jc415yaPCTY+44/ChkvUIcXcv0bXLXSiXdOb+nf45CsYq+BOO8ALMTMX7anMy57BgUUsAk7DJDmDFiQnnfmsBBMXbIDBZK478= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aAtRATif; 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="aAtRATif" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 480F5C4CECF; Tue, 3 Dec 2024 15:04:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733238289; bh=R6rPoCmZTqyNcbOdoFtcyWQtSb361QVaxm1x0ZnZn40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aAtRATif20nLV0vU1zDmYYYgPFTTRgqqs1LeaIHxYetmXRfI/o4on1pE6CpnlX0S7 pmvtreYMgxwYPGT6XuvOkuBYUbVOSEoTvgBy1+umwXm0WbdTy/2QQs6OkUGM9BTqsJ hG/8pQGGd96pezrtM5Y7SYICKILd4h+JZVxUxlNs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinjie Ruan , Brian Norris , Kalle Valo , Sasha Levin Subject: [PATCH 6.11 227/817] wifi: mwifiex: Use IRQF_NO_AUTOEN flag in request_irq() Date: Tue, 3 Dec 2024 15:36:39 +0100 Message-ID: <20241203144004.609989877@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinjie Ruan [ Upstream commit 9a98dd48b6d834d7a3fe5e8e7b8c3a1d006f9685 ] disable_irq() after request_irq() still has a time gap in which interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will disable IRQ auto-enable when request IRQ. Fixes: 853402a00823 ("mwifiex: Enable WoWLAN for both sdio and pcie") Signed-off-by: Jinjie Ruan Acked-by: Brian Norris Signed-off-by: Kalle Valo Link: https://patch.msgid.link/20240910124314.698896-3-ruanjinjie@huawei.com Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/mwifiex/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index d99127dc466ec..6c60a4c21a312 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -1633,7 +1633,8 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter) } ret = devm_request_irq(dev, adapter->irq_wakeup, - mwifiex_irq_wakeup_handler, IRQF_TRIGGER_LOW, + mwifiex_irq_wakeup_handler, + IRQF_TRIGGER_LOW | IRQF_NO_AUTOEN, "wifi_wake", adapter); if (ret) { dev_err(dev, "Failed to request irq_wakeup %d (%d)\n", @@ -1641,7 +1642,6 @@ static void mwifiex_probe_of(struct mwifiex_adapter *adapter) goto err_exit; } - disable_irq(adapter->irq_wakeup); if (device_init_wakeup(dev, true)) { dev_err(dev, "fail to init wakeup for mwifiex\n"); goto err_exit; -- 2.43.0