diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/intel/haswell/bootblock.c | 9 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/bootblock.c | 3 | ||||
| -rw-r--r-- | src/cpu/intel/model_206ax/bootblock.c | 3 |
3 files changed, 7 insertions, 8 deletions
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 <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <arch/io.h> +#include <halt.h> #include <cpu/intel/microcode/microcode.c> #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(); } } diff --git a/src/cpu/intel/model_2065x/bootblock.c b/src/cpu/intel/model_2065x/bootblock.c index fa8e137c00..23fb02ab88 100644 --- a/src/cpu/intel/model_2065x/bootblock.c +++ b/src/cpu/intel/model_2065x/bootblock.c @@ -23,6 +23,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <arch/io.h> +#include <halt.h> #include <cpu/intel/microcode/microcode.c> @@ -109,7 +110,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); - asm("hlt"); + halt(); } static void bootblock_cpu_init(void) diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index 49c4012eee..d6fa2e7521 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -23,6 +23,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <arch/io.h> +#include <halt.h> #include <cpu/intel/microcode/microcode.c> #include "model_206ax.h" @@ -110,7 +111,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); - asm("hlt"); + halt(); } static void bootblock_cpu_init(void) |