Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson, Felix Held.
Kangheui Won has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52961 )
Change subject: cezanne/psp_verstage: populate a/b firmware
......................................................................
cezanne/psp_verstage: populate a/b firmware
Build amdfw_[ab] and put them into CBFS. We can reuse FW_[AB] position
from zork since we have same flash layout and size.
Signed-off-by: Kangheui Won <khwon(a)chromium.org>
Change-Id: Idb31afa7a513f01593b2af75515a170dfca8d360
---
M src/mainboard/google/guybrush/Kconfig
M src/mainboard/google/mancomb/Kconfig
M src/soc/amd/cezanne/Kconfig
M src/soc/amd/cezanne/Makefile.inc
4 files changed, 97 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/52961/1
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index 8c23cf0..ef27cd5 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -71,6 +71,22 @@
hex
default 0x50
+config CEZANNE_FW_A_POSITION
+ hex
+ default 0xFF012040
+ depends on VBOOT_SLOTS_RW_AB
+ 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 CEZANNE_FW_B_POSITION
+ hex
+ default 0xFF312040
+ depends on VBOOT_SLOTS_RW_AB
+ 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 EFS_SPI_READ_MODE
int
default 0 if EM100 # Normal read mode
diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig
index 4ed29cd..328fb5d 100644
--- a/src/mainboard/google/mancomb/Kconfig
+++ b/src/mainboard/google/mancomb/Kconfig
@@ -63,6 +63,22 @@
hex
default 0x50
+config CEZANNE_FW_A_POSITION
+ hex
+ default 0xFF012040
+ depends on VBOOT_SLOTS_RW_AB
+ 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 CEZANNE_FW_B_POSITION
+ hex
+ default 0xFF312040
+ depends on VBOOT_SLOTS_RW_AB
+ 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 EFS_SPI_READ_MODE
int
default 0 if EM100 # Normal read mode
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 7d76699..cd07108 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -417,4 +417,32 @@
This is the byte before the default first byte used by VBNV
(0x26 + 0x0E - 1)
+if VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+
+config RWA_REGION_ONLY
+ string
+ default "apu/amdfw_a"
+ help
+ Add a space-delimited list of filenames that should only be in the
+ RW-A section.
+
+config RWB_REGION_ONLY
+ string
+ default "apu/amdfw_b"
+ help
+ Add a space-delimited list of filenames that should only be in the
+ RW-B section.
+
+config CEZANNE_FW_A_POSITION
+ hex
+ help
+ Location of the AMD firmware in the RW_A region
+
+config CEZANNE_FW_B_POSITION
+ hex
+ help
+ Location of the AMD firmware in the RW_B region
+
+endif # VBOOT_SLOTS_RW_AB && VBOOT_STARTS_BEFORE_BOOTBLOCK
+
endif # SOC_AMD_CEZANNE
diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc
index ebdad45..8b4b1bc 100644
--- a/src/soc/amd/cezanne/Makefile.inc
+++ b/src/soc/amd/cezanne/Makefile.inc
@@ -234,11 +234,48 @@
$(AMDCOMPRESS) --infile $(PSP_ELF_FILE) --outfile $@ --compress \
--maxsize $(PSP_BIOSBIN_SIZE)
+$(obj)/amdfw_a.rom: $(obj)/amdfw.rom
+ rm -f $@
+ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n"
+ $(AMDFWTOOL) \
+ $(AMDFW_COMMON_ARGS) \
+ $(OPT_APOB_NV_SIZE) \
+ $(OPT_APOB_NV_BASE) \
+ --location $(shell printf "%#x" $(CONFIG_CEZANNE_FW_A_POSITION)) \
+ --anywhere \
+ --multilevel \
+ --output $@
+
+$(obj)/amdfw_b.rom: $(obj)/amdfw.rom
+ rm -f $@
+ @printf " AMDFWTOOL $(subst $(obj)/,,$(@))\n"
+ $(AMDFWTOOL) \
+ $(AMDFW_COMMON_ARGS) \
+ $(OPT_APOB_NV_SIZE) \
+ $(OPT_APOB_NV_BASE) \
+ --location $(shell printf "%#x" $(CONFIG_CEZANNE_FW_B_POSITION)) \
+ --anywhere \
+ --multilevel \
+ --output $@
+
+
cbfs-files-y += apu/amdfw
apu/amdfw-file := $(obj)/amdfw.rom
apu/amdfw-position := $(CEZANNE_FWM_POSITION)
apu/amdfw-type := raw
+ifeq ($(CONFIG_VBOOT_SLOTS_RW_AB)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy)
+cbfs-files-y += apu/amdfw_a
+apu/amdfw_a-file := $(obj)/amdfw_a.rom
+apu/amdfw_a-position := $(call strip_quotes, $(CONFIG_CEZANNE_FW_A_POSITION))
+apu/amdfw_a-type := raw
+
+cbfs-files-y += apu/amdfw_b
+apu/amdfw_b-file := $(obj)/amdfw_b.rom
+apu/amdfw_b-position := $(call strip_quotes, $(CONFIG_CEZANNE_FW_B_POSITION))
+apu/amdfw_b-type := raw
+endif
+
cpu_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/UcodePatch_*.bin)
endif # ($(CONFIG_SOC_AMD_CEZANNE),y)
--
To view, visit https://review.coreboot.org/c/coreboot/+/52961
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Idb31afa7a513f01593b2af75515a170dfca8d360
Gerrit-Change-Number: 52961
Gerrit-PatchSet: 1
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
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-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: newchange
Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson, Kangheui Won, Felix Held.
Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Marshall Dawson, Felix Held,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/52751
to look at the new patch set (#2).
Change subject: cezanne/psp_verstage: reduce memory usage
......................................................................
cezanne/psp_verstage: reduce memory usage
For now we only have 80KB for psp_verstage in cezanne. (it's 160KB for
picasso). So we have to trim down various things to fit into 80KB space.
This should be reverted after we have enough space in the PSP since this
increases boot time quite a lot.
Signed-off-by: Kangheui Won <khwon(a)chromium.org>
Change-Id: I30730a6dc53e2449981c635ecfe63029c73e58ee
---
M src/soc/amd/cezanne/Kconfig
M src/soc/amd/common/psp_verstage/Makefile.inc
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/52751/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/52751
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I30730a6dc53e2449981c635ecfe63029c73e58ee
Gerrit-Change-Number: 52751
Gerrit-PatchSet: 2
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
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: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Kangheui Won <khwon(a)chromium.org>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: Subrata Banik, Nico Huber, Furquan Shaikh, Tim Wawrzynczak, Angel Pons.
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/52895 )
Change subject: include/console: Fix duplicate entry of postcode 0x79
......................................................................
Patch Set 4:
(1 comment)
File src/include/console/post_codes.h:
https://review.coreboot.org/c/coreboot/+/52895/comment/6956ac02_3b34a8bf
PS3, Line 190: POST_BS_WRITE_TABLES
> All the POST_BS_* post codes are used in the boot state machine as the comment indicates. […]
Ahh, got it. Thanks.
btw, looks like Nico and Angel shared their feedback and i have addressed those.
Can we make progress with this CL now ?
--
To view, visit https://review.coreboot.org/c/coreboot/+/52895
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I50cc75cd3097fba3e7faff05188511bba69ef1e7
Gerrit-Change-Number: 52895
Gerrit-PatchSet: 4
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-CC: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Subrata Banik <subi.banik(a)gmail.com>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-Attention: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Comment-Date: Thu, 06 May 2021 06:27:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Subrata Banik <subi.banik(a)gmail.com>
Comment-In-Reply-To: Furquan Shaikh <furquan(a)google.com>
Comment-In-Reply-To: Subrata Banik <subrata.banik(a)intel.com>
Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-MessageType: comment
Attention is currently required from: David Wu.
Karthik Ramasubramanian has uploaded a new patch set (#3) to the change originally created by David Wu. ( https://review.coreboot.org/c/coreboot/+/52887 )
Change subject: mb/google/dedede: Add a variant callback to update devicetree config
......................................................................
mb/google/dedede: Add a variant callback to update devicetree config
This callback is required to update the devicetree config at run-time
after probing the firmware config.
BUG=b:186380807
BRANCH=dedede
TEST=Build and boot to OS in metaknight.
Change-Id: I857211bfc4beb36ab225f3786c1707336a34aae9
Signed-off-by: David Wu <david_wu(a)quanta.corp-partner.google.com>
---
M src/mainboard/google/dedede/mainboard.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/52887/3
--
To view, visit https://review.coreboot.org/c/coreboot/+/52887
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I857211bfc4beb36ab225f3786c1707336a34aae9
Gerrit-Change-Number: 52887
Gerrit-PatchSet: 3
Gerrit-Owner: David Wu <david_wu(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Attention: David Wu <david_wu(a)quanta.corp-partner.google.com>
Gerrit-MessageType: newpatchset