summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-05-14 11:21:41 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2019-05-16 18:08:50 +0000
commitbc674765a93bc5c9bf2c20ce2444389dccc754e1 (patch)
treeb363bda561b009f204ff3580f68afe318aead52b /src/drivers
parent2e8188aa13b84f607fd3a1e95fb7b63b26ff1d89 (diff)
downloadcoreboot-bc674765a93bc5c9bf2c20ce2444389dccc754e1.tar.xz
{arch,cpu}/x86, drivers/intel: Restore cpu_index error handling
Previously cpu_index() always succeeded, but since commit 095c931 (src/arch/x86: Use core apic id to get cpu_index()) it is now possible for it to indicate an error by returning -1. This commit adds error handling for all calls to cpu_index(), and restores several checks that were removed in commit 7c712bb (Fix code that would trip -Wtype-limits) but are now needed. Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Change-Id: I5436eed4cb5675f916924eb9670db04592a8b927 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32795 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c9
1 files changed, 9 insertions, 0 deletions
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;