6 files changed, 28 insertions, 6 deletions
diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c
index fb4c7b6cfe..e6c9435503 100644
--- a/src/arch/x86/cpu.c
+++ b/src/arch/x86/cpu.c
@@ -350,7 +350,7 @@ void arch_bootstate_coreboot_exit(void)
  * Hence new logic to use cpuid to fetch lapic id and matches with
  * cpus_default_apic_id[] variable to return correct cpu_index().
  */
-unsigned long cpu_index(void)
+int cpu_index(void)
 {
 	int i;
 	int lapic_id = initial_lapicid();
diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c
index b00777a455..b88f4a7553 100644
--- a/src/arch/x86/exception.c
+++ b/src/arch/x86/exception.c
@@ -502,7 +502,7 @@ void x86_exception(struct eregs *info)
 	}
 #else /* !CONFIG_GDB_STUB */
 #define MDUMP_SIZE 0x80
-	unsigned int logical_processor = 0;
+	int logical_processor = 0;
 
 #if ENV_RAMSTAGE
 	logical_processor = cpu_index();
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 481ee9d8e0..078ea1748b 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -379,6 +379,6 @@ uint32_t cpu_get_feature_flags_edx(void);
  * Hence new logic to use cpuid to fetch lapic id and matches with
  * cpus_default_apic_id[] variable to return correct cpu_index().
  */
-unsigned long cpu_index(void);
+int cpu_index(void);
 
 #endif /* ARCH_CPU_H */
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 8957515540..b7b8fe2afa 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -870,13 +870,20 @@ static int run_ap_work(struct mp_callback *val, long expire_us)
 	int i;
 	int cpus_accepted;
 	struct stopwatch sw;
-	int cur_cpu = cpu_index();
+	int cur_cpu;
 
 	if (!CONFIG(PARALLEL_MP_AP_WORK)) {
 		printk(BIOS_ERR, "APs already parked. PARALLEL_MP_AP_WORK not selected.\n");
 		return -1;
 	}
 
+	cur_cpu = cpu_index();
+
+	if (cur_cpu < 0) {
+		printk(BIOS_ERR, "Invalid CPU index.\n");
+		return -1;
+	}
+
 	/* Signal to all the APs to run the func. */
 	for (i = 0; i < ARRAY_SIZE(ap_callbacks); i++) {
 		if (cur_cpu == i)
@@ -918,6 +925,12 @@ static void ap_wait_for_instruction(void)
 		return;
 
 	cur_cpu = cpu_index();
+
+	if (cur_cpu < 0) {
+		printk(BIOS_ERR, "Invalid CPU index.\n");
+		return;
+	}
+
 	per_cpu_slot = &ap_callbacks[cur_cpu];
 
 	while (1) {
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 062ee402f1..9c921342f1 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -116,12 +116,12 @@ void *map_2M_page(unsigned long page)
 	static struct pg_table pgtbl[CONFIG_MAX_CPUS]
 		__attribute__((aligned(4096)));
 	static unsigned long mapped_window[CONFIG_MAX_CPUS];
-	unsigned long index;
+	int index;
 	unsigned long window;
 	void *result;
 	int i;
 	index = cpu_index();
-	if (index >= CONFIG_MAX_CPUS)
+	if (index < 0)
 		return MAPPING_ERROR;
 	window = page >> 10;
 	if (window != mapped_window[index]) {
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
index cdc98e06de..e26701b099 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
@@ -45,6 +45,9 @@ static efi_return_status_t mp_get_processor_info(const
 	efi_uintn_t processor_number,
 	efi_processor_information *processor_info_buffer)
 {
+	if (cpu_index() < 0)
+		return FSP_DEVICE_ERROR;
+
 	if (processor_info_buffer == NULL)
 		return FSP_INVALID_PARAMETER;
 
@@ -68,6 +71,9 @@ static efi_return_status_t mp_startup_all_aps(const
 	efi_ap_procedure procedure, efi_boolean_t ignored3,
 	efi_uintn_t timeout_usec, void *argument)
 {
+	if (cpu_index() < 0)
+		return FSP_DEVICE_ERROR;
+
 	if (procedure == NULL)
 		return FSP_INVALID_PARAMETER;
 
@@ -85,6 +91,9 @@ static efi_return_status_t mp_startup_this_ap(const
 	efi_ap_procedure procedure, efi_uintn_t processor_number,
 	efi_uintn_t timeout_usec, void *argument)
 {
+	if (cpu_index() < 0)
+		return FSP_DEVICE_ERROR;
+
 	if (processor_number > get_cpu_count())
 		return FSP_NOT_FOUND;