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 79A77189F2F; Sun, 28 Jul 2024 16:09:27 +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=1722182967; cv=none; b=QNbcikTYhqWxW5YLMglwd2q8CuocD467tbT7UryRSa/mWM2AsE4ymvd2+hWR3F/tJPNT89BheOe+3Zj8uV/LETM/kwcU8YIww3rkb40x1fbuGnkygTEWQocXHAcahJMd1BaAXCI5R1Ko83/vsys6GGb6n8+tJsCUh7HIoO6TDHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722182967; c=relaxed/simple; bh=jyoZ/dDEF8f69zvwUwGshgaX9lEN9Oai6RGlHu36DwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eCymv/YgnIqs+nWZuFuo5ofgGeFCHLS7zCxdI1AhGzD/Vb3JVJVq7443qiGMHxgOIdMs3PbvxKOzOFGsS+NTsOeTmaea3LOzzDfrl0pLx3aUq0JkU3WzEapiegmvwmCLJ3ajLf4TsGO0ZgjfR+k+4Lq3qfxdhCNLcPtkMsZjzVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AStcpVkE; 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="AStcpVkE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F25CC4AF10; Sun, 28 Jul 2024 16:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722182967; bh=jyoZ/dDEF8f69zvwUwGshgaX9lEN9Oai6RGlHu36DwE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AStcpVkExpSfzzwqvx+GGOgFCjSKghOM5Wue8aiRiRgliFH6kCuCBfWlfFlMorv55 E1qzaCadYNfSsDjXECgSgCcPVkjY7aQT5QaGFYmejo/GUhl6aPnLZvNyH0LRqKuCjC SYZ2MHb6TwmOWibnJU/4+h5kSAAPUGikELwrg4IQEYPAyDt7Xe/tmZDRi+Hnq3mICE L9EpJw6NE4UEI7CizEwMHGQtcQaH8knNYS4oVfGbUpzaDdEnCPSfLMz+Xm2Qt7DU1w o+QPkej1Bhj+rf5N1zQQSW6QNREJwsR92nWDVnnax61wa1kOUaywb0EEgdDROjfB3x GCMQ8grwkIW0g== 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 5.15 08/13] PCI/AER: Disable AER service on suspend Date: Sun, 28 Jul 2024 12:08:50 -0400 Message-ID: <20240728160907.2053634-8-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728160907.2053634-1-sashal@kernel.org> References: <20240728160907.2053634-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.164 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 4f7744aab6c72..2908bfda88804 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1382,6 +1382,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 @@ -1453,6 +1469,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