diff --git a/src/cpu/x86/topology.c b/src/cpu/x86/topology.c
index 58e71fc787..70bdf47c4a 100644
--- a/src/cpu/x86/topology.c
+++ b/src/cpu/x86/topology.c
@@ -110,6 +110,7 @@ void set_cpu_topology(struct device *cpu)
 	static struct bitfield_descriptor topology[LEVEL_TYPE_MAX];
 	static enum cb_err ret;
 	static bool done;
+	unsigned int core_id_within_package;
 	struct {
 		unsigned int level;
 		unsigned int *field;
@@ -151,4 +152,8 @@ void set_cpu_topology(struct device *cpu)
 			*apic_fields[i].field = value;
 		}
 	}
+
+	core_id_within_package = apicid & ((1 << topology[LEVEL_TYPE_PACKAGE].first_bit) - 1);
+	core_id_within_package >>= topology[LEVEL_TYPE_CORE].first_bit;
+	cpu->path.apic.core_id_within_package = core_id_within_package;
 }
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 41fccd6a52..b697ccbf21 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
@@ -61,7 +61,7 @@ efi_return_status_t mp_get_processor_info(efi_uintn_t processor_number,
 
 	processor_info_buffer->ProcessorId = dev->path.apic.apic_id;
 	processor_info_buffer->Location.Package = dev->path.apic.package_id;
-	processor_info_buffer->Location.Core = dev->path.apic.core_id;
+	processor_info_buffer->Location.Core = dev->path.apic.core_id_within_package;
 	processor_info_buffer->Location.Thread = dev->path.apic.thread_id;
 
 	return FSP_SUCCESS;
diff --git a/src/include/device/path.h b/src/include/device/path.h
index fdc2f44790..03aa909d88 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -82,6 +82,11 @@ struct apic_path {
 	unsigned int core_id;
 	unsigned int thread_id;
 	unsigned int module_id;
+	/*
+	 * Core identifier within the package, including the die group, die, tile, module, and
+	 * specific core.
+	 */
+	unsigned int core_id_within_package;
 	unsigned char core_type;
 };