summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMoritz Fischer <moritzf@google.com>2024-01-10 04:59:02 +0000
committerTom Rini <trini@konsulko.com>2024-01-18 20:24:13 -0500
commit040834703497bafb81fce88a92d8e54c8837fcaa (patch)
tree4e8d159c1b5f0138c852d987af38f7da2e5f0980 /drivers
parent21a2c129adaab04a7a032a31c816ae09375fe954 (diff)
downloadu-boot-040834703497bafb81fce88a92d8e54c8837fcaa.tar.gz
u-boot-040834703497bafb81fce88a92d8e54c8837fcaa.tar.bz2
u-boot-040834703497bafb81fce88a92d8e54c8837fcaa.zip
drivers: pci: Fix dm_pci_map_bar() to support 64b BARs
This enables 64b BARs if CONFIG_SYS_PCI_64BIT is enabled. Reviewed-by: Philip Oberfichtner <pro@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Moritz Fischer <moritzf@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci-uclass.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index e0d01f6a85..1a48256de0 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1611,6 +1611,17 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len,
dm_pci_read_config32(udev, bar, &bar_response);
pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
+ /* This has a lot of baked in assumptions, but essentially tries
+ * to mirror the behavior of BAR assignment for 64 Bit enabled
+ * hosts and 64 bit placeable BARs in the auto assign code.
+ */
+#if defined(CONFIG_SYS_PCI_64BIT)
+ if (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_64) {
+ dm_pci_read_config32(udev, bar + 4, &bar_response);
+ pci_bus_addr |= (pci_addr_t)bar_response << 32;
+ }
+#endif /* CONFIG_SYS_PCI_64BIT */
+
if (~((pci_addr_t)0) - pci_bus_addr < offset)
return NULL;