git: e82b2913b780 - main - arm64/acpica: Fix the IORT MSI xref type

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Fri, 06 Nov 2026 15:39:23 UTC
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=e82b2913b780063e004cec8b3a7cc04a47c40124

commit e82b2913b780063e004cec8b3a7cc04a47c40124
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2026-11-06 15:35:38 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2026-11-06 15:38:51 +0000

    arm64/acpica: Fix the IORT MSI xref type
    
    The acpi IORT code incorrectly uses a u_int as the MSI xref type, while
    INTRNG expects an intptr_t. Switch to using intptr_t to help document
    this value is the xref for the MSI controller.
    
    Reviewed by:    dsl
    Sponsored by:   Arm Ltd
    Differential Revision:  https://reviews.freebsd.org/D60653
---
 sys/arm64/acpica/acpi_iort.c        | 14 +++++++-------
 sys/arm64/arm64/gic_v3_acpi.c       |  2 +-
 sys/arm64/arm64/gic_v3_var.h        |  2 +-
 sys/arm64/arm64/gicv5_its.c         |  2 +-
 sys/arm64/arm64/gicv5_iwb.c         |  2 +-
 sys/dev/acpica/acpivar.h            |  7 ++++---
 sys/dev/dpaa2/dpaa2_mc.c            | 12 +++++++-----
 sys/dev/pci/pci_host_generic_acpi.c |  8 +++++---
 8 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/sys/arm64/acpica/acpi_iort.c b/sys/arm64/acpica/acpi_iort.c
index 3ca1ff0e32df..e4ede60e350c 100644
--- a/sys/arm64/acpica/acpi_iort.c
+++ b/sys/arm64/acpica/acpi_iort.c
@@ -46,7 +46,7 @@
 /*
  * Track next XREF available for ITS groups.
  */
-static u_int acpi_its_xref = ACPI_MSI_XREF;
+static intptr_t acpi_its_xref = ACPI_MSI_XREF;
 
 /*
  * Some types of IORT nodes have a set of mappings.  Each of them map
@@ -70,8 +70,8 @@ struct iort_map_entry {
  * data here, so that it can be retrieved together.
  */
 struct iort_its_entry {
+	intptr_t		xref;
 	u_int			its_id;
-	u_int			xref;
 	int			pxm;
 };
 
@@ -470,7 +470,7 @@ madt_resolve_its_xref(ACPI_SUBTABLE_HEADER *entry, void *arg)
 	ACPI_MADT_GICv5_ITS *gicv5_its;
 	struct iort_node *its_node;
 	struct iort_its_entry *its_entry;
-	u_int xref;
+	intptr_t xref;
 	int i, matches;
 
 	switch (entry->Type) {
@@ -638,7 +638,7 @@ SYSINIT(acpi_parse_iort, SI_SUB_DRIVERS, SI_ORDER_FIRST, acpi_parse_iort, NULL);
  * Provide ITS ID to PIC xref mapping.
  */
 int
-acpi_iort_its_lookup(u_int its_id, u_int *xref, int *pxm)
+acpi_iort_its_lookup(u_int its_id, intptr_t *xref, int *pxm)
 {
 	struct iort_node *its_node;
 	struct iort_its_entry *its_entry;
@@ -663,7 +663,7 @@ acpi_iort_its_lookup(u_int its_id, u_int *xref, int *pxm)
  * use for the interrupt setup
  */
 int
-acpi_iort_map_pci_msi(u_int seg, u_int rid, u_int *xref, u_int *devid)
+acpi_iort_map_pci_msi(u_int seg, u_int rid, intptr_t *xref, u_int *devid)
 {
 	struct iort_node *node;
 
@@ -703,7 +703,7 @@ acpi_iort_map_pci_smmuv3(u_int seg, u_int rid, uint64_t *xref, u_int *sid)
  * XREF for MSI interrupt setup and the device ID to use for the interrupt setup.
  */
 int
-acpi_iort_map_named_msi(const char *devname, u_int rid, u_int *xref,
+acpi_iort_map_named_msi(const char *devname, u_int rid, intptr_t *xref,
     u_int *devid)
 {
 	struct iort_node *node;
@@ -803,11 +803,11 @@ int
 acpi_iort_alloc_msi(device_t bus, device_t dev, int *count)
 {
         int *irqs;
+        intptr_t xref;
         int irq_count;
         int error;
         int i;
         int its_id;
-        u_int xref;
         int pxm;
 
         irq_count = *count;
diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c
index 88fd0394c548..9fbd5e02043b 100644
--- a/sys/arm64/arm64/gic_v3_acpi.c
+++ b/sys/arm64/arm64/gic_v3_acpi.c
@@ -392,7 +392,7 @@ gic_v3_add_children(ACPI_SUBTABLE_HEADER *entry, void *arg)
 	struct gic_v3_acpi_devinfo *di;
 	struct gic_v3_softc *sc;
 	device_t child, dev;
-	u_int xref;
+	intptr_t xref;
 	int err, pxm;
 
 	if (entry->Type == ACPI_MADT_TYPE_GENERIC_TRANSLATOR) {
diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h
index 8c1e39d63774..b29044323360 100644
--- a/sys/arm64/arm64/gic_v3_var.h
+++ b/sys/arm64/arm64/gic_v3_var.h
@@ -99,8 +99,8 @@ struct gic_v3_softc {
 };
 
 struct gic_v3_devinfo {
+	intptr_t msi_xref;
 	int gic_domain;
-	int msi_xref;
 	int is_vgic;
 };
 
diff --git a/sys/arm64/arm64/gicv5_its.c b/sys/arm64/arm64/gicv5_its.c
index f69ab215f9e7..8e0b2ad653dc 100644
--- a/sys/arm64/arm64/gicv5_its.c
+++ b/sys/arm64/arm64/gicv5_its.c
@@ -1283,10 +1283,10 @@ gicv5_its_acpi_probe(device_t dev)
 
 struct find_its_translate_data {
 	bus_addr_t its_frame_paddr;
+	intptr_t its_translate_xref;
 	uint8_t flags;
 	int its_found;
 	int its_translate_found;
-	u_int its_translate_xref;
 	int its_translate_pxm;
 };
 
diff --git a/sys/arm64/arm64/gicv5_iwb.c b/sys/arm64/arm64/gicv5_iwb.c
index 2cf4d9723961..a638cf90d317 100644
--- a/sys/arm64/arm64/gicv5_iwb.c
+++ b/sys/arm64/arm64/gicv5_iwb.c
@@ -626,7 +626,7 @@ static int
 gicv5_iwb_acpi_attach(device_t dev)
 {
 	struct gicv5_iwb_acpi_softc *sc;
-	u_int xref;
+	intptr_t xref;
 	int its_id;
 	int error;
 	int pxm;
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 7ff8bd711e57..66050662853c 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -617,11 +617,12 @@ acpi_set_prepare_sleep(
 /*
  * ARM specific ACPI interfaces, relating to IORT table.
  */
-int	acpi_iort_map_pci_msi(u_int seg, u_int rid, u_int *xref, u_int *devid);
+int	acpi_iort_map_pci_msi(u_int seg, u_int rid, intptr_t *xref,
+	    u_int *devid);
 int	acpi_iort_map_pci_smmuv3(u_int seg, u_int rid, uint64_t *xref,
 	    u_int *devid);
-int	acpi_iort_its_lookup(u_int its_id, u_int *xref, int *pxm);
-int	acpi_iort_map_named_msi(const char *devname, u_int rid, u_int *xref,
+int	acpi_iort_its_lookup(u_int its_id, intptr_t *xref, int *pxm);
+int	acpi_iort_map_named_msi(const char *devname, u_int rid, intptr_t *xref,
 	    u_int *devid);
 int	acpi_iort_map_named_smmuv3(const char *devname, u_int rid,
 	    uint64_t *xref, u_int *devid);
diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c
index 9702bdbe13ba..2ff4899a6b00 100644
--- a/sys/dev/dpaa2/dpaa2_mc.c
+++ b/sys/dev/dpaa2/dpaa2_mc.c
@@ -113,7 +113,7 @@ static struct resource_spec dpaa2_mc_spec[] = {
 	RESOURCE_SPEC_END
 };
 
-static u_int dpaa2_mc_get_xref(device_t, device_t);
+static intptr_t dpaa2_mc_get_xref(device_t, device_t);
 static u_int dpaa2_mc_map_id(device_t, device_t, uintptr_t *);
 
 static int dpaa2_mc_alloc_msi_impl(device_t, device_t, int, int, int *);
@@ -644,13 +644,14 @@ dpaa2_mc_release_dev(device_t mcdev, device_t dpaa2_dev,
 /**
  * @internal
  */
-static u_int
+static intptr_t
 dpaa2_mc_get_xref(device_t mcdev, device_t child)
 {
 	struct dpaa2_mc_softc *sc = device_get_softc(mcdev);
 	struct dpaa2_devinfo *dinfo = device_get_ivars(child);
 #ifdef DEV_ACPI
-	u_int xref, devid;
+	intptr_t xref;
+	u_int devid;
 #endif
 #ifdef FDT
 	phandle_t msi_parent;
@@ -678,7 +679,7 @@ dpaa2_mc_get_xref(device_t mcdev, device_t child)
 			    &msi_parent, NULL);
 			if (error)
 				return (0);
-			return ((u_int) msi_parent);
+			return ((intptr_t) msi_parent);
 		}
 #endif
 	}
@@ -693,7 +694,8 @@ dpaa2_mc_map_id(device_t mcdev, device_t child, uintptr_t *id)
 {
 	struct dpaa2_devinfo *dinfo;
 #ifdef DEV_ACPI
-	u_int xref, devid;
+	intptr_t xref;
+	u_int devid;
 	int error;
 #endif
 
diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c
index 324ead5e8b87..43ae4a3f2a56 100644
--- a/sys/dev/pci/pci_host_generic_acpi.c
+++ b/sys/dev/pci/pci_host_generic_acpi.c
@@ -368,12 +368,13 @@ generic_pcie_acpi_route_interrupt(device_t bus, device_t dev, int pin)
 	return (acpi_pcib_route_interrupt(bus, dev, pin, &sc->ap_prt));
 }
 
-static u_int
+static intptr_t
 generic_pcie_get_xref(device_t pci, device_t child)
 {
 	struct generic_pcie_acpi_softc *sc;
 	uintptr_t rid;
-	u_int xref, devid;
+	intptr_t xref;
+	u_int devid;
 	int err;
 
 	sc = device_get_softc(pci);
@@ -391,7 +392,8 @@ generic_pcie_map_id(device_t pci, device_t child, uintptr_t *id)
 {
 	struct generic_pcie_acpi_softc *sc;
 	uintptr_t rid;
-	u_int xref, devid;
+	intptr_t xref;
+	u_int devid;
 	int err;
 
 	sc = device_get_softc(pci);