Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32400
Change subject: nb/intel/sandybridge: add pch.h include
......................................................................
nb/intel/sandybridge: add pch.h include
Fixes src/northbridge/intel/sandybridge/raminit_mrc.c:286:3: error:
implicit declaration of function 'enable_usb_bar'
Change-Id: I48bf59c56b518477a3fc0d75902fc58df6b7def7
Signed-off-by: Patrick Georgi <pgeorgi(a)google.com>
---
M src/northbridge/intel/sandybridge/raminit_mrc.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/32400/1
diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c
index 852da7a..8c4f27d 100644
--- a/src/northbridge/intel/sandybridge/raminit_mrc.c
+++ b/src/northbridge/intel/sandybridge/raminit_mrc.c
@@ -33,6 +33,7 @@
#include "pei_data.h"
#include "sandybridge.h"
#include <security/vboot/vboot_common.h>
+#include <southbridge/intel/bd82x6x/pch.h>
/* Management Engine is in the southbridge */
#include <southbridge/intel/bd82x6x/me.h>
--
To view, visit https://review.coreboot.org/c/coreboot/+/32400
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I48bf59c56b518477a3fc0d75902fc58df6b7def7
Gerrit-Change-Number: 32400
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-MessageType: newchange
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31494 )
Change subject: cbfstool: Fix cbfs_file_next_attr
......................................................................
cbfstool: Fix cbfs_file_next_attr
The last attribute was never returned.
Fix size compare to retrieve all attributes.
Manually tested and seen all attributes, including the last one.
Change-Id: I08df073158a0f285f96048c92aa8066fa4f57e6f
Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31494
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Furquan Shaikh <furquan(a)google.com>
---
M util/cbfstool/cbfs_image.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
Julius Werner: Looks good to me, approved
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 6ccc4f9..5ff8130 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -1844,7 +1844,7 @@
/* Is there enough space for another attribute? */
if ((uint8_t *)attr + ntohl(attr->len) +
- sizeof(struct cbfs_file_attribute) >=
+ sizeof(struct cbfs_file_attribute) >
(uint8_t *)file + ntohl(file->offset))
return NULL;
--
To view, visit https://review.coreboot.org/c/coreboot/+/31494
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I08df073158a0f285f96048c92aa8066fa4f57e6f
Gerrit-Change-Number: 31494
Gerrit-PatchSet: 9
Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Amol N Sukerkar <amol.n.sukerkar(a)intel.com>
Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com>
Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Jens Drenhaus <jens.drenhaus(a)9elements.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Kai Michaelis <kai.michaelis(a)9elements.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Roy Wen <rgzwen(a)arista.com>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-MessageType: merged
Keith Short has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32365
Change subject: coreboot: Run mainboard specific code before Cr50 reset
......................................................................
coreboot: Run mainboard specific code before Cr50 reset
When coreboot checks the TPM and key-ladder state it issues a reboot of
the Cr50 with a delay parameter. Older Cr50 code doesn't support the
delay parameter and reboots immediately, which prevented coreboot from
running the mainboard specific code needed for the AP to come back up.
This change calls mainboard_prepare_cr50_reset() prior to sending the
VENDOR_CC_IMMEDIATE_RESET command.
This change also removes a false error message from the coreboot log
that indicated an "Unexpected Cr50 TPM mode 3".
BUG=b:130830178
BRANCH=none
TEST=build coreboot on sarien and grunt platforms.
TEST=Run 'gsctool -a -m disable; reboot'. Verify corebot send the
VENDOR_CC_IMMEDIATE_RESET command and that the AP boots normally.
Change-Id: Ib05c9cfde8e87daffd4233114263de5b30822872
Signed-off-by: Keith Short <keithshort(a)chromium.org>
---
M src/vendorcode/google/chromeos/cr50_enable_update.c
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/32365/1
diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c
index 91a10cb..315f9dc 100644
--- a/src/vendorcode/google/chromeos/cr50_enable_update.c
+++ b/src/vendorcode/google/chromeos/cr50_enable_update.c
@@ -68,7 +68,7 @@
* This is not an expected state, as the Cr50 always sets the TPM mode
* to TPM_MODE_ENABLED_TENTATIVE during any TPM reset action.
*/
- if (tpm_mode != TPM_MODE_ENABLED_TENTATIVE) {
+ if (!cr50_must_reset && tpm_mode != TPM_MODE_ENABLED_TENTATIVE) {
printk(BIOS_NOTICE,
"NOTICE: Unexpected Cr50 TPM mode (%d). "
"A Cr50 reset is required.\n", tpm_mode);
@@ -79,6 +79,14 @@
if (!cr50_must_reset)
return 0;
+ /*
+ * Give mainboard a chance to take action - note that older Cr50
+ * firmware didn't support the timeout argument and performed an
+ * immediate reset. If the Cr50 honors the timeout request then
+ * mainboard_prepare_cr50_reset() is called again without harm.
+ */
+ mainboard_prepare_cr50_reset();
+
ret = tlcl_cr50_immediate_reset(timeout_ms);
if (ret != TPM_SUCCESS) {
--
To view, visit https://review.coreboot.org/c/coreboot/+/32365
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib05c9cfde8e87daffd4233114263de5b30822872
Gerrit-Change-Number: 32365
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Short <keithshort(a)chromium.org>
Gerrit-MessageType: newchange