3 files changed, 4 insertions, 3 deletions

diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c
index f12632e7205b..324ead5e8b87 100644
--- a/sys/dev/pci/pci_host_generic_acpi.c
+++ b/sys/dev/pci/pci_host_generic_acpi.c
@@ -411,7 +411,8 @@ generic_pcie_get_iommu(device_t pci, device_t child, uintptr_t *id)
 {
 	struct generic_pcie_acpi_softc *sc;
 	struct pci_id_ofw_iommu *iommu;
-	u_int iommu_sid, iommu_xref;
+	uint64_t iommu_xref;
+	u_int iommu_sid;
 	uintptr_t rid;
 	int err;
 
diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c
index 73c6201dc14b..ffe63b82a234 100644
--- a/sys/dev/pci/pci_host_generic_fdt.c
+++ b/sys/dev/pci/pci_host_generic_fdt.c
@@ -367,7 +367,7 @@ generic_pcie_get_iommu(device_t pci, device_t child, uintptr_t *id)
 {
 	struct pci_id_ofw_iommu *iommu;
 	uint32_t iommu_rid;
-	uint32_t iommu_xref;
+	phandle_t iommu_xref;
 	uint16_t pci_rid;
 	phandle_t node;
 	int err;
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 14cb577dbedf..d1b7d28eae91 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -122,8 +122,8 @@ struct pcicfg_msix {
 };
 
 struct pci_id_ofw_iommu {
+	uintptr_t xref;
 	uint32_t id;
-	uint32_t xref;
 };
 
 /* Interesting values for HyperTransport */