Attention is currently required from: Martin Roth, Furquan Shaikh.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Furquan Shaikh, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/52085
to look at the new patch set (#2).
Change subject: decompressor: Add CBFS_VERIFICATION support
......................................................................
decompressor: Add CBFS_VERIFICATION support
CBFS_VERIFICATION requires the CBFS metadata hash anchor to be linked
into an uncompressed stage, but for platforms using COMPRESS_BOOTBLOCK,
this is only the decompressor stage. The first CBFS accesses are made in
the bootblock stage after decompression, so if we want to make
CBFS_VERIFICATION work on those platforms, we have to pass the metadata
hash anchor from the decompressor into the bootblock. This patch does
just that. (Note that this relies on the decompressor data remaining
valid in memory for as long as the metadata hash anchor is needed. This
is always true even for OVERLAP_DECOMPRESSOR_ROMSTAGE() situations
because the FMAP and CBFS metadata necessarily need to have finished
verification before a new stage could be loaded.)
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I2e6d7384cfb8339a24369eb6c01fc12f911c974e
---
M src/include/bootblock_common.h
M src/include/metadata_hash.h
M src/lib/Kconfig.cbfs_verification
M src/lib/Makefile.inc
M src/lib/bootblock.c
M src/lib/decompressor.c
M src/lib/metadata_hash.c
7 files changed, 42 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/52085/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/52085
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2e6d7384cfb8339a24369eb6c01fc12f911c974e
Gerrit-Change-Number: 52085
Gerrit-PatchSet: 2
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-MessageType: newpatchset
Attention is currently required from: Martin Roth, Furquan Shaikh.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/52085 )
Change subject: decompressor: Add CBFS_VERIFICATION support
......................................................................
Patch Set 1:
(1 comment)
File src/lib/metadata_hash.c:
https://review.coreboot.org/c/coreboot/+/52085/comment/0a03237c_e6726680
PS1, Line 33: return &anchor_ptr->cbfs_hash;
> I know it's not likely (and much badness would have to occur), but do you think it's worth doing che […]
Yeah... I had that at first and then I wanted to simplify it further. I can put it back in if you want.
--
To view, visit https://review.coreboot.org/c/coreboot/+/52085
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I2e6d7384cfb8339a24369eb6c01fc12f911c974e
Gerrit-Change-Number: 52085
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-Comment-Date: Mon, 05 Apr 2021 23:09:59 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-MessageType: comment
Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/52081 )
Change subject: cbfs: Make `mdata` argument to cbfs_allocator_t const
......................................................................
cbfs: Make `mdata` argument to cbfs_allocator_t const
Right before CB:49334 was submitted, I changed the signature of
cbfs_allocator_t function pointers to include another argument passing
in the already loaded CBFS metadata (to allow for the rare edge case of
allocators needing to read CBFS attributes). This interface is not meant
to be able to modify the passed-in metadata, so to clarify that and
prevent potential errors, we should declare the argument const.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I7e3756490b9ad7ded91268c61797cef36c4118ee
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52081
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-by: Furquan Shaikh <furquan(a)google.com>
---
M src/include/cbfs.h
M src/lib/cbfs.c
M src/lib/rmodule.c
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
build bot (Jenkins): Verified
Aaron Durbin: Looks good to me, approved
Furquan Shaikh: Looks good to me, approved
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index b89a13d..37bac30 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -67,7 +67,7 @@
* attributes). Must return a pointer to space of the requested size where the file data should
* be loaded, or NULL to make the operation fail.
*/
-typedef void *(*cbfs_allocator_t)(void *arg, size_t size, union cbfs_mdata *mdata);
+typedef void *(*cbfs_allocator_t)(void *arg, size_t size, const union cbfs_mdata *mdata);
static inline size_t cbfs_load(const char *name, void *buf, size_t size);
static inline size_t cbfs_ro_load(const char *name, void *buf, size_t size);
@@ -183,9 +183,9 @@
void *buf;
size_t buf_size;
};
-void *_cbfs_default_allocator(void *arg, size_t size, union cbfs_mdata *unused);
+void *_cbfs_default_allocator(void *arg, size_t size, const union cbfs_mdata *unused);
-void *_cbfs_cbmem_allocator(void *arg, size_t size, union cbfs_mdata *unused);
+void *_cbfs_cbmem_allocator(void *arg, size_t size, const union cbfs_mdata *unused);
/**********************************************************************************************
* INLINE IMPLEMENTATIONS *
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index fbf4531..65bb721 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -369,7 +369,7 @@
return loc;
}
-void *_cbfs_default_allocator(void *arg, size_t size, union cbfs_mdata *unused)
+void *_cbfs_default_allocator(void *arg, size_t size, const union cbfs_mdata *unused)
{
struct _cbfs_default_allocator_arg *darg = arg;
if (size > darg->buf_size)
@@ -377,7 +377,7 @@
return darg->buf;
}
-void *_cbfs_cbmem_allocator(void *arg, size_t size, union cbfs_mdata *unused)
+void *_cbfs_cbmem_allocator(void *arg, size_t size, const union cbfs_mdata *unused)
{
return cbmem_add((uintptr_t)arg, size);
}
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index ac9eb0b..31bf141 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -192,7 +192,7 @@
}
static void *rmodule_cbfs_allocator(void *rsl_arg, size_t unused,
- union cbfs_mdata *mdata)
+ const union cbfs_mdata *mdata)
{
struct rmod_stage_load *rsl = rsl_arg;
--
To view, visit https://review.coreboot.org/c/coreboot/+/52081
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I7e3756490b9ad7ded91268c61797cef36c4118ee
Gerrit-Change-Number: 52081
Gerrit-PatchSet: 2
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Attention is currently required from: Furquan Shaikh, Marshall Dawson, Paul Menzel, Matt Papageorge, Felix Held.
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51806 )
Change subject: vc/amd/fsp/cezanne: update UPD headers
......................................................................
Patch Set 9:
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/51806/comment/5ab48413_7ff20f2c
PS9, Line 19: TODO
Tested on guybrush and it works!
--
To view, visit https://review.coreboot.org/c/coreboot/+/51806
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Idca235029bf2e68d403230d55308820cab61a6c0
Gerrit-Change-Number: 51806
Gerrit-PatchSet: 9
Gerrit-Owner: Matt Papageorge <matthewpapa07(a)gmail.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: Nikolai Vyssotski <nikolai.vyssotski(a)amd.corp-partner.google.com>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Attention: Matt Papageorge <matthewpapa07(a)gmail.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Comment-Date: Mon, 05 Apr 2021 22:57:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Nico Huber, Furquan Shaikh, Subrata Banik, Raj Astekar, Patrick Rudolph.
Wonkyu Kim has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51724 )
Change subject: src/*acpi: create acpi table for x2apic mode
......................................................................
Patch Set 7:
(2 comments)
File src/acpi/acpi.c:
https://review.coreboot.org/c/coreboot/+/51724/comment/0882efc4_66d7b3da
PS6, Line 165: if (apic_ids[index] < 0xff)
> No need for further indentation, this could be an `else if`.
Done
https://review.coreboot.org/c/coreboot/+/51724/comment/e52ae021_568c6e9e
PS6, Line 170: current += acpi_create_madt_lx2apic(
: (acpi_madt_lx2apic_t *)current,
: index, apic_ids[index]);
> This already uses the lx2apic function. Please explain what is wrong […]
Tested it again and it's working without change.
I thought we should not mix.
Remove this file change.
--
To view, visit https://review.coreboot.org/c/coreboot/+/51724
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9399d30b686b55d86806f5db4110bf4a80fe459b
Gerrit-Change-Number: 51724
Gerrit-PatchSet: 7
Gerrit-Owner: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Jamie Ryu <jamie.m.ryu(a)intel.com>
Gerrit-Reviewer: Lance Zhao
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Raj Astekar <raj.astekar(a)intel.com>
Gerrit-Reviewer: Ravishankar Sarawadi <ravishankar.sarawadi(a)intel.com>
Gerrit-Reviewer: Srinidhi N Kaushik <srinidhi.n.kaushik(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Wonkyu Kim <wonkyu.kim(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Nico Huber <nico.h(a)gmx.de>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Furquan Shaikh <furquan(a)google.com>
Gerrit-Attention: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Attention: Raj Astekar <raj.astekar(a)intel.com>
Gerrit-Attention: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Comment-Date: Mon, 05 Apr 2021 22:53:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: comment