drivers: pci: Fix dm_pci_map_bar() to support 64b BARs
PATCH v4 1/1 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 <[email protected]>
Reviewed-by Simon Glass <[email protected]>
Signed-off-by Moritz Fischer <[email protected]>
---
Changes from V3:
- Rebased onto v2024.01
Changes from V2:
- Turned IS_ENABLED() into #if defined to allow
building on platforms that don't define
CONFIG_SYS_PCI_64BIT
Changes from V1:
- Reworded commit message / typo
--- drivers/pci/pci-uclass.c | 11 +++++++++++ include/pci.h | 1 + 2 files changed, 12 insertions(+)
drivers/pci/pci-uclass.c +11 -0
@@ -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 ;
include/pci.h +1 -0
@@ -1354,6 +1354,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len,* type 1 functions. * Can also be used on type 0 functions that support Enhanced Allocation for * 32b/64b BARs. Note that duplicate BEI entries are not supported. +* Can also be used on 64b bars on type 0 functions. * * @dev: Device to check * @bar: Bar register offset (PCI_BASE_ADDRESS_...)
Signature · 1 line
2.43.0.472.g3155946c3a-goog
Quoted 5 lines · Moritz Fischer
This enables 64b BARs if
CONFIG_SYS_PCI_64BITis enabled.Reviewed-by Philip Oberfichtner <[email protected]>Reviewed-by Simon Glass <[email protected]>Signed-off-by Moritz Fischer <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom