diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-06-03 09:20:05 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-06-04 03:03:18 -0600 |
| commit | f2653e8dd92229328480da35c26e6f9fbfec4381 (patch) | |
| tree | 774cce23bd148a5a3d3e831d0823907f7d8486d9 /arch | |
| parent | 683b09d7837a71fb4c5dd53919c6afa4d800e60e (diff) | |
| download | talos-obmc-uboot-f2653e8dd92229328480da35c26e6f9fbfec4381.tar.gz talos-obmc-uboot-f2653e8dd92229328480da35c26e6f9fbfec4381.zip | |
x86: coreboot: Control I/O port 0xb2 writing via device tree
Writing 0xcb to I/O port 0xb2 (Advanced Power Management Control) causes
U-Boot to hang on QEMU q35 target. We introduce a config option in the
device tree "u-boot,no-apm-finalize" under /config node if we don't want
to do that.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/coreboot/coreboot.c | 12 | ||||
| -rw-r--r-- | arch/x86/dts/qemu-x86_q35.dts | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index c3dfd28fff..c4cac045b2 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <fdtdec.h> #include <netdev.h> #include <asm/io.h> #include <asm/msr.h> @@ -74,9 +75,14 @@ void board_final_cleanup(void) mtrr_close(&state); } - /* Issue SMI to Coreboot to lock down ME and registers */ - printf("Finalizing Coreboot\n"); - outb(0xcb, 0xb2); + if (!fdtdec_get_config_bool(gd->fdt_blob, "u-boot,no-apm-finalize")) { + /* + * Issue SMI to coreboot to lock down ME and registers + * when allowed via device tree + */ + printf("Finalizing coreboot\n"); + outb(0xcb, 0xb2); + } } int misc_init_r(void) diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts index 6c89283bd6..02a483cd37 100644 --- a/arch/x86/dts/qemu-x86_q35.dts +++ b/arch/x86/dts/qemu-x86_q35.dts @@ -15,6 +15,7 @@ config { silent_console = <0>; + u-boot,no-apm-finalize; }; chosen { |
