diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-07-10 16:25:32 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-07-17 00:01:23 -0500 |
| commit | 3cd749c99791d43ee929b9401fb14fc6739ce360 (patch) | |
| tree | dac79c5a11e20050cd9ffe3330dc38d04a94fac8 /core/init.c | |
| parent | 2c30ddb93baf34c0191e5c23579c03a8f76f27c4 (diff) | |
| download | skiboot-3cd749c99791d43ee929b9401fb14fc6739ce360.zip skiboot-3cd749c99791d43ee929b9401fb14fc6739ce360.tar.gz skiboot-3cd749c99791d43ee929b9401fb14fc6739ce360.tar.bz2 | |
Recognise signed VERSION partition
A few things need to change to support a signed VERSION partition:
- A signed VERSION partition will be 4K + SECURE_BOOT_HEADERS_SIZE (4K).
- The VERSION partition needs to be loaded after secure/trusted boot is
set up, and therefore after nvram_init().
- Added to the trustedboot resources array.
This also moves the ipmi_dt_add_bmc_info() call to after
flash_dt_add_fw_version() since it adds info to ibm,firmware-versions.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core/init.c')
| -rw-r--r-- | core/init.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/init.c b/core/init.c index b660af2..ca6c468 100644 --- a/core/init.c +++ b/core/init.c @@ -1070,6 +1070,13 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) secureboot_init(); trustedboot_init(); + /* + * BMC platforms load version information from flash after + * secure/trustedboot init. + */ + if (platform.bmc) + flash_fw_version_preload(); + /* preload the IMC catalog dtb */ imc_catalog_preload(); @@ -1128,6 +1135,12 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* Add OPAL timer related properties */ late_init_timers(); + /* Setup ibm,firmware-versions if able */ + if (platform.bmc) { + flash_dt_add_fw_version(); + ipmi_dt_add_bmc_info(); + } + ipmi_set_fw_progress_sensor(IPMI_FW_PCI_INIT); /* |