soc/intel/xeon_sp: Move CPU helper functions

Continue Xeon-SP de-duplication.
Move CPU helper functions from skx/ and cpx soc_util.c to common util.c.
Functions only used by util.c are updated to be static.

The following functions are moved:
 int get_threads_per_package(void);
 int get_platform_thread_count(void);
 const IIO_UDS *get_iio_uds(void);
 unsigned int soc_get_num_cpus(void);
 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);
 void xeonsp_init_cpu_config(void);

Change-Id: I118a451b9468459cf2c2194f31da1055e1435ebe
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47170
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

3 files changed, 2 insertions, 142 deletions

diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c
index 134824a250..d1bcbd7977 100644
--- a/src/soc/intel/xeon_sp/cpx/cpu.c
+++ b/src/soc/intel/xeon_sp/cpx/cpu.c
@@ -17,6 +17,7 @@
 #include <soc/cpu.h>
 #include <soc/msr.h>
 #include <soc/soc_util.h>
+#include <soc/util.h>
 
 #include "chip.h"
 
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 5f4a6f9e2f..8c454bb29e 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
@@ -13,16 +13,6 @@ struct iiostack_resource {
 
 uint8_t get_iiostack_info(struct iiostack_resource *info);
 
-void xeonsp_init_cpu_config(void);
-const IIO_UDS *get_iio_uds(void);
-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);
-/* Return socket count, as obtained from FSP HOB */
-unsigned int soc_get_num_cpus(void);
-
-int get_platform_thread_count(void);
-int get_threads_per_package(void);
 const struct SystemMemoryMapHob *get_system_memory_map(void);
 
 void set_bios_init_completion(void);
diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c
index de6d8525c2..149f2c01eb 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_util.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
-#include <commonlib/sort.h>
 #include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -9,22 +8,11 @@
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/soc_util.h>
+#include <soc/util.h>
 #include <stdlib.h>
 #include <string.h>
 #include <timer.h>
 
-int get_threads_per_package(void)
-{
-	unsigned int core_count, thread_count;
-	cpu_read_topology(&core_count, &thread_count);
-	return thread_count;
-}
-
-int get_platform_thread_count(void)
-{
-	return soc_get_num_cpus() * get_threads_per_package();
-}
-
 const struct SystemMemoryMapHob *get_system_memory_map(void)
 {
 	size_t hob_size;
@@ -41,125 +29,6 @@ const struct SystemMemoryMapHob *get_system_memory_map(void)
 	return *memmap_addr;
 }
 
-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)
-{
-	if (package != NULL)
-		*package = (apicid >> (thread_bits + core_bits));
-	if (core != NULL)
-		*core = (uint32_t)((apicid >> thread_bits) & ~((~0) << core_bits));
-	if (thread != NULL)
-		*thread = (uint32_t)(apicid & ~((~0) << thread_bits));
-}
-
-void get_core_thread_bits(uint32_t *core_bits, uint32_t *thread_bits)
-{
-	register int ecx;
-	struct cpuid_result cpuid_regs;
-
-	/* get max index of CPUID */
-	cpuid_regs = cpuid(0);
-	assert(cpuid_regs.eax >= 0xb); /* cpuid_regs.eax is max input value for cpuid */
-
-	*thread_bits = *core_bits = 0;
-	ecx = 0;
-	while (1) {
-		cpuid_regs = cpuid_ext(0xb, ecx);
-		if (ecx == 0) {
-			*thread_bits = (cpuid_regs.eax & 0x1f);
-		} else {
-			*core_bits = (cpuid_regs.eax & 0x1f) - *thread_bits;
-			break;
-		}
-		ecx++;
-	}
-}
-
-const IIO_UDS *get_iio_uds(void)
-{
-	size_t hob_size;
-	const IIO_UDS *hob;
-	const uint8_t fsp_hob_iio_universal_data_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
-
-	hob = fsp_find_extension_hob_by_guid(fsp_hob_iio_universal_data_guid, &hob_size);
-	assert(hob != NULL && hob_size != 0);
-	return hob;
-}
-
-unsigned int soc_get_num_cpus(void)
-{
-	/* The FSP IIO UDS HOB has field numCpus, it is actually socket count */
-	return get_iio_uds()->SystemStatus.numCpus;
-}
-
-void xeonsp_init_cpu_config(void)
-{
-	struct device *dev;
-	int apic_ids[CONFIG_MAX_CPUS] = {0}, apic_ids_by_thread[CONFIG_MAX_CPUS] = {0};
-	int  num_apics = 0;
-	uint32_t core_bits, thread_bits;
-	unsigned int core_count, thread_count;
-	unsigned int num_sockets;
-
-	/*
-	 * sort APIC ids in asending order to identify apicid ranges for
-	 * each numa domain
-	 */
-	for (dev = all_devices; dev; dev = dev->next) {
-		if ((dev->path.type != DEVICE_PATH_APIC) ||
-			(dev->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) {
-			continue;
-		}
-		if (!dev->enabled)
-			continue;
-		if (num_apics >= ARRAY_SIZE(apic_ids))
-			break;
-	  apic_ids[num_apics++] = dev->path.apic.apic_id;
-	}
-	if (num_apics > 1)
-		bubblesort(apic_ids, num_apics, NUM_ASCENDING);
-
-	num_sockets = soc_get_num_cpus();
-	cpu_read_topology(&core_count, &thread_count);
-	assert(num_apics == (num_sockets * thread_count));
-
-	/* sort them by thread i.e., all cores with thread 0 and then thread 1 */
-	int index = 0;
-	for (int id = 0; id < num_apics; ++id) {
-		int apic_id = apic_ids[id];
-		if (apic_id & 0x1) { /* 2nd thread */
-			apic_ids_by_thread[index + (num_apics/2) - 1] = apic_id;
-		} else { /* 1st thread */
-			apic_ids_by_thread[index++] = apic_id;
-		}
-	}
-
-	/* update apic_id, node_id in sorted order */
-	num_apics = 0;
-	get_core_thread_bits(&core_bits, &thread_bits);
-	for (dev = all_devices; dev; dev = dev->next) {
-		uint8_t package;
-
-		if ((dev->path.type != DEVICE_PATH_APIC) ||
-			(dev->bus->dev->path.type != DEVICE_PATH_CPU_CLUSTER)) {
-			continue;
-		}
-		if (!dev->enabled)
-			continue;
-		if (num_apics >= ARRAY_SIZE(apic_ids))
-			break;
-		dev->path.apic.apic_id = apic_ids_by_thread[num_apics];
-		get_cpu_info_from_apicid(dev->path.apic.apic_id, core_bits, thread_bits,
-			&package, NULL, NULL);
-		dev->path.apic.node_id = package;
-		printk(BIOS_DEBUG, "CPU %d apic_id: 0x%x (%d), node_id: 0x%x\n",
-			num_apics, dev->path.apic.apic_id,
-			dev->path.apic.apic_id, dev->path.apic.node_id);
-
-		++num_apics;
-	}
-}
-
 uint8_t get_iiostack_info(struct iiostack_resource *info)
 {
 	size_t hob_size;