From 546953c0c553465761705fb0747964c08d634461 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 29 Nov 2014 10:38:17 +0100 Subject: Replace hlt with halt() There were instances of unneeded arch/hlt.h includes, various hlt() calls that weren't supposed to exit (but might have) and various forms of endless loops around hlt() calls. All these are sorted out now: unnecessary includes are dropped, hlt() is uniformly replaced with halt() (except in assembly, obviously). Change-Id: I3d38fed6e8d67a28fdeb17be803d8c4b62d383c5 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/7608 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel --- src/cpu/intel/haswell/bootblock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/cpu/intel/haswell') diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c index 4857f23e69..366c56b179 100644 --- a/src/cpu/intel/haswell/bootblock.c +++ b/src/cpu/intel/haswell/bootblock.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "haswell.h" @@ -106,9 +107,7 @@ static void set_flex_ratio_to_tdp_nominal(void) /* Issue warm reset, will be "CPU only" due to soft reset data */ outb(0x0, 0xcf9); outb(0x6, 0xcf9); - while (1) { - asm("hlt"); - } + halt(); } static void check_for_clean_reset(void) @@ -122,9 +121,7 @@ static void check_for_clean_reset(void) if (msr.lo & (MTRRdefTypeEn | MTRRdefTypeFixEn)) { outb(0x0, 0xcf9); outb(0x6, 0xcf9); - while (1) { - asm("hlt"); - } + halt(); } } -- cgit v1.2.3