Hello build bot (Jenkins), Furquan Shaikh, Wonkyu Kim, Maulik V Vaghela, Duncan Laurie, Sridhar Siricilla, Aamir Bohra, Srinidhi N Kaushik, Andrey Petrov, Aaron Durbin, Patrick Rudolph, Nathaniel L Desimone,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41728
to look at the new patch set (#4).
Change subject: drivers/intel/fsp2_0: Add FSP 2.2 specific support
......................................................................
drivers/intel/fsp2_0: Add FSP 2.2 specific support
• Based on FSP EAS v2.1 – Backward compatibility is retained.
• Added multi-phase silicon initialization to increase the modularity of the
FspSiliconInit() API.
• Added FspMultiPhaseSiInit() API
• FSP_INFO_HEADER changes
o Added FspMultiPhaseSiInitEntryOffset
• Added FSPS_ARCH_UPD
o Added EnableMultiPhaseSiliconInit, bootloaders designed for
FSP 2.0/2.1 can disable the FspMultiPhaseSiInit() API and
continue to use FspSiliconInit() without change.
FSP 2.2 Specification:
https://www.intel.com/content/www/us/en/intelligent-systems/intel-firmware-…
Change-Id: If7177a267f3a9b4cbb60a639f1c737b9a3341913
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/commonlib/include/commonlib/timestamp_serialized.h
M src/drivers/intel/fsp2_0/Kconfig
M src/drivers/intel/fsp2_0/include/fsp/api.h
M src/drivers/intel/fsp2_0/include/fsp/info_header.h
M src/drivers/intel/fsp2_0/include/fsp/upd.h
M src/drivers/intel/fsp2_0/include/fsp/util.h
M src/drivers/intel/fsp2_0/silicon_init.c
M src/drivers/intel/fsp2_0/util.c
M src/include/console/post_codes.h
9 files changed, 198 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/41728/4
--
To view, visit https://review.coreboot.org/c/coreboot/+/41728
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If7177a267f3a9b4cbb60a639f1c737b9a3341913
Gerrit-Change-Number: 41728
Gerrit-PatchSet: 4
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Aamir Bohra <aamir.bohra(a)intel.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com>
Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com>
Gerrit-Reviewer: Nathaniel L Desimone <nathaniel.l.desimone(a)intel.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Sridhar Siricilla <sridhar.siricilla(a)intel.com>
Gerrit-Reviewer: Srinidhi N Kaushik <srinidhi.n.kaushik(a)intel.com>
Gerrit-Reviewer: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: newpatchset
Jonathan Zhang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41732 )
Change subject: drivers/vpd: add VPD region VPD_RW_OR_RO
......................................................................
drivers/vpd: add VPD region VPD_RW_OR_RO
This change is based on the concept that system user's (overwrite)
settings are held in VPD_RW region, while system owner's (default)
settings are held in VPD_RO region.
Add VPD_RW_OR_RO, so that VPD_RW region is searched first to get
overwrite setting, otherwise VPD_RO region is searched to get
default setting.
Signed-off-by: Jonathan Zhang <jonzhang(a)fb.com>
Change-Id: Icd7cbd9c3fb2a6b02fc417ad45d7d22ca6795457
---
M src/drivers/vpd/vpd.c
M src/drivers/vpd/vpd.h
2 files changed, 30 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/41732/1
diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c
index f1dcf8c..9264140 100644
--- a/src/drivers/vpd/vpd.c
+++ b/src/drivers/vpd/vpd.c
@@ -193,17 +193,33 @@
}
}
- assert(region == VPD_RO_OR_RW);
/*
- * As the region is set to VPD_RO_OR_RW, use the search result from VPD_RO
+ * If the region is set to VPD_RO_OR_RW, use the search result from VPD_RO
* as the preference, otherwise use the search result from VPD_RW.
*/
- if (arg_ro.matched) {
- *size = arg_ro.value_len;
- return arg_ro.value;
- } else if (arg_rw.matched) {
+ if (region == VPD_RO_OR_RW) {
+ if (arg_ro.matched) {
+ *size = arg_ro.value_len;
+ return arg_ro.value;
+ } else if (arg_rw.matched) {
+ *size = arg_rw.value_len;
+ return arg_rw.value;
+ } else {
+ return NULL;
+ }
+ }
+
+ /*
+ * As the region is set to VPD_RW_OR_RO, use the search result from VPD_RW
+ * as the preference, otherwise use the search result from VPD_RO.
+ */
+ assert(region == VPD_RW_OR_RO);
+ if (arg_rw.matched) {
*size = arg_rw.value_len;
return arg_rw.value;
+ } else if (arg_ro.matched) {
+ *size = arg_ro.value_len;
+ return arg_ro.value;
} else {
return NULL;
}
diff --git a/src/drivers/vpd/vpd.h b/src/drivers/vpd/vpd.h
index 5fa3b4e..549b7a4 100644
--- a/src/drivers/vpd/vpd.h
+++ b/src/drivers/vpd/vpd.h
@@ -13,11 +13,16 @@
/*
* VPD_RO_OR_RW indicates VPD_RO search result is preferred over VPD_RW search result.
+ *
+ * VPD_RW_OR_RO indicates VPD_RW search result is preferred over VPD_RO search result.
+ * This is based on the concept that system user's (overwrite) settings are held in
+ * VPD_RW region, while system owner's (default) settings are held in VPD_RO region.
*/
enum vpd_region {
- VPD_RO_OR_RW = 0,
- VPD_RO = 1,
- VPD_RW = 2
+ VPD_RO = 0,
+ VPD_RW = 1,
+ VPD_RO_OR_RW = 2,
+ VPD_RW_OR_RO = 3
};
/* VPD 2.0 data blob structure */
--
To view, visit https://review.coreboot.org/c/coreboot/+/41732
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Icd7cbd9c3fb2a6b02fc417ad45d7d22ca6795457
Gerrit-Change-Number: 41732
Gerrit-PatchSet: 1
Gerrit-Owner: Jonathan Zhang <jonzhang(a)fb.com>
Gerrit-MessageType: newchange