soc/intel/xeon_sp/cpx: Work around FSP-M issues

Currently FSP-M does not implement the spec completely, e.g it is unable
to use user-provided heap location in CAR. While this is being resolved,
this workaround is a stop-gap solution that allows multi-socket usage.

TEST=tested on OCP Sonora Pass EVT and Intel Cedar Island CRB

Change-Id: Ia2529526a8724cf54377b0bd2339b04fa900815a
Signed-off-by: Andrey Petrov <anpetrov@fb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40555
Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Andrey Petrov 2020-04-20 18:07:08 -07:00 committed by Andrey Petrov
parent 2f96970e1f
commit dddb9a85bd
3 changed files with 14 additions and 4 deletions

View File

@ -16,7 +16,6 @@ config USE_FSP2_0_DRIVER
select UDK_2015_BINDING select UDK_2015_BINDING
select POSTCAR_CONSOLE select POSTCAR_CONSOLE
select POSTCAR_STAGE select POSTCAR_STAGE
select FSP_USES_CB_STACK
config FSP_HEADER_PATH config FSP_HEADER_PATH
string "Location of FSP headers" string "Location of FSP headers"
@ -40,11 +39,11 @@ config PCR_BASE_ADDRESS
# currently FSP hardcodes [0fe800000;fe930000] for its heap # currently FSP hardcodes [0fe800000;fe930000] for its heap
config DCACHE_RAM_BASE config DCACHE_RAM_BASE
hex hex
default 0xfe930000 default 0xfe9a0000
config DCACHE_RAM_SIZE config DCACHE_RAM_SIZE
hex hex
default 0xd0000 default 0x60000
config DCACHE_BSP_STACK_SIZE config DCACHE_BSP_STACK_SIZE
hex hex

View File

@ -28,7 +28,7 @@ const void *intel_mp_current_microcode(void)
static void each_cpu_init(struct device *cpu) static void each_cpu_init(struct device *cpu)
{ {
printk(BIOS_INFO, "%s dev: %s, cpu: %d, apic_id: 0x%x\n", printk(BIOS_SPEW, "%s dev: %s, cpu: %d, apic_id: 0x%x\n",
__func__, dev_path(cpu), cpu_index(), cpu->path.apic.apic_id); __func__, dev_path(cpu), cpu_index(), cpu->path.apic.apic_id);
setup_lapic(); setup_lapic();

View File

@ -9,8 +9,19 @@
void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
{ {
FSP_M_CONFIG *m_cfg = &mupd->FspmConfig; FSP_M_CONFIG *m_cfg = &mupd->FspmConfig;
FSPM_ARCH_UPD *arch_upd = &mupd->FspmArchUpd;
(void)m_cfg; (void)m_cfg;
/*
* Currently FSP for CPX does not implement user-provided StackBase/Size
* properly. When KTI link needs to be trained, inter-socket communication
* library needs quite a bit of memory for its heap usage. However, location
* is hardcoded so this workaround is needed.
*/
if (CONFIG_MAX_SOCKET > 1) {
arch_upd->StackBase = (void *) 0xfe930000;
arch_upd->StackSize = 0x70000;
}
mainboard_memory_init_params(mupd); mainboard_memory_init_params(mupd);
} }