From: Vasant Hegde <vasant.hegde@amd.com>
To: <iommu@lists.linux.dev>, <joro@8bytes.org>, <linux-pci@vger.kernel.org>
Cc: <will@kernel.org>, <robin.murphy@arm.com>,
<suravee.suthikulpanit@amd.com>, <bhelgaas@google.com>,
<alexander.deucher@amd.com>, <mario.limonciello@amd.com>,
<jgg@ziepe.ca>, Vasant Hegde <vasant.hegde@amd.com>,
Amandeep Kaur Longia <AmandeepKaur.Longia@amd.com>
Subject: [PATCH 2/2] iommu/amd: Force identity mode for selected GPUs only
Date: Thu, 23 Jul 2026 06:15:48 +0000 [thread overview]
Message-ID: <20260723061548.10187-3-vasant.hegde@amd.com> (raw)
In-Reply-To: <20260723061548.10187-1-vasant.hegde@amd.com>
Certain AMD GPU's must always be in identity mode. Currently its enforced
using PASID check. It worked fine as most GPU's has PASID feature. But
this means, identity mode enforcement is done for all PASID capable devices.
Previously it made sense as domain allocation API
(iommu_ops->domain_alloc()) was just passing domain type. So it couldn't
check device capability and decide best suited page table type (v1 or
v2). With recent enhancement to driver code, it uses
domain_alloc_paging_flags() ops for all paging mode domain allocation.
This can check device/flags and allocate best suited page table (v1 or v2).
Hence fix amd_iommu_def_domain_type() to force identity mapping for selected
GPUs only.
With this change system booted with DMA translation mode will select:
* Guest (v2) page table for PASID capable device
* Host (v1) page table for non-PASID capable device
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Tested-by: Amandeep Kaur Longia <AmandeepKaur.Longia@amd.com>
---
drivers/iommu/amd/iommu.c | 56 +++++++++++++++++++++++++++++++--------
1 file changed, 45 insertions(+), 11 deletions(-)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 563f9c2672d5..fe642e33c87d 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -3112,6 +3112,32 @@ static bool amd_iommu_is_attach_deferred(struct device *dev)
return dev_data->defer_attach;
}
+static bool quirks_force_identity_mapping(struct pci_dev *pdev)
+{
+ struct pci_dev *root_port;
+ int class = pdev->class >> 8;
+
+ /* AMD GPU vendor ID */
+ if (pdev->vendor != PCI_VENDOR_ID_ATI)
+ return false;
+
+ /* GPU class */
+ if (class != PCI_CLASS_DISPLAY_VGA &&
+ class != PCI_CLASS_DISPLAY_OTHER)
+ return false;
+
+ root_port = pcie_find_root_port(pdev);
+ if (!root_port)
+ return false;
+
+ /* If bridge vendor is not ATI then its APU and force IDENTITY mode */
+ if (root_port->vendor != PCI_VENDOR_ID_ATI)
+ return true;
+
+ /* Rest all are dGPUs and works fine with DMA mode */
+ return false;
+}
+
static int amd_iommu_def_domain_type(struct device *dev)
{
struct iommu_dev_data *dev_data;
@@ -3120,20 +3146,28 @@ static int amd_iommu_def_domain_type(struct device *dev)
if (!dev_data)
return 0;
+ if (!dev_is_pci(dev))
+ return 0;
+
/* Always use DMA domain for untrusted device */
- if (dev_is_pci(dev) && to_pci_dev(dev)->untrusted)
+ if (to_pci_dev(dev)->untrusted)
return IOMMU_DOMAIN_DMA;
- /*
- * Do not identity map IOMMUv2 capable devices when:
- * - memory encryption is active, because some of those devices
- * (AMD GPUs) don't have the encryption bit in their DMA-mask
- * and require remapping.
- * - SNP is enabled, because it prohibits DTE[Mode]=0.
- */
- if (pdev_pasid_supported(dev_data) &&
- !cc_platform_has(CC_ATTR_MEM_ENCRYPT) &&
- !amd_iommu_snp_en) {
+ /* Apply device specific quirks */
+ if (quirks_force_identity_mapping(to_pci_dev(dev))) {
+
+ /*
+ * When memory encryption is active, some of these devices
+ * don't have the encryption bit in their DMA-mask and
+ * require remapping.
+ */
+ if (cc_platform_has(CC_ATTR_MEM_ENCRYPT))
+ return 0;
+
+ /* DTE[Mode]=0 is prohibited when SNP is enabled */
+ if (amd_iommu_snp_en)
+ return 0;
+
return IOMMU_DOMAIN_IDENTITY;
}
--
2.31.1
next prev parent reply other threads:[~2026-07-23 6:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-23 6:15 [PATCH 0/2] iommu/amd: Fix default domain selection for PASID-capable devices Vasant Hegde
2026-07-23 6:15 ` [PATCH 1/2] PCI: Mark Radeon Pro WX 4100 ATS as broken Vasant Hegde
2026-07-23 6:21 ` sashiko-bot
2026-07-23 6:15 ` Vasant Hegde [this message]
2026-07-23 6:25 ` [PATCH 2/2] iommu/amd: Force identity mode for selected GPUs only sashiko-bot
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=20260723061548.10187-3-vasant.hegde@amd.com \
--to=vasant.hegde@amd.com \
--cc=AmandeepKaur.Longia@amd.com \
--cc=alexander.deucher@amd.com \
--cc=bhelgaas@google.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=linux-pci@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=robin.murphy@arm.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=will@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