From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To: <linux-kernel@vger.kernel.org>, <iommu@lists.linux.dev>
Cc: <joro@8bytes.org>, <jon.grimm@amd.com>, <vasant.hegde@amd.com>,
<frank.gorishek@amd.com>, <thomas.lendacky@amd.com>,
<santosh.shukla@amd.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [PATCH 3/4] iommu/amd: Clean up and simplify IVMD entry handling
Date: Mon, 20 Apr 2026 17:00:32 +0000 [thread overview]
Message-ID: <20260420170033.6780-4-suravee.suthikulpanit@amd.com> (raw)
In-Reply-To: <20260420170033.6780-1-suravee.suthikulpanit@amd.com>
Clean up IVMD ACPI flags and mask in amd_iommu_types.h, and drop the
IOMMU_PROT_* / IOMMU_UNITY_MAP_FLAG_EXCL_RANGE, which only existed
to carry IVMD semantics.
Rename unity_map_entry and unity_map to ivmd_entry and ivmd_entry_map,
store the raw IVMD flags byte from the ACPI table instead of shifting
protection into a separate int, and derive IOMMU reserved regions from
those flags in amd_iommu_get_resv_regions(). Also, rename struct
list_head unity_map to ivmd_entry_map along with renaming the unity-map
helper functions.
Lastyly, add error message when handling invalid IVMD entry.
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
drivers/iommu/amd/amd_iommu_types.h | 20 +++++++--------
drivers/iommu/amd/init.c | 39 +++++++++++++----------------
drivers/iommu/amd/iommu.c | 28 +++++++++++++++------
3 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index c4ea701b7cab..e93b4b857dde 100644
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -376,11 +376,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 IOMMU_UNITY_MAP_FLAG_EXCL_RANGE (1 << 2)
+#define IVMD_FLAG_UNITY BIT(0)
+#define IVMD_FLAG_IR BIT(1)
+#define IVMD_FLAG_IW BIT(2)
+#define IVMD_FLAG_EXCL BIT(3)
+#define IVMD_FLAG_MASK GENMASK_U32(3, 0)
/* IOMMU capabilities */
#define IOMMU_CAP_IOTLB 24
@@ -616,11 +616,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 entry 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_map;
};
/*
@@ -876,7 +876,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) */
@@ -889,8 +889,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 2e854f4639a7..4b62bb89a12c 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
@@ -134,7 +129,7 @@ struct ivhd_entry {
/*
* 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 devices and regions.
*/
struct ivmd_header {
u8 type;
@@ -1708,7 +1703,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_map);
list_add_tail(&pci_seg->list, &amd_iommu_pci_seg_list);
if (alloc_dev_table(pci_seg))
@@ -2301,8 +2296,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
@@ -2588,28 +2583,28 @@ 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_map, list) {
list_del(&entry->list);
kfree(entry);
}
}
}
-/* called for unity map ACPI definition */
-static int __init init_unity_map_range(struct ivmd_header *m,
- struct acpi_table_header *ivrs_base)
+/* called for ivmd map ACPI definition */
+static int __init init_ivmd_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;
@@ -2642,7 +2637,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;
+ 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"
@@ -2653,7 +2648,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_map);
return 0;
}
@@ -2669,8 +2664,8 @@ static int __init init_memory_definitions(struct acpi_table_header *table)
while (p < end) {
m = (struct ivmd_header *)p;
- if (m->flags & (IVMD_FLAG_UNITY_MAP | IVMD_FLAG_EXCL_RANGE))
- init_unity_map_range(m, table);
+ if (m->flags & (IVMD_FLAG_UNITY | IVMD_FLAG_EXCL))
+ init_ivmd_map_range(m, table);
p += m->length;
}
@@ -3115,7 +3110,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 760d5f4623b5..fc3389ded01a 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -3050,7 +3050,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;
@@ -3063,28 +3063,42 @@ 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_map, list) {
int type, prot = 0;
size_t length;
if (devid < entry->devid_start || devid > entry->devid_end)
continue;
+ /*
+ * IVMD_FLAG_UNITY, IVMD_FLAG_IR, IVMD_FLAG_IW are ignored if
+ * IVMD_FLAG_EXCL is set.
+ */
+ if ((entry->flags & IVMD_FLAG_EXCL) &&
+ (entry->flags & (IVMD_FLAG_UNITY | IVMD_FLAG_IR | IVMD_FLAG_IW)))
+ pr_err(FW_BUG "%s: Invalid IVMD flags combination: %#02x for sbdf=%#x. Ignore IW/IR/Unity flags\n",
+ __func__, entry->flags, sbdf);
+
+ 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->prot & IOMMU_UNITY_MAP_FLAG_EXCL_RANGE)
- /* Exclusion range */
+ if (entry->flags & IVMD_FLAG_EXCL) {
type = IOMMU_RESV_RESERVED;
+ prot = 0;
+ }
region = iommu_alloc_resv_region(entry->address_start,
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
next prev parent reply other threads:[~2026-04-20 17:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-20 17:00 [PATCH 0/4] iommu/amd: IVMD handling cleanup and ivmd= boot override Suravee Suthikulpanit
2026-04-20 17:00 ` [PATCH 1/4] iommu/amd: Drop unused global exclusion range fields and init Suravee Suthikulpanit
2026-04-20 17:00 ` [PATCH 2/4] iommu/amd: Do not convert IVMD exclusion range to unity range Suravee Suthikulpanit
2026-04-20 17:00 ` Suravee Suthikulpanit [this message]
2026-04-20 17:00 ` [PATCH 4/4] iommu/amd: Introduce boot option ivmd=seg:bus:dev.fun,start,size,flags Suravee Suthikulpanit
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=20260420170033.6780-4-suravee.suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=frank.gorishek@amd.com \
--cc=iommu@lists.linux.dev \
--cc=jon.grimm@amd.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=santosh.shukla@amd.com \
--cc=thomas.lendacky@amd.com \
--cc=vasant.hegde@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: 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