This is a note to let you know that I've just added the patch titled
iommu/amd: Keep track of amd_iommu_irq_remap state
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-amd-keep-track-of-amd_iommu_irq_remap-state.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4b8ef157ca832f812b3302b1800548bd92c207de Mon Sep 17 00:00:00 2001
From: Joerg Roedel <jroedel@xxxxxxx>
Date: Wed, 17 Mar 2021 10:10:37 +0100
Subject: iommu/amd: Keep track of amd_iommu_irq_remap state
From: Joerg Roedel <jroedel@xxxxxxx>
commit 4b8ef157ca832f812b3302b1800548bd92c207de upstream.
The amd_iommu_irq_remap variable is set to true in amd_iommu_prepare().
But if initialization fails it is not set to false. Fix that and
correctly keep track of whether irq remapping is enabled or not.
References: https://bugzilla.kernel.org/show_bug.cgi?id=212133
References: https://bugzilla.suse.com/show_bug.cgi?id=1183132
Fixes: b34f10c2dc59 ("iommu/amd: Stop irq_remapping_select() matching when remapping is disabled")
Cc: stable@xxxxxxxxxxxxxxx # v5.11
Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
Link: https://lore.kernel.org/r/20210317091037.31374-4-joro@xxxxxxxxxx
Acked-by: Huang Rui <ray.huang@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iommu/amd/init.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -3000,8 +3000,11 @@ int __init amd_iommu_prepare(void)
amd_iommu_irq_remap = true;
ret = iommu_go_to_state(IOMMU_ACPI_FINISHED);
- if (ret)
+ if (ret) {
+ amd_iommu_irq_remap = false;
return ret;
+ }
+
return amd_iommu_irq_remap ? 0 : -ENODEV;
}
Patches currently in stable-queue which might be from jroedel@xxxxxxx are
queue-5.11/iommu-amd-move-stoney-ridge-check-to-detect_ivrs.patch
queue-5.11/iommu-amd-don-t-call-early_amd_iommu_init-when-amd-iommu-is-disabled.patch
queue-5.11/iommu-amd-keep-track-of-amd_iommu_irq_remap-state.patch
