From d71975ae6e0f3dc1c0c96d3a8cc0120a266305b9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 14 May 2018 19:38:13 +0300 Subject: PCI: autoconfig: Don't allocate 64-bit addresses to 32-bit only resources Currently, if we happen to allocate an address requiring 64 bits to a device only supporting 32-bit BARs, the address eventually gets silently truncated to 32 bits. Avoid this by adding a new flag to pciauto_region_allocate() to bail out in such situations. Signed-off-by: Tuomas Tynkkynen Reviewed-by: Simon Glass --- drivers/pci/pci_auto_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'drivers/pci/pci_auto_common.c') diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index d90dbcf..1837873 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -32,7 +32,7 @@ void pciauto_region_align(struct pci_region *res, pci_size_t size) } int pciauto_region_allocate(struct pci_region *res, pci_size_t size, - pci_addr_t *bar) + pci_addr_t *bar, bool supports_64bit) { pci_addr_t addr; @@ -48,6 +48,11 @@ int pciauto_region_allocate(struct pci_region *res, pci_size_t size, goto error; } + if (upper_32_bits(addr) && !supports_64bit) { + debug("Cannot assign 64-bit address to 32-bit-only resource\n"); + goto error; + } + res->bus_lower = addr + size; debug("address=0x%llx bus_lower=0x%llx\n", (unsigned long long)addr, -- cgit v1.1