From 44807acaefc71cd4985779e742e6791cb9daf65d Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 13 Sep 2022 12:43:37 +0200 Subject: soc/amd/common: Add common function to get cpu count This is the same for all supported AMD hardware. Change-Id: Ic6b954308dbb4c5a2050f1eb8f15acb41d0b81bd Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/67617 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/common/block/cpu/Makefile.inc | 2 ++ src/soc/amd/common/block/cpu/cpu.c | 9 +++++++++ src/soc/amd/common/block/cpu/noncar/cpu.c | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 src/soc/amd/common/block/cpu/cpu.c (limited to 'src/soc/amd/common') diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index 34685689de..7541a9bd5b 100644 --- a/src/soc/amd/common/block/cpu/Makefile.inc +++ b/src/soc/amd/common/block/cpu/Makefile.inc @@ -1,5 +1,7 @@ subdirs-y += ./* ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_UCODE) += update_microcode.c +romstage-y += cpu.c +ramstage-y += cpu.c ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_UCODE),y) define add-ucode-as-cbfs diff --git a/src/soc/amd/common/block/cpu/cpu.c b/src/soc/amd/common/block/cpu/cpu.c new file mode 100644 index 0000000000..bece89bc72 --- /dev/null +++ b/src/soc/amd/common/block/cpu/cpu.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include + +int get_cpu_count(void) +{ + return 1 + (cpuid_ecx(0x80000008) & 0xff); +} diff --git a/src/soc/amd/common/block/cpu/noncar/cpu.c b/src/soc/amd/common/block/cpu/noncar/cpu.c index 56d4eb0384..8fd371564e 100644 --- a/src/soc/amd/common/block/cpu/noncar/cpu.c +++ b/src/soc/amd/common/block/cpu/noncar/cpu.c @@ -8,11 +8,6 @@ #include #include -int get_cpu_count(void) -{ - return 1 + (cpuid_ecx(0x80000008) & 0xff); -} - unsigned int smbios_processor_family(struct cpuid_result res) { return 0x6b; /* Zen */ -- cgit v1.2.3