diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-14 19:38:13 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-26 12:46:50 -0400 |
| commit | d71975ae6e0f3dc1c0c96d3a8cc0120a266305b9 (patch) | |
| tree | a7684ddd6ff0eb0c17fa38ca840a2636342d54b0 /drivers/pci/pci_auto_common.c | |
| parent | ed12a89d0738dd030c42a608efa7a72dd4a1f6da (diff) | |
| download | u-boot-d71975ae6e0f3dc1c0c96d3a8cc0120a266305b9.tar.gz | |
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 <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/pci/pci_auto_common.c')
| -rw-r--r-- | drivers/pci/pci_auto_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index d90dbcf91a..183787333e 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, |