Change in coreboot[master]: mb/google/zork: Enable psp_verstage

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Martin Roth (Code Review)

9 Jun 2020 9 Jun '20

9:42 a.m.

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig A src/mainboard/google/zork/memlayout.ld 2 files changed, 35 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/1

diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 9a2e373..aca5640 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -88,8 +88,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH - select VBOOT_STARTS_IN_BOOTBLOCK - select VBOOT_SEPARATE_VERSTAGE

config VBOOT_VBNV_OFFSET hex @@ -122,6 +120,21 @@ depends on USE_OEM_BIN default ""

+#TODO: Change these to get the postition from the FMAP file +config PICASSO_FW_A_POSITION + hex + default 0xFF031040 + depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK + help + Location of the AMD firmware in the RW_A region. + +config PICASSO_FW_B_POSITION + hex + default 0xFF3CF040 + depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK + help + Location of the AMD firmware in the RW_B region + config VARIANT_HAS_FW_CONFIG bool help @@ -134,4 +147,21 @@ help Which board version did FW_CONFIG become valid in CBI.

+config VBOOT_STARTS_BEFORE_BOOTBLOCK + bool "PSP verstage" + depends on HAVE_PRE_BOOTBLOCK_VBOOT_SUPPORT + default y if VBOOT + help + Firmware verification happens before the main processor is brought + online. + +config VBOOT_STARTS_IN_BOOTBLOCK + bool "X86 verstage (in bootblock)" + depends on VBOOT && ! VBOOT_STARTS_BEFORE_BOOTBLOCK + select VBOOT_SEPARATE_VERSTAGE + help + Firmware verification happens during the end of or right after the + bootblock. This implies that a static VBOOT2_WORK() buffer must be + allocated in memlayout. + endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ diff --git a/src/mainboard/google/zork/memlayout.ld b/src/mainboard/google/zork/memlayout.ld new file mode 100644 index 0000000..5493e0d --- /dev/null +++ b/src/mainboard/google/zork/memlayout.ld @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <soc/memlayout.ld>

Attachments:

attachment.htm (text/html — 6.1 KB)

Show replies by date

Martin Roth (Code Review)

15 Jun 15 Jun

1:35 a.m.

Hello build bot (Jenkins), Julius Werner,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42226

to look at the new patch set (#2).

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig 1 file changed, 32 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/2

Eric Peers (Code Review)

23 Jun 23 Jun

6:36 p.m.

Eric Peers has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 3:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... PS3, Line 125: #TODO: Change these to get the postition from the FMAP file bug #?

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... PS3, Line 159: # TODO: Remove after testing is complete bug # to remove or date that it should be removed by?

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-Comment-Date: Tue, 23 Jun 2020 16:36:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Martin Roth (Code Review)

24 Jun 24 Jun

8:08 a.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Julius Werner, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42226

to look at the new patch set (#4).

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig 1 file changed, 30 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/4

Martin Roth (Code Review)

3:48 p.m.

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 4:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... PS3, Line 125: #TODO: Change these to get the postition from the FMAP file

...

bug #?

Removed - The todo wasn't needed, it's tracked in the bug but the code stands as it is.

https://review.coreboot.org/c/coreboot/+/42226/3/src/mainboard/google/zork/K... PS3, Line 159: # TODO: Remove after testing is complete

...

bug # to remove or date that it should be removed by?

Removed todo.

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 4 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 24 Jun 2020 13:48:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Eric Peers epeers@google.com Gerrit-MessageType: comment

Martin Roth (Code Review)

6:21 p.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Julius Werner, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42226

to look at the new patch set (#5).

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig 1 file changed, 30 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/5

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 5 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Aaron Durbin (Code Review)

25 Jun 25 Jun

7:15 a.m.

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 5:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... PS5, Line 154: default y if VBOOT Do we want to make this default or select it in our chromium configs?

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... PS5, Line 162: select VBOOT_SEPARATE_VERSTAGE shouldn't we be selecting this for VBOOT_STARTS_BEFORE_BOOTBLOCK as well?

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 5 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 25 Jun 2020 05:15:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Martin Roth (Code Review)

5:45 p.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Julius Werner, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42226

to look at the new patch set (#6).

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig 1 file changed, 30 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/6

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Raul Rangel (Code Review)

11:07 p.m.

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 6: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/42226/6/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/6/src/mainboard/google/zork/K... PS6, Line 128: 0xFF031040 Can you provide the command you used to calculate these so they can be double checked? Also if someone wants to update the values at a later date.

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 25 Jun 2020 21:07:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

26 Jun 26 Jun

1:56 a.m.

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42226/6/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/6/src/mainboard/google/zork/K... PS6, Line 128: 0xFF031040

...

Can you provide the command you used to calculate these so they can be double checked? Also if someo […]

Sure. This is the start of the region in the fmap table with 0x40 added for the cbfs header.

I'm working on getting rid of these and will be updating verstage to find them with cbfs. That needs to happen in the next couple of weeks.

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 6 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 25 Jun 2020 23:56:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Raul Rangel rrangel@chromium.org Gerrit-MessageType: comment

Martin Roth (Code Review)

2:05 a.m.

Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, Julius Werner, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42226

to look at the new patch set (#7).

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 --- M src/mainboard/google/zork/Kconfig 1 file changed, 32 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42226/7

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 7 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: newpatchset

Raul Rangel (Code Review)

6:21 p.m.

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 7: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 7 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 26 Jun 2020 16:21:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Martin Roth (Code Review)

8 Jul 8 Jul

11:06 p.m.

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 9:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... PS5, Line 154: default y if VBOOT

...

Do we want to make this default or select it in our chromium configs?

I think we want to make it the default. I was thinking we'd remove the bootblock option for zork relatively soon.

https://review.coreboot.org/c/coreboot/+/42226/5/src/mainboard/google/zork/K... PS5, Line 162: select VBOOT_SEPARATE_VERSTAGE

...

shouldn't we be selecting this for VBOOT_STARTS_BEFORE_BOOTBLOCK as well?

It automatically gets selected by selecting VBOOT_STARTS_BEFORE_BOOTBLOCK, so there's no need to do it here.

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 9 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Wed, 08 Jul 2020 21:06:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Aaron Durbin adurbin@chromium.org Gerrit-MessageType: comment

Martin Roth (Code Review)

11:06 p.m.

Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

mb/google/zork: Enable psp_verstage

Finally enable psp_verstage for zork.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42226 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Raul Rangel rrangel@chromium.org --- M src/mainboard/google/zork/Kconfig 1 file changed, 32 insertions(+), 2 deletions(-)

Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved

diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 19225d7..a6c866d 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -100,8 +100,6 @@ config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH - select VBOOT_STARTS_IN_BOOTBLOCK - select VBOOT_SEPARATE_VERSTAGE

config VBOOT_VBNV_OFFSET hex @@ -123,6 +121,22 @@ hex default 0x50

+config PICASSO_FW_A_POSITION + hex + default 0xFF031040 + depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK + help + Location of the AMD firmware in the RW_A region. This is the + start of the RW-A region + 64 bytes for the cbfs header. + +config PICASSO_FW_B_POSITION + hex + default 0xFF3CF040 + depends on VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK + help + Location of the AMD firmware in the RW_B region. This is the + start of the RW-A region + 64 bytes for the cbfs header. + config VARIANT_HAS_FW_CONFIG bool help @@ -151,4 +165,20 @@ default 2 if BOARD_GOOGLE_VILBOZ default VARIANT_MIN_BOARD_ID_V3_SCHEMATICS

+config VBOOT_STARTS_BEFORE_BOOTBLOCK + bool "PSP verstage" + default y if VBOOT + help + Firmware verification happens before the main processor is brought + online. + +config VBOOT_STARTS_IN_BOOTBLOCK + bool "X86 verstage (in bootblock)" + depends on VBOOT && ! VBOOT_STARTS_BEFORE_BOOTBLOCK + select VBOOT_SEPARATE_VERSTAGE + help + Firmware verification happens during the end of or right after the + bootblock. This implies that a static VBOOT2_WORK() buffer must be + allocated in memlayout. + endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 10 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

Raul Rangel (Code Review)

11:59 p.m.

Raul Rangel has created a revert of this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 10 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: revert

Kyösti Mälkki (Code Review)

9 Jul 9 Jul

5:45 p.m.

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 10:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42226/10/src/mainboard/google/zork/... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/10/src/mainboard/google/zork/... PS10, Line 171: help Why is this a visible option? Does not build if selected and VBOOT=n.

https://review.coreboot.org/c/coreboot/+/42226/10/src/mainboard/google/zork/... PS10, Line 178: select VBOOT_SEPARATE_VERSTAGE This asymmetry is confusing to me, it's a VBOOT_SEPARATE_VERSTAGE=y in the VBOOT_STARTS_BEFORE_BOOTBLOCK case too.

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 10 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: 9elements QA hardwaretestrobot@gmail.com Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 09 Jul 2020 15:45:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Arthur Heymans (Code Review)

27 Jul 27 Jul

4:12 p.m.

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42226 )

Change subject: mb/google/zork: Enable psp_verstage ......................................................................

Patch Set 10:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42226/10/src/mainboard/google/zork/... File src/mainboard/google/zork/Kconfig:

https://review.coreboot.org/c/coreboot/+/42226/10/src/mainboard/google/zork/... PS10, Line 138: RW-A RW-B?

-- To view, visit https://review.coreboot.org/c/coreboot/+/42226 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a12c2074d7c84c0cb766393c66f5eff29a58d5 Gerrit-Change-Number: 42226 Gerrit-PatchSet: 10 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Raul Rangel rrangel@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: 9elements QA hardwaretestrobot@gmail.com Gerrit-CC: Arthur Heymans arthur@aheymans.xyz Gerrit-CC: Eric Peers epeers@google.com Gerrit-CC: Kyösti Mälkki kyosti.malkki@gmail.com Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Mon, 27 Jul 2020 14:12:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1562

days inactive

1610

days old

coreboot-gerrit@coreboot.org

16 comments

6 participants

tags (0)

participants (6)

Aaron Durbin (Code Review)
Arthur Heymans (Code Review)
Eric Peers (Code Review)
Kyösti Mälkki (Code Review)
Martin Roth (Code Review)
Raul Rangel (Code Review)