commit d1d4f937ec7ecf8032911fbce2ff899b14199384
author Kyösti Mälkki <kyosti.malkki@gmail.com> Sun Sep 24 08:21:00 2017 +0300
committer Patrick Georgi <pgeorgi@google.com> Sat May 25 08:37:57 2019 +0000
tree df3650d4ab355655a8484e0b7b67c5a3c202032c
parent ec85e2f55df026e2097fa5e56ec3605ab0762256

AGESA: Move debug helper to eventlog file

Change-Id: I2d74f934936e250886526b9c8482f500628a1158
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31513
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/drivers/amd/agesa/state_machine.c

diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index 90bf038..03c6582 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/src/drivers/amd/agesa/state_machine.c
@@ -26,7 +26,6 @@
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 #include <amdlib.h>
 
-#include <debug_util.h>
 #include <AMD.h>
 
 #if CONFIG(CPU_AMD_AGESA_OPENSOURCE)
@@ -231,38 +230,6 @@
 	return status;
 }
 
-/* DEBUG trace helper */
-
-struct agesa_state
-{
-	u8 apic_id;
-
-	AGESA_STRUCT_NAME func;
-	const char *function_name;
-};
-
-static void state_on_entry(struct agesa_state *task, AGESA_STRUCT_NAME func,
-	const char *struct_name)
-{
-	task->apic_id = (u8) (cpuid_ebx(1) >> 24);
-	task->func = func;
-	task->function_name = struct_name;
-
-	printk(BIOS_DEBUG, "\nAPIC %02d: ** Enter %s [%08x]\n",
-		task->apic_id, task->function_name, task->func);
-}
-
-static void state_on_exit(struct agesa_state *task,
-	AMD_CONFIG_PARAMS *StdHeader)
-{
-	printk(BIOS_DEBUG, "APIC %02d: Heap in %s (%d) at 0x%08x\n",
-		task->apic_id, heap_status_name(StdHeader->HeapStatus),
-		StdHeader->HeapStatus, (u32)StdHeader->HeapBasePtr);
-
-	printk(BIOS_DEBUG, "APIC %02d: ** Exit  %s [%08x]\n",
-		task->apic_id, task->function_name, task->func);
-}
-
 int agesa_execute_state(struct sysinfo *cb, AGESA_STRUCT_NAME func)
 {
 	AMD_INTERFACE_PARAMS aip;
@@ -272,13 +239,12 @@
 	} agesa_params;
 	void *buf = NULL;
 	size_t len = 0;
-	const char *state_name = agesa_struct_name(func);
 
 	AGESA_STATUS status, final;
 
 	struct agesa_state task;
 	memset(&task, 0, sizeof(task));
-	state_on_entry(&task, func, state_name);
+	agesa_state_on_entry(&task, func);
 
 	aip.StdHeader = cb->StdHeader;
 
@@ -302,13 +268,13 @@
 	if (ENV_RAMSTAGE)
 		final = ramstage_dispatch(cb, func, StdHeader);
 
-	agesawrapper_trace(final, StdHeader, state_name);
+	agesawrapper_trace(final, StdHeader, task.function_name);
 	ASSERT(final < AGESA_FATAL);
 
 	status = amd_release_struct(&aip);
 	ASSERT(status == AGESA_SUCCESS);
 
-	state_on_exit(&task, &aip.StdHeader);
+	agesa_state_on_exit(&task, &aip.StdHeader);
 
 	return (final < AGESA_FATAL) ? 0 : -1;
 }