soc/amd/common/data_fabric/domain: introduce add_pci_cfg_resources

Since reporting the PCI ECAM MMCONF MMIO region and the IO ports for the
legacy PCI config space access is needed on all AMD SoCs, implement a
common add_pci_cfg_resources function that reports both and gets called
from amd_pci_domain_read_resources and don't report those in the SoC-
specific code any more. The only functional change is that on Genoa now
the IO ports used for the legacy PCI config space access get reserved.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ibbcc2aea4f25b6dc68fdf7f360e5a4ce53f6d850
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80270
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Felix Held 2024-01-30 15:40:53 +01:00
parent fbda323e8a
commit dde265f5a2
7 changed files with 8 additions and 22 deletions

View File

@ -111,8 +111,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
early_reserved_dram_start = e->base;
early_reserved_dram_end = e->base + e->size;
fixed_io_range_reserved(dev, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
/* 0x0 - 0x9ffff */
ram_range(dev, (*idx)++, 0, 0xa0000);
@ -134,8 +132,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
*/
ram_from_to(dev, (*idx)++, early_reserved_dram_end, mem_usable);
mmconf_resource(dev, (*idx)++);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, (*idx)++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);

View File

@ -191,6 +191,12 @@ static void add_data_fabric_io_regions(struct device *domain, unsigned long *idx
}
}
static void add_pci_cfg_resources(struct device *domain, unsigned long *idx)
{
fixed_io_range_reserved(domain, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
mmconf_resource(domain, (*idx)++);
}
void amd_pci_domain_read_resources(struct device *domain)
{
unsigned long idx = 0;
@ -203,6 +209,8 @@ void amd_pci_domain_read_resources(struct device *domain)
/* Only add the SoC's DRAM memory map and fixed resources once */
if (domain->path.domain.domain == 0) {
add_pci_cfg_resources(domain, &idx);
read_soc_memmap_resources(domain, &idx);
}
}

View File

@ -126,8 +126,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
early_reserved_dram_start = e->base;
early_reserved_dram_end = e->base + e->size;
fixed_io_range_reserved(dev, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
/* 0x0 - 0x9ffff */
ram_range(dev, (*idx)++, 0, 0xa0000);
@ -149,8 +147,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
*/
ram_from_to(dev, (*idx)++, early_reserved_dram_end, mem_usable);
mmconf_resource(dev, (*idx)++);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, (*idx)++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);

View File

@ -154,8 +154,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
early_reserved_dram_start = e->base;
early_reserved_dram_end = e->base + e->size;
fixed_io_range_reserved(dev, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
/* 0x0 - 0x9ffff */
ram_range(dev, (*idx)++, 0, 0xa0000);
@ -177,8 +175,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
*/
ram_from_to(dev, (*idx)++, early_reserved_dram_end, mem_usable);
mmconf_resource(dev, (*idx)++);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, (*idx)++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);

View File

@ -126,8 +126,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
early_reserved_dram_start = e->base;
early_reserved_dram_end = e->base + e->size;
fixed_io_range_reserved(dev, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
/* 0x0 - 0x9ffff */
ram_range(dev, (*idx)++, 0, 0xa0000);
@ -149,8 +147,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
*/
ram_from_to(dev, (*idx)++, early_reserved_dram_end, mem_usable);
mmconf_resource(dev, (*idx)++);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, (*idx)++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);

View File

@ -111,8 +111,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
early_reserved_dram_start = e->base;
early_reserved_dram_end = e->base + e->size;
fixed_io_range_reserved(dev, (*idx)++, PCI_IO_CONFIG_INDEX, PCI_IO_CONFIG_PORT_COUNT);
/* 0x0 - 0x9ffff */
ram_range(dev, (*idx)++, 0, 0xa0000);
@ -132,8 +130,6 @@ void read_soc_memmap_resources(struct device *dev, unsigned long *idx)
* cbmem_top() accounts for low UMA and TSEG if they are used. */
ram_from_to(dev, (*idx)++, early_reserved_dram_end, mem_usable);
mmconf_resource(dev, (*idx)++);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, (*idx)++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);

View File

@ -114,8 +114,6 @@ void add_opensil_memmap(struct device *dev, unsigned long *idx)
if (mem_usable != top_mem)
reserved_ram_from_to(dev, (*idx)++, mem_usable, top_mem);
mmconf_resource(dev, (*idx)++);
// Check if we're done
if (top_of_mem <= 0x100000000)
return;