From 8284f873dfd3dc5aa35ec406e4aecf9989e74d3a Mon Sep 17 00:00:00 2001 From: Jerry Snitselaar Date: Sun, 16 Jun 2024 13:31:09 -0700 Subject: [PATCH] iommu/amd: Fix panic accessing amd_iommu_enable_faulting JIRA: https://issues.redhat.com/browse/RHEL-40344 JIRA: https://issues.redhat.com/browse/RHEL-37320 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git commit 12243a8115f8583a6bcada7717c01fb164e23c89 Author: Dimitri Sivanich Date: Thu May 30 13:36:03 2024 -0500 iommu/amd: Fix panic accessing amd_iommu_enable_faulting This fixes a bug introduced by commit d74169ceb0d2 ("iommu/vt-d: Allocate DMAR fault interrupts locally"). The panic happens when amd_iommu_enable_faulting is called from CPUHP_AP_ONLINE_DYN context. Fixes: d74169ceb0d2 ("iommu/vt-d: Allocate DMAR fault interrupts locally") Signed-off-by: Dimitri Sivanich Tested-by: Yi Zhang Reviewed-by: Jerry Snitselaar Reviewed-by: Vasant Hegde Link: https://lore.kernel.org/r/ZljHE/R4KLzGU6vx@hpe.com Signed-off-by: Joerg Roedel (cherry picked from commit 12243a8115f8583a6bcada7717c01fb164e23c89) Signed-off-by: Jerry Snitselaar --- drivers/iommu/amd/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 1e0123f0daa1..458ebb85bdad 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3324,7 +3324,7 @@ int amd_iommu_reenable(int mode) return 0; } -int __init amd_iommu_enable_faulting(unsigned int cpu) +int amd_iommu_enable_faulting(unsigned int cpu) { /* We enable MSI later when PCI is initialized */ return 0;