x86: Drop unnecessary mp_init logic

Now that sequence numbers are set up when devices are bound, this code is
not needed. Also, we should use dev_seq() instead of req_seq. Update the
whole file accordingly.

Also fix up APL cpu while we are here.

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

diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c
index d37f91d1ce1420e4db9a8130c05a6aefc3583dc3..328f79255f8c6aa2065632f67b142d9344d90b86 100644 (file)
--- a/arch/x86/cpu/apollolake/cpu.c
+++ b/arch/x86/cpu/apollolake/cpu.c
@@ -63,7 +63,7 @@ static int apl_get_info(const struct udevice *dev, struct cpu_info *info)
 
 static int acpi_cpu_fill_ssdt(const struct udevice *dev, struct acpi_ctx *ctx)
 {
-       uint core_id = dev->req_seq;
+       uint core_id = dev_seq(dev);
        int cores_per_package;
        int ret;
 

diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index a0e112178db2340da437412f8d32fa8ff20710bc..0e61c7b5d7fad1164efe5f51e4c267e904df9a36 100644 (file)
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -87,7 +87,7 @@ DECLARE_GLOBAL_DATA_PTR;
  *                     intel,apic-id = <2>;
  *             };
  *
- * Here the 'reg' property is the CPU number and then is placed in dev->req_seq
+ * Here the 'reg' property is the CPU number and then is placed in dev_seq(cpu)
  * so that we can index into ap_callbacks[] using that. The APIC ID is different
  * and may not be sequential (it typically is if hyperthreading is supported).
  *
@@ -135,7 +135,7 @@ struct mp_flight_plan {
  *
  * @func: Function to run
  * @arg: Argument to pass to the function
- * @logical_cpu_number: Either a CPU number (i.e. dev->req_seq) or a special
+ * @logical_cpu_number: Either a CPU number (i.e. dev_seq(cpu) or a special
  *     value like MP_SELECT_BSP. It tells the AP whether it should process this
  *     callback
  */
@@ -152,7 +152,7 @@ static struct mp_flight_plan mp_info;
  * ap_callbacks - Callback mailbox array
  *
  * Array of callback, one entry for each available CPU, indexed by the CPU
- * number, which is dev->req_seq. The entry for the main CPU is never used.
+ * number, which is dev_seq(cpu). The entry for the main CPU is never used.
  * When this is NULL, there is no pending work for the CPU to run. When
  * non-NULL it points to the mp_callback structure. This is shared between all
  * CPUs, so should only be written by the main CPU.
@@ -562,7 +562,7 @@ static int get_bsp(struct udevice **devp, int *cpu_countp)
        if (cpu_countp)
                *cpu_countp = ret;
 
-       return dev->req_seq >= 0 ? dev->req_seq : 0;
+       return dev_seq(dev) >= 0 ? dev_seq(dev) : 0;
 }
 
 /**
@@ -614,7 +614,7 @@ static void store_callback(struct mp_callback **slot, struct mp_callback *val)
 static int run_ap_work(struct mp_callback *callback, struct udevice *bsp,
                       int num_cpus, uint expire_ms)
 {
-       int cur_cpu = bsp->req_seq;
+       int cur_cpu = dev_seq(bsp);
        int num_aps = num_cpus - 1; /* number of non-BSPs to get this message */
        int cpus_accepted;
        ulong start;
@@ -679,7 +679,7 @@ static int ap_wait_for_instruction(struct udevice *cpu, void *unused)
        if (!IS_ENABLED(CONFIG_SMP_AP_WORK))
                return 0;
 
-       per_cpu_slot = &ap_callbacks[cpu->req_seq];
+       per_cpu_slot = &ap_callbacks[dev_seq(cpu)];
 
        while (1) {
                struct mp_callback *cb = read_callback(per_cpu_slot);
@@ -694,7 +694,7 @@ static int ap_wait_for_instruction(struct udevice *cpu, void *unused)
                mfence();
                if (lcb.logical_cpu_number == MP_SELECT_ALL ||
                    lcb.logical_cpu_number == MP_SELECT_APS ||
-                   cpu->req_seq == lcb.logical_cpu_number)
+                   dev_seq(cpu) == lcb.logical_cpu_number)
                        lcb.func(lcb.arg);
 
                /* Indicate we are finished */
@@ -839,7 +839,6 @@ int mp_init(void)
        int num_aps, num_cpus;
        atomic_t *ap_count;
        struct udevice *cpu;
-       struct uclass *uc;
        int ret;
 
        if (IS_ENABLED(CONFIG_QFW)) {
@@ -848,14 +847,6 @@ int mp_init(void)
                        return ret;
        }
 
-       /*
-        * Multiple APs are brought up simultaneously and they may get the same
-        * seq num in the uclass_resolve_seq() during device_probe(). To avoid
-        * this, set req_seq to the reg number in the device tree in advance.
-        */
-       uclass_id_foreach_dev(UCLASS_CPU, cpu, uc)
-               cpu->req_seq = dev_read_u32_default(cpu, "reg", -1);
-
        ret = get_bsp(&cpu, &num_cpus);
        if (ret < 0) {
                debug("Cannot init boot CPU: err=%d\n", ret);

diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h
index 5f9b8c656432dcbb1000f7c9058b648c2e122e8a..1e4e35321decb0e0d721f42465f3963503d1430c 100644 (file)
--- a/arch/x86/include/asm/mp.h
+++ b/arch/x86/include/asm/mp.h
@@ -114,7 +114,7 @@ typedef void (*mp_run_func)(void *arg);
  * Running on anything other than the boot CPU is only supported if
  * CONFIG_SMP_AP_WORK is enabled
  *
- * @cpu_select: CPU to run on (its dev->req_seq value), or MP_SELECT_ALL for
+ * @cpu_select: CPU to run on (its dev_seq() value), or MP_SELECT_ALL for
  *     all, or MP_SELECT_BSP for BSP
  * @func: Function to run
  * @arg: Argument to pass to the function