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>
This commit is contained in:
Felix Held 2021-02-08 22:23:54 +01:00
parent cf6dc7d3a1
commit dd2f3fa533
7 changed files with 14 additions and 8 deletions

View File

@ -3,6 +3,7 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR),y)
bootblock-y += pre_c.S
bootblock-y += write_resume_eip.c
romstage-y += memmap.c
ramstage-y += cpu.c
ramstage-y += memmap.c
endif # CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR

View File

@ -0,0 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/cpu.h>
#include <cpu/cpu.h>
int get_cpu_count(void)
{
return 1 + (cpuid_ecx(0x80000008) & 0xff);
}

View File

@ -3,6 +3,7 @@
#ifndef AMD_BLOCK_CPU_H
#define AMD_BLOCK_CPU_H
int get_cpu_count(void);
void write_resume_eip(void);
#endif /* AMD_BLOCK_CPU_H */

View File

@ -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>

View File

@ -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>

View File

@ -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;

View File

@ -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