Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32838 )
Change subject: console: Add new function die_with_post_code()
......................................................................
console: Add new function die_with_post_code()
Add a new helper function die_with_post_code() that generates a post
code and an error string prior to halting the CPU.
BUG=b:124401932
BRANCH=sarien
TEST=build coreboot for sarien and arcada platforms
Change-Id: I87551d60b253dc13ff76f7898c1f112f573a00a2
Signed-off-by: Keith Short <keithshort(a)chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32838
Reviewed-by: Martin Roth <martinroth(a)google.com>
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-by: Furquan Shaikh <furquan(a)google.com>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M src/console/die.c
M src/include/console/console.h
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Martin Roth: Looks good to me, approved
Aaron Durbin: Looks good to me, approved
Furquan Shaikh: Looks good to me, approved
diff --git a/src/console/die.c b/src/console/die.c
index 769e651..513d1c4 100644
--- a/src/console/die.c
+++ b/src/console/die.c
@@ -36,4 +36,11 @@
die_notify();
halt();
}
+
+/* Report a fatal error with a post code */
+void __noreturn die_with_post_code(uint8_t value, const char *msg)
+{
+ post_code(value);
+ die(msg);
+}
#endif
diff --git a/src/include/console/console.h b/src/include/console/console.h
index ed10807..082ba29 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -43,6 +43,7 @@
/* this function is weak and can be overridden by a mainboard function. */
void mainboard_post(u8 value);
void __noreturn die(const char *msg);
+void __noreturn die_with_post_code(uint8_t value, const char *msg);
/*
* This function is weak and can be overridden to provide additional
--
To view, visit https://review.coreboot.org/c/coreboot/+/32838
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I87551d60b253dc13ff76f7898c1f112f573a00a2
Gerrit-Change-Number: 32838
Gerrit-PatchSet: 4
Gerrit-Owner: Keith Short <keithshort(a)chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Keith Short <keithshort(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lijian Zhao <lijian.zhao(a)intel.com>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: merged
Jett Rink has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32849
Change subject: util/scripts: update references to cross-repo-cherrypick
......................................................................
util/scripts: update references to cross-repo-cherrypick
It appears that the rebase.sh script was renamed to
cross-repo-cherrypick and changed directories. Update comments to
reflect that change.
Change-Id: I863df48378feb48c9b195b1778dcaf1972a4f105
Signed-off-by: Jett Rink <jettrink(a)chromium.org>
---
M util/scripts/cross-repo-cherrypick
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/32849/1
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 38d4f46..42b05b5 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -1,6 +1,6 @@
#!/bin/sh
-# rebase.sh - rebase helper script
+# cross-repo-cherrypick - rebase helper script
#
# Copyright 2015, 2017 Google Inc.
#
@@ -22,8 +22,8 @@
# git remote add ...
# git checkout -b upstreaming
# git cherry-pick ...
-# git rebase -i --exec util/gitconfig/rebase.sh master
-# Alternatively, you can run util/gitconfig/rebase.sh after every
+# git rebase -i --exec util/scripts/cross-repo-cherrypick master
+# Alternatively, you can run util/scripts/cross-repo-cherrypick after every
# individual cherry-pick.
# use $0 --cros to add a stub BUG/BRANCH/TEST block
--
To view, visit https://review.coreboot.org/c/coreboot/+/32849
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I863df48378feb48c9b195b1778dcaf1972a4f105
Gerrit-Change-Number: 32849
Gerrit-PatchSet: 1
Gerrit-Owner: Jett Rink <jettrink(a)chromium.org>
Gerrit-MessageType: newchange
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/27496 )
Change subject: sb/amd/cimx/sb800: Get rid of power button device in coreboot
......................................................................
Patch Set 7: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/27496
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0cbecb72f7e1bf3d051d3b7656c6af4d6f43b497
Gerrit-Change-Number: 27496
Gerrit-PatchSet: 7
Gerrit-Owner: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Mon, 20 May 2019 14:43:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Krishna P Bhat D has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32782
Change subject: mb/google/hatch: Change SD_CD# reset config to PLTRST
......................................................................
mb/google/hatch: Change SD_CD# reset config to PLTRST
The system should boot fine to OS on pressing power button before the
system enters G3. However, on hatch, we observe that the system waits
for few seconds at "Starting kernel" and then resets, with SD card tray
inserted and SD_CD# pad reset config set to DEEP. Hence configuring SD_CD#
pad reset config to PLTRST.
BUG=b:129933011
TEST=Built and verified on hatch.
Change-Id: Ic4466b96332f095ff39b28d98607e95fc3d12d6a
Signed-off-by: Krishna Prasad Bhat <krishna.p.bhat.d(a)intel.com>
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/32782/1
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index 32526cc..0b66075 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -339,7 +339,7 @@
/* G4 : SD_DATA3 */
PAD_CFG_NF(GPP_G4, NONE, DEEP, NF1),
/* G5 : SD_CD# */
- PAD_CFG_NF(GPP_G5, NONE, DEEP, NF1),
+ PAD_CFG_NF(GPP_G5, NONE, PLTRST, NF1),
/* G6 : SD_CLK */
PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
/* G7 : SD_WP => NC */
--
To view, visit https://review.coreboot.org/c/coreboot/+/32782
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic4466b96332f095ff39b28d98607e95fc3d12d6a
Gerrit-Change-Number: 32782
Gerrit-PatchSet: 1
Gerrit-Owner: Krishna P Bhat D <krishna.p.bhat.d(a)intel.com>
Gerrit-MessageType: newchange
Frans Hendriks has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32532
Change subject: security/vboot/vboot_crtm.c: Use ENV_ conditions for vboot_measure_cbfs_hook()
......................................................................
security/vboot/vboot_crtm.c: Use ENV_ conditions for vboot_measure_cbfs_hook()
vboot_measure_cbfs_hook() is included when CONFIG_VBOOT_MEASURED_BOOT
is enabled, but this function is defined a 0 in vboot_crtm.h using ENV_
Use same ENV_ for vboot_measure_cbfs_hook() as used in vboot_crtm.h.
is_runtime_data() is not used when vboot_measure_cbfs_hook() is disabled, so
use same conditions for this function also.
BUG=NA
TEST=Build Google Banon and Google Cyan
Change-Id: Ic62c18db09c119dfb85340a6b7f36bfd148aaa45
Signed-off-by: Frans Hendriks <fhendriks(a)eltan.com>
---
M src/security/vboot/vboot_crtm.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/32532/1
diff --git a/src/security/vboot/vboot_crtm.c b/src/security/vboot/vboot_crtm.c
index e4266b2..199bab6 100644
--- a/src/security/vboot/vboot_crtm.c
+++ b/src/security/vboot/vboot_crtm.c
@@ -139,6 +139,7 @@
return VB2_SUCCESS;
}
+#if !ENV_BOOTBLOCK && !ENV_DECOMPRESSOR && !ENV_SMM
static bool is_runtime_data(const char *name)
{
const char *whitelist = CONFIG_VBOOT_MEASURED_BOOT_RUNTIME_DATA;
@@ -193,3 +194,4 @@
return tpm_measure_region(&rdev, pcr_index, tcpa_metadata);
}
+#endif
--
To view, visit https://review.coreboot.org/c/coreboot/+/32532
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic62c18db09c119dfb85340a6b7f36bfd148aaa45
Gerrit-Change-Number: 32532
Gerrit-PatchSet: 1
Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-MessageType: newchange
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29662 )
Change subject: {drivers,soc/intel/braswell}: Add C_ENVIRONMENT_BOOTBLOCK support
......................................................................
Patch Set 26:
(1 comment)
https://review.coreboot.org/#/c/29662/23/src/soc/intel/braswell/romstage/ca…
File src/soc/intel/braswell/romstage/car_stage_entry.S:
https://review.coreboot.org/#/c/29662/23/src/soc/intel/braswell/romstage/ca…
PS23, Line 24: #include "src/drivers/intel/fsp1_1/after_raminit.S"
:
> Tried to integrate this patch set with 30686 but build fails on redefinitions of car_get_var_ptr() a […]
After resync and clean build, able to build.
--
To view, visit https://review.coreboot.org/c/coreboot/+/29662
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iab48ad72f1514c93f20d70db5ef4fd8fa2383e8c
Gerrit-Change-Number: 29662
Gerrit-PatchSet: 26
Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-Reviewer: Hannah Williams <hannah.williams(a)intel.com>
Gerrit-Reviewer: Huang Jin <huang.jin(a)intel.com>
Gerrit-Reviewer: Lee Leahy <leroy.p.leahy(a)intel.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: York Yang <yyang024(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-CC: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Comment-Date: Mon, 20 May 2019 13:26:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Arthur Heymans <arthur(a)aheymans.xyz>
Comment-In-Reply-To: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-MessageType: comment
Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32843
Change subject: vboot: save whether developer mode is enabled
......................................................................
vboot: save whether developer mode is enabled
Save whether or not vboot has selected developer mode as a flag
in vboot_working_data. Other coreboot code may access this flag
without needing to consult vboot_handoff (which is in the process
of being deprecated).
BUG=b:124141368, b:124192753
TEST=make clean && make test-abuild
BRANCH=none
Change-Id: Ieb6ac4937c943aea78ddc762595a05387d2b8114
Signed-off-by: Joel Kitching <kitching(a)google.com>
---
M src/security/vboot/bootmode.c
M src/security/vboot/misc.h
M src/security/vboot/vboot_common.c
M src/security/vboot/vboot_common.h
M src/security/vboot/vboot_logic.c
5 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/32843/1
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index e6e53b6..68749f0 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -164,10 +164,8 @@
int vboot_developer_mode_enabled(void)
{
- if (cbmem_possibly_online() && vboot_handoff_check_developer_flag())
- return 1;
-
- return 0;
+ return cbmem_possibly_online() &&
+ vboot_get_working_data()->flags & VBOOT_WD_FLAG_DEVELOPER_MODE;
}
#if CONFIG(VBOOT_NO_BOARD_SUPPORT)
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index 23159c8..acb6dbb 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -47,6 +47,8 @@
*/
/* vboot requests display initialization from coreboot. */
#define VBOOT_WD_FLAG_DISPLAY_INIT (1 << 0)
+/* vboot has selected developer mode. */
+#define VBOOT_WD_FLAG_DEVELOPER_MODE (1 << 1)
/*
* Source: security/vboot/common.c
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index 14f154c..ff8e6c8 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -88,11 +88,6 @@
return !!(vbho->out_flags & flag);
}
-int vboot_handoff_check_developer_flag(void)
-{
- return vboot_get_handoff_flag(VB_INIT_OUT_ENABLE_DEVELOPER);
-}
-
int vboot_handoff_check_recovery_flag(void)
{
return vboot_get_handoff_flag(VB_INIT_OUT_ENABLE_RECOVERY);
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 9a02303..a785a8b 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -62,7 +62,6 @@
* Returns value read for other fields
*/
int vboot_handoff_check_recovery_flag(void);
-int vboot_handoff_check_developer_flag(void);
int vboot_handoff_get_recovery_reason(void);
/* ============================ VBOOT REBOOT ============================== */
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index df34490..00347c3 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -364,10 +364,13 @@
vboot_reboot();
}
- /* Is vboot declaring that display is available? If so, we should mark
- it down, so that the mainboard/SoC knows to initialize display. */
+ /* Jot down some information from vboot which may be required later on
+ in coreboot boot flow. */
if (ctx.flags & VB2_CONTEXT_DISPLAY_INIT)
+ /* Mainboard/SoC should initialize display. */
vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DISPLAY_INIT;
+ if (ctx.flags & VB2_CONTEXT_DEVELOPER_MODE)
+ vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DEVELOPER_MODE;
/* Determine which firmware slot to boot (based on NVRAM) */
printk(BIOS_INFO, "Phase 2\n");
--
To view, visit https://review.coreboot.org/c/coreboot/+/32843
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ieb6ac4937c943aea78ddc762595a05387d2b8114
Gerrit-Change-Number: 32843
Gerrit-PatchSet: 1
Gerrit-Owner: Joel Kitching <kitching(a)google.com>
Gerrit-MessageType: newchange