soc/amd: Use mp_cpu_bus_init()
Change-Id: Ia4508a9a087e3996ef7667280f8e2788421e5700 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41952 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
parent
0ef6562656
commit
79e12abb1b
6 changed files with 6 additions and 12 deletions
|
@ -20,7 +20,7 @@ extern const char *i2c_acpi_name(const struct device *dev);
|
||||||
struct device_operations cpu_bus_ops = {
|
struct device_operations cpu_bus_ops = {
|
||||||
.read_resources = noop_read_resources,
|
.read_resources = noop_read_resources,
|
||||||
.set_resources = noop_set_resources,
|
.set_resources = noop_set_resources,
|
||||||
.init = picasso_init_cpus,
|
.init = mp_cpu_bus_init,
|
||||||
.acpi_fill_ssdt = generate_cpu_entries,
|
.acpi_fill_ssdt = generate_cpu_entries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -92,10 +92,10 @@ static const struct mp_ops mp_ops = {
|
||||||
.post_mp_init = enable_smi_generation,
|
.post_mp_init = enable_smi_generation,
|
||||||
};
|
};
|
||||||
|
|
||||||
void picasso_init_cpus(struct device *dev)
|
void mp_init_cpus(struct bus *cpu_bus)
|
||||||
{
|
{
|
||||||
/* Clear for take-off */
|
/* Clear for take-off */
|
||||||
if (mp_init_with_smm(dev->link_list, &mp_ops) < 0)
|
if (mp_init_with_smm(cpu_bus, &mp_ops) < 0)
|
||||||
printk(BIOS_ERR, "MP initialization failure.\n");
|
printk(BIOS_ERR, "MP initialization failure.\n");
|
||||||
|
|
||||||
/* The flash is now no longer cacheable. Reset to WP for performance. */
|
/* The flash is now no longer cacheable. Reset to WP for performance. */
|
||||||
|
|
|
@ -3,11 +3,8 @@
|
||||||
#ifndef __PICASSO_CPU_H__
|
#ifndef __PICASSO_CPU_H__
|
||||||
#define __PICASSO_CPU_H__
|
#define __PICASSO_CPU_H__
|
||||||
|
|
||||||
#include <device/device.h>
|
|
||||||
|
|
||||||
#define CSTATE_BASE_REG 0xc0010073
|
#define CSTATE_BASE_REG 0xc0010073
|
||||||
|
|
||||||
void picasso_init_cpus(struct device *dev);
|
|
||||||
int get_cpu_count(void);
|
int get_cpu_count(void);
|
||||||
void check_mca(void);
|
void check_mca(void);
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ extern const char *i2c_acpi_name(const struct device *dev);
|
||||||
struct device_operations cpu_bus_ops = {
|
struct device_operations cpu_bus_ops = {
|
||||||
.read_resources = noop_read_resources,
|
.read_resources = noop_read_resources,
|
||||||
.set_resources = noop_set_resources,
|
.set_resources = noop_set_resources,
|
||||||
.init = stoney_init_cpus,
|
.init = mp_cpu_bus_init,
|
||||||
.acpi_fill_ssdt = generate_cpu_entries,
|
.acpi_fill_ssdt = generate_cpu_entries,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -93,10 +93,10 @@ static const struct mp_ops mp_ops = {
|
||||||
.post_mp_init = enable_smi_generation,
|
.post_mp_init = enable_smi_generation,
|
||||||
};
|
};
|
||||||
|
|
||||||
void stoney_init_cpus(struct device *dev)
|
void mp_init_cpus(struct bus *cpu_bus)
|
||||||
{
|
{
|
||||||
/* Clear for take-off */
|
/* Clear for take-off */
|
||||||
if (mp_init_with_smm(dev->link_list, &mp_ops) < 0)
|
if (mp_init_with_smm(cpu_bus, &mp_ops) < 0)
|
||||||
printk(BIOS_ERR, "MP initialization failure.\n");
|
printk(BIOS_ERR, "MP initialization failure.\n");
|
||||||
|
|
||||||
/* The flash is now no longer cacheable. Reset to WP for performance. */
|
/* The flash is now no longer cacheable. Reset to WP for performance. */
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
#ifndef __STONEYRIDGE_CPU_H__
|
#ifndef __STONEYRIDGE_CPU_H__
|
||||||
#define __STONEYRIDGE_CPU_H__
|
#define __STONEYRIDGE_CPU_H__
|
||||||
|
|
||||||
#include <device/device.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set a variable MTRR in bootblock and/or romstage. AGESA will use the lowest
|
* Set a variable MTRR in bootblock and/or romstage. AGESA will use the lowest
|
||||||
* numbered registers. Any values defined below are subtracted from the
|
* numbered registers. Any values defined below are subtracted from the
|
||||||
|
@ -16,7 +14,6 @@
|
||||||
#define SOC_EARLY_VMTRR_CAR_HEAP 2
|
#define SOC_EARLY_VMTRR_CAR_HEAP 2
|
||||||
#define SOC_EARLY_VMTRR_TEMPRAM 3
|
#define SOC_EARLY_VMTRR_TEMPRAM 3
|
||||||
|
|
||||||
void stoney_init_cpus(struct device *dev);
|
|
||||||
void check_mca(void);
|
void check_mca(void);
|
||||||
|
|
||||||
#endif /* __STONEYRIDGE_CPU_H__ */
|
#endif /* __STONEYRIDGE_CPU_H__ */
|
||||||
|
|
Loading…
Reference in a new issue