Attention is currently required from: Bora Guvendik, Tarun Tuli, Subrata Banik, Selma Bensaid, Tim Wawrzynczak, Nick Vaccaro.
YH Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/68094 )
Change subject: mb/google/brya/var/brya0: use RPL FSP headers
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://review.coreboot.org/c/coreboot/+/68094
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2dd84757532d734ad97b74ba960537d937fb313e
Gerrit-Change-Number: 68094
Gerrit-PatchSet: 2
Gerrit-Owner: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Reviewer: Selma Bensaid <selma.bensaid(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Reviewer: YH Lin <yueherngl(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Selma Bensaid <selma.bensaid(a)intel.com>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Comment-Date: Tue, 04 Oct 2022 20:23:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Subrata Banik, Tim Wawrzynczak, Nick Vaccaro.
YH Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/68025 )
Change subject: mb/google/brya/var/brya0: add new THERMAL FW_CONFIG field
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit https://review.coreboot.org/c/coreboot/+/68025
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iba3bd87abd4c112ceff4bbe51a7cf9eae3a694f2
Gerrit-Change-Number: 68025
Gerrit-PatchSet: 4
Gerrit-Owner: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Sumeet R Pawnikar <sumeet.r.pawnikar(a)intel.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Reviewer: YH Lin <yueherngl(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Comment-Date: Tue, 04 Oct 2022 20:23:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Bora Guvendik, Varshit Pandya, Noga Smith, Subrata Banik, Selma Bensaid, Tim Wawrzynczak, Nick Vaccaro, AlanKY Lee.
YH Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/67929 )
Change subject: mb/google/brya/var/skolas: sync brya0 and skolas FW_CONFIG
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/67929
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3be26e0a05f4dc08e5dc3f6ef7b71bdd8fd4f859
Gerrit-Change-Number: 67929
Gerrit-PatchSet: 5
Gerrit-Owner: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: AlanKY Lee <alanky_lee(a)compal.corp-partner.google.com>
Gerrit-Reviewer: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: Noga Smith <nogasmith(a)google.com>
Gerrit-Reviewer: Selma Bensaid <selma.bensaid(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Reviewer: Varshit Pandya <pandyavarshit(a)gmail.com>
Gerrit-Reviewer: YH Lin <yueherngl(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Bora Guvendik <bora.guvendik(a)intel.com>
Gerrit-Attention: Varshit Pandya <pandyavarshit(a)gmail.com>
Gerrit-Attention: Noga Smith <nogasmith(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Selma Bensaid <selma.bensaid(a)intel.com>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Attention: AlanKY Lee <alanky_lee(a)compal.corp-partner.google.com>
Gerrit-Comment-Date: Tue, 04 Oct 2022 20:23:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Hello build bot (Jenkins), Jason Glenesk, Raul Rangel, Matt DeVillier, Felix Held,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/68122
to look at the new patch set (#2).
Change subject: soc/amd/common/[,block/cpu/]Makefile.inc: Add support for sbin ucode files
......................................................................
soc/amd/common/[,block/cpu/]Makefile.inc: Add support for sbin ucode files
Recent PI releases have been distributing the ucode patch files as sbin
files instead of bin files. The sbin uses a 256 byte amd_fw_header to
wrap the bin file.
Offset 0x14 of the header is the size field. The can be extracted with
hexdump to get the size of the ucode bin file. The bin file can then be
extracted with dd and placed in the build directory for inclusion as a
cbfs file.
In the case where both an sbin and bin ucode file are present, the sbin
file will be added and a note will print at the start of the build about
the bin file being skipped.
TEST=chausie/morphius builds with only bin, only sbin, non-matching bin
and sbin, matching bin and sbin files
Signed-off-by: Fred Reitberger <reitbergerfred(a)gmail.com>
Change-Id: I29768ea19543bdc76662e687f59bf31b76f555ae
---
M src/soc/amd/common/Makefile.inc
M src/soc/amd/common/block/cpu/Makefile.inc
2 files changed, 58 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/68122/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/68122
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I29768ea19543bdc76662e687f59bf31b76f555ae
Gerrit-Change-Number: 68122
Gerrit-PatchSet: 2
Gerrit-Owner: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: newpatchset
Fred Reitberger has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68122 )
Change subject: soc/amd/common/[,block/cpu/]Makefile.inc: Add support for sbin ucode files
......................................................................
soc/amd/common/[,block/cpu/]Makefile.inc: Add support for sbin ucode files
Recent PI releases have been distributing the ucode patch files as sbin
files instead of bin files. The sbin uses a 256 byte amd_fw_header to
wrap the bin file.
Offset 0x14 of the header is the size field. The can be extracted with
hexdump to get the size of the ucode bin file. The bin file can then be
extracted with dd and placed in the build directory for inclusion as a
cbfs file.
In the case where both an sbin and bin ucode file are present, the sbin
file will be added and a note will print at the start of the build about
the bin file being skipped.
TEST=chausie/morphius builds with only bin, only sbin, non-matching bin
and sbin, matching bin and sbin files
Signed-off-by: Fred Reitberger <reitbergerfred(a)gmail.com>
Change-Id: I29768ea19543bdc76662e687f59bf31b76f555ae
---
M src/soc/amd/common/Makefile.inc
M src/soc/amd/common/block/cpu/Makefile.inc
2 files changed, 59 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/68122/1
diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index a935565..eeb68aa 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -13,5 +13,6 @@
DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d -e /*/d -e /^FIRMWARE_LOCATION/d $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}' ))
amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin)
+amd_microcode_sbins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.sbin)
endif
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index 7541a9b..174027b 100644
--- a/src/soc/amd/common/block/cpu/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/Makefile.inc
@@ -16,5 +16,35 @@
endif
endef
-$(foreach ucode,$(amd_microcode_bins),$(eval $(call add-ucode-as-cbfs,$(ucode),$(shell hexdump -n 2 -s 0x18 -e '"%x"' $(ucode)))))
-endif
+# Function to grab bytes from a file and format them as desired
+# $(call extract-bytes,filename,bytes-to-read,offset-to-bytes,output-format)
+extract-bytes = $(shell hexdump -n $(2) -s $(3) -e '$(4)' $(1))
+
+# Function to grab part of one file and put it into another
+# $(call extract-to-file,input-filename,output-filename,offset-into-file,bytes-to-get)
+extract-to-file = $(shell dd ibs=1 status=none skip=$(3) count=$(4) if=$(1) of=$(2))
+
+# Standardize the name of the temp file created in the build directory
+tmp-ucode-name = $(obj)/$(subst .sbin,.bin,$(notdir $(1)))
+
+# add-ucode-sbin-as-cbfs
+# $(call add-ucode-sbin-as-cbfs,sbin-ucode-file)
+# Convert the sbin to a bin file located at tmp-ucode-name, then add the bin file with add-ucode-as-cbfs
+# The sbin header is 256 bytes, and the size of the unwrapped file is at offset 0x14
+define add-ucode-sbin-as-cbfs
+ $(eval $(call extract-to-file,$(1),$(call tmp-ucode-name,$(1)),256,$(call extract-bytes,$(1),4,0x14,"%d")))
+ $(eval $(call add-ucode-as-cbfs,$(call tmp-ucode-name,$(1)),$(call extract-bytes,$(1),2,0x118,"%04x")))
+endef
+
+# check if there is already an sbin wrapped ucode file and only add if there is not
+define add-ucode-if-not-sbin
+ $(if $(findstring $(call tmp-ucode-name,$(1)),$(call tmp-ucode-name,$(amd_microcode_sbins))),\
+ $(info skipping $(1) due to .sbin),\
+ $(call add-ucode-as-cbfs,$(1),$(call extract-bytes,$(1),2,0x18,"%04x")))
+endef
+
+$(foreach ucsbin,$(amd_microcode_sbins),$(eval $(call add-ucode-sbin-as-cbfs,$(ucsbin))))
+$(foreach ucode,$(amd_microcode_bins),$(eval $(call add-ucode-if-not-sbin,$(ucode))))
+
+endif #ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_UCODE),y)
+
--
To view, visit https://review.coreboot.org/c/coreboot/+/68122
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I29768ea19543bdc76662e687f59bf31b76f555ae
Gerrit-Change-Number: 68122
Gerrit-PatchSet: 1
Gerrit-Owner: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-MessageType: newchange
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/68119 )
Change subject: util/amdfwtool: Add new types
......................................................................
Patch Set 1:
(1 comment)
File util/amdfwtool/data_parse.c:
Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-159666):
https://review.coreboot.org/c/coreboot/+/68119/comment/0a51266d_726b1bb6
PS1, Line 365: fw_type =AMD_TOKEN_UNLOCK;
spaces required around that '=' (ctx:WxV)
--
To view, visit https://review.coreboot.org/c/coreboot/+/68119
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I20dc77fb6f83dc813e3da5fe30f8f52068fc4662
Gerrit-Change-Number: 68119
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 04 Oct 2022 18:39:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment