GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Rename function from xeon_sp_get_cpu_count()
to xeon_sp_get_socket_count().

This 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
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42439
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Jonathan Zhang 2020-06-16 17:14:42 -07:00 committed by Patrick Georgi
parent 5569ee9d13
commit 38c9b8045e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/intel/xeon_sp/cpx/acpi.c
View File

@ -449,7 +449,7 @@ static unsigned long acpi_fill_srat(unsigned long current)
static unsigned long acpi_fill_slit(unsigned long current) static unsigned long acpi_fill_slit(unsigned long current)
{ {
unsigned int nodes = xeon_sp_get_cpu_count(); unsigned int nodes = xeon_sp_get_socket_count();
uint8_t *p = (uint8_t *)current; uint8_t *p = (uint8_t *)current;
memset(p, 0, 8 + nodes * nodes); memset(p, 0, 8 + nodes * nodes);

3
src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h
View File

@ -34,7 +34,8 @@ const IIO_UDS *get_iio_uds(void);
void get_core_thread_bits(uint32_t *core_bits, uint32_t *thread_bits); 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, 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); 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_socket_count(void);
int get_platform_thread_count(void); int get_platform_thread_count(void);
int get_threads_per_package(void); int get_threads_per_package(void);

15
src/soc/intel/xeon_sp/cpx/soc_util.c
View File

@ -22,7 +22,7 @@ int get_threads_per_package(void)
int get_platform_thread_count(void) int get_platform_thread_count(void)
{ {
return xeon_sp_get_cpu_count() * get_threads_per_package(); return xeon_sp_get_socket_count() * get_threads_per_package();
} }
const struct SystemMemoryMapHob *get_system_memory_map(void) const struct SystemMemoryMapHob *get_system_memory_map(void)
@ -82,8 +82,9 @@ const IIO_UDS *get_iio_uds(void)
return hob; return hob;
} }
unsigned int xeon_sp_get_cpu_count(void) unsigned int xeon_sp_get_socket_count(void)
{ {
/* The FSP IIO UDS HOB has field numCpus, it is actually socket count */
return get_iio_uds()->SystemStatus.numCpus; return get_iio_uds()->SystemStatus.numCpus;
} }
@ -94,7 +95,7 @@ void xeonsp_init_cpu_config(void)
int num_apics = 0; int num_apics = 0;
uint32_t core_bits, thread_bits; uint32_t core_bits, thread_bits;
unsigned int core_count, thread_count; unsigned int core_count, thread_count;
unsigned int num_cpus; unsigned int num_sockets;
/* /*
* sort APIC ids in asending order to identify apicid ranges for * sort APIC ids in asending order to identify apicid ranges for
@ -114,11 +115,9 @@ void xeonsp_init_cpu_config(void)
if (num_apics > 1) if (num_apics > 1)
bubblesort(apic_ids, num_apics, NUM_ASCENDING); bubblesort(apic_ids, num_apics, NUM_ASCENDING);
/* Here num_cpus is the number of processors */ num_sockets = xeon_sp_get_socket_count();
/* The FSP HOB parameter has it named as num_cpus */
num_cpus = xeon_sp_get_cpu_count();
cpu_read_topology(&core_count, &thread_count); cpu_read_topology(&core_count, &thread_count);
assert(num_apics == (num_cpus * thread_count)); assert(num_apics == (num_sockets * thread_count));
/* sort them by thread i.e., all cores with thread 0 and then thread 1 */ /* sort them by thread i.e., all cores with thread 0 and then thread 1 */
int index = 0; int index = 0;
@ -308,7 +307,7 @@ void set_bios_init_completion(void)
* to receive the BIOS init completion message. So, we send it to all non-SBSP * to receive the BIOS init completion message. So, we send it to all non-SBSP
* sockets first. * sockets first.
*/ */
for (uint32_t socket = 0; socket < xeon_sp_get_cpu_count(); ++socket) { for (uint32_t socket = 0; socket < xeon_sp_get_socket_count(); ++socket) {
if (socket == sbsp_socket_id) if (socket == sbsp_socket_id)
continue; continue;
set_bios_init_completion_for_package(socket); set_bios_init_completion_for_package(socket);