sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd,intel: Drop s3_resume parameter on FSP-S functions

Browse Source 
ACPI S3 is a global state and it is no longer needed to
pass it as a parameter.

Change-Id: Id0639a47ea65c210b9a79e6ca89cee819e7769b1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50360
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Kyösti Mälkki
2021-01-09 22:53:52 +02:00
committed by Patrick Georgi
parent 4949a3dd62
commit cc93c6e474
25 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/intel/fsp1_1/include/fsp/ramstage.h
View File

@@ -8,7 +8,6 @@
/* Perform Intel silicon init. */
void intel_silicon_init(void);
void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup);
/* Called after the silicon init code has run. */
void soc_after_silicon_init(void);
/* Initialize UPD data before SiliconInit call. */

4
src/drivers/intel/fsp1_1/ramstage.c
View File

@@ -51,7 +51,7 @@ static void display_hob_info(FSP_INFO_HEADER *fsp_info_header)
}
}
void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup)
static void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header)
{
FSP_SILICON_INIT fsp_silicon_init;
SILICON_INIT_UPD *original_params;
@@ -179,7 +179,7 @@ static void fsp_load(void)
void intel_silicon_init(void)
{
fsp_load();
fsp_run_silicon_init(fsp_get_fih(), acpi_is_wakeup_s3());
fsp_run_silicon_init(fsp_get_fih());
}
/* Initialize the UPD parameters for SiliconInit */

4
src/drivers/intel/fsp2_0/include/fsp/api.h
View File

@@ -33,7 +33,7 @@ enum fsp_notify_phase {
/* Main FSP stages */
void fsp_memory_init(bool s3wake);
void fsp_silicon_init(bool s3wake);
void fsp_silicon_init(void);
void fsp_temp_ram_exit(void);
/*
@@ -41,7 +41,7 @@ void fsp_temp_ram_exit(void);
* separately from calling silicon init. It might be required in cases where
* stage cache is no longer available by the point SoC calls into silicon init.
*/
void fsps_load(bool s3wake);
void fsps_load(void);
/* Callbacks for updating stage-specific parameters */
void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version);

6
src/drivers/intel/fsp2_0/silicon_init.c
View File

@@ -191,7 +191,7 @@ static int fsps_get_dest(const struct fsp_load_descriptor *fspld, void **dest,
return 0;
}
void fsps_load(bool s3wake)
void fsps_load(void)
{
struct fsp_load_descriptor fspld = {
.fsp_prog = PROG_INIT(PROG_REFCODE, CONFIG_FSP_S_CBFS),
@@ -220,9 +220,9 @@ void fsps_load(bool s3wake)
load_done = 1;
}
void fsp_silicon_init(bool s3wake)
void fsp_silicon_init(void)
{
fsps_load(s3wake);
fsps_load();
do_silicon_init(&fsps_hdr);
}