[PATCH 07/17] x86: Update the MP constants to avoid conflicts

Simon Glass sjg at chromium.org
Wed Apr 7 06:32:17 CEST 2021

These constants conflict with error codes returned by the MP
implementation when something is wrong. In particular, mp_first_cpu()
returns MP_SELECT_BSP when running without multiprocessing enabled.
Since this is -2, it is interpreted as an error by callers, which
expect a positive CPU number for the first CPU.

Correct this by using a different range for the pre-defined CPU
numbers, above zero and out of the range of possible CPU values. For
now it is safe to assume there are no more than 64K CPUs.

This fixes the 'mtrr' command when CONFIG_SMP is not enabled.

Signed-off-by: Simon Glass <sjg at chromium.org>

 arch/x86/include/asm/mp.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 1a3ae8e3950..e48ba051d92 100644
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -10,18 +10,22 @@
 #include <asm/atomic.h>
 #include <asm/cache.h>
+#include <linux/bitops.h>
 struct udevice;
 enum {
-	/* Indicates that the function should run on all CPUs */
+	/*
+	 * Indicates that the function should run on all CPUs. We use a large
+	 * number, above the number of real CPUs we expect to find.
+	 */
 	/* Run on boot CPUs */
 	/* Run on non-boot CPUs */
 typedef int (*mp_callback_t)(struct udevice *cpu, void *arg);

More information about the U-Boot mailing list