From 92e3c5e3c12ad70290ae2a3f9c494b9fe41e98d4 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Thu, 7 Feb 2008 16:09:24 +0000 Subject: [PATCH] If there is a problem loading VSA we should stop here instead of failing in PCI scan later. Signed-off-by: Marc Jones Acked-by: Ronald G. Minnich git-svn-id: svn://coreboot.org/repository/coreboot-v3@576 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- northbridge/amd/geodelx/vsmsetup.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/northbridge/amd/geodelx/vsmsetup.c b/northbridge/amd/geodelx/vsmsetup.c index 1f1f5844d7..5591143020 100644 --- a/northbridge/amd/geodelx/vsmsetup.c +++ b/northbridge/amd/geodelx/vsmsetup.c @@ -183,13 +183,11 @@ void do_vsmbios(void) init_archive(&archive); if (find_file(&archive, "blob/vsa", &file)){ - printk(BIOS_ERR, "NO VSA found!\n"); - return; + die("FATAL: NO VSA found!\n"); } if (process_file(&file, (void *)VSA2_BUFFER)) { - printk(BIOS_ERR, "Processing /blob/vsa failed\n"); - return; + die("FATAL: Processing /blob/vsa failed\n"); } buf = (unsigned char *)VSA2_BUFFER; @@ -202,8 +200,7 @@ void do_vsmbios(void) don't bother. */ if ((buf[0x20] != 0xb0) || (buf[0x21] != 0x10) || (buf[0x22] != 0xe6) || (buf[0x23] != 0x80)) { - printk(BIOS_ERR, "do_vsmbios: no vsainit.bin signature, skipping!\n"); - return; + die("FATAL: no vsainit.bin signature, skipping!\n"); } /* ecx gets smm, edx gets sysm */ @@ -218,7 +215,6 @@ void do_vsmbios(void) if (VSA_vrRead(SIGNATURE) == VSA2_SIGNATURE) printk(BIOS_DEBUG, "do_vsmbios: VSA2 VR signature verified\n"); else - printk(BIOS_ERR, - "do_vsmbios: VSA2 VR signature not valid, install failed!\n"); + die("FATAL: VSA2 VR signature not valid, install failed!\n"); }