From 45aae7f10ff2b2fc6a947eb2667eb658188d3b52 Mon Sep 17 00:00:00 2001 From: Fabio Aiuto Date: Fri, 23 Sep 2022 16:51:34 +0200 Subject: [PATCH] treewide: use is_enabled_cpu() on cycles over device list use is_enabled_cpu() on cycles over device list to check whether the current device is enabled cpu. TEST: compile test and qemu run successfully with coreinfo payload Signed-off-by: Fabio Aiuto Change-Id: If64bd18f006b6f5fecef4f606c1df7d3a4d42883 Reviewed-on: https://review.coreboot.org/c/coreboot/+/67797 Reviewed-by: Tim Wawrzynczak Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/acpi/acpi.c | 6 +----- src/arch/x86/mpspec.c | 7 +------ src/cpu/intel/speedstep/acpi.c | 6 +----- src/device/device_util.c | 5 +---- src/mainboard/prodrive/hermes/mainboard.c | 6 +----- src/soc/intel/xeon_sp/cpx/soc_acpi.c | 6 +----- src/soc/intel/xeon_sp/nb_acpi.c | 6 +----- src/soc/intel/xeon_sp/skx/soc_acpi.c | 6 +----- src/southbridge/intel/i82371eb/acpi_tables.c | 7 +------ 9 files changed, 9 insertions(+), 46 deletions(-) diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 78d5f07045..e211558f62 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -147,11 +147,7 @@ unsigned long acpi_create_madt_lapics(unsigned long current) int index, apic_ids[CONFIG_MAX_CPUS] = {0}, num_cpus = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { - continue; - } - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; if (num_cpus >= ARRAY_SIZE(apic_ids)) break; diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c index 93058f1db2..2e65e252d5 100644 --- a/src/arch/x86/mpspec.c +++ b/src/arch/x86/mpspec.c @@ -160,12 +160,7 @@ void smp_write_processors(struct mp_config_table *mc) for (order_id = 0; order_id < 256; order_id++) { for (cpu = all_devices; cpu; cpu = cpu->next) { unsigned long cpu_flag; - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != - DEVICE_PATH_CPU_CLUSTER)) - continue; - - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; cpu_flag = MPC_CPU_ENABLED; diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index b340b6d511..d997ee867c 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -14,11 +14,7 @@ static int determine_total_number_of_cores(void) struct device *cpu; int count = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { - continue; - } - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; count++; } diff --git a/src/device/device_util.c b/src/device/device_util.c index 1e13bca151..0be6cfbf36 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -917,10 +917,7 @@ int dev_count_cpu(void) int count = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) - continue; - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; count++; } diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c index 2f0de61843..a713342d96 100644 --- a/src/mainboard/prodrive/hermes/mainboard.c +++ b/src/mainboard/prodrive/hermes/mainboard.c @@ -104,11 +104,7 @@ static void update_board_layout(void) /* Update CPU fields */ for (struct device *cpu = all_devices; cpu; cpu = cpu->next) { - if (cpu->path.type != DEVICE_PATH_APIC) - continue; - if (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER) - continue; - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; layout.cpu_count++; if (!layout.cpu_name[0]) diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index 0d102a13a6..d6e7cf0c87 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -224,11 +224,7 @@ unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current) uint8_t num_cpus = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { - continue; - } - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, num_cpus, cpu->path.apic.apic_id); diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c index b3e4575f4d..64851f5bbc 100644 --- a/src/soc/intel/xeon_sp/nb_acpi.c +++ b/src/soc/intel/xeon_sp/nb_acpi.c @@ -25,11 +25,7 @@ unsigned long acpi_create_srat_lapics(unsigned long current) unsigned int cpu_index = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { - continue; - } - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; printk(BIOS_DEBUG, "SRAT: lapic cpu_index=%02x, node_id=%02x, apic_id=%02x\n", cpu_index, cpu->path.apic.node_id, cpu->path.apic.apic_id); diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index 23bb6d6e3c..621e755636 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -155,11 +155,7 @@ unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current) uint8_t num_cpus = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { - continue; - } - if (!cpu->enabled) + if (!is_enabled_cpu(cpu)) continue; current += acpi_create_madt_lapic((acpi_madt_lapic_t *)current, num_cpus, cpu->path.apic.apic_id); diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c index 5d4ca699a9..c23c2f6f31 100644 --- a/src/southbridge/intel/i82371eb/acpi_tables.c +++ b/src/southbridge/intel/i82371eb/acpi_tables.c @@ -11,13 +11,8 @@ static int determine_total_number_of_cores(void) struct device *cpu; int count = 0; for (cpu = all_devices; cpu; cpu = cpu->next) { - if ((cpu->path.type != DEVICE_PATH_APIC) || - (cpu->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) { + if (!is_enabled_cpu(cpu)) continue; - } - if (!cpu->enabled) { - continue; - } count++; } return count;