* [PATCH v4 1/3] iommu/amd: Drop unused global exclusion range fields and init
2026-11-17 7:06 [PATCH v4 0/3] iommu/amd: IVMD handling cleanup and ivmd= boot override Sairaj Kodilkar
@ 2026-11-17 7:06 ` Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 2/3] iommu/amd: Do not convert IVMD exclusion range to unity range Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 3/3] iommu/amd: Rename unity_map_entry and unit_map to ivmd_entry and ivhd_entry_list Sairaj Kodilkar
2 siblings, 0 replies; 4+ messages in thread
From: Sairaj Kodilkar @ 2026-11-17 7:06 UTC (permalink / raw)
To: Joerg Roedel (AMD),
Adrian Huang, Joerg Roedel, Robin Murphy, Suravee Suthikulpanit,
Vasant Hegde, Will Deacon, iommu, linux-kernel
Cc: Sairaj Kodilkar, Akshay Jindal
From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Remove unused struct amd_iommu.exclusion_start/exclusion_length, the
MMIO_EXCL_* flag masks, and iommu_set_exclusion_range(). These struct
amd_iommu fields were never assigned, so early_enable_iommu() never
programmed the hardware exclusion registers through this path.
Please note that the exclusion range registers have been repurposed
to SNP completion-wait store base / limit registers. So, rename
MMIO_EXCL_BASE/LIMIT via to MMIO_COMPL_STORE_BASE/LIMIT instead.
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com>
Reviewed-by: Akshay Jindal <Akshay.Jindal@amd.com>
---
drivers/iommu/amd/amd_iommu_types.h | 4 ++--
drivers/iommu/amd/init.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 8241ef922519..678ceddd711c 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -44,8 +44,8 @@
#define MMIO_CMD_BUF_OFFSET 0x0008
#define MMIO_EVT_BUF_OFFSET 0x0010
#define MMIO_CONTROL_OFFSET 0x0018
-#define MMIO_EXCL_BASE_OFFSET 0x0020
-#define MMIO_EXCL_LIMIT_OFFSET 0x0028
+#define MMIO_COMPL_STORE_BASE_OFFSET 0x0020
+#define MMIO_COMPL_STORE_LIMIT_OFFSET 0x0028
#define MMIO_EXT_FEATURES 0x0030
#define MMIO_PPR_LOG_OFFSET 0x0038
#define MMIO_GA_LOG_BASE_OFFSET 0x00e0
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 8a410d4aa370..13c96feed64f 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -370,14 +370,14 @@ static void iommu_set_cwwb_range(struct amd_iommu *iommu)
* Re-purpose Exclusion base/limit registers for Completion wait
* write-back base/limit.
*/
- memcpy_toio(iommu->mmio_base + MMIO_EXCL_BASE_OFFSET,
+ memcpy_toio(iommu->mmio_base + MMIO_COMPL_STORE_BASE_OFFSET,
&entry, sizeof(entry));
/* Note:
* Default to 4 Kbytes, which can be specified by setting base
* address equal to the limit address.
*/
- memcpy_toio(iommu->mmio_base + MMIO_EXCL_LIMIT_OFFSET,
+ memcpy_toio(iommu->mmio_base + MMIO_COMPL_STORE_LIMIT_OFFSET,
&entry, sizeof(entry));
}
@@ -1022,7 +1022,7 @@ static int __init remap_or_alloc_cwwb_sem(struct amd_iommu *iommu)
* completion wait buffer (CWB) address. Read and re-use it.
*/
pr_info_once("Re-using CWB buffers from the previous kernel\n");
- paddr = readq(iommu->mmio_base + MMIO_EXCL_BASE_OFFSET) & PM_ADDR_MASK;
+ paddr = readq(iommu->mmio_base + MMIO_COMPL_STORE_BASE_OFFSET) & PM_ADDR_MASK;
iommu->cmd_sem = iommu_memremap(paddr, PAGE_SIZE);
if (!iommu->cmd_sem)
return -ENOMEM;
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v4 2/3] iommu/amd: Do not convert IVMD exclusion range to unity range
2026-11-17 7:06 [PATCH v4 0/3] iommu/amd: IVMD handling cleanup and ivmd= boot override Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 1/3] iommu/amd: Drop unused global exclusion range fields and init Sairaj Kodilkar
@ 2026-11-17 7:06 ` Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 3/3] iommu/amd: Rename unity_map_entry and unit_map to ivmd_entry and ivhd_entry_list Sairaj Kodilkar
2 siblings, 0 replies; 4+ messages in thread
From: Sairaj Kodilkar @ 2026-11-17 7:06 UTC (permalink / raw)
To: Joerg Roedel (AMD),
Adrian Huang, Joerg Roedel, Robin Murphy, Suravee Suthikulpanit,
Vasant Hegde, Will Deacon, iommu, linux-kernel
Cc: Baoquan He, Jerry Snitselaar, Sairaj Kodilkar
From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Original problem was there could be multiple IVMD exclusion entries
conflicting over a single exclusion range supported in older Linux
kernel. The fix was first introduced in commit 387caf0b759a ("iommu/amd:
Treat per-device exclusion ranges as r/w unity-mapped regions") and in
commit 0bbe4ced53e3 ("iommu/amd: Fix the overwritten field in IVMD header")
, where IVMD exclusions are converted to separate unity_map_entry objects
in pci_seg->unity_map so amd_iommu_get_resv_regions() treated every such
entry as IOMMU_RESV_DIRECT with R/W.
The driver no longer programs the exclusion base/limit registers and
relies on the kernel to keep the IOVA ranges named by exclusion IVMDs
unmapped. Stop forcing exclusion entries to RW-unity. Store the raw
IVMD flags in struct unity_map_entry instead of a pre-shifted
protection value, and derive the reserved region from those flags.
Exclusion entries are now reported as IOMMU_RESV_RESERVED with no
read/write permission.
Reject unity entries that grant neither IR nor IW with a FW_BUG
message, and warn about invalid flag combinations and unknown flag bits
Fixes: 0bbe4ced53e3 ("iommu/amd: Fix the overwritten field in IVMD header")
Cc: Baoquan He <bhe@redhat.com>
Cc: Adrian Huang <ahuang12@lenovo.com>
Cc: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com>
Reviewed-by: Adrian Huang <ahuang12@lenovo.com>
---
drivers/iommu/amd/amd_iommu_types.h | 12 ++++++-----
drivers/iommu/amd/init.c | 31 ++++++++++++++---------------
drivers/iommu/amd/iommu.c | 12 +++++++++--
3 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 678ceddd711c..122eac81d4e3 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -368,9 +368,11 @@
/* DTE[128:179] | DTE[184:191] */
#define DTE_DATA2_INTR_MASK ~GENMASK_ULL(55, 52)
-#define IOMMU_PROT_MASK 0x03
-#define IOMMU_PROT_IR 0x01
-#define IOMMU_PROT_IW 0x02
+#define IVMD_FLAG_UNITY_MAP BIT(0)
+#define IVMD_FLAG_IR BIT(1)
+#define IVMD_FLAG_IW BIT(2)
+#define IVMD_FLAG_EXCL_RANGE BIT(3)
+#define IVMD_FLAG_MASK GENMASK_U32(3, 0)
/* IOMMU capabilities */
#define IOMMU_CAP_IOTLB 24
@@ -880,8 +882,8 @@ struct unity_map_entry {
/* end address to unity map (including) */
u64 address_end;
- /* required protection */
- int prot;
+ /* IVMD flags for the entry */
+ u8 flags;
};
/*
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 13c96feed64f..de8e4ba2ccd0 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -70,11 +70,6 @@
#define IVHD_FLAG_RESPASSPW_EN_MASK 0x04
#define IVHD_FLAG_ISOC_EN_MASK 0x08
-#define IVMD_FLAG_EXCL_RANGE 0x08
-#define IVMD_FLAG_IW 0x04
-#define IVMD_FLAG_IR 0x02
-#define IVMD_FLAG_UNITY_MAP 0x01
-
#define ACPI_DEVFLAG_INITPASS 0x01
#define ACPI_DEVFLAG_EXTINT 0x02
#define ACPI_DEVFLAG_NMI 0x04
@@ -2636,6 +2631,20 @@ static int __init init_unity_map_range(struct ivmd_header *m,
struct amd_iommu_pci_seg *pci_seg;
char *s;
+ if ((m->flags & IVMD_FLAG_UNITY_MAP) &&
+ !(m->flags & (IVMD_FLAG_IR | IVMD_FLAG_IW))) {
+ pr_err(FW_BUG "IVMD type %#x devid %#x range %#llx+%#llx: Unity set without IR/IW, ignoring\n",
+ m->type, m->devid, m->range_start, m->range_length);
+ return -EINVAL;
+ }
+
+ if ((m->flags & IVMD_FLAG_EXCL_RANGE) &&
+ (m->flags & (IVMD_FLAG_UNITY_MAP | IVMD_FLAG_IR | IVMD_FLAG_IW))) {
+ pr_err(FW_BUG "IVMD type %#x devid %#x range %#llx+%#llx: Invalid IOMMU flags %#x, ignoring\n",
+ m->type, m->devid, m->range_start, m->range_length, m->flags);
+ return -EINVAL;
+ }
+
pci_seg = get_pci_segment(m->pci_seg, ivrs_base);
if (pci_seg == NULL)
return -ENOMEM;
@@ -2665,17 +2674,7 @@ static int __init init_unity_map_range(struct ivmd_header *m,
}
e->address_start = PAGE_ALIGN(m->range_start);
e->address_end = e->address_start + PAGE_ALIGN(m->range_length);
- e->prot = m->flags >> 1;
-
- /*
- * Treat per-device exclusion ranges as r/w unity-mapped regions
- * since some buggy BIOSes might lead to the overwritten exclusion
- * range (exclusion_start and exclusion_length members). This
- * happens when there are multiple exclusion ranges (IVMD entries)
- * defined in ACPI table.
- */
- if (m->flags & IVMD_FLAG_EXCL_RANGE)
- e->prot = (IVMD_FLAG_IW | IVMD_FLAG_IR) >> 1;
+ e->flags = m->flags;
DUMP_printk("%s devid_start: %04x:%02x:%02x.%x devid_end: "
"%04x:%02x:%02x.%x range_start: %016llx range_end: %016llx"
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 56262f6b1f70..7edaf99a1ecb 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -3120,12 +3120,20 @@ static void amd_iommu_get_resv_regions(struct device *dev,
if (devid < entry->devid_start || devid > entry->devid_end)
continue;
+ if (entry->flags & ~IVMD_FLAG_MASK)
+ pr_err("%s: Unknown flags: %#02x for sbdf=%#x\n",
+ __func__, entry->flags & ~IVMD_FLAG_MASK, sbdf);
+
type = IOMMU_RESV_DIRECT;
length = entry->address_end - entry->address_start;
- if (entry->prot & IOMMU_PROT_IR)
+ if (entry->flags & IVMD_FLAG_IR)
prot |= IOMMU_READ;
- if (entry->prot & IOMMU_PROT_IW)
+ if (entry->flags & IVMD_FLAG_IW)
prot |= IOMMU_WRITE;
+ if (entry->flags & IVMD_FLAG_EXCL_RANGE) {
+ type = IOMMU_RESV_RESERVED;
+ prot = 0;
+ }
region = iommu_alloc_resv_region(entry->address_start,
length, prot, type,
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v4 3/3] iommu/amd: Rename unity_map_entry and unit_map to ivmd_entry and ivhd_entry_list
2026-11-17 7:06 [PATCH v4 0/3] iommu/amd: IVMD handling cleanup and ivmd= boot override Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 1/3] iommu/amd: Drop unused global exclusion range fields and init Sairaj Kodilkar
2026-11-17 7:06 ` [PATCH v4 2/3] iommu/amd: Do not convert IVMD exclusion range to unity range Sairaj Kodilkar
@ 2026-11-17 7:06 ` Sairaj Kodilkar
2 siblings, 0 replies; 4+ messages in thread
From: Sairaj Kodilkar @ 2026-11-17 7:06 UTC (permalink / raw)
To: Joerg Roedel (AMD),
Adrian Huang, Joerg Roedel, Robin Murphy, Suravee Suthikulpanit,
Vasant Hegde, Will Deacon, iommu, linux-kernel
Cc: Sairaj Kodilkar, Akshay Jindal
Also, rename struct list_head unity_map to ivmd_entry_map along with
renaming the unity-map helper functions and add error message when
handling invalid IVMD entry.
No functional change intended.
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Sairaj Kodilkar <sarunkod@amd.com>
Reviewed-by: Akshay Jindal <Akshay.Jindal@amd.com>
---
drivers/iommu/amd/amd_iommu_types.h | 6 +++---
drivers/iommu/amd/init.c | 22 +++++++++++-----------
drivers/iommu/amd/iommu.c | 7 ++++---
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 122eac81d4e3..10625fb0853e 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -609,11 +609,11 @@ struct amd_iommu_pci_seg {
u16 *alias_table;
/*
- * A list of required unity mappings we find in ACPI. It is not locked
+ * A list of required IVMD mappings we find in ACPI. It is not locked
* because as runtime it is only read. It is created at ACPI table
* parsing time.
*/
- struct list_head unity_map;
+ struct list_head ivmd_entry_list;
};
/*
@@ -869,7 +869,7 @@ struct ivhd_dte_flags {
/*
* One entry for unity mappings parsed out of the ACPI table.
*/
-struct unity_map_entry {
+struct ivmd_entry {
struct list_head list;
/* starting device id this entry is used for (including) */
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index de8e4ba2ccd0..ba4cd4c91840 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -132,7 +132,7 @@ int amd_iommu_pprlog_size = PPRLOG_SIZE_DEF;
/*
* An AMD IOMMU memory definition structure. It defines things like exclusion
- * ranges for devices and regions that should be unity mapped.
+ * ranges, unity mapping for device and regions.
*/
struct ivmd_header {
u8 type;
@@ -1726,7 +1726,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,
pci_seg->id = id;
init_llist_head(&pci_seg->dev_data_list);
- INIT_LIST_HEAD(&pci_seg->unity_map);
+ INIT_LIST_HEAD(&pci_seg->ivmd_entry_list);
list_add_tail(&pci_seg->list, &amd_iommu_pci_seg_list);
if (alloc_dev_table(pci_seg))
@@ -2319,8 +2319,8 @@ static int __init amd_iommu_init_pci(void)
}
/*
- * Order is important here to make sure any unity map requirements are
- * fulfilled. The unity mappings are created and written to the device
+ * Order is important here to make sure any ivmd map requirements are
+ * fulfilled. The ivmd mappings are created and written to the device
* table during the iommu_init_pci() call.
*
* After that we call init_device_table_dma() to make sure any
@@ -2606,17 +2606,17 @@ static int iommu_init_irq(struct amd_iommu *iommu)
*
* The next functions belong to the third pass of parsing the ACPI
* table. In this last pass the memory mapping requirements are
- * gathered (like exclusion and unity mapping ranges).
+ * gathered (like exclusion and ivmd mapping ranges).
*
****************************************************************************/
-static void __init free_unity_maps(void)
+static void __init free_ivmd_maps(void)
{
- struct unity_map_entry *entry, *next;
+ struct ivmd_entry *entry, *next;
struct amd_iommu_pci_seg *p, *pci_seg;
for_each_pci_segment_safe(pci_seg, p) {
- list_for_each_entry_safe(entry, next, &pci_seg->unity_map, list) {
+ list_for_each_entry_safe(entry, next, &pci_seg->ivmd_entry_list, list) {
list_del(&entry->list);
kfree(entry);
}
@@ -2627,7 +2627,7 @@ static void __init free_unity_maps(void)
static int __init init_unity_map_range(struct ivmd_header *m,
struct acpi_table_header *ivrs_base)
{
- struct unity_map_entry *e = NULL;
+ struct ivmd_entry *e = NULL;
struct amd_iommu_pci_seg *pci_seg;
char *s;
@@ -2685,7 +2685,7 @@ static int __init init_unity_map_range(struct ivmd_header *m,
PCI_SLOT(e->devid_end), PCI_FUNC(e->devid_end),
e->address_start, e->address_end, m->flags);
- list_add_tail(&e->list, &pci_seg->unity_map);
+ list_add_tail(&e->list, &pci_seg->ivmd_entry_list);
return 0;
}
@@ -3185,7 +3185,7 @@ static bool __init check_ioapic_information(void)
static void __init free_dma_resources(void)
{
amd_iommu_pdom_id_destroy();
- free_unity_maps();
+ free_ivmd_maps();
}
static void __init ivinfo_init(void *ivrs)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 7edaf99a1ecb..d0fd936776b7 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -3100,7 +3100,7 @@ static void amd_iommu_get_resv_regions(struct device *dev,
struct list_head *head)
{
struct iommu_resv_region *region;
- struct unity_map_entry *entry;
+ struct ivmd_entry *entry;
struct amd_iommu *iommu;
struct amd_iommu_pci_seg *pci_seg;
int devid, sbdf;
@@ -3113,7 +3113,7 @@ static void amd_iommu_get_resv_regions(struct device *dev,
iommu = get_amd_iommu_from_dev(dev);
pci_seg = iommu->pci_seg;
- list_for_each_entry(entry, &pci_seg->unity_map, list) {
+ list_for_each_entry(entry, &pci_seg->ivmd_entry_list, list) {
int type, prot = 0;
size_t length;
@@ -3139,7 +3139,8 @@ static void amd_iommu_get_resv_regions(struct device *dev,
length, prot, type,
GFP_KERNEL);
if (!region) {
- dev_err(dev, "Out of memory allocating dm-regions\n");
+ pr_err("%s: Out of memory allocating reserved regions for sbdf=%#x\n",
+ __func__, sbdf);
return;
}
list_add_tail(®ion->list, head);
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread