coreboot-gerrit February 2024

coreboot-gerrit@coreboot.org

1 participants
3066 discussions

[XS] Change in coreboot[main]: device/pnp_device: Skip init on disabled functions
by Matt DeVillier (Code Review) 22 Feb '24

22 Feb '24

Matt DeVillier has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/80598?usp=email ) Change subject: device/pnp_device: Skip init on disabled functions ...................................................................... Abandoned abandoning for now, since CB:80646 achieves the same end result -- To view, visit https://review.coreboot.org/c/coreboot/+/80598?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I5c9d5cf34947535bf249b91f78d6fabfb28729ea Gerrit-Change-Number: 80598 Gerrit-PatchSet: 1 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

[XS] Change in coreboot[main]: soc/intel/common/lpc: Skip setting resources for disabled devices
by Matt DeVillier (Code Review) 22 Feb '24

22 Feb '24

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80646?usp=email ) Change subject: soc/intel/common/lpc: Skip setting resources for disabled devices ...................................................................... soc/intel/common/lpc: Skip setting resources for disabled devices If a downstream LPC device (eg, SIO function) is disabled, we shouldn't attempt to open PMIO windows for it, as those functions often have unset IO bases (which default to 0), resulting in false errors like: [ERROR] LPC IO decode base 0! TEST=build/boot purism/librem_cnl (Mini v2), verify no LPC IO errors in cbmem log for disabled SIO functions. Change-Id: I92c79fc01be21466976f3056242f6d1824878eab Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80646 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Subrata Banik <subratabanik(a)google.com> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M src/soc/intel/common/block/lpc/lpc.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Subrata Banik: Looks good to me, approved Nico Huber: Looks good to me, but someone else must approve diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index dbd982b..b27e09e9 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -87,6 +87,9 @@ { struct resource *res; + if (!dev->enabled) + return; + for (res = dev->resource_list; res; res = res->next) { if (res->flags & IORESOURCE_IO) lpc_open_pmio_window(res->base, res->size); -- To view, visit https://review.coreboot.org/c/coreboot/+/80646?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I92c79fc01be21466976f3056242f6d1824878eab Gerrit-Change-Number: 80646 Gerrit-PatchSet: 2 Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[XS] Change in coreboot[main]: soc/intel/braswell/gpio_support: drop unused get_gpio
by Matt DeVillier (Code Review) 22 Feb '24

22 Feb '24

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80690?usp=email ) Change subject: soc/intel/braswell/gpio_support: drop unused get_gpio ...................................................................... soc/intel/braswell/gpio_support: drop unused get_gpio The get_gpio function in this file is both unused and it shouldn't use a signed int to pass in the MMIO base address and offset. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I3b08bad040ad175b37175ef21d0a0a29525c4478 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80690 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> --- M src/soc/intel/braswell/gpio_support.c M src/soc/intel/braswell/include/soc/gpio.h 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved diff --git a/src/soc/intel/braswell/gpio_support.c b/src/soc/intel/braswell/gpio_support.c index 0a2e001..34464af 100644 --- a/src/soc/intel/braswell/gpio_support.c +++ b/src/soc/intel/braswell/gpio_support.c @@ -143,8 +143,3 @@ return pad_value & PAD_RX_BIT; } - -int get_gpio(int community_base, int pad0_offset) -{ - return (read32p(community_base + pad0_offset)) & PAD_RX_BIT; -} diff --git a/src/soc/intel/braswell/include/soc/gpio.h b/src/soc/intel/braswell/include/soc/gpio.h index 2a01b2d..d4bfb89 100644 --- a/src/soc/intel/braswell/include/soc/gpio.h +++ b/src/soc/intel/braswell/include/soc/gpio.h @@ -466,7 +466,6 @@ typedef int gpio_t; -int get_gpio(int community_base, int pad0_offset); uint16_t gpio_family_number(uint8_t community, uint8_t pad); uint32_t *gpio_pad_config_reg(uint8_t community, uint8_t pad); -- To view, visit https://review.coreboot.org/c/coreboot/+/80690?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3b08bad040ad175b37175ef21d0a0a29525c4478 Gerrit-Change-Number: 80690 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[main]: treewide: Move list.h to commonlib
by Julius Werner (Code Review) 22 Feb '24

22 Feb '24

Attention is currently required from: Arthur Heymans, Felix Held, Jakub Czapiga, Lean Sheng Tan, Martin L Roth, Maximilian Brune, Paul Menzel. Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/77968?usp=email ) Change subject: treewide: Move list.h to commonlib ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/77968?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I16eb7b743fb1d36301f0eda563a62364e7a9cfec Gerrit-Change-Number: 77968 Gerrit-PatchSet: 10 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Jakub Czapiga <czapiga(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 21:29:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: treewide: Move list.h to commonlib
by Maximilian Brune (Code Review) 22 Feb '24

22 Feb '24

Attention is currently required from: Arthur Heymans, Felix Held, Jakub Czapiga, Julius Werner, Lean Sheng Tan, Martin L Roth, Paul Menzel. Maximilian Brune has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/77968?usp=email ) Change subject: treewide: Move list.h to commonlib ...................................................................... Patch Set 10: (2 comments) File src/include/fit.h: https://review.coreboot.org/c/coreboot/+/77968/comment/b50cdd51_e812071b : PS9, Line 10: #include <commonlib/list.h> > Alphabetical order Done File src/lib/cbfs.c: https://review.coreboot.org/c/coreboot/+/77968/comment/f61112af_b9dab2e3 : PS9, Line 12: #include <commonlib/list.h> > Please move this include to follow alphabetical order. Done -- To view, visit https://review.coreboot.org/c/coreboot/+/77968?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I16eb7b743fb1d36301f0eda563a62364e7a9cfec Gerrit-Change-Number: 77968 Gerrit-PatchSet: 10 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Jakub Czapiga <czapiga(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Thu, 22 Feb 2024 21:28:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Jakub Czapiga <czapiga(a)google.com> Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: treewide: Move list.h to commonlib
by Maximilian Brune (Code Review) 22 Feb '24

22 Feb '24

Attention is currently required from: Arthur Heymans, Felix Held, Julius Werner, Lean Sheng Tan, Martin L Roth, Maximilian Brune, Paul Menzel. Hello Arthur Heymans, Felix Held, Jakub Czapiga, Julius Werner, Lean Sheng Tan, Paul Menzel, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/77968?usp=email to look at the new patch set (#10). The following approvals got outdated and were removed: Code-Review+1 by Lean Sheng Tan, Verified+1 by build bot (Jenkins) Change subject: treewide: Move list.h to commonlib ...................................................................... treewide: Move list.h to commonlib It is needed in order to move device_tree.c into commonlib in a subsequent commit. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I16eb7b743fb1d36301f0eda563a62364e7a9cfec --- M payloads/libpayload/Makefile.mk M payloads/libpayload/libc/Makefile.mk M src/commonlib/Makefile.mk R src/commonlib/include/commonlib/list.h R src/commonlib/list.c M src/include/device_tree.h M src/include/fit.h M src/lib/Makefile.mk M src/lib/cbfs.c M src/lib/edid_fill_fb.c M tests/commonlib/Makefile.mk R tests/commonlib/list-test.c M tests/lib/Makefile.mk 13 files changed, 25 insertions(+), 17 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/77968/10 -- To view, visit https://review.coreboot.org/c/coreboot/+/77968?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I16eb7b743fb1d36301f0eda563a62364e7a9cfec Gerrit-Change-Number: 77968 Gerrit-PatchSet: 10 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in coreboot[main]: libpayload: Remove legacy CBFS API
by Julius Werner (Code Review) 22 Feb '24

22 Feb '24

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80650?usp=email ) Change subject: libpayload: Remove legacy CBFS API ...................................................................... libpayload: Remove legacy CBFS API It's been several years already since we announced the deprecation of the legacy CBFS API for payloads. It's time to remove it completely. Change-Id: I0ed157ac2d1376b8dff4537af9a63731064b45f6 Signed-off-by: Julius Werner <jwerner(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/80650 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Jakub Czapiga <czapiga(a)google.com> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> Reviewed-by: Lean Sheng Tan <sheng.tan(a)9elements.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Maximilian Brune <maximilian.brune(a)9elements.com> --- M payloads/libpayload/arch/arm/Makefile.mk D payloads/libpayload/arch/arm/dummy_media.c M payloads/libpayload/arch/arm64/Makefile.mk D payloads/libpayload/arch/arm64/dummy_media.c M payloads/libpayload/arch/mock/Makefile.mk D payloads/libpayload/arch/mock/mock_media.c M payloads/libpayload/arch/x86/Makefile.mk D payloads/libpayload/arch/x86/rom_media.c M payloads/libpayload/include/cbfs.h D payloads/libpayload/include/cbfs_core.h D payloads/libpayload/include/cbfs_legacy.h D payloads/libpayload/include/cbfs_ram.h M payloads/libpayload/include/libpayload.h M payloads/libpayload/libc/fmap.c M payloads/libpayload/libcbfs/Makefile.mk D payloads/libpayload/libcbfs/cbfs_core.c D payloads/libpayload/libcbfs/cbfs_legacy.c D payloads/libpayload/libcbfs/ram_media.c 18 files changed, 0 insertions(+), 1,268 deletions(-) Approvals: Jakub Czapiga: Looks good to me, approved Maximilian Brune: Looks good to me, approved Lean Sheng Tan: Looks good to me, approved Nico Huber: Looks good to me, but someone else must approve Arthur Heymans: Looks good to me, approved build bot (Jenkins): Verified diff --git a/payloads/libpayload/arch/arm/Makefile.mk b/payloads/libpayload/arch/arm/Makefile.mk index c973601..f71138b 100644 --- a/payloads/libpayload/arch/arm/Makefile.mk +++ b/payloads/libpayload/arch/arm/Makefile.mk @@ -43,8 +43,6 @@ libgdb-y += gdb.c -libcbfs-$(CONFIG_LP_CBFS) += dummy_media.c - # Add other classes here when you put assembly files into them! head.o-S-ccopts += $(arm_asm_flags) libc-S-ccopts += $(arm_asm_flags) diff --git a/payloads/libpayload/arch/arm/dummy_media.c b/payloads/libpayload/arch/arm/dummy_media.c deleted file mode 100644 index 4e16635..0000000 --- a/payloads/libpayload/arch/arm/dummy_media.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#define LIBPAYLOAD - -#include <cbfs.h> -#include <string.h> - -/* The generic cbfs code relies on the libpayload_init_default_cbfs_media - * symbol. Therefore, provide an implementation that just throws an error. */ - -int libpayload_init_default_cbfs_media(struct cbfs_media *media); - -__attribute__((weak)) int libpayload_init_default_cbfs_media( - struct cbfs_media *media) -{ - return -1; -} diff --git a/payloads/libpayload/arch/arm64/Makefile.mk b/payloads/libpayload/arch/arm64/Makefile.mk index 6eb9fe8..b478c77 100644 --- a/payloads/libpayload/arch/arm64/Makefile.mk +++ b/payloads/libpayload/arch/arm64/Makefile.mk @@ -38,7 +38,6 @@ libc-y += cache.c cpu.S libc-y += selfboot.c libc-y += mmu.c -libcbfs-$(CONFIG_LP_CBFS) += dummy_media.c libgdb-y += gdb.c diff --git a/payloads/libpayload/arch/arm64/dummy_media.c b/payloads/libpayload/arch/arm64/dummy_media.c deleted file mode 100644 index 4e16635..0000000 --- a/payloads/libpayload/arch/arm64/dummy_media.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#define LIBPAYLOAD - -#include <cbfs.h> -#include <string.h> - -/* The generic cbfs code relies on the libpayload_init_default_cbfs_media - * symbol. Therefore, provide an implementation that just throws an error. */ - -int libpayload_init_default_cbfs_media(struct cbfs_media *media); - -__attribute__((weak)) int libpayload_init_default_cbfs_media( - struct cbfs_media *media) -{ - return -1; -} diff --git a/payloads/libpayload/arch/mock/Makefile.mk b/payloads/libpayload/arch/mock/Makefile.mk index 415886a..e3f10a6 100644 --- a/payloads/libpayload/arch/mock/Makefile.mk +++ b/payloads/libpayload/arch/mock/Makefile.mk @@ -4,6 +4,4 @@ libc-y += virtual.c -libcbfs-$(CONFIG_LP_CBFS) += mock_media.c - CFLAGS += -Wno-address-of-packed-member diff --git a/payloads/libpayload/arch/mock/mock_media.c b/payloads/libpayload/arch/mock/mock_media.c deleted file mode 100644 index 2bb06ed..0000000 --- a/payloads/libpayload/arch/mock/mock_media.c +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <cbfs.h> - -int libpayload_init_default_cbfs_media(struct cbfs_media *media); - -__attribute__((weak)) int libpayload_init_default_cbfs_media(struct cbfs_media *media) -{ - return -1; -} diff --git a/payloads/libpayload/arch/x86/Makefile.mk b/payloads/libpayload/arch/x86/Makefile.mk index 653412e..196415d 100644 --- a/payloads/libpayload/arch/x86/Makefile.mk +++ b/payloads/libpayload/arch/x86/Makefile.mk @@ -43,7 +43,6 @@ libgdb-y += gdb.c -libcbfs-$(CONFIG_LP_CBFS) += rom_media.c libcbfs-$(CONFIG_LP_CBFS) += boot_media.c # Multiboot support is configurable diff --git a/payloads/libpayload/arch/x86/rom_media.c b/payloads/libpayload/arch/x86/rom_media.c deleted file mode 100644 index ffb3809..0000000 --- a/payloads/libpayload/arch/x86/rom_media.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#define LIBPAYLOAD - -#include <cbfs.h> -#include <string.h> - -#ifdef LIBPAYLOAD -# define printk(x...) -# define init_default_cbfs_media libpayload_init_default_cbfs_media - extern int libpayload_init_default_cbfs_media(struct cbfs_media *media); -#else -# include <console/console.h> -#endif - -// Implementation of memory-mapped ROM media source on X86. - -static int x86_rom_open(struct cbfs_media *media) { - return 0; -} - -static void *x86_rom_map(struct cbfs_media *media, size_t offset, size_t count) { - void *ptr; - // Some address (ex, pointer to master header) may be given in memory - // mapped location. To workaround that, we handle >0xf0000000 as real - // memory pointer. - - if ((uint32_t)offset > (uint32_t)0xf0000000) - ptr = (void*)offset; - else - ptr = (void*)(0 - (uint32_t)media->context + offset); - return ptr; -} - -static void *x86_rom_unmap(struct cbfs_media *media, const void *address) { - return NULL; -} - -static size_t x86_rom_read(struct cbfs_media *media, void *dest, size_t offset, - size_t count) { - void *ptr = x86_rom_map(media, offset, count); - memcpy(dest, ptr, count); - x86_rom_unmap(media, ptr); - return count; -} - -static int x86_rom_close(struct cbfs_media *media) { - return 0; -} - -int init_x86rom_cbfs_media(struct cbfs_media *media); -int init_x86rom_cbfs_media(struct cbfs_media *media) { - // On X86, we always keep a reference of pointer to CBFS header in - // 0xfffffffc, and the pointer is still a memory-mapped address. - // Since the CBFS core always use ROM offset, we need to figure out - // header->romsize even before media is initialized. - struct cbfs_header *header = (struct cbfs_header*) - *(uint32_t*)(0xfffffffc); - if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { -#if CONFIG(LP_ROM_SIZE) - printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header); - media->context = (void*)CONFIG_LP_ROM_SIZE; -#else - return -1; -#endif - } else { - uint32_t romsize = ntohl(header->romsize); - media->context = (void*)romsize; -#if CONFIG(LP_ROM_SIZE) - if (CONFIG_LP_ROM_SIZE != romsize) - printk(BIOS_WARNING, "rom size unmatch (%d/%d)\n", - CONFIG_LP_ROM_SIZE, romsize); -#endif - } - media->open = x86_rom_open; - media->close = x86_rom_close; - media->map = x86_rom_map; - media->unmap = x86_rom_unmap; - media->read = x86_rom_read; - return 0; -} - -int init_default_cbfs_media(struct cbfs_media *media) { - return init_x86rom_cbfs_media(media); -} diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h index 23b9669..9420cb0 100644 --- a/payloads/libpayload/include/cbfs.h +++ b/payloads/libpayload/include/cbfs.h @@ -139,8 +139,4 @@ return _cbfs_boot_lookup(name, true, &mdata) >= 0; } - -/* Legacy API. Designated for removal in the future. */ -#include <cbfs_legacy.h> - #endif diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h deleted file mode 100644 index 4a638d9..0000000 --- a/payloads/libpayload/include/cbfs_core.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * - * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> - * Copyright (C) 2012 Google, Inc. - * - * This file is dual-licensed. You can choose between: - * - The GNU GPL, version 2, as published by the Free Software Foundation - * - The revised BSD license (without advertising clause) - * - * --------------------------------------------------------------------------- - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * --------------------------------------------------------------------------- - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * --------------------------------------------------------------------------- - */ - -#ifndef _CBFS_CORE_H_ -#define _CBFS_CORE_H_ - -#include <commonlib/bsd/cbfs_serialized.h> -#include <endian.h> -#include <stddef.h> -#include <stdint.h> -#include <stdlib.h> - -#define CBFS_HEADER_INVALID_ADDRESS ((void*)(0xffffffff)) - -struct cbfs_stage { - uint32_t compression; /** Compression type */ - uint64_t entry; /** entry point */ - uint64_t load; /** Where to load in memory */ - uint32_t len; /** length of data to load */ - uint32_t memlen; /** total length of object in memory */ -} __packed; - -#define CBFS_MEDIA_INVALID_MAP_ADDRESS ((void*)(0xffffffff)) -#define CBFS_DEFAULT_MEDIA ((void*)(0x0)) - -/* Media for CBFS to load files. */ -struct cbfs_media { - - /* implementation dependent context, to hold resource references */ - void *context; - - /* opens media and returns 0 on success, -1 on failure */ - int (*open)(struct cbfs_media *media); - - /* returns number of bytes read from media into dest, starting from - * offset for count of bytes */ - size_t (*read)(struct cbfs_media *media, void *dest, size_t offset, - size_t count); - - /* returns a pointer to memory with count of bytes from media source - * starting from offset, or CBFS_MEDIA_INVALID_MAP_ADDRESS on failure. - * Note: mapped data can't be free unless unmap is called, even if you - * do close first. */ - void * (*map)(struct cbfs_media *media, size_t offset, size_t count); - - /* returns NULL and releases the memory by address, which was allocated - * by map */ - void * (*unmap)(struct cbfs_media *media, const void *address); - - /* closes media and returns 0 on success, -1 on failure. */ - int (*close)(struct cbfs_media *media); -}; - -/* - * Returns pointer to a copy of the file content or NULL on error. - * If the file is compressed, data will be decompressed. - * The caller owns the returned memory. - */ -void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz); - -/* Returns decompressed size on success, 0 on failure. */ -size_t cbfs_decompress(int algo, const void *src, size_t srcn, void *dst, - size_t dstn); - -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media); - -/* Persistent handle to a CBFS file that has not yet been fully mapped. */ -struct cbfs_handle { - struct cbfs_media media; /* copy of original media object */ - u32 type; /* CBFS file type */ - u32 media_offset; /* offset from beginning of media */ - u32 attribute_offset; /* relative offset of attributes */ - u32 content_offset; /* relative offset of contents */ - u32 content_size; /* length of file contents in bytes */ -}; - -/* Returns handle to CBFS file, or NULL on error. Does not yet map contents. - * Caller is responsible to free() returned handle after use. */ -struct cbfs_handle *cbfs_get_handle(struct cbfs_media *media, const char *name); - -/* Given a cbfs_handle and an attribute tag, return a mapping for the first - * instance of the attribute or NULL if none found. */ -void *cbfs_get_attr(struct cbfs_handle *handle, uint32_t tag); - -/* Given a cbfs_handle, returns the (decompressed) file contents in a buffer, - * or NULL on error. If |size| is passed, will store amount of bytes read there. - * If |limit| is not 0, will only return up to that many bytes. */ -void *cbfs_get_contents(struct cbfs_handle *handle, size_t *size, size_t limit); - -#endif diff --git a/payloads/libpayload/include/cbfs_legacy.h b/payloads/libpayload/include/cbfs_legacy.h deleted file mode 100644 index c98da0c..0000000 --- a/payloads/libpayload/include/cbfs_legacy.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * - * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> - * Copyright (C) 2013 Google, Inc. - * - * This file is dual-licensed. You can choose between: - * - The GNU GPL, version 2, as published by the Free Software Foundation - * - The revised BSD license (without advertising clause) - * - * --------------------------------------------------------------------------- - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * --------------------------------------------------------------------------- - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * --------------------------------------------------------------------------- - */ - -#ifndef _CBFS_LEGACY_H_ -#define _CBFS_LEGACY_H_ - -#include <cbfs_core.h> - -/* legacy APIs */ -const struct cbfs_header *get_cbfs_header(void); -struct cbfs_file *cbfs_find(const char *name); -void *cbfs_find_file(const char *name, int type); - -int cbfs_execute_stage(struct cbfs_media *media, const char *name); -void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, - uint16_t device); -void *cbfs_load_payload(struct cbfs_media *media, const char *name); -void *cbfs_load_stage(struct cbfs_media *media, const char *name); - -/* Simple buffer for streaming media. */ -struct cbfs_simple_buffer { - char *buffer; - size_t allocated; - size_t size; - size_t last_allocate; -}; - -void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, - struct cbfs_media *media, - size_t offset, size_t count); - -void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer, - const void *address); - -// Utility functions -int run_address(void *f); - -/* Defined in individual arch / board implementation. */ -int init_default_cbfs_media(struct cbfs_media *media); - -#endif diff --git a/payloads/libpayload/include/cbfs_ram.h b/payloads/libpayload/include/cbfs_ram.h deleted file mode 100644 index e245162..0000000 --- a/payloads/libpayload/include/cbfs_ram.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * Copyright (C) 2013 Google, Inc. - * - * This file is dual-licensed. You can choose between: - * - The GNU GPL, version 2, as published by the Free Software Foundation - * - The revised BSD license (without advertising clause) - * - * --------------------------------------------------------------------------- - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * --------------------------------------------------------------------------- - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * --------------------------------------------------------------------------- - */ - -#ifndef _CBFS_RAM_H_ -#define _CBFS_RAM_H_ - -#include <stdint.h> - -struct cbfs_media; - -/* The following functions return 0 for success. None-zero on error. */ -int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size); -int setup_cbfs_from_ram(void *start, uint32_t size); -int setup_cbfs_from_flash(void); - -#endif /* _CBFS_RAM_H_ */ diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 5e34124..61dbd27 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -537,8 +537,4 @@ /* Defined in arch/${ARCH}/selfboot.c */ void selfboot(void *entry); -/* look for area "name" in "fmap", setting offset and size to describe it. - Returns 0 on success, < 0 on error. */ -int fmap_region_by_name(const uint32_t fmap_offset, const char * const name, - uint32_t * const offset, uint32_t * const size); #endif diff --git a/payloads/libpayload/libc/fmap.c b/payloads/libpayload/libc/fmap.c index 2ee9e3e..87a531a 100644 --- a/payloads/libpayload/libc/fmap.c +++ b/payloads/libpayload/libc/fmap.c @@ -78,56 +78,3 @@ return fmap_find_area(_fmap_cache, name, offset, size); } - -/*********************************************************************************************** - * LEGACY CODE * - **********************************************************************************************/ - -int fmap_region_by_name(const uint32_t fmap_offset, const char * const name, - uint32_t * const offset, uint32_t * const size) -{ - int i; - - struct fmap *fmap; - struct fmap fmap_head; - struct cbfs_media default_media; - struct cbfs_media *media = &default_media; - - if (init_default_cbfs_media(media) != 0) - return -1; - - media->open(media); - - if (!media->read(media, &fmap_head, fmap_offset, sizeof(fmap_head))) - return -1; - - if (memcmp(fmap_head.signature, FMAP_SIGNATURE, sizeof(fmap_head.signature))) { - return -1; - } - - int fmap_size = sizeof(*fmap) + - fmap_head.nareas * sizeof(struct fmap_area); - - fmap = malloc(fmap_size); - if (!fmap) - return -1; - - if (!media->read(media, fmap, fmap_offset, fmap_size)) - goto err; - - media->close(media); - - for (i = 0; i < fmap->nareas; i++) { - if (strcmp((const char *)fmap->areas[i].name, name) != 0) - continue; - if (offset) - *offset = fmap->areas[i].offset; - if (size) - *size = fmap->areas[i].size; - free(fmap); - return 0; - } -err: - free(fmap); - return -1; -} diff --git a/payloads/libpayload/libcbfs/Makefile.mk b/payloads/libpayload/libcbfs/Makefile.mk index 53e6f7f..0c82e4d 100644 --- a/payloads/libpayload/libcbfs/Makefile.mk +++ b/payloads/libpayload/libcbfs/Makefile.mk @@ -27,8 +27,6 @@ ## libcbfs-$(CONFIG_LP_CBFS) += cbfs.c -libcbfs-$(CONFIG_LP_CBFS) += ram_media.c -libcbfs-$(CONFIG_LP_CBFS) += cbfs_legacy.c ifeq ($(CONFIG_LP_CBFS),y) libcbfs-srcs += $(coreboottop)/src/commonlib/bsd/cbfs_private.c diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c deleted file mode 100644 index 82c2846..0000000 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ /dev/null @@ -1,363 +0,0 @@ -/* - * - * Copyright (C) 2011 secunet Security Networks AG - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* The CBFS core requires a couple of #defines or functions to adapt it to the - * target environment: - * - * CBFS_CORE_WITH_LZMA (must be #define) - * if defined, ulzma() must exist for decompression of data streams - * - * CBFS_CORE_WITH_LZ4 (must be #define) - * if defined, ulz4f() must exist for decompression of data streams - * - * ERROR(x...) - * print an error message x (in printf format) - * - * LOG(x...) - * print a message x (in printf format) - * - * DEBUG(x...) - * print a debug message x (in printf format) - * - */ - -#include <libpayload.h> -#include <cbfs.h> -#include <string.h> -#include <sysinfo.h> - -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) -{ - int32_t rel_offset; - const struct cbfs_header *header; - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media.\n"); - return CBFS_HEADER_INVALID_ADDRESS; - } - } - media->open(media); - - if (!media->read(media, &rel_offset, (size_t)(0 - sizeof(int32_t)), - sizeof(int32_t))) { - ERROR("Could not read CBFS master header offset!\n"); - return CBFS_HEADER_INVALID_ADDRESS; - } - header = media->map(media, (size_t)rel_offset, sizeof(*header)); - DEBUG("CBFS header at %#zx (-%#zx from end of image).\n", - (size_t)rel_offset, (size_t)-rel_offset); - media->close(media); - - if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("Failed to load CBFS header from %#zx(-%#zx)\n", - (size_t)rel_offset, (size_t)-rel_offset); - return CBFS_HEADER_INVALID_ADDRESS; - } - - if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { - ERROR("Could not find valid CBFS master header at %#zx(-%#zx): " - "magic %#.8x vs %#.8x.\n", (size_t)rel_offset, - (size_t)-rel_offset, CBFS_HEADER_MAGIC, - ntohl(header->magic)); - if (header->magic == 0xffffffff) { - ERROR("Maybe ROM is not mapped properly?\n"); - } - return CBFS_HEADER_INVALID_ADDRESS; - } - return header; -} - -static int get_cbfs_range(uint32_t *offset, uint32_t *cbfs_end, - struct cbfs_media *media) -{ - const struct cbfs_header *header; - - if (media == CBFS_DEFAULT_MEDIA && - lib_sysinfo.cbfs_offset && lib_sysinfo.cbfs_size) { - *offset = lib_sysinfo.cbfs_offset; - *cbfs_end = *offset + lib_sysinfo.cbfs_size; - return 0; - } - - /* read offset and size from cbfs master header */ - DEBUG("Read CBFS offset & size from master header\n"); - header = cbfs_get_header(media); - if (header == CBFS_HEADER_INVALID_ADDRESS) - return -1; - // Logical offset (for source media) of first file. - *offset = ntohl(header->offset); - *cbfs_end = ntohl(header->romsize); -#if CONFIG(LP_ARCH_X86) - // resolve actual length of ROM used for CBFS components - // the bootblock size was not taken into account - *cbfs_end -= ntohl(header->bootblocksize); - - // fine tune the length to handle alignment positioning. - // using (bootblock size) % align, to derive the - // number of bytes the bootblock is off from the alignment size. - if ((ntohl(header->bootblocksize) % CBFS_ALIGNMENT)) - *cbfs_end -= (CBFS_ALIGNMENT - - (ntohl(header->bootblocksize) % CBFS_ALIGNMENT)); - else - *cbfs_end -= 1; -#endif - return 0; -} - -/* public API starts here*/ -struct cbfs_handle *cbfs_get_handle(struct cbfs_media *media, const char *name) -{ - const char *vardata; - uint32_t offset, cbfs_end, vardata_len; - struct cbfs_file file; - struct cbfs_handle *handle = malloc(sizeof(*handle)); - - if (!handle) - return NULL; - - if (get_cbfs_range(&offset, &cbfs_end, media)) { - ERROR("Failed to find cbfs range\n"); - free(handle); - return NULL; - } - - if (media == CBFS_DEFAULT_MEDIA) { - media = &handle->media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media.\n"); - free(handle); - return NULL; - } - } else { - memcpy(&handle->media, media, sizeof(*media)); - } - - DEBUG("CBFS location: 0x%x~0x%x\n", offset, cbfs_end); - DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); - - media->open(media); - while (offset < cbfs_end && - media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { - if (memcmp(CBFS_FILE_MAGIC, file.magic, - sizeof(file.magic)) != 0) { - uint32_t new_align = CBFS_ALIGNMENT; - if (offset % CBFS_ALIGNMENT) - new_align += CBFS_ALIGNMENT - - (offset % CBFS_ALIGNMENT); - ERROR("ERROR: No file header found at 0x%xx - " - "try next aligned address: 0x%x.\n", offset, - offset + new_align); - offset += new_align; - continue; - } - vardata_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x variable data (%d bytes)...\n", - offset, vardata_len); - - // load file name (arbitrary length). - vardata = (const char*)media->map( - media, offset + sizeof(file), vardata_len); - if (vardata == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(vardata, name) == 0) { - int file_offset = ntohl(file.offset), - file_len = ntohl(file.len); - DEBUG("Found file (offset=0x%x, len=%d).\n", - offset + file_offset, file_len); - media->unmap(media, vardata); - media->close(media); - handle->type = ntohl(file.type); - handle->media_offset = offset; - handle->content_offset = file_offset; - handle->content_size = file_len; - handle->attribute_offset = - ntohl(file.attributes_offset); - return handle; - } else { - DEBUG(" (unmatched file @0x%x: %s)\n", offset, - vardata); - media->unmap(media, vardata); - } - - // Move to next file. - uint32_t next_offset = offset + ntohl(file.len) + ntohl(file.offset); - if (next_offset % CBFS_ALIGNMENT) - next_offset += CBFS_ALIGNMENT - (next_offset % CBFS_ALIGNMENT); - // Check that offset is strictly monotonic to prevent infinite loop - if (next_offset <= offset) { - ERROR("ERROR: corrupted CBFS file header at 0x%x.\n", offset); - break; - } - offset = next_offset; - } - media->close(media); - LOG("WARNING: '%s' not found.\n", name); - free(handle); - return NULL; -} - -void *cbfs_get_contents(struct cbfs_handle *handle, size_t *size, size_t limit) -{ - struct cbfs_media *m = &handle->media; - size_t on_media_size = handle->content_size; - int algo = CBFS_COMPRESS_NONE; - void *ret = NULL; - size_t dummy_size; - - if (!size) - size = &dummy_size; - - struct cbfs_file_attr_compression *comp = - cbfs_get_attr(handle, CBFS_FILE_ATTR_TAG_COMPRESSION); - if (comp) { - algo = ntohl(comp->compression); - DEBUG("File '%s' is compressed (alg=%d)\n", name, algo); - *size = ntohl(comp->decompressed_size); - /* TODO: Implement partial decompression with |limit| */ - } - - if (algo == CBFS_COMPRESS_NONE) { - if (limit != 0 && limit < on_media_size) - on_media_size = limit; - *size = on_media_size; - } - - void *data = m->map(m, handle->media_offset + handle->content_offset, - on_media_size); - if (data == CBFS_MEDIA_INVALID_MAP_ADDRESS) - return NULL; - - ret = malloc(*size); - if (ret != NULL) { - size_t final_size = cbfs_decompress(algo, data, on_media_size, - ret, *size); - if (final_size != *size) { - ERROR("Expect %zu bytes but got %zu bytes after " - "decompression.\n", *size, final_size); - free(ret); - ret = NULL; - } - } - - m->unmap(m, data); - return ret; -} - -void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz) -{ - void *ret = NULL; - struct cbfs_handle *handle = cbfs_get_handle(media, name); - - if (!handle) - return NULL; - - if (handle->type == type) - ret = cbfs_get_contents(handle, sz, 0); - else - ERROR("File '%s' is of type %x, but we requested %x.\n", name, - handle->type, type); - - free(handle); - return ret; -} - -void *cbfs_get_attr(struct cbfs_handle *handle, uint32_t tag) -{ - struct cbfs_media *m = &handle->media; - uint32_t offset = handle->media_offset + handle->attribute_offset; - uint32_t end = handle->media_offset + handle->content_offset; - struct cbfs_file_attribute attr; - void *ret; - - /* attribute_offset should be 0 when there is no attribute, but all - * values that point into the cbfs_file header are invalid, too. */ - if (handle->attribute_offset <= sizeof(struct cbfs_file)) - return NULL; - - m->open(m); - while (offset + sizeof(attr) <= end) { - if (m->read(m, &attr, offset, sizeof(attr)) != sizeof(attr)) { - ERROR("Failed to read attribute header %#x\n", offset); - m->close(m); - return NULL; - } - if (ntohl(attr.tag) != tag) { - uint32_t next_offset = offset + ntohl(attr.len); - // Check that offset is strictly monotonic to prevent infinite loop - if (next_offset <= offset) { - ERROR("ERROR: corrupted CBFS attribute at 0x%x.\n", offset); - m->close(m); - return NULL; - } - offset = next_offset; - continue; - } - ret = m->map(m, offset, ntohl(attr.len)); - if (ret == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - ERROR("Failed to map attribute at %#x\n", offset); - m->close(m); - return NULL; - } - return ret; - } - m->close(m); - - return NULL; -} - -size_t cbfs_decompress(int algo, const void *src, size_t srcn, void *dst, - size_t dstn) -{ - size_t len; - switch (algo) { - case CBFS_COMPRESS_NONE: - len = MIN(srcn, dstn); - memcpy(dst, src, len); - return len; -#ifdef CBFS_CORE_WITH_LZMA - case CBFS_COMPRESS_LZMA: - return ulzman(src, srcn, dst, dstn); -#endif -#ifdef CBFS_CORE_WITH_LZ4 - case CBFS_COMPRESS_LZ4: - return ulz4fn(src, srcn, dst, dstn); -#endif - default: - ERROR("tried to decompress %zu bytes with algorithm " - "#%x, but that algorithm id is unsupported.\n", - srcn, algo); - return 0; - } -} diff --git a/payloads/libpayload/libcbfs/cbfs_legacy.c b/payloads/libpayload/libcbfs/cbfs_legacy.c deleted file mode 100644 index d24b528..0000000 --- a/payloads/libpayload/libcbfs/cbfs_legacy.c +++ /dev/null @@ -1,243 +0,0 @@ -/* - * - * Copyright (C) 2011 secunet Security Networks AG - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#define LIBPAYLOAD - -#ifdef LIBPAYLOAD -# include <libpayload-config.h> -# if CONFIG(LP_LZMA) -# include <lzma.h> -# define CBFS_CORE_WITH_LZMA -# endif -# if CONFIG(LP_LZ4) -# include <lz4.h> -# define CBFS_CORE_WITH_LZ4 -# endif -# define CBFS_MINI_BUILD -#elif defined(__SMM__) -# define CBFS_MINI_BUILD -#else -# define CBFS_CORE_WITH_LZMA -# define CBFS_CORE_WITH_LZ4 -# include <lib.h> -#endif - -#include <cbfs.h> -#include <string.h> - -#ifdef LIBPAYLOAD -# include <stdio.h> -# define DEBUG(x...) -# define LOG(x...) -# define ERROR(x...) printf(x) -#else -# include <console/console.h> -# define ERROR(x...) printk(BIOS_ERR, "CBFS: " x) -# define LOG(x...) printk(BIOS_INFO, "CBFS: " x) -# if CONFIG_LP_DEBUG_CBFS -# define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x) -# else -# define DEBUG(x...) -# endif -#endif - -#include "cbfs_core.c" - -#ifndef __SMM__ -static inline int tohex4(unsigned int c) -{ - return (c <= 9) ? (c + '0') : (c - 10 + 'a'); -} - -static void tohex16(unsigned int val, char* dest) -{ - dest[0] = tohex4(val>>12); - dest[1] = tohex4((val>>8) & 0xf); - dest[2] = tohex4((val>>4) & 0xf); - dest[3] = tohex4(val & 0xf); -} - -void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, - uint16_t device) -{ - char name[17] = "pciXXXX,XXXX.rom"; - - tohex16(vendor, name+3); - tohex16(device, name+8); - - return cbfs_get_file_content(media, name, CBFS_TYPE_OPTIONROM, NULL); -} - -void * cbfs_load_stage(struct cbfs_media *media, const char *name) -{ - struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); - /* this is a mess. There is no ntohll. */ - /* for now, assume compatible byte order until we solve this. */ - uintptr_t entry; - uint32_t final_size; - - if (stage == NULL) - return (void *) -1; - - LOG("loading stage %s @ %p (%d bytes), entry @ 0x%llx\n", - name, - (void*)(uintptr_t) stage->load, stage->memlen, - stage->entry); - - final_size = cbfs_decompress(stage->compression, - ((unsigned char *) stage) + - sizeof(struct cbfs_stage), - stage->len, - (void *) (uintptr_t) stage->load, - stage->memlen); - if (!final_size) { - entry = -1; - goto out; - } - - memset((void *)((uintptr_t)stage->load + final_size), 0, - stage->memlen - final_size); - - DEBUG("stage loaded.\n"); - - entry = stage->entry; - // entry = ntohll(stage->entry); - -out: - free(stage); - return (void *) entry; -} - -int cbfs_execute_stage(struct cbfs_media *media, const char *name) -{ - struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); - - if (stage == NULL) - return 1; - - if (ntohl(stage->compression) != CBFS_COMPRESS_NONE) { - LOG("Unable to run %s: Compressed file" - "Not supported for in-place execution\n", name); - free(stage); - return 1; - } - - LOG("run @ %p\n", (void *) (uintptr_t)ntohll(stage->entry)); - int result = run_address((void *)(uintptr_t)ntohll(stage->entry)); - free(stage); - return result; -} - -void *cbfs_load_payload(struct cbfs_media *media, const char *name) -{ - return (struct cbfs_payload *)cbfs_get_file_content( - media, name, CBFS_TYPE_SELF, NULL); -} - -struct cbfs_file *cbfs_find(const char *name) { - struct cbfs_handle *handle = cbfs_get_handle(CBFS_DEFAULT_MEDIA, name); - struct cbfs_media *m = &handle->media; - void *ret; - - if (!handle) - return NULL; - - ret = m->map(m, handle->media_offset, - handle->content_offset + handle->content_size); - if (ret == CBFS_MEDIA_INVALID_MAP_ADDRESS) { - free(handle); - return NULL; - } - - free(handle); - return ret; -} - -void *cbfs_find_file(const char *name, int type) { - return cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type, NULL); -} - -const struct cbfs_header *get_cbfs_header(void) { - return cbfs_get_header(CBFS_DEFAULT_MEDIA); -} - -/* Simple buffer */ - -void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, - struct cbfs_media *media, - size_t offset, size_t count) { - void *address = buffer->buffer + buffer->allocated; - DEBUG("simple_buffer_map(offset=%zu, count=%zu): " - "allocated=%zu, size=%zu, last_allocate=%zu\n", - offset, count, buffer->allocated, buffer->size, - buffer->last_allocate); - if (buffer->allocated + count >= buffer->size) - return CBFS_MEDIA_INVALID_MAP_ADDRESS; - if (media->read(media, address, offset, count) != count) { - ERROR("simple_buffer: fail to read %zd bytes from 0x%zx\n", - count, offset); - return CBFS_MEDIA_INVALID_MAP_ADDRESS; - } - buffer->allocated += count; - buffer->last_allocate = count; - return address; -} - -void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer, - const void *address) { - // TODO Add simple buffer management so we can free more than last - // allocated one. - DEBUG("simple_buffer_unmap(address=%p): " - "allocated=%zu, size=%zu, last_allocate=%zu\n", - address, buffer->allocated, buffer->size, - buffer->last_allocate); - if ((buffer->buffer + buffer->allocated - buffer->last_allocate) == - address) { - buffer->allocated -= buffer->last_allocate; - buffer->last_allocate = 0; - } - return NULL; -} - -/** - * run_address is passed the address of a function taking no parameters and - * jumps to it, returning the result. - * @param f the address to call as a function. - * @return value returned by the function. - */ - -int run_address(void *f) -{ - int (*v) (void); - v = f; - return v(); -} - -#endif diff --git a/payloads/libpayload/libcbfs/ram_media.c b/payloads/libpayload/libcbfs/ram_media.c deleted file mode 100644 index 153bc83..0000000 --- a/payloads/libpayload/libcbfs/ram_media.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * - * Copyright (C) 2013 Google, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include <cbfs.h> -#include <cbfs_ram.h> -#include <string.h> -#include <stdio.h> -#include <stdlib.h> - -// Implementation of a media source based on given memory buffer. -struct ram_media { - char *start; - size_t size; -}; - -static int ram_open(struct cbfs_media *media) { - return 0; -} - -static void *ram_map(struct cbfs_media *media, size_t offset, size_t count) { - struct ram_media *m = (struct ram_media*)media->context; - /* assume addressing from top of image in this case */ - if (offset > 0xf0000000) { - offset = m->size + offset; - } - if (offset + count > m->size) { - printf("ERROR: ram_map: request out of range (0x%zx+0x%zx)\n", - offset, count); - return CBFS_MEDIA_INVALID_MAP_ADDRESS; - } - return (void*)(m->start + offset); -} - -static void *ram_unmap(struct cbfs_media *media, const void *address) { - return NULL; -} - -static size_t ram_read(struct cbfs_media *media, void *dest, size_t offset, - size_t count) { - void *ptr = ram_map(media, offset, count); - if (ptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) - return 0; - memcpy(dest, ptr, count); - ram_unmap(media, ptr); - return count; -} - -static int ram_close(struct cbfs_media *media) { - return 0; -} - -int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size) { - // TODO Find a way to release unused media. Maybe adding media->destroy. - struct ram_media *m = (struct ram_media*)malloc(sizeof(*m)); - m->start = start; - m->size = size; - media->context = (void*)m; - media->open = ram_open; - media->close = ram_close; - media->map = ram_map; - media->unmap = ram_unmap; - media->read = ram_read; - return 0; -} - -// Legacy setup_cbfs_from_*. -static int is_default_cbfs_media_initialized; -static struct cbfs_media default_cbfs_media; - -int setup_cbfs_from_ram(void *start, uint32_t size) { - int result = init_cbfs_ram_media(&default_cbfs_media, start, size); - if (result == 0) - is_default_cbfs_media_initialized = 1; - return result; -} - -extern int libpayload_init_default_cbfs_media(struct cbfs_media *media); -int setup_cbfs_from_flash(void) { - int result = libpayload_init_default_cbfs_media(&default_cbfs_media); - if (result == 0) - is_default_cbfs_media_initialized = 1; - return result; -} - -int init_default_cbfs_media(struct cbfs_media *media) { - int result = 0; - if (is_default_cbfs_media_initialized != 1) { - result = setup_cbfs_from_flash(); - } - if (result == 0) - memcpy(media, &default_cbfs_media, sizeof(*media)); - return result; -} -- To view, visit https://review.coreboot.org/c/coreboot/+/80650?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I0ed157ac2d1376b8dff4537af9a63731064b45f6 Gerrit-Change-Number: 80650 Gerrit-PatchSet: 2 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Lean Sheng Tan <sheng.tan(a)9elements.com> Gerrit-Reviewer: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[main]: drivers/intel/fsp2_0: Initialize CPUs only when FSP-S has completed
by Jérémy Compostella (Code Review) 22 Feb '24

22 Feb '24

1 0

[S] Change in coreboot[main]: drivers/intel/fsp2_0: Initialize CPUs only when FSP-S has completed
by Jérémy Compostella (Code Review) 22 Feb '24

22 Feb '24

Attention is currently required from: Andrey Petrov, Ronak Kanabar, Subrata Banik. Jérémy Compostella has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80691?usp=email ) Change subject: drivers/intel/fsp2_0: Initialize CPUs only when FSP-S has completed ...................................................................... Patch Set 2: -Code-Review (1 comment) Patchset: PS2: I've been looking into this CL issue on Meteor Lake rex. It turns out that the error I was running into is the result of Chrome FSP ebuild recipe stripping down the FSP binary and removing the MP service support in the process. If I use a non-stripped version of the FSP it boots way further. However, it still fails: [DEBUG] Setting up SMI for CPU [DEBUG] IED base = 0x77400000 [DEBUG] IED size = 0x00400000 [INFO ] Will perform SMM setup. [INFO ] CPU: Genuine Intel(R) 0000. [EMERG] Switching from X2APIC to XAPIC mode is not implemented. This seems to be the result of an incompatibility between what has been programmed by the FSP and coreboot expectation. It seems that `USE_INTEL_FSP_MP_INIT` use-case is not really supported on Meteor Lake rex unless PPI are passed to FSP. **Note** that I also verified that this CL works fine on Raptor Lake brya0 board which uses `USE_INTEL_FSP_MP_INIT` by default. -- To view, visit https://review.coreboot.org/c/coreboot/+/80691?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: If0397f5cc8d0f4f1872bd37a001fe42e0c37ec92 Gerrit-Change-Number: 80691 Gerrit-PatchSet: 2 Gerrit-Owner: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Jérémy Compostella <jeremy.compostella(a)intel.com> Gerrit-Reviewer: Ronak Kanabar <ronak.kanabar(a)intel.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Ronak Kanabar <ronak.kanabar(a)intel.com> Gerrit-Attention: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Comment-Date: Thu, 22 Feb 2024 21:08:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: vboot: Enable new arm64 SIMD crypto acceleration
by Julius Werner (Code Review) 22 Feb '24

22 Feb '24

Attention is currently required from: Yu-Ping Wu. Hello Yu-Ping Wu, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/80710?usp=email to review the following change. Change subject: vboot: Enable new arm64 SIMD crypto acceleration ...................................................................... vboot: Enable new arm64 SIMD crypto acceleration This patch passes the correct flag to vboot to enable SIMD crypto acceleration on arm64 devices. This uses a core part of the ISA and should thus be supported on all arm64 SoCs -- so we normally always want it enabled, but there should still be a Kconfig in case a SoC wants to use the hwcrypto interface for its own (off-CPU) crypto acceleration engine instead. (You could also disable it to save a small amount of code size at the cost of speed, if necessary.) Change-Id: I3820bd6b7505202b7edb6768385ce5deb18777a4 Signed-off-by: Julius Werner <jwerner(a)chromium.org> --- M payloads/libpayload/vboot/Kconfig M payloads/libpayload/vboot/Makefile.mk M src/security/vboot/Kconfig M src/security/vboot/Makefile.mk 4 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/80710/1 diff --git a/payloads/libpayload/vboot/Kconfig b/payloads/libpayload/vboot/Kconfig index 23d61f4..6d71a7c 100644 --- a/payloads/libpayload/vboot/Kconfig +++ b/payloads/libpayload/vboot/Kconfig @@ -49,4 +49,16 @@ help This option enables SHA256 implementation using ARMv8 Crypto Extension. +config VBOOT_ARM64_RSA_ACCELERATION + bool "Use arm64 SIMD instructions to accelerate RSA signature verification" + default y + depends on ARCH_ARM64 + help + Use arm64 SIMD instructions (NEON) to parallelize two multiplications + in the modulus exponentiation algorithm, which speeds up RSA signature + verification in vboot. This is supported on all arm64 CPUs so you'd + generally always want this enabled, unless your SoC is overriding + vboot's hwcrypto API with its own crypto accelerator IP instead (or + you're trying really hard to save on code size). + endif diff --git a/payloads/libpayload/vboot/Makefile.mk b/payloads/libpayload/vboot/Makefile.mk index bdc9ad2a..554fec8 100644 --- a/payloads/libpayload/vboot/Makefile.mk +++ b/payloads/libpayload/vboot/Makefile.mk @@ -46,6 +46,7 @@ X86_SHA_EXT=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_X86_SHA_EXT)) \ VB2_X86_RSA_ACCELERATION=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_X86_RSA_ACCELERATION)) \ ARMV8_CRYPTO_EXT=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_SHA_ARMV8_CE)) \ + ARM64_RSA_ACCELERATION=$(call kconfig-to-binary, $(CONFIG_LP_VBOOT_ARM64_RSA_ACCELERATION)) \ UNROLL_LOOPS=1 \ BUILD="$(VBOOT_BUILD_DIR)" \ V=$(V) \ diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 56e94d5..4bd36f5 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -318,6 +318,18 @@ help Use ARMv8 Crypto Extension to accelerate SHA hash calculation in vboot. +config VBOOT_ARM64_RSA_ACCELERATION + bool "Use arm64 SIMD instructions to accelerate RSA signature verification" + default y + depends on ARCH_VERSTAGE_ARM64 + help + Use arm64 SIMD instructions (NEON) to parallelize two multiplications + in the modulus exponentiation algorithm, which speeds up RSA signature + verification in vboot. This is supported on all arm64 CPUs so you'd + generally always want this enabled, unless your SoC is overriding + vboot's hwcrypto API with its own crypto accelerator IP instead (or + you're trying really hard to save on code size). + config VBOOT_DEFINE_WIDEVINE_COUNTERS bool default n diff --git a/src/security/vboot/Makefile.mk b/src/security/vboot/Makefile.mk index 1689efb..23271ea 100644 --- a/src/security/vboot/Makefile.mk +++ b/src/security/vboot/Makefile.mk @@ -33,6 +33,7 @@ VB2_X86_RSA_ACCELERATION="$(if $(CONFIG_ARCH_$(call toupper,$(1))_X86_32)$(CONFIG_ARCH_$(call toupper,$(1))_X86_64),$\ $(CONFIG_VBOOT_X86_RSA_ACCELERATION))" \ ARMV8_CRYPTO_EXT="$(if $(CONFIG_ARCH_$(call toupper,$(1))_ARMV8_64),$$(CONFIG_VBOOT_ARMV8_CE_SHA256_ACCELERATION))" \ + ARM64_RSA_ACCELERATION="$(if $(CONFIG_ARCH_$(call toupper,$(1))_ARM64),$$(CONFIG_VBOOT_ARM64_RSA_ACCELERATION))" \ $(MAKE) -C $(VBOOT_SOURCE) \ BUILD=$$(abspath $$(dir $$(VBOOT_LIB_$(1)))) \ V=$(V) \ -- To view, visit https://review.coreboot.org/c/coreboot/+/80710?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I3820bd6b7505202b7edb6768385ce5deb18777a4 Gerrit-Change-Number: 80710 Gerrit-PatchSet: 1 Gerrit-Owner: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2024