From 0b0113f2436b448cd172d2ae9cfcc07628020173 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 31 Aug 2023 17:09:28 +0200 Subject: 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 Change-Id: I4e65fdbaf0b42c5f4f62297a60d818d299d76f73 Reviewed-on: https://review.coreboot.org/c/coreboot/+/78326 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Yidi Lin --- src/device/pci_device.c | 2 +- src/include/device/device.h | 2 +- src/mainboard/emulation/qemu-aarch64/mainboard.c | 2 +- src/mainboard/emulation/qemu-i440fx/northbridge.c | 2 +- src/northbridge/amd/pi/00730F01/northbridge.c | 2 +- src/northbridge/intel/e7505/northbridge.c | 2 +- src/northbridge/intel/gm45/northbridge.c | 2 +- src/northbridge/intel/haswell/northbridge.c | 2 +- src/northbridge/intel/i440bx/northbridge.c | 2 +- src/northbridge/intel/i945/northbridge.c | 2 +- src/northbridge/intel/ironlake/northbridge.c | 2 +- src/northbridge/intel/pineview/northbridge.c | 2 +- src/northbridge/intel/sandybridge/northbridge.c | 2 +- src/northbridge/intel/x4x/northbridge.c | 2 +- src/soc/amd/common/block/data_fabric/domain.c | 4 ++-- src/soc/amd/stoneyridge/chip.c | 2 +- src/soc/cavium/cn81xx/ecam0.c | 2 +- src/soc/intel/alderlake/chip.c | 2 +- src/soc/intel/apollolake/chip.c | 2 +- src/soc/intel/baytrail/chip.c | 2 +- src/soc/intel/braswell/chip.c | 2 +- src/soc/intel/broadwell/northbridge.c | 2 +- src/soc/intel/cannonlake/chip.c | 2 +- src/soc/intel/denverton_ns/chip.c | 2 +- src/soc/intel/elkhartlake/chip.c | 2 +- src/soc/intel/jasperlake/chip.c | 2 +- src/soc/intel/meteorlake/chip.c | 2 +- src/soc/intel/skylake/chip.c | 2 +- src/soc/intel/tigerlake/chip.c | 2 +- src/soc/mediatek/mt8195/soc.c | 2 +- src/soc/qualcomm/sc7280/soc.c | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 60339e3ade81..21b43529d7f8 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -1662,7 +1662,7 @@ void pci_scan_bridge(struct device *dev) * * @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 bbad3c77d5f3..68e2622f4173 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -272,7 +272,7 @@ void show_all_devs_resources(int debug_level, const char *msg); 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 481745f2147d..a655989f2bf8 100644 --- a/src/mainboard/emulation/qemu-aarch64/mainboard.c +++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c @@ -49,5 +49,5 @@ static void qemu_aarch64_domain_read_resources(struct device *dev) 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 5d24c5ba7f20..5fe12e715dee 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -230,7 +230,7 @@ static const char *qemu_acpi_name(const struct device *dev) 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 0c389d5443df..bafe5a581014 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -840,7 +840,7 @@ static const char *domain_acpi_name(const struct device *dev) 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 b51b2ab5c48d..65a021210ed5 100644 --- a/src/northbridge/intel/e7505/northbridge.c +++ b/src/northbridge/intel/e7505/northbridge.c @@ -58,7 +58,7 @@ static void mch_domain_set_resources(struct device *dev) 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 07dba86faea4..4bddf2069234 100644 --- a/src/northbridge/intel/gm45/northbridge.c +++ b/src/northbridge/intel/gm45/northbridge.c @@ -183,7 +183,7 @@ struct device_operations gm45_pci_domain_ops = { .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 73afe07a3114..ef5b9e9f0d74 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -36,7 +36,7 @@ static const char *northbridge_acpi_name(const struct device *dev) 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 bc6541fce077..0670f725f073 100644 --- a/src/northbridge/intel/i440bx/northbridge.c +++ b/src/northbridge/intel/i440bx/northbridge.c @@ -69,7 +69,7 @@ static void i440bx_domain_read_resources(struct device *dev) 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 47c14f78069f..1dfcc4005b30 100644 --- a/src/northbridge/intel/i945/northbridge.c +++ b/src/northbridge/intel/i945/northbridge.c @@ -97,7 +97,7 @@ void northbridge_write_smram(u8 smram) 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 8c434aa54cdb..74ddee2d8e1d 100644 --- a/src/northbridge/intel/ironlake/northbridge.c +++ b/src/northbridge/intel/ironlake/northbridge.c @@ -71,7 +71,7 @@ static const char *northbridge_acpi_name(const struct device *dev) 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 7689d34be9ef..a23a0d5a68e2 100644 --- a/src/northbridge/intel/pineview/northbridge.c +++ b/src/northbridge/intel/pineview/northbridge.c @@ -137,7 +137,7 @@ static struct device_operations pci_domain_ops = { .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 ee4ddc589486..9511cc323d65 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -55,7 +55,7 @@ static const char *northbridge_acpi_name(const struct device *dev) 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 a3e1bd29d81c..12a7a40d0668 100644 --- a/src/northbridge/intel/x4x/northbridge.c +++ b/src/northbridge/intel/x4x/northbridge.c @@ -111,7 +111,7 @@ struct device_operations x4x_pci_domain_ops = { .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 01fad999b49e..4ec52fcbd8ec 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 @@ void amd_pci_domain_scan_bus(struct device *domain) /* 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 eaa0e9ad6cb9..09cede3ddb34 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -84,7 +84,7 @@ struct device_operations stoneyridge_pci_domain_ops = { .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 e789fd8db13c..d02e8843f223 100644 --- a/src/soc/cavium/cn81xx/ecam0.c +++ b/src/soc/cavium/cn81xx/ecam0.c @@ -312,5 +312,5 @@ static void ecam0_init(struct device *dev) 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 8b32b965b52a..063915798dcc 100644 --- a/src/soc/intel/alderlake/chip.c +++ b/src/soc/intel/alderlake/chip.c @@ -248,7 +248,7 @@ static void cpu_set_north_irqs(struct device *dev) 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 37b3186af58e..07c2637ecd25 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -202,7 +202,7 @@ const char *soc_acpi_name(const struct device *dev) 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 1f72dc449025..592e17879aa5 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 e2ee0a930156..ce394d0baa10 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 d3c899ea79c8..652527520f61 100644 --- a/src/soc/intel/broadwell/northbridge.c +++ b/src/soc/intel/broadwell/northbridge.c @@ -400,7 +400,7 @@ static const struct pci_driver systemagent_driver __pci_driver = { 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 19b8c396b3c0..0ece32c64628 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -174,7 +174,7 @@ static void cpu_set_north_irqs(struct device *dev) 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 3d974a2214d1..1a4341e1d6e3 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -109,7 +109,7 @@ const char *soc_acpi_name(const struct device *dev) 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 4d61c3b5edaa..20e46c04d87c 100644 --- a/src/soc/intel/elkhartlake/chip.c +++ b/src/soc/intel/elkhartlake/chip.c @@ -132,7 +132,7 @@ void soc_init_pre_device(void *chip_info) 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 e51a60181178..c049163feca8 100644 --- a/src/soc/intel/jasperlake/chip.c +++ b/src/soc/intel/jasperlake/chip.c @@ -139,7 +139,7 @@ void soc_init_pre_device(void *chip_info) 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 954c32bdfcbe..a1b19682afde 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/chip.c @@ -203,7 +203,7 @@ static void cpu_set_north_irqs(struct device *dev) 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 70d12e4316ab..8df1ad354395 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -189,7 +189,7 @@ void soc_init_pre_device(void *chip_info) 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 15281c8c465d..024763dd7f8b 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -179,7 +179,7 @@ static void cpu_set_north_irqs(struct device *dev) 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 2ecc31e5518f..5425695bafda 100644 --- a/src/soc/mediatek/mt8195/soc.c +++ b/src/soc/mediatek/mt8195/soc.c @@ -53,7 +53,7 @@ static struct device_operations soc_ops = { 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 268f0801948b..e6dbf219784e 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, }; -- cgit v1.2.3