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 B4B8C12D1FC; Sun, 28 Jul 2024 16:06:09 +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=1722182769; cv=none; b=lxuP3Iu6KkiB2pe8eJ5XfiOvFA3ccWVirFBls8IXRlAIMpl/EYIL+bZ8ZYnIz0QTGnXyyhuUneTo04z/BXpFK3YfmFp3FASOJCsNIufScEBnD2isFUPQeGj59z24vf5l46g8u8wphKl2bkJI9UCwVj9Qtrs6iyKUNidoaX85ysc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722182769; c=relaxed/simple; bh=V4WkW2zK33v32li7a+lwTN6E8P+pMGGHHbWdkQT0Q04=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DzUNf+BhIHv9IalmBU7dhXtxI1P21FKTZd4sBRHCXVassiMllp8QxcmEMG2w3KJBoNzvRZcx8KJhQE+V+rmuJzwBfaykOm45I/y0hqURmpeL08joA/keq5fw9fBoAwOgRyDTc/oDaHPMf8ts/sjc1vOZQFWb14X2YAsbfe2InIc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bl1vBJKl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bl1vBJKl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 920B8C4AF0E; Sun, 28 Jul 2024 16:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722182769; bh=V4WkW2zK33v32li7a+lwTN6E8P+pMGGHHbWdkQT0Q04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bl1vBJKlpNkF4dPrwjZSBqtts7FS9adiMETrZEbngdKg3svEdE2o/zyskaCMpu35l MXOyf4we2jLJNlz+HM2W8nEe9qtllrKJL4Y0+xsijMmUJKsxqVMYOMrZUh25cXqSpF gYVzc6554wuZr+8sXpqH03JbQvhnTZFBvJqxFosFKLMoDbMttR6cfdklqKGE58aKWE Gy2PyaioSoHGjAcSIrDO/BDt1uajS/hLVuqlE7bpYPN7grRU3jrTM7ivDgLMYDNqu8 wC1DrYGhw9TsdonLpx6CZqof7NYpsWZYxtpQT9+vy5xLNXO6lrbZmRksxFvDy0fmmI YU/ccahEhJnjw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai-Heng Feng , Bjorn Helgaas , Sasha Levin , mahesh@linux.ibm.com, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 12/23] PCI/AER: Disable AER service on suspend Date: Sun, 28 Jul 2024 12:04:53 -0400 Message-ID: <20240728160538.2051879-12-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728160538.2051879-1-sashal@kernel.org> References: <20240728160538.2051879-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Kai-Heng Feng [ Upstream commit 5afc2f763edc5daae4722ee46fea4e627d01fa90 ] If the link is powered off during suspend, electrical noise may cause errors that are logged via AER. If the AER interrupt is enabled and shares an IRQ with PME, that causes a spurious wakeup during suspend. Disable the AER interrupt during suspend to prevent this. Clear error status before re-enabling IRQ interrupts during resume so we don't get an interrupt for errors that occurred during the suspend/resume process. Link: https://bugzilla.kernel.org/show_bug.cgi?id=209149 Link: https://bugzilla.kernel.org/show_bug.cgi?id=216295 Link: https://bugzilla.kernel.org/show_bug.cgi?id=218090 Link: https://lore.kernel.org/r/20240416043225.1462548-2-kai.heng.feng@canonical.com Signed-off-by: Kai-Heng Feng [bhelgaas: drop pci_ancestor_pr3_present() etc, commit log] Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/pcie/aer.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index ac6293c249766..13b8586924ead 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1497,6 +1497,22 @@ static int aer_probe(struct pcie_device *dev) return 0; } +static int aer_suspend(struct pcie_device *dev) +{ + struct aer_rpc *rpc = get_service_data(dev); + + aer_disable_rootport(rpc); + return 0; +} + +static int aer_resume(struct pcie_device *dev) +{ + struct aer_rpc *rpc = get_service_data(dev); + + aer_enable_rootport(rpc); + return 0; +} + /** * aer_root_reset - reset Root Port hierarchy, RCEC, or RCiEP * @dev: pointer to Root Port, RCEC, or RCiEP @@ -1561,6 +1577,8 @@ static struct pcie_port_service_driver aerdriver = { .service = PCIE_PORT_SERVICE_AER, .probe = aer_probe, + .suspend = aer_suspend, + .resume = aer_resume, .remove = aer_remove, }; -- 2.43.0