[coreboot] New patch to review for coreboot: 53d4234 Move cpus_ready_for_init() to AMD K8

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Sat Jul 7 12:45:04 CEST 2012


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1184

-gerrit

commit 53d42342667eaa94da20df258d5d49664c015f58
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sat Jul 7 13:42:03 2012 +0300

    Move cpus_ready_for_init() to AMD K8
    
    The function is a noop for all but amd/serengeti_cheetah.
    
    Change-Id: I09e2e710aa964c2f31e35fcea4f14856cc1e1dca
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/x86/lapic/lapic_cpu_init.c      |    2 --
 src/include/cpu/cpu.h                   |    6 ------
 src/northbridge/amd/amdk8/amdk8.h       |    2 ++
 src/northbridge/amd/amdk8/northbridge.c |    3 +++
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index b6dc560..302eeba 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -286,8 +286,6 @@ void initialize_cpus(struct bus *cpu_bus)
 	smm_init();
 #endif
 
-	cpus_ready_for_init();
-
 	/* Initialize the bootstrap processor */
 	cpu_initialize(cpu_bus, 0);
 
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 9765dfd..90e4620 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -11,12 +11,6 @@ void secondary_cpu_init(int index);
 
 extern unsigned int cpucount;
 
-#if !CONFIG_WAIT_BEFORE_CPUS_INIT
-	#define cpus_ready_for_init() do {} while(0)
-#else
-	void cpus_ready_for_init(void);
-#endif
-
 #if CONFIG_HAVE_SMI_HANDLER
 void smm_init(void);
 void smm_lock(void);
diff --git a/src/northbridge/amd/amdk8/amdk8.h b/src/northbridge/amd/amdk8/amdk8.h
index 5aa3b31..e001706 100644
--- a/src/northbridge/amd/amdk8/amdk8.h
+++ b/src/northbridge/amd/amdk8/amdk8.h
@@ -14,4 +14,6 @@ void setup_resource_map_offset(const unsigned int *register_values, int max, uns
 void fill_mem_ctrl(int controllers, struct mem_controller *ctrl_a, const uint16_t *spd_addr);
 #endif
 
+void cpus_ready_for_init(void);
+
 #endif /* AMDK8_H */
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 5eeeda2..cf80389 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -1331,6 +1331,9 @@ static u32 cpu_bus_scan(device_t dev, u32 max)
 
 static void cpu_bus_init(device_t dev)
 {
+#if CONFIG_WAIT_BEFORE_CPUS_INIT
+	cpus_ready_for_init();
+#endif
 	initialize_cpus(dev->link_list);
 }
 




More information about the coreboot mailing list