From 58fc2b54f5b9102d593f3b98c370b6cbaeb97ac2 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 5 Feb 2020 21:59:12 +0100 Subject: [PATCH] pci: definition of pci_addr_t and pci_size_t Currently the size of pci_addr_t and pci_size_t depends on CONFIG_SYS_PCI_64BIT. For qemu_arm64_defconfig with 4 GiB RAM this leads to an error pci_hose_phys_to_bus: invalid physical address which is due to the truncation of the bus address in _dm_pci_phys_to_bus. Defining CONFIG_SYS_PCI_64BIT is not a solution as this results in an error PCI: Failed autoconfig bar 10 So let's use unsigned long for pci_addr_t and pci_size_t if CONFIG_SYS_PCI_64BIT is not defined. Considering that 32bit U-Boot is used to launch some 64bit x86 systems we cannot do without CONFIG_SYS_PCI_64BIT requiring u64 as type. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/pci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pci.h b/include/pci.h index 50ca249f2d..174ddd4460 100644 --- a/include/pci.h +++ b/include/pci.h @@ -488,8 +488,8 @@ typedef u64 pci_addr_t; typedef u64 pci_size_t; #else -typedef u32 pci_addr_t; -typedef u32 pci_size_t; +typedef unsigned long pci_addr_t; +typedef unsigned long pci_size_t; #endif struct pci_region { -- 2.25.1