Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/78326?usp=email )
Change subject: device/device.h: Rename pci_domain_scan_bus ......................................................................
device/device.h: Rename pci_domain_scan_bus
On all targets the domain works as a host bridge. Xeon-sp code intends to feature multiple host bridges below a domain, hence rename the function to pci_host_bridge_scan_bus.
Signed-off-by: Arthur Heymans arthur@aheymans.xyz Change-Id: I4e65fdbaf0b42c5f4f62297a60d818d299d76f73 --- M src/device/pci_device.c M src/include/device/device.h M src/mainboard/emulation/qemu-aarch64/mainboard.c M src/mainboard/emulation/qemu-i440fx/northbridge.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/intel/e7505/northbridge.c M src/northbridge/intel/gm45/northbridge.c M src/northbridge/intel/haswell/northbridge.c M src/northbridge/intel/i440bx/northbridge.c M src/northbridge/intel/i945/northbridge.c M src/northbridge/intel/ironlake/northbridge.c M src/northbridge/intel/pineview/northbridge.c M src/northbridge/intel/sandybridge/northbridge.c M src/northbridge/intel/x4x/northbridge.c M src/soc/amd/common/block/data_fabric/domain.c M src/soc/amd/stoneyridge/chip.c M src/soc/cavium/cn81xx/ecam0.c M src/soc/intel/alderlake/chip.c M src/soc/intel/apollolake/chip.c M src/soc/intel/baytrail/chip.c M src/soc/intel/braswell/chip.c M src/soc/intel/broadwell/northbridge.c M src/soc/intel/cannonlake/chip.c M src/soc/intel/denverton_ns/chip.c M src/soc/intel/elkhartlake/chip.c M src/soc/intel/jasperlake/chip.c M src/soc/intel/meteorlake/chip.c M src/soc/intel/skylake/chip.c M src/soc/intel/tigerlake/chip.c M src/soc/mediatek/mt8195/soc.c M src/soc/qualcomm/sc7280/soc.c 31 files changed, 32 insertions(+), 32 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/78326/1
diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 60339e3..21b4352 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -1662,7 +1662,7 @@ * * @param dev Pointer to the domain. */ -void pci_domain_scan_bus(struct device *dev) +void pci_host_bridge_scan_bus(struct device *dev) { struct bus *link = dev->link_list; pci_scan_bus(link, PCI_DEVFN(0, 0), 0xff); diff --git a/src/include/device/device.h b/src/include/device/device.h index bbad3c7..68e2622 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -272,7 +272,7 @@ extern struct device_operations default_dev_ops_root; void pci_domain_read_resources(struct device *dev); void pci_domain_set_resources(struct device *dev); -void pci_domain_scan_bus(struct device *dev); +void pci_host_bridge_scan_bus(struct device *dev);
void mmconf_resource(struct device *dev, unsigned long index);
diff --git a/src/mainboard/emulation/qemu-aarch64/mainboard.c b/src/mainboard/emulation/qemu-aarch64/mainboard.c index 481745f..a655989 100644 --- a/src/mainboard/emulation/qemu-aarch64/mainboard.c +++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c @@ -49,5 +49,5 @@ struct device_operations qemu_aarch64_pci_domain_ops = { .read_resources = qemu_aarch64_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, }; diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 5d24c5b..5fe12e7 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -230,7 +230,7 @@ static struct device_operations pci_domain_ops = { .read_resources = cpu_pci_domain_read_resources, .set_resources = cpu_pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, #if CONFIG(GENERATE_SMBIOS_TABLES) .get_smbios_data = qemu_get_smbios_data, #endif diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 0c389d5..bafe5a5 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -840,7 +840,7 @@ static struct device_operations pci_domain_ops = { .read_resources = domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_name = domain_acpi_name, };
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c index b51b2ab..65a0212 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -58,7 +58,7 @@ struct device_operations e7505_pci_domain_ops = { .read_resources = mch_domain_read_resources, .set_resources = mch_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .ops_pci = &pci_dev_ops_pci, };
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c index 07dba86..4bddf20 100644 --- a/src/northbridge/intel/gm45/northbridge.c +++ b/src/northbridge/intel/gm45/northbridge.c @@ -183,7 +183,7 @@ .read_resources = mch_domain_read_resources, .set_resources = mch_domain_set_resources, .init = mch_domain_init, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .write_acpi_tables = northbridge_write_acpi_tables, .acpi_fill_ssdt = pci_domain_ssdt, .acpi_name = northbridge_acpi_name, diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index 73afe07..ef5b9e9 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -36,7 +36,7 @@ struct device_operations haswell_pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_name = northbridge_acpi_name, .write_acpi_tables = northbridge_write_acpi_tables, }; diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c index bc6541f..0670f72 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -69,7 +69,7 @@ static struct device_operations pci_domain_ops = { .read_resources = i440bx_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, };
static int get_cpu_count(void) diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c index 47c14f7..1dfcc40 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -97,7 +97,7 @@ struct device_operations i945_pci_domain_ops = { .read_resources = mch_domain_read_resources, .set_resources = mch_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_name = northbridge_acpi_name, };
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c index 8c434aa..74ddee2 100644 --- a/src/northbridge/intel/ironlake/northbridge.c +++ b/src/northbridge/intel/ironlake/northbridge.c @@ -71,7 +71,7 @@ struct device_operations ironlake_pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = northbridge_acpi_name, #endif diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c index 7689d34..a23a0d5 100644 --- a/src/northbridge/intel/pineview/northbridge.c +++ b/src/northbridge/intel/pineview/northbridge.c @@ -137,7 +137,7 @@ .read_resources = mch_domain_read_resources, .set_resources = mch_domain_set_resources, .init = mch_domain_init, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_fill_ssdt = generate_cpu_entries, .acpi_name = northbridge_acpi_name, }; diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index ee4ddc5..9511cc3 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -55,7 +55,7 @@ struct device_operations sandybridge_pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .write_acpi_tables = northbridge_write_acpi_tables, .acpi_name = northbridge_acpi_name, }; diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c index a3e1bd2..12a7a40 100644 --- a/src/northbridge/intel/x4x/northbridge.c +++ b/src/northbridge/intel/x4x/northbridge.c @@ -111,7 +111,7 @@ .read_resources = mch_domain_read_resources, .set_resources = mch_domain_set_resources, .init = mch_domain_init, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .write_acpi_tables = northbridge_write_acpi_tables, .acpi_fill_ssdt = generate_cpu_entries, .acpi_name = northbridge_acpi_name, diff --git a/src/soc/amd/common/block/data_fabric/domain.c b/src/soc/amd/common/block/data_fabric/domain.c index 01fad99..4ec52fc 100644 --- a/src/soc/amd/common/block/data_fabric/domain.c +++ b/src/soc/amd/common/block/data_fabric/domain.c @@ -28,12 +28,12 @@
/* Set bus first number of PCI root */ domain->link_list->secondary = bus; - /* subordinate needs to be the same as secondary before pci_domain_scan_bus call. */ + /* subordinate needs to be the same as secondary before pci_host_bridge_scan_bus call. */ domain->link_list->subordinate = bus; /* Tell allocator about maximum PCI bus number in domain */ domain->link_list->max_subordinate = limit;
- pci_domain_scan_bus(domain); + pci_host_bridge_scan_bus(domain); }
static void print_df_mmio_outside_of_cpu_mmio_error(unsigned int reg) diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c index eaa0e9a..09cede3 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -84,7 +84,7 @@ .read_resources = domain_read_resources, .set_resources = pci_domain_set_resources, .enable_resources = domain_enable_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_name = soc_acpi_name, };
diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c index e789fd8..d02e884 100644 --- a/src/soc/cavium/cn81xx/ecam0.c +++ b/src/soc/cavium/cn81xx/ecam0.c @@ -312,5 +312,5 @@ struct device_operations pci_domain_ops_ecam0 = { .read_resources = ecam0_read_resources, .init = ecam0_init, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, }; diff --git a/src/soc/intel/alderlake/chip.c b/src/soc/intel/alderlake/chip.c index 8b32b96..0639157 100644 --- a/src/soc/intel/alderlake/chip.c +++ b/src/soc/intel/alderlake/chip.c @@ -248,7 +248,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 37b3186..07c2637 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -202,7 +202,7 @@ static struct device_operations pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, }; diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c index 1f72dc4..592e178 100644 --- a/src/soc/intel/baytrail/chip.c +++ b/src/soc/intel/baytrail/chip.c @@ -11,7 +11,7 @@ static struct device_operations pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, };
static struct device_operations cpu_bus_ops = { diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c index e2ee0a9..ce394d0 100644 --- a/src/soc/intel/braswell/chip.c +++ b/src/soc/intel/braswell/chip.c @@ -13,7 +13,7 @@ static struct device_operations pci_domain_ops = { .read_resources = pci_domain_read_resources, .set_resources = pci_domain_set_resources, - .scan_bus = pci_domain_scan_bus, + .scan_bus = pci_host_bridge_scan_bus, };
static struct device_operations cpu_bus_ops = { diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c index d3c899e..6525275 100644 --- a/src/soc/intel/broadwell/northbridge.c +++ b/src/soc/intel/broadwell/northbridge.c @@ -400,7 +400,7 @@ struct device_operations broadwell_pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .write_acpi_tables = &northbridge_write_acpi_tables, #endif diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 19b8c39..0ece32c 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -174,7 +174,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c index 3d974a2..1a4341e 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -109,7 +109,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, #endif diff --git a/src/soc/intel/elkhartlake/chip.c b/src/soc/intel/elkhartlake/chip.c index 4d61c3b..20e46c0 100644 --- a/src/soc/intel/elkhartlake/chip.c +++ b/src/soc/intel/elkhartlake/chip.c @@ -132,7 +132,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/jasperlake/chip.c b/src/soc/intel/jasperlake/chip.c index e51a601..c049163f 100644 --- a/src/soc/intel/jasperlake/chip.c +++ b/src/soc/intel/jasperlake/chip.c @@ -139,7 +139,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c index 954c32b..a1b1968 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/chip.c @@ -203,7 +203,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 70d12e4..8df1ad3 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -189,7 +189,7 @@ struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index 15281c8..024763d 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -179,7 +179,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = &soc_acpi_name, .acpi_fill_ssdt = ssdt_set_above_4g_pci, diff --git a/src/soc/mediatek/mt8195/soc.c b/src/soc/mediatek/mt8195/soc.c index 2ecc31e..5425695 100644 --- a/src/soc/mediatek/mt8195/soc.c +++ b/src/soc/mediatek/mt8195/soc.c @@ -53,7 +53,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &mtk_pcie_domain_read_resources, .set_resources = &mtk_pcie_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, .enable = &mtk_pcie_domain_enable, };
diff --git a/src/soc/qualcomm/sc7280/soc.c b/src/soc/qualcomm/sc7280/soc.c index 268f080..e6dbf21 100644 --- a/src/soc/qualcomm/sc7280/soc.c +++ b/src/soc/qualcomm/sc7280/soc.c @@ -10,7 +10,7 @@ static struct device_operations pci_domain_ops = { .read_resources = &qcom_pci_domain_read_resources, .set_resources = &pci_domain_set_resources, - .scan_bus = &pci_domain_scan_bus, + .scan_bus = &pci_host_bridge_scan_bus, .enable = &qcom_setup_pcie_host, };
-
Arthur Heymans (Code Review)