| Message ID | 20200614105621.v2.17.I9cd33fea6b1875fc7606864fb74ae8d92fb46d7b@changeid |
|---|---|
| State | Accepted |
| Commit | 3d734b59c7c11021b5c92d147f86b1030ad35b16 |
| Headers | show |
| Series | x86: Enhance MTRR functionality to support multiple CPUs | expand |
Hi Simon, -----"Simon Glass" <sjg at chromium.org> schrieb: ----- > Betreff: [PATCH v2 17/25] x86: Don't enable SMP in SPL > > SMP should be set up in U-Boot where possible, not SPL. Disable it in SPL. > For 64-bit U-Boot we should find a way to allow SMP operations in U-Boot, > but this is somewhat more complicated. For now that is disabled too. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > Changes in v2: > - Add a new patch to avoid enabling SMP in SPL > > arch/x86/cpu/Makefile | 2 +- > arch/x86/include/asm/mp.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Wolfgang Wallner <wolfgang.wallner at br-automation.com>
On Mon, Jun 15, 2020 at 1:00 AM Simon Glass <sjg at chromium.org> wrote: > > SMP should be set up in U-Boot where possible, not SPL. Disable it in SPL. > For 64-bit U-Boot we should find a way to allow SMP operations in U-Boot, > but this is somewhat more complicated. For now that is disabled too. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > Changes in v2: > - Add a new patch to avoid enabling SMP in SPL > > arch/x86/cpu/Makefile | 2 +- > arch/x86/include/asm/mp.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index ee0499f5d7..16e67e3da2 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -60,7 +60,7 @@ ifndef CONFIG_SYS_COREBOOT obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += irq.o endif ifndef CONFIG_$(SPL_)X86_64 -obj-$(CONFIG_SMP) += mp_init.o +obj-$(CONFIG_$(SPL_)SMP) += mp_init.o endif obj-y += mtrr.o obj-$(CONFIG_PCI) += pci.o diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index 9f4223ae8c..0fabfca8df 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -93,7 +93,7 @@ int x86_mp_init(void); */ typedef void (*mp_run_func)(void *arg); -#if defined(CONFIG_SMP) && !CONFIG_IS_ENABLED(X86_64) +#if CONFIG_IS_ENABLED(SMP) && !CONFIG_IS_ENABLED(X86_64) /** * mp_run_on_cpus() - Run a function on one or all CPUs *
SMP should be set up in U-Boot where possible, not SPL. Disable it in SPL. For 64-bit U-Boot we should find a way to allow SMP operations in U-Boot, but this is somewhat more complicated. For now that is disabled too. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v2: - Add a new patch to avoid enabling SMP in SPL arch/x86/cpu/Makefile | 2 +- arch/x86/include/asm/mp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)