Jonathan Zhang would like Anjaneya "Reddy" Chagam to review this change.

View Change

soc/intel/xeon_sp/cpx: rename xeon_sp_get_cpu_count()

Rename function from xeon_sp_get_cpu_count() to xeon_sp_get_sku_count().
The function returns CPU socket count, by getting it from the field
named as numCpus in FSP HOB.

Signed-off-by: Jonathan Zhang <jonzhang@fb.com>
Signed-off-by: Reddy Chagam <anjaneya.chagam@intel.com>
Change-Id: Ic96bdf4ab042ac15d43f9b636185627c63fbf8a1
---
M src/soc/intel/xeon_sp/cpx/acpi.c
M src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
M src/soc/intel/xeon_sp/cpx/soc_util.c
3 files changed, 8 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/42439/1

diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c
index 33c85ca..654f761 100644
--- a/src/soc/intel/xeon_sp/cpx/acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/acpi.c
@@ -454,7 +454,7 @@
 
 static unsigned long acpi_fill_slit(unsigned long current)
 {
-	unsigned int nodes = xeon_sp_get_cpu_count();
+	unsigned int nodes = xeon_sp_get_skt_count();
 
 	uint8_t *p = (uint8_t *)current;
 	memset(p, 0, 8 + nodes * nodes);
diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
index ee2b68b..1bcd222 100644
--- a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
+++ b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
@@ -34,7 +34,8 @@
 void get_core_thread_bits(uint32_t *core_bits, uint32_t *thread_bits);
 void get_cpu_info_from_apicid(uint32_t apicid, uint32_t core_bits, uint32_t thread_bits,
 	uint8_t *package, uint8_t *core, uint8_t *thread);
-unsigned int xeon_sp_get_cpu_count(void);
+/* Return socket count, as obtained from FSP HOB */
+unsigned int xeon_sp_get_skt_count(void);
 
 int get_platform_thread_count(void);
 int get_threads_per_package(void);
diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c
index 9837cd9..09237d0 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_util.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_util.c
@@ -22,7 +22,7 @@
 
 int get_platform_thread_count(void)
 {
-	return xeon_sp_get_cpu_count() * get_threads_per_package();
+	return xeon_sp_get_skt_count() * get_threads_per_package();
 }
 
 const struct SystemMemoryMapHob *get_system_memory_map(void)
@@ -82,8 +82,9 @@
 	return hob;
 }
 
-unsigned int xeon_sp_get_cpu_count(void)
+unsigned int xeon_sp_get_skt_count(void)
 {
+	/* The FSP IIO UDS HOB has field numCpus, it is actually socket count */
 	return get_iio_uds()->SystemStatus.numCpus;
 }
 
@@ -114,9 +115,7 @@
 	if (num_apics > 1)
 		bubblesort(apic_ids, num_apics, NUM_ASCENDING);
 
-	/* Here num_cpus is the number of processors */
-	/* The FSP HOB parameter has it named as num_cpus */
-	num_cpus = xeon_sp_get_cpu_count();
+	num_cpus = xeon_sp_get_skt_count();
 	cpu_read_topology(&core_count, &thread_count);
 	assert(num_apics == (num_cpus * thread_count));
 
@@ -307,7 +306,7 @@
 	 * According to the BIOS writer's guide, this needs to be set on non-SBSP
 	 * first, before set on SBSP.
 	 */
-	for (uint32_t socket = 0; socket < xeon_sp_get_cpu_count(); ++socket) {
+	for (uint32_t socket = 0; socket < xeon_sp_get_skt_count(); ++socket) {
 		if (socket == sbsp_socket_id)
 			continue;
 		set_bios_init_completion_for_package(socket);

To view, visit change 42439. To unsubscribe, or for help writing mail filters, visit settings.