diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-07-27 19:16:08 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-05 08:42:38 -0600 |
| commit | a2eb65fcad4c66ee6992e18d8bea15fd0b07886e (patch) | |
| tree | 12f02c4b7aafaf51930ca8e3c8cfa9b39a364265 | |
| parent | 417576c2f1f2c5392cd69ef3ed33668cc9900e6e (diff) | |
x86: qemu: Add MP initialization
Add a cpu1 node to the device tree and enable the MP initialization
on QEMU targets (i440fx and q35).
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/x86/dts/qemu-x86_i440fx.dts | 7 | ||||
| -rw-r--r-- | arch/x86/dts/qemu-x86_q35.dts | 7 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 2 | ||||
| -rw-r--r-- | doc/README.x86 | 5 |
4 files changed, 21 insertions, 0 deletions
diff --git a/arch/x86/dts/qemu-x86_i440fx.dts b/arch/x86/dts/qemu-x86_i440fx.dts index c26c71bcf73..fc74cd0f014 100644 --- a/arch/x86/dts/qemu-x86_i440fx.dts +++ b/arch/x86/dts/qemu-x86_i440fx.dts @@ -34,6 +34,13 @@ reg = <0>; intel,apic-id = <0>; }; + + cpu@1 { + device_type = "cpu"; + compatible = "cpu-x86"; + reg = <1>; + intel,apic-id = <1>; + }; }; pci { diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts index 2e785fa4bf5..7f16971783b 100644 --- a/arch/x86/dts/qemu-x86_q35.dts +++ b/arch/x86/dts/qemu-x86_q35.dts @@ -45,6 +45,13 @@ reg = <0>; intel,apic-id = <0>; }; + + cpu@1 { + device_type = "cpu"; + compatible = "cpu-x86"; + reg = <1>; + intel,apic-id = <1>; + }; }; pci { diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 4b18d517386..e579c36200c 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -1,5 +1,7 @@ CONFIG_X86=y CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" +CONFIG_SMP=y +CONFIG_MAX_CPUS=2 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_CMD_CPU=y diff --git a/doc/README.x86 b/doc/README.x86 index 5d712445df5..1cab42cc41f 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -281,6 +281,11 @@ QEMU emulates a graphic card which U-Boot supports. Removing '-nographic' will show QEMU's VGA console window. Note this will disable QEMU's serial output. If you want to check both consoles, use '-serial stdio'. +Multicore is also supported by QEMU via '-smp n' where n is the number of cores +to instantiate. Currently the default U-Boot built for QEMU supports 2 cores. +In order to support more cores, you need add additional cpu nodes in the device +tree and change CONFIG_MAX_CPUS accordingly. + CPU Microcode ------------- Modern CPUs usually require a special bit stream called microcode [8] to be |