From: Joerg Roedel <joro@8bytes.org>
To: Joerg Roedel <joro@8bytes.org>
Cc: corbet@lwn.net, tony.luck@intel.com, fenghua.yu@intel.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
hpa@zytor.com, x86@kernel.org, linux-doc@vger.kernel.org,
linux-ia64@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, Thomas.Lendacky@amd.com,
Suravee.Suthikulpanit@amd.com, Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 02/10] iommu/amd: Request passthrough mode from IOMMU core
Date: Wed, 14 Aug 2019 15:38:33 +0200 [thread overview]
Message-ID: <20190814133841.7095-3-joro@8bytes.org> (raw)
In-Reply-To: <20190814133841.7095-1-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Get rid of the iommu_pass_through variable and request
passthrough mode via the new iommu core function.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b607a92791d3..7434b34d7a94 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -436,7 +436,7 @@ static int iommu_init_device(struct device *dev)
* invalid address), we ignore the capability for the device so
* it'll be forced to go into translation mode.
*/
- if ((iommu_pass_through || !amd_iommu_force_isolation) &&
+ if ((iommu_default_passthrough() || !amd_iommu_force_isolation) &&
dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
struct amd_iommu *iommu;
@@ -2226,7 +2226,7 @@ static int amd_iommu_add_device(struct device *dev)
BUG_ON(!dev_data);
- if (iommu_pass_through || dev_data->iommu_v2)
+ if (dev_data->iommu_v2)
iommu_request_dm_for_dev(dev);
/* Domains are initialized for this device - have a look what we ended up with */
@@ -2805,7 +2805,7 @@ int __init amd_iommu_init_api(void)
int __init amd_iommu_init_dma_ops(void)
{
- swiotlb = (iommu_pass_through || sme_me_mask) ? 1 : 0;
+ swiotlb = (iommu_default_passthrough() || sme_me_mask) ? 1 : 0;
iommu_detected = 1;
if (amd_iommu_unmap_flush)
--
2.17.1
next prev parent reply other threads:[~2019-08-14 13:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 13:38 [PATCH 00/10 v2] Cleanup IOMMU passthrough setting (and disable IOMMU Passthrough when SME is active) Joerg Roedel
2019-08-14 13:38 ` [PATCH 01/10] iommu: Add helpers to set/get default domain type Joerg Roedel
2019-08-14 13:38 ` Joerg Roedel [this message]
2019-08-14 13:38 ` [PATCH 03/10] iommu/vt-d: Request passthrough mode from IOMMU core Joerg Roedel
2019-08-15 4:46 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 04/10] x86/dma: Get rid of iommu_pass_through Joerg Roedel
2019-08-15 4:53 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 05/10] ia64: " Joerg Roedel
2019-08-14 13:38 ` [PATCH 06/10] iommu: Remember when default domain type was set on kernel command line Joerg Roedel
2019-08-15 5:01 ` Lu Baolu
2019-08-15 7:19 ` Joerg Roedel
2019-08-14 13:38 ` [PATCH 07/10] iommu: Print default domain type on boot Joerg Roedel
2019-08-15 5:04 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 08/10] iommu: Set default domain type at runtime Joerg Roedel
2019-08-15 6:55 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 09/10] iommu: Disable passthrough mode when SME is active Joerg Roedel
2019-08-14 13:38 ` [PATCH 10/10] Documentation: Update Documentation for iommu.passthrough 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=20190814133841.7095-3-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=Thomas.Lendacky@amd.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@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).