Prepare v2023.10

[platform/kernel/u-boot.git] / drivers / pci / pci_auto_common.c

diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c
index 1837873..2f4aff0 100644 (file)
--- a/drivers/pci/pci_auto_common.c
+++ b/drivers/pci/pci_auto_common.c
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <log.h>
 #include <pci.h>
 
 void pciauto_region_init(struct pci_region *res)
@@ -21,9 +22,10 @@ void pciauto_region_init(struct pci_region *res)
        /*
         * Avoid allocating PCI resources from address 0 -- this is illegal
         * according to PCI 2.1 and moreover, this is known to cause Linux IDE
-        * drivers to fail. Use a reasonable starting value of 0x1000 instead.
+        * drivers to fail. Use a reasonable starting value of 0x1000 instead
+        * if the bus start address is below 0x1000.
         */
-       res->bus_lower = res->bus_start ? res->bus_start : 0x1000;
+       res->bus_lower = res->bus_start < 0x1000 ? 0x1000 : res->bus_start;
 }
 
 void pciauto_region_align(struct pci_region *res, pci_size_t size)
@@ -44,7 +46,9 @@ int pciauto_region_allocate(struct pci_region *res, pci_size_t size,
        addr = ((res->bus_lower - 1) | (size - 1)) + 1;
 
        if (addr - res->bus_start + size > res->size) {
-               debug("No room in resource");
+               debug("No room in resource, avail start=%llx / size=%llx, "
+                     "need=%llx\n", (unsigned long long)res->bus_lower,
+                     (unsigned long long)res->size, (unsigned long long)size);
                goto error;
        }
 
@@ -70,7 +74,7 @@ static void pciauto_show_region(const char *name, struct pci_region *region)
 {
        pciauto_region_init(region);
        debug("PCI Autoconfig: Bus %s region: [%llx-%llx],\n"
-             "\t\tPhysical Memory [%llx-%llxx]\n", name,
+             "\t\tPhysical Memory [%llx-%llx]\n", name,
              (unsigned long long)region->bus_start,
              (unsigned long long)(region->bus_start + region->size - 1),
              (unsigned long long)region->phys_start,