Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/29060 )
Change subject: vboot: fix CONFIG_RESUME_PATH_SAME_AS_BOOT S3 resume logic
......................................................................
Patch Set 7: Code-Review+2
--
To view, visit https://review.coreboot.org/29060
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I1ef0bcdfd01746198f8140f49698b58065d820b9
Gerrit-Change-Number: 29060
Gerrit-PatchSet: 7
Gerrit-Owner: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Wed, 24 Oct 2018 09:06:29 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: Yes
Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/29063 )
Change subject: tpm2/tlcl_send_startup: should pass on TPM_E_INVALID_POSTINIT
......................................................................
tpm2/tlcl_send_startup: should pass on TPM_E_INVALID_POSTINIT
Change TSS layer tlcl_send_startup() to expose TPM_RC_INITIALIZE,
which gets mapped to TPM_E_INVALID_POSTINIT. The return value
is exposed to TSPI layer tpm_setup(), and dealt with as follows:
- Regular startup: TPM_E_INVALID_POSTINIT should count as failure.
- S3 resume: TPM_E_INVALID_POSTINIT can be assumed to mean that
TPM maintains power during S3, and is already initialized.
Also, correct an error where |response| could be erroneously accessed
when it is set to NULL.
BUG=b:114018226
TEST=compile coreboot
Change-Id: Ib0c3750386ae04279401c1dc318c5019d39f5ecf
Signed-off-by: Joel Kitching <kitching(a)google.com>
Reviewed-on: https://review.coreboot.org/29063
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
---
M src/security/tpm/tss/tcg-2.0/tss.c
1 file changed, 15 insertions(+), 3 deletions(-)
Approvals:
build bot (Jenkins): Verified
Paul Menzel: Looks good to me, but someone else must approve
Philipp Deppenwiese: Looks good to me, approved
Julius Werner: Looks good to me, approved
diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c
index e6ec57c..c67fdfa 100644
--- a/src/security/tpm/tss/tcg-2.0/tss.c
+++ b/src/security/tpm/tss/tcg-2.0/tss.c
@@ -61,12 +61,24 @@
startup.startup_type = type;
response = tpm_process_command(TPM2_Startup, &startup);
- if (response && (response->hdr.tpm_code == 0 ||
- response->hdr.tpm_code == TPM_RC_INITIALIZE)) {
- return TPM_SUCCESS;
+ /* IO error, tpm2_response pointer is empty. */
+ if (response == NULL) {
+ printk(BIOS_ERR, "%s: TPM communication error\n", __func__);
+ return TPM_E_IOERROR;
}
+
printk(BIOS_INFO, "%s: Startup return code is %x\n",
__func__, response->hdr.tpm_code);
+
+ switch (response->hdr.tpm_code) {
+ case TPM_RC_INITIALIZE:
+ /* TPM already initialized. */
+ return TPM_E_INVALID_POSTINIT;
+ case TPM2_RC_SUCCESS:
+ return TPM_SUCCESS;
+ }
+
+ /* Collapse any other errors into TPM_E_IOERROR. */
return TPM_E_IOERROR;
}
--
To view, visit https://review.coreboot.org/29063
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0c3750386ae04279401c1dc318c5019d39f5ecf
Gerrit-Change-Number: 29063
Gerrit-PatchSet: 6
Gerrit-Owner: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Vadim Bendebury <vbendeb(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Werner Zeh <werner.zeh(a)siemens.com>
Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/29063 )
Change subject: tpm2/tlcl_send_startup: should pass on TPM_E_INVALID_POSTINIT
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://review.coreboot.org/29063
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib0c3750386ae04279401c1dc318c5019d39f5ecf
Gerrit-Change-Number: 29063
Gerrit-PatchSet: 5
Gerrit-Owner: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Joel Kitching <kitching(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com>
Gerrit-Reviewer: Vadim Bendebury <vbendeb(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Comment-Date: Wed, 24 Oct 2018 09:05:01 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: Yes
Hello Richard Spiegel, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/29243
to look at the new patch set (#5).
Change subject: {cpu,drivers,nb,sb}/amd: Replace {MSR,MTRR} addresses with macros
......................................................................
{cpu,drivers,nb,sb}/amd: Replace {MSR,MTRR} addresses with macros
Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/cpu/amd/agesa/family12/fixme.c
M src/cpu/amd/agesa/family14/fixme.c
M src/cpu/amd/agesa/family15tn/fixme.c
M src/cpu/amd/agesa/family16kb/fixme.c
M src/cpu/amd/pi/00630F01/fixme.c
M src/cpu/amd/pi/00660F01/fixme.c
M src/cpu/amd/pi/00730F01/fixme.c
M src/drivers/amd/agesa/s3_mtrr.c
M src/include/cpu/amd/mtrr.h
M src/northbridge/amd/amdmct/mct/mct_d.c
M src/northbridge/amd/amdmct/mct/mctdqs_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
M src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
M src/southbridge/amd/rs780/gfx.c
M src/southbridge/amd/sr5650/sr5650.c
16 files changed, 54 insertions(+), 44 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/29243/5
--
To view, visit https://review.coreboot.org/29243
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Gerrit-Change-Number: 29243
Gerrit-PatchSet: 5
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Martin Roth <martinroth(a)google.com>
Hello Richard Spiegel, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/29243
to look at the new patch set (#4).
Change subject: {cpu,drivers,nb,sb}/amd: Replace {MSR,MTRR} addresses with macros
......................................................................
{cpu,drivers,nb,sb}/amd: Replace {MSR,MTRR} addresses with macros
Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/cpu/amd/agesa/family12/fixme.c
M src/cpu/amd/agesa/family14/fixme.c
M src/cpu/amd/agesa/family15tn/fixme.c
M src/cpu/amd/agesa/family16kb/fixme.c
M src/cpu/amd/pi/00630F01/fixme.c
M src/cpu/amd/pi/00660F01/fixme.c
M src/cpu/amd/pi/00730F01/fixme.c
M src/drivers/amd/agesa/s3_mtrr.c
M src/include/cpu/amd/mtrr.h
M src/northbridge/amd/amdmct/mct/mct_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
M src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
M src/southbridge/amd/rs780/gfx.c
M src/southbridge/amd/sr5650/sr5650.c
15 files changed, 51 insertions(+), 39 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/29243/4
--
To view, visit https://review.coreboot.org/29243
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Gerrit-Change-Number: 29243
Gerrit-PatchSet: 4
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Martin Roth <martinroth(a)google.com>
Hello Richard Spiegel, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/29243
to look at the new patch set (#3).
Change subject: {cpu,drivers,sb}/amd: Replace {MSR,MTRR} addresses with macros
......................................................................
{cpu,drivers,sb}/amd: Replace {MSR,MTRR} addresses with macros
Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr>
---
M src/cpu/amd/agesa/family12/fixme.c
M src/cpu/amd/agesa/family14/fixme.c
M src/cpu/amd/agesa/family15tn/fixme.c
M src/cpu/amd/agesa/family16kb/fixme.c
M src/cpu/amd/pi/00630F01/fixme.c
M src/cpu/amd/pi/00660F01/fixme.c
M src/cpu/amd/pi/00730F01/fixme.c
M src/drivers/amd/agesa/s3_mtrr.c
M src/include/cpu/amd/mtrr.h
M src/northbridge/amd/amdmct/mct/mct_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
M src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
M src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
M src/southbridge/amd/rs780/gfx.c
M src/southbridge/amd/sr5650/sr5650.c
15 files changed, 51 insertions(+), 39 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/29243/3
--
To view, visit https://review.coreboot.org/29243
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7e8de35dcdad52bb311b34bfa9b272d17ed3186b
Gerrit-Change-Number: 29243
Gerrit-PatchSet: 3
Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr>
Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Martin Roth <martinroth(a)google.com>