From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 7/7] iommu/amd: Remove amd_iommu_disabled check from amd_iommu_detect()
Date: Fri, 16 Jun 2017 16:10:00 +0200 [thread overview]
Message-ID: <1497622200-18188-8-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1497622200-18188-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
This check needs to happens later now, when all previously
enabled IOMMUs have been disabled.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu_init.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index eedd3d3..bc9dfcf 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2576,9 +2576,6 @@ int __init amd_iommu_detect(void)
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
return -ENODEV;
- if (amd_iommu_disabled)
- return -ENODEV;
-
ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
if (ret)
return ret;
--
2.7.4
prev parent reply other threads:[~2017-06-16 14:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 14:09 [PATCH 0/7] iommu/amd: Disable previously enabled IOMMUs at boot Joerg Roedel
2017-06-16 14:09 ` [PATCH 1/7] iommu/amd: Disable IOMMUs at boot if they are enabled Joerg Roedel
[not found] ` <1497622200-18188-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2017-06-16 14:09 ` [PATCH 2/7] iommu/amd: Rename free_on_init_error() Joerg Roedel
2017-06-16 14:09 ` [PATCH 3/7] iommu/amd: Add new init-state IOMMU_CMDLINE_DISABLED Joerg Roedel
2017-06-16 14:09 ` [PATCH 4/7] iommu/amd: Check for error states first in iommu_go_to_state() Joerg Roedel
2017-06-16 14:09 ` [PATCH 5/7] iommu/amd: Set global pointers to NULL after freeing them Joerg Roedel
2017-06-16 14:09 ` [PATCH 6/7] iommu/amd: Free IOMMU resources when disabled on command line Joerg Roedel
2017-06-16 14:10 ` Joerg Roedel [this message]
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=1497622200-18188-8-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).