cpu/x86/mp_init: remove unused callback arguments
The BSP and AP callback declarations both had an optional argument
that could be passed. In practice that functionality was never used
so drop it.
Change-Id: I47fa814a593b6c2ee164c88d255178d3fb71e8ce
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/14556
Tested-by: build bot (Jenkins)
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Leroy P Leahy <leroy.p.leahy@intel.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index 03fae0e..21cd33a 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -71,7 +71,7 @@
*/
static struct mp_flight_record flight_plan[] = {
/* NOTE: MTRR solution must be calculated before firing up the APs */
- MP_FR_NOBLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_NOBLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
};
void apollolake_init_cpus(device_t dev)
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 6188689..fd9c7fb 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -32,14 +32,14 @@
#include <soc/ramstage.h>
#include <soc/smm.h>
-static void smm_relocate(void *unused);
-static void enable_smis(void *unused);
+static void smm_relocate(void);
+static void enable_smis(void);
static struct mp_flight_record mp_steps[] = {
- MP_FR_BLOCK_APS(smm_relocate, NULL, smm_relocate, NULL),
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(smm_relocate, smm_relocate),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
/* Wait for APs to finish initialization before proceeding. */
- MP_FR_BLOCK_APS(NULL, NULL, enable_smis, NULL),
+ MP_FR_BLOCK_APS(NULL, enable_smis),
};
/* The APIC id space on Bay Trail is sparse. Each id is separated by 2. */
@@ -278,7 +278,7 @@
return 0;
}
-static void smm_relocate(void *unused)
+static void smm_relocate(void)
{
const struct pattrs *pattrs = pattrs_get();
@@ -298,7 +298,7 @@
intel_microcode_load_unlocked(pattrs->microcode_patch);
}
-static void enable_smis(void *unused)
+static void enable_smis(void)
{
southcluster_smm_enable_smi();
}
diff --git a/src/soc/intel/braswell/cpu.c b/src/soc/intel/braswell/cpu.c
index 71af487..3d682b7 100644
--- a/src/soc/intel/braswell/cpu.c
+++ b/src/soc/intel/braswell/cpu.c
@@ -33,16 +33,16 @@
#include <soc/smm.h>
#include <stdlib.h>
-static void smm_relocate(void *unused);
-static void enable_smis(void *unused);
-static void pre_smm_relocation(void *unused);
+static void smm_relocate(void);
+static void enable_smis(void);
+static void pre_smm_relocation(void);
static struct mp_flight_record mp_steps[] = {
- MP_FR_BLOCK_APS(pre_smm_relocation, NULL, pre_smm_relocation, NULL),
- MP_FR_BLOCK_APS(smm_relocate, NULL, smm_relocate, NULL),
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(pre_smm_relocation, pre_smm_relocation),
+ MP_FR_BLOCK_APS(smm_relocate, smm_relocate),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
/* Wait for APs to finish initialization before proceeding. */
- MP_FR_BLOCK_APS(NULL, NULL, enable_smis, NULL),
+ MP_FR_BLOCK_APS(NULL, enable_smis),
};
/* The APIC id space is sparse. Each id is separated by 2. */
@@ -299,7 +299,7 @@
return 0;
}
-static void pre_smm_relocation(void *unused)
+static void pre_smm_relocation(void)
{
const struct pattrs *pattrs = pattrs_get();
msr_t msr_value;
@@ -310,7 +310,7 @@
intel_microcode_load_unlocked(pattrs->microcode_patch);
}
-static void smm_relocate(void *unused)
+static void smm_relocate(void)
{
const struct pattrs *pattrs = pattrs_get();
@@ -330,7 +330,7 @@
intel_microcode_load_unlocked(pattrs->microcode_patch);
}
-static void enable_smis(void *unused)
+static void enable_smis(void)
{
southcluster_smm_enable_smi();
}
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu.c
index 5f3fb15..15c003e 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu.c
@@ -619,7 +619,7 @@
return 2 * index;
}
-static void relocate_and_load_microcode(void *unused)
+static void relocate_and_load_microcode(void)
{
/* Relocate the SMM handler. */
smm_relocate();
@@ -628,7 +628,7 @@
intel_microcode_load_unlocked(microcode_patch);
}
-static void enable_smis(void *unused)
+static void enable_smis(void)
{
/* Now that all APs have been relocated as well as the BSP let SMIs
* start flowing. */
@@ -639,11 +639,11 @@
}
static struct mp_flight_record mp_steps[] = {
- MP_FR_NOBLOCK_APS(relocate_and_load_microcode, NULL,
- relocate_and_load_microcode, NULL),
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_NOBLOCK_APS(relocate_and_load_microcode,
+ relocate_and_load_microcode),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
/* Wait for APs to finish initialization before proceeding. */
- MP_FR_BLOCK_APS(NULL, NULL, enable_smis, NULL),
+ MP_FR_BLOCK_APS(NULL, enable_smis),
};
static struct device_operations cpu_dev_ops = {
diff --git a/src/soc/intel/fsp_baytrail/cpu.c b/src/soc/intel/fsp_baytrail/cpu.c
index 1fed554..3856a06 100644
--- a/src/soc/intel/fsp_baytrail/cpu.c
+++ b/src/soc/intel/fsp_baytrail/cpu.c
@@ -33,18 +33,18 @@
#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)
#include <soc/smm.h>
-static void smm_relocate(void *unused);
-static void enable_smis(void *unused);
+static void smm_relocate(void);
+static void enable_smis(void);
static struct mp_flight_record mp_steps[] = {
- MP_FR_BLOCK_APS(smm_relocate, NULL, smm_relocate, NULL),
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(smm_relocate, smm_relocate),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
/* Wait for APs to finish initialization before proceeding. */
- MP_FR_BLOCK_APS(NULL, NULL, enable_smis, NULL),
+ MP_FR_BLOCK_APS(NULL, enable_smis),
};
#else /* CONFIG_HAVE_SMI_HANDLER */
static struct mp_flight_record mp_steps[] = {
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
};
#endif
@@ -252,7 +252,7 @@
return 0;
}
-static void smm_relocate(void *unused)
+static void smm_relocate(void)
{
/* Load relocation and permanent handler. */
@@ -268,7 +268,7 @@
smm_initiate_relocation();
}
-static void enable_smis(void *unused)
+static void enable_smis(void)
{
southcluster_smm_enable_smi();
}
diff --git a/src/soc/intel/fsp_broadwell_de/cpu.c b/src/soc/intel/fsp_broadwell_de/cpu.c
index 173e978..2f6487a 100644
--- a/src/soc/intel/fsp_broadwell_de/cpu.c
+++ b/src/soc/intel/fsp_broadwell_de/cpu.c
@@ -30,7 +30,7 @@
static void configure_mca(void);
static struct mp_flight_record mp_steps[] = {
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
};
static int adjust_apic_id(int index, int apic_id)
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 38c5b52..17fa0ae 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -391,7 +391,7 @@
return 2 * index;
}
-static void relocate_and_load_microcode(void *unused)
+static void relocate_and_load_microcode(void)
{
/* Relocate the SMM handler. */
smm_relocate();
@@ -400,7 +400,7 @@
intel_microcode_load_unlocked(microcode_patch);
}
-static void enable_smis(void *unused)
+static void enable_smis(void)
{
/*
* Now that all APs have been relocated as well as the BSP let SMIs
@@ -415,13 +415,13 @@
}
static struct mp_flight_record mp_steps[] = {
- MP_FR_NOBLOCK_APS(relocate_and_load_microcode, NULL,
- relocate_and_load_microcode, NULL),
+ MP_FR_NOBLOCK_APS(relocate_and_load_microcode,
+ relocate_and_load_microcode),
#if IS_ENABLED(CONFIG_SMP)
- MP_FR_BLOCK_APS(mp_initialize_cpu, NULL, mp_initialize_cpu, NULL),
+ MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
/* Wait for APs to finish initialization before proceeding. */
#endif
- MP_FR_BLOCK_APS(NULL, NULL, enable_smis, NULL),
+ MP_FR_BLOCK_APS(NULL, enable_smis),
};
static struct device_operations cpu_dev_ops = {