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

fsp raminit: Add romstage_params to soc_memory_init_params 

The SOC handler for memory init params is only taking UPD
as an input which does not allow it to use romstage_params.
In addition the UPD input is called params which is confusing
so rename it to upd so romstage_params can be passed properly.

BUG=chrome-os-partner:40635
BRANCH=none
TEST=build and boot on glados p2

Change-Id: I414610fee2b5d03a8e2cebfa548ea8bf49932a48
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Original-Commit-Id: db94d6f3e6cad721de2188a136df10ccf66aff6a
Original-Change-Id: I7ec15edd4a16df121c5967aadd8b2651267ec773
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/294066
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11413
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Duncan Laurie 2015-08-17 18:09:14 -07:00 committed by Patrick Georgi
parent fd016a44bb
commit 9dcd4f059b
4 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/soc/intel/braswell/romstage/romstage.c
View File

@ -203,7 +203,8 @@ void soc_after_ram_init(struct romstage_params *params)
} }
/* Initialize the UPD parameters for MemoryInit */ /* Initialize the UPD parameters for MemoryInit */
void soc_memory_init_params(MEMORY_INIT_UPD *params) void soc_memory_init_params(struct romstage_params *params,
MEMORY_INIT_UPD *upd)
{ {
const struct device *dev; const struct device *dev;
const struct soc_intel_braswell_config *config; const struct soc_intel_braswell_config *config;
@ -212,16 +213,16 @@ void soc_memory_init_params(MEMORY_INIT_UPD *params)
dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));
config = dev->chip_info; config = dev->chip_info;
printk(BIOS_DEBUG, "Updating UPD values for MemoryInit\n"); printk(BIOS_DEBUG, "Updating UPD values for MemoryInit\n");
params->PcdMrcInitTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ? upd->PcdMrcInitTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ?
config->PcdMrcInitTsegSize : 0; config->PcdMrcInitTsegSize : 0;
params->PcdMrcInitMmioSize = config->PcdMrcInitMmioSize; upd->PcdMrcInitMmioSize = config->PcdMrcInitMmioSize;
params->PcdMrcInitSpdAddr1 = config->PcdMrcInitSpdAddr1; upd->PcdMrcInitSpdAddr1 = config->PcdMrcInitSpdAddr1;
params->PcdMrcInitSpdAddr2 = config->PcdMrcInitSpdAddr2; upd->PcdMrcInitSpdAddr2 = config->PcdMrcInitSpdAddr2;
params->PcdIgdDvmt50PreAlloc = config->PcdIgdDvmt50PreAlloc; upd->PcdIgdDvmt50PreAlloc = config->PcdIgdDvmt50PreAlloc;
params->PcdApertureSize = config->PcdApertureSize; upd->PcdApertureSize = config->PcdApertureSize;
params->PcdGttSize = config->PcdGttSize; upd->PcdGttSize = config->PcdGttSize;
params->PcdLegacySegDecode = config->PcdLegacySegDecode; upd->PcdLegacySegDecode = config->PcdLegacySegDecode;
params->PcdDvfsEnable = config->PcdDvfsEnable; upd->PcdDvfsEnable = config->PcdDvfsEnable;
} }
void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,

6
src/soc/intel/common/raminit.c
View File

@ -100,7 +100,7 @@ void raminit(struct romstage_params *params)
fsp_memory_init_params.HobListPtr = &hob_list_ptr; fsp_memory_init_params.HobListPtr = &hob_list_ptr;
/* Update the UPD data */ /* Update the UPD data */
soc_memory_init_params(&memory_init_params); soc_memory_init_params(params, &memory_init_params);
mainboard_memory_init_params(params, &memory_init_params); mainboard_memory_init_params(params, &memory_init_params);
post_code(0x36); post_code(0x36);
@ -309,7 +309,9 @@ __attribute__((weak)) void soc_display_memory_init_params(
} }
/* Initialize the UPD parameters for MemoryInit */ /* Initialize the UPD parameters for MemoryInit */
__attribute__((weak)) void soc_memory_init_params(MEMORY_INIT_UPD *params) __attribute__((weak)) void soc_memory_init_params(
struct romstage_params *params,
MEMORY_INIT_UPD *upd)
{ {
printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__); printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__);
} }

3
src/soc/intel/common/romstage.h
View File

@ -93,7 +93,8 @@ void soc_after_ram_init(struct romstage_params *params);
void soc_after_temp_ram_exit(void); void soc_after_temp_ram_exit(void);
void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,
MEMORY_INIT_UPD *new); MEMORY_INIT_UPD *new);
void soc_memory_init_params(MEMORY_INIT_UPD *params); void soc_memory_init_params(struct romstage_params *params,
MEMORY_INIT_UPD *upd);
void soc_pre_console_init(struct romstage_params *params); void soc_pre_console_init(struct romstage_params *params);
void soc_pre_ram_init(struct romstage_params *params); void soc_pre_ram_init(struct romstage_params *params);
void soc_romstage_init(struct romstage_params *params); void soc_romstage_init(struct romstage_params *params);

36
src/soc/intel/skylake/romstage/romstage.c
View File

@ -77,33 +77,33 @@ int vboot_get_sw_write_protect(void)
#endif #endif
/* UPD parameters to be initialized before MemoryInit */ /* UPD parameters to be initialized before MemoryInit */
void soc_memory_init_params(MEMORY_INIT_UPD *params) void soc_memory_init_params(struct romstage_params *params,
MEMORY_INIT_UPD *upd)
{ {
const struct device *dev; const struct device *dev;
const struct soc_intel_skylake_config *config; const struct soc_intel_skylake_config *config;
/* Set the parameters for MemoryInit */ /* Set the parameters for MemoryInit */
dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0)); dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0));
config = dev->chip_info; config = dev->chip_info;
memcpy(params->PcieRpEnable, config->PcieRpEnable, memcpy(upd->PcieRpEnable, config->PcieRpEnable,
sizeof(params->PcieRpEnable)); sizeof(upd->PcieRpEnable));
memcpy(params->PcieRpClkReqSupport, config->PcieRpClkReqSupport, memcpy(upd->PcieRpClkReqSupport, config->PcieRpClkReqSupport,
sizeof(params->PcieRpClkReqSupport)); sizeof(upd->PcieRpClkReqSupport));
memcpy(params->PcieRpClkReqNumber, config->PcieRpClkReqNumber, memcpy(upd->PcieRpClkReqNumber, config->PcieRpClkReqNumber,
sizeof(params->PcieRpClkReqNumber)); sizeof(upd->PcieRpClkReqNumber));
params->MmioSize = 0x800; /* 2GB in MB */ upd->MmioSize = 0x800; /* 2GB in MB */
params->TsegSize = CONFIG_SMM_TSEG_SIZE; upd->TsegSize = CONFIG_SMM_TSEG_SIZE;
params->IedSize = CONFIG_IED_REGION_SIZE; upd->IedSize = CONFIG_IED_REGION_SIZE;
params->ProbelessTrace = config->ProbelessTrace; upd->ProbelessTrace = config->ProbelessTrace;
params->EnableLan = config->EnableLan; upd->EnableLan = config->EnableLan;
params->EnableSata = config->EnableSata; upd->EnableSata = config->EnableSata;
params->SataMode = config->SataMode; upd->SataMode = config->SataMode;
params->EnableTraceHub = config->EnableTraceHub; upd->EnableTraceHub = config->EnableTraceHub;
params->SaGv = config->SaGv; upd->SaGv = config->SaGv;
params->RMT = config->Rmt; upd->RMT = config->Rmt;
} }
void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,