[coreboot] [PATCH] AMD F10h: avoid timeout when waiting forAP core completion

[Scott Duplichan]

]> patch eliminates the timeout by making function wait_cpu_state
]> recognize 01 as an additional valid AP completion value.
]
]Do we want some names for those values? (rather than magical 1?)
]
]> Signed-off-by: Scott Duplichan <scott at notabs.org>
]
]Acked-by: Peter Stuge <peter at stuge.se>

Hello Peter,

How about this:

Signed-off-by: Scott Duplichan <scott at notabs.org>

Index: src/cpu/amd/model_10xxx/fidvid.c
===================================================================
--- src/cpu/amd/model_10xxx/fidvid.c	(revision 5965)
+++ src/cpu/amd/model_10xxx/fidvid.c	(working copy)
@@ -530,7 +530,7 @@
 
 	// Send signal to BSP about this AP max fid
 	// This also indicates this AP is ready for warm reset (if required).
-	lapic_write(LAPIC_MSG_REG, send | 1);
+	lapic_write(LAPIC_MSG_REG, send | F10_APSTATE_RESET);
 }
 
 static u32 calc_common_fid(u32 fid_packed, u32 fid_packed_new)
Index: src/cpu/amd/model_10xxx/init_cpus.c
===================================================================
--- src/cpu/amd/model_10xxx/init_cpus.c	(revision 5965)
+++ src/cpu/amd/model_10xxx/init_cpus.c	(working copy)
@@ -166,9 +166,6 @@
 	return result;
 }
 
-/* Use the LAPIC timer count register to hold each cores init status */
-#define LAPIC_MSG_REG 0x380
-
 #if SET_FIDVID == 1
 static void init_fidvid_ap(u32 bsp_apicid, u32 apicid, u32 nodeid, u32 coreid);
 #endif
@@ -190,7 +187,7 @@
 	while (--loop > 0) {
 		if (lapic_remote_read(apicid, LAPIC_MSG_REG, &readback) != 0)
 			continue;
-		if ((readback & 0x3f) == state) {
+		if ((readback & 0x3f) == state || (readback & 0x3f) == F10_APSTATE_RESET) {
 			timeout = 0;
 			break;	//target cpu is in stage started
 		}
@@ -207,7 +204,7 @@
 static void wait_ap_started(u32 ap_apicid, void *gp)
 {
 	u32 timeout;
-	timeout = wait_cpu_state(ap_apicid, 0x13);	// started
+	timeout = wait_cpu_state(ap_apicid, F10_APSTATE_STARTED);
 	printk(BIOS_DEBUG, "* AP %02x", ap_apicid);
 	if (timeout) {
 		printk(BIOS_DEBUG, " timed out:%08x\n", timeout);
@@ -231,7 +228,7 @@
 	/* FIXME Do APs use this? */
 
 	// allow aps to stop use 6 bits for state
-	lapic_write(LAPIC_MSG_REG, (bsp_apicid << 24) | 0x14);
+	lapic_write(LAPIC_MSG_REG, (bsp_apicid << 24) | F10_APSTATE_STOPPED);
 }
 
 static void enable_apic_ext_id(u32 node)
@@ -331,7 +328,7 @@
 			distinguish_cpu_resets(id.nodeid);	// Also indicates we are started
 	}
 	// Mark the core as started.
-	lapic_write(LAPIC_MSG_REG, (apicid << 24) | 0x13);
+	lapic_write(LAPIC_MSG_REG, (apicid << 24) | F10_APSTATE_STARTED);
 
 	if (apicid != bsp_apicid) {
 		/* Setup each AP's cores MSRs.
Index: src/northbridge/amd/amdfam10/amdfam10.h
===================================================================
--- src/northbridge/amd/amdfam10/amdfam10.h	(revision 5965)
+++ src/northbridge/amd/amdfam10/amdfam10.h	(working copy)
@@ -953,6 +953,16 @@
 #define NonCoherent	   (1 << 2)
 #define ConnectionPending (1 << 4)
 
+// Use the LAPIC timer count register to hold each core's init status
+//   Format: byte 0 - state
+//           byte 1 - fid_max
+//           byte 2 - nb_cof_vid_update
+//           byte 3 - apic id
+   
+#define LAPIC_MSG_REG 0x380
+#define F10_APSTATE_STARTED 0x13  // start of AP execution
+#define F10_APSTATE_STOPPED 0x14  // allow AP to stop
+#define F10_APSTATE_RESET   0x01  // waiting for warm reset
 
 #include "amdfam10_nums.h"