diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-08 22:23:54 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-09 21:32:15 +0000 |
| commit | dd2f3fa533eb8f7537aa480b20d9bbf61f01d6a7 (patch) | |
| tree | d17a8cc4e58991bb9cc316883ffc48c3fc226618 /src/soc/amd/picasso | |
| parent | cf6dc7d3a147ef39de84e33d2ce43c103a6b831b (diff) | |
| download | coreboot-dd2f3fa533eb8f7537aa480b20d9bbf61f01d6a7.tar.xz | |
soc/amd/picasso/cpu: move get_cpu_count to common code
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I0690787f492d764a20a4219822eb10fb5cd86de0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50406
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/soc/amd/picasso')
| -rw-r--r-- | src/soc/amd/picasso/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/agesa_acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/cpu.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/cpu.h | 1 |
4 files changed, 3 insertions, 8 deletions
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index eba9dfee3d..2f08dce852 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -19,9 +19,9 @@ #include <device/pci.h> #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> +#include <amdblocks/cpu.h> #include <soc/acpi.h> #include <soc/pci_devs.h> -#include <soc/cpu.h> #include <soc/msr.h> #include <soc/southbridge.h> #include <soc/nvs.h> diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 6020ec0017..119dd55b89 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -12,7 +12,7 @@ #include <stdint.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <soc/cpu.h> +#include <amdblocks/cpu.h> #include <soc/data_fabric.h> #include <soc/pci_devs.h> #include <stdlib.h> diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index 5979fc6a82..b18a3b4641 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/cpu.h> #include <cpu/cpu.h> #include <cpu/x86/mp.h> #include <cpu/x86/mtrr.h> @@ -41,11 +42,6 @@ static void pre_mp_init(void) x86_mtrr_check(); } -int get_cpu_count(void) -{ - return 1 + (cpuid_ecx(0x80000008) & 0xff); -} - static void set_cstate_io_addr(void) { msr_t cst_addr; diff --git a/src/soc/amd/picasso/include/soc/cpu.h b/src/soc/amd/picasso/include/soc/cpu.h index 3f6cd247c2..79d5cc6536 100644 --- a/src/soc/amd/picasso/include/soc/cpu.h +++ b/src/soc/amd/picasso/include/soc/cpu.h @@ -3,7 +3,6 @@ #ifndef AMD_PICASSO_CPU_H #define AMD_PICASSO_CPU_H -int get_cpu_count(void); void check_mca(void); #define RAVEN1_B0_CPUID 0x00810f10 |