Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/56921 )
Change subject: mb/google/guybrush: Create nipperkin variant
......................................................................
mb/google/guybrush: Create nipperkin variant
Create the nipperkin variant of the guybrush reference board by
copying the template files to a new directory named for the variant.
(Auto-Generated by create_coreboot_variant.sh version 4.5.0).
BUG=None
BRANCH=None
TEST=util/abuild/abuild -p none -t google/guybrush -x -a
make sure the build includes GOOGLE_NIPPERKIN
Signed-off-by: Karthikeyan Ramasubramanian <kramasub(a)google.com>
Change-Id: Ie525ea501e6c3d5d94e67c1db1d4e307fb7ccba7
---
M src/mainboard/google/guybrush/Kconfig
M src/mainboard/google/guybrush/Kconfig.name
A src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
A src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h
A src/mainboard/google/guybrush/variants/nipperkin/include/variant/gpio.h
A src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
A src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt
A src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt
A src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
9 files changed, 39 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/56921/1
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index 17cdada..2da9230 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -72,6 +72,7 @@
config MAINBOARD_PART_NUMBER
default "Guybrush" if BOARD_GOOGLE_GUYBRUSH
+ default "Nipperkin" if BOARD_GOOGLE_NIPPERKIN
config AMD_FWM_POSITION_INDEX
int
@@ -103,6 +104,7 @@
config VARIANT_DIR
default "guybrush" if BOARD_GOOGLE_GUYBRUSH
+ default "nipperkin" if BOARD_GOOGLE_NIPPERKIN
config DEVICETREE
default "variants/baseboard/devicetree.cb"
diff --git a/src/mainboard/google/guybrush/Kconfig.name b/src/mainboard/google/guybrush/Kconfig.name
index 076516c..edddbf8 100644
--- a/src/mainboard/google/guybrush/Kconfig.name
+++ b/src/mainboard/google/guybrush/Kconfig.name
@@ -3,3 +3,7 @@
config BOARD_GOOGLE_GUYBRUSH
bool "-> Guybrush"
select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
+
+config BOARD_GOOGLE_NIPPERKIN
+ bool "-> Nipperkin"
+ select BOARD_GOOGLE_BASEBOARD_GUYBRUSH
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
new file mode 100644
index 0000000..88e75bd
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+subdirs-y += ./memory
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h
new file mode 100644
index 0000000..9e61a44
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/ec.h>
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/include/variant/gpio.h b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/gpio.h
new file mode 100644
index 0000000..dfaeec3
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/gpio.h
@@ -0,0 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/gpio.h>
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
new file mode 100644
index 0000000..b0ca222
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
@@ -0,0 +1,5 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+## This is an auto-generated file. Do not edit!!
+## Add memory parts in mem_parts_used.txt and run spd_tools to regenerate.
+
+SPD_SOURCES = placeholder.spd.hex
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt b/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt
new file mode 100644
index 0000000..fa24790
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/dram_id.generated.txt
@@ -0,0 +1 @@
+DRAM Part Name ID to assign
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt
new file mode 100644
index 0000000..8124e4f
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt
@@ -0,0 +1,11 @@
+# This is a CSV file containing a list of memory parts used by this variant.
+# One part per line with an optional fixed ID in column 2.
+# Only include a fixed ID if it is required for legacy reasons!
+# Generated IDs are dependent on the order of parts in this file,
+# so new parts must always be added at the end of the file!
+#
+# Generate an updated Makefile.inc and dram_id.generated.txt by running the
+# gen_part_id tool from util/spd_tools/{ddr4,lp4x}.
+# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
+
+# Part Name, Fixed ID (optional)
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
new file mode 100644
index 0000000..c182265
--- /dev/null
+++ b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+chip soc/amd/cezanne
+ device domain 0 on
+
+ end # domain
+end # chip soc/amd/cezanne
--
To view, visit https://review.coreboot.org/c/coreboot/+/56921
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ie525ea501e6c3d5d94e67c1db1d4e307fb7ccba7
Gerrit-Change-Number: 56921
Gerrit-PatchSet: 1
Gerrit-Owner: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-MessageType: newchange
Attention is currently required from: Raul Rangel, Martin Roth, Marshall Dawson, Karthik Ramasubramanian, Felix Held.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56919 )
Change subject: soc/amd/common: Skip psp_verstage on S0i3 resume
......................................................................
Patch Set 1:
(1 comment)
File src/soc/amd/common/psp_verstage/psp_verstage.c:
https://review.coreboot.org/c/coreboot/+/56919/comment/7b59e453_2e133ddb
PS1, Line 205: Currently, we want to skip running verstage on all S0i3 resumes. This relies
: on an assumption that the PSP will be checksumming all of its components.
> Yes that is the eventual goal. We decided to introduce this change for 2 reasons: […]
Thanks for the background, Karthik. Let's capture the motivation behind the change in commit message as well. Also, it would be good to add a TODO and b/???? here to ensure we track dropping of this workaround once PSP behavior is finalized.
--
To view, visit https://review.coreboot.org/c/coreboot/+/56919
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia7b2560ff3d7621922ec4bc0e8793961f5d7550f
Gerrit-Change-Number: 56919
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Furquan Shaikh <furquan(a)google.com>
Gerrit-CC: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 11 Aug 2021 23:48:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Furquan Shaikh <furquan(a)google.com>
Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-MessageType: comment
Attention is currently required from: Jason Glenesk, Raul Rangel, Furquan Shaikh, Martin Roth, Marshall Dawson, Felix Held.
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56919 )
Change subject: soc/amd/common: Skip psp_verstage on S0i3 resume
......................................................................
Patch Set 1:
(4 comments)
Commit Message:
https://review.coreboot.org/c/coreboot/+/56919/comment/a9fa8da5_9a4a506c
PS1, Line 10: :
=
https://review.coreboot.org/c/coreboot/+/56919/comment/c9ed48fd_a1b07810
PS1, Line 10: S0i3
psp_verstage
File src/soc/amd/common/psp_verstage/psp_verstage.c:
https://review.coreboot.org/c/coreboot/+/56919/comment/e0e444cb_1fd4025e
PS1, Line 205: Currently, we want to skip running verstage on all S0i3 resumes. This relies
: on an assumption that the PSP will be checksumming all of its components.
> If verstage must not run on S0i3 resume, then I would expect PSP BL to not load this component at al […]
Yes that is the eventual goal. We decided to introduce this change for 2 reasons:
1) PSP release takes some time.
2) Also PSP team has been waiting on inputs on this bug: b/177064859 to avoid loading PSP verstage on S0i3. The concern is that PSP is loading lots of firmware components from SPI ROM on S0i3 resume
This is an alternative approach until a consensus is reached on the above 2 factors.
https://review.coreboot.org/c/coreboot/+/56919/comment/f83de323_5db2f1c2
PS1, Line 207: svc_get_boot_mode(&bootmode);
> I think we are doing this in verstage because it was the shortest path. […]
Preferably not. Please refer to the above comment.
--
To view, visit https://review.coreboot.org/c/coreboot/+/56919
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia7b2560ff3d7621922ec4bc0e8793961f5d7550f
Gerrit-Change-Number: 56919
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Furquan Shaikh <furquan(a)google.com>
Gerrit-CC: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 11 Aug 2021 21:44:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Jason Glenesk <jason.glenesk(a)gmail.com>
Comment-In-Reply-To: Furquan Shaikh <furquan(a)google.com>
Gerrit-MessageType: comment
Attention is currently required from: Raul Rangel, Martin Roth, Marshall Dawson, Felix Held.
Jason Glenesk has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56919 )
Change subject: soc/amd/common: Skip psp_verstage on S0i3 resume
......................................................................
Patch Set 1:
(1 comment)
File src/soc/amd/common/psp_verstage/psp_verstage.c:
https://review.coreboot.org/c/coreboot/+/56919/comment/edd95c9e_ba8ffd0d
PS1, Line 207: svc_get_boot_mode(&bootmode);
I think we are doing this in verstage because it was the shortest path. Are we going to keep it this way after the PSP implements their fix not to load during resume?
--
To view, visit https://review.coreboot.org/c/coreboot/+/56919
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia7b2560ff3d7621922ec4bc0e8793961f5d7550f
Gerrit-Change-Number: 56919
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Furquan Shaikh <furquan(a)google.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 11 Aug 2021 21:13:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Raul Rangel, Martin Roth, Felix Held.
Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/56499 )
Change subject: mb/google/guybrush: Update GPIOs for fingerprint
......................................................................
Patch Set 7: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/56499
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iaae5feec60abb2480777d1f99174254c5132bb43
Gerrit-Change-Number: 56499
Gerrit-PatchSet: 7
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Wed, 11 Aug 2021 20:56:11 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment