From: Joerg Roedel <joro@8bytes.org> To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Huang Rui <ray.huang@amd.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, Alex Deucher <alexander.deucher@amd.com>, Xiaojian Du <xiaojian.du@amd.com>, David Woodhouse <dwmw2@infradead.org>, Joerg Roedel <jroedel@suse.de>, stable@vger.kernel.org Subject: [PATCH 3/3] iommu/amd: Keep track of amd_iommu_irq_remap state Date: Wed, 17 Mar 2021 10:10:37 +0100 [thread overview] Message-ID: <20210317091037.31374-4-joro@8bytes.org> (raw) In-Reply-To: <20210317091037.31374-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> 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@vger.kernel.org # v5.11 Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd/init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 61dae1800b7f..321f5906e6ed 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3002,8 +3002,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; } -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro@8bytes.org> To: iommu@lists.linux-foundation.org Cc: Joerg Roedel <jroedel@suse.de>, Xiaojian Du <xiaojian.du@amd.com>, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Huang Rui <ray.huang@amd.com>, Alex Deucher <alexander.deucher@amd.com>, David Woodhouse <dwmw2@infradead.org> Subject: [PATCH 3/3] iommu/amd: Keep track of amd_iommu_irq_remap state Date: Wed, 17 Mar 2021 10:10:37 +0100 [thread overview] Message-ID: <20210317091037.31374-4-joro@8bytes.org> (raw) In-Reply-To: <20210317091037.31374-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> 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@vger.kernel.org # v5.11 Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/amd/init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 61dae1800b7f..321f5906e6ed 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3002,8 +3002,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; } -- 2.30.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-03-17 9:11 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-17 9:10 [PATCH 0/3] iommu/amd: Fix booting with amd_iommu=off Joerg Roedel 2021-03-17 9:10 ` Joerg Roedel 2021-03-17 9:10 ` [PATCH 1/3] iommu/amd: Move Stoney Ridge check to detect_ivrs() Joerg Roedel 2021-03-17 9:10 ` Joerg Roedel 2021-03-17 9:10 ` [PATCH 2/3] iommu/amd: Don't call early_amd_iommu_init() when AMD IOMMU is disabled Joerg Roedel 2021-03-17 9:10 ` Joerg Roedel 2021-03-17 11:47 ` David Woodhouse 2021-03-17 11:47 ` David Woodhouse 2021-03-17 13:32 ` Joerg Roedel 2021-03-17 13:32 ` Joerg Roedel 2021-03-17 13:37 ` David Woodhouse 2021-03-17 13:37 ` David Woodhouse 2021-03-17 14:24 ` Joerg Roedel 2021-03-17 14:24 ` Joerg Roedel 2021-03-17 9:10 ` Joerg Roedel [this message] 2021-03-17 9:10 ` [PATCH 3/3] iommu/amd: Keep track of amd_iommu_irq_remap state Joerg Roedel 2021-03-17 10:48 ` [PATCH 0/3] iommu/amd: Fix booting with amd_iommu=off Huang Rui 2021-03-17 10:48 ` Huang Rui 2021-03-18 9:47 ` Joerg Roedel 2021-03-18 9:47 ` Joerg Roedel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210317091037.31374-4-joro@8bytes.org \ --to=joro@8bytes.org \ --cc=alexander.deucher@amd.com \ --cc=dwmw2@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jroedel@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=ray.huang@amd.com \ --cc=stable@vger.kernel.org \ --cc=suravee.suthikulpanit@amd.com \ --cc=xiaojian.du@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.