Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/70164 )
(
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: mb/google/herobrine: Mask out upper bits from sku_id()
......................................................................
mb/google/herobrine: Mask out upper bits from sku_id()
When retrieving the SKU id value through the sku_id() function in
mainboard_needs_pcie_init(), we only want the values in the lower 5
bits as we can only represent SKU id up to 27. Everything in the
higher bits should be masked out because they are not needed.
BUG=b:254281839
BRANCH=None
TEST=Make sure that NVMe is not initialized
Tested on a herobrine board with SKU id 0
Change-Id: I0e786ec392b5e1484cb2ff6d83a8d4fdd698950c
Signed-off-by: Shelley Chen <shchen(a)google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70164
Reviewed-by: Julius Werner <jwerner(a)chromium.org>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M src/mainboard/google/herobrine/mainboard.c
1 file changed, 29 insertions(+), 1 deletion(-)
Approvals:
build bot (Jenkins): Verified
Julius Werner: Looks good to me, approved
diff --git a/src/mainboard/google/herobrine/mainboard.c b/src/mainboard/google/herobrine/mainboard.c
index 2648392..c9bca73 100644
--- a/src/mainboard/google/herobrine/mainboard.c
+++ b/src/mainboard/google/herobrine/mainboard.c
@@ -91,7 +91,12 @@
*/
bool mainboard_needs_pcie_init(void)
{
- uint32_t sku = sku_id();
+ /*
+ * Mask out everything above the actual SKU bits We have 3 sku pins,
+ * each tristate, so we can represent numbers up to 27, or 5 bits
+ */
+ uint32_t sku_bits_mask = 0xff;
+ uint32_t sku = sku_id() & sku_bits_mask;
if (sku == CROS_SKU_UNKNOWN) {
printk(BIOS_WARNING, "Unknown SKU (%#x); assuming PCIe", sku);
--
To view, visit https://review.coreboot.org/c/coreboot/+/70164
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0e786ec392b5e1484cb2ff6d83a8d4fdd698950c
Gerrit-Change-Number: 70164
Gerrit-PatchSet: 6
Gerrit-Owner: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-CC: Sudheer Amrabadi <samrabad(a)codeaurora.org>
Gerrit-CC: Venkat Thogaru <thogaru(a)qualcomm.corp-partner.google.com>
Gerrit-CC: mturney mturney <mturney(a)codeaurora.org>
Gerrit-MessageType: merged
Shelley Chen has submitted this change. ( https://review.coreboot.org/c/coreboot/+/70162 )
Change subject: mb/google/herobrine: Only retrieve sku_id from EC once
......................................................................
mb/google/herobrine: Only retrieve sku_id from EC once
Currently, we are getting the sku id from the EC every time we call
the sku_id() function. However, this will never change so we only
need to retrieve it once. Inserting exit condition if sku id is
already set, then don't get it from the EC again.
Also, removing the ram_code function, which does nothing right now.
There is already a weak stub_function for this in
src/lib/coreboot_table.c that already does the same thing.
BUG=b:260740438,b:182963902
BRANCH=None
TEST=make sure image still boots to login on herobrine device
Change-Id: Ia787968100baf58a41ccce0cf95ed3ec9ce1758a
Signed-off-by: Shelley Chen <shchen(a)google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70162
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Doug Anderson <dianders(a)chromium.org>
---
M src/mainboard/google/herobrine/boardid.c
1 file changed, 38 insertions(+), 14 deletions(-)
Approvals:
build bot (Jenkins): Verified
Doug Anderson: Looks good to me, approved
diff --git a/src/mainboard/google/herobrine/boardid.c b/src/mainboard/google/herobrine/boardid.c
index fc058e2..1f0c88f 100644
--- a/src/mainboard/google/herobrine/boardid.c
+++ b/src/mainboard/google/herobrine/boardid.c
@@ -11,6 +11,9 @@
uint32_t board_id(void)
{
static uint32_t id = UNDEFINED_STRAPPING_ID;
+ if (id != UNDEFINED_STRAPPING_ID)
+ return id;
+
gpio_t pins[3] = { 0 };
if (CONFIG(BOARD_GOOGLE_HEROBRINE_REV0)) {
pins[2] = GPIO(75);
@@ -22,20 +25,7 @@
pins[0] = GPIO(48);
}
- if (id == UNDEFINED_STRAPPING_ID)
- id = gpio_base3_value(pins, ARRAY_SIZE(pins));
-
- printk(BIOS_INFO, "BoardID :%d - "
- "Machine model: "
- "Qualcomm Technologies, Inc. "
- "sc7280 platform\n", id);
-
- return id;
-}
-
-uint32_t ram_code(void)
-{
- static uint32_t id = UNDEFINED_STRAPPING_ID;
+ id = gpio_base3_value(pins, ARRAY_SIZE(pins));
return id;
}
@@ -44,6 +34,14 @@
{
static uint32_t id = UNDEFINED_STRAPPING_ID;
+ /*
+ * This means that we already retrieved the sku id from the EC once
+ * during this boot, so no need to do it again as we'll get the same
+ * value again.
+ */
+ if (id != UNDEFINED_STRAPPING_ID)
+ return id;
+
/* Update modem status in 9th bit of sku id */
uint32_t mask = 1 << 9;
id = google_chromeec_get_board_sku();
--
To view, visit https://review.coreboot.org/c/coreboot/+/70162
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia787968100baf58a41ccce0cf95ed3ec9ce1758a
Gerrit-Change-Number: 70162
Gerrit-PatchSet: 4
Gerrit-Owner: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: Doug Anderson <dianders(a)chromium.org>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Sudheer Amrabadi <samrabad(a)codeaurora.org>
Gerrit-CC: Venkat Thogaru <thogaru(a)qualcomm.corp-partner.google.com>
Gerrit-CC: mturney mturney <mturney(a)codeaurora.org>
Gerrit-MessageType: merged
Attention is currently required from: Tarun Tuli, Subrata Banik, Kangheui Won, Eric Lai.
Reka Norman has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70146 )
Change subject: mb/google/brya: Don't add MPTS to both DSDT and SSDT
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/70146/comment/ee5152ad_bd70c50f
PS1, Line 9: CB:65488
> use the format commit +hash
Done
--
To view, visit https://review.coreboot.org/c/coreboot/+/70146
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9f411aae81ea87aa9c8fc7754c3709e398771a32
Gerrit-Change-Number: 70146
Gerrit-PatchSet: 2
Gerrit-Owner: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Reka Norman <rekanorman(a)google.com>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Kangheui Won <khwon(a)chromium.org>
Gerrit-Attention: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Comment-Date: Wed, 30 Nov 2022 21:28:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-MessageType: comment
Attention is currently required from: Tarun Tuli, Subrata Banik, Kangheui Won, Reka Norman.
Hello build bot (Jenkins), Tarun Tuli, Subrata Banik, Kangheui Won, Eric Lai,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/70146
to look at the new patch set (#2).
Change subject: mb/google/brya: Don't add MPTS to both DSDT and SSDT
......................................................................
mb/google/brya: Don't add MPTS to both DSDT and SSDT
commit 52ccd293d7 started unconditionally adding MPTS to the SSDT. On
variants with HAVE_WWAN_POWER_SEQUENCE selected, MPTS is already added
to the DSDT via wwan_power.asl. The duplicate definition results in a
kernel error:
ERR kernel: [ 0.109237] ACPI BIOS Error (bug): Failure creating named object [\_SB.MPTS], AE_ALREADY_EXISTS (20210730/dswload2-327)
ERR kernel: [ 0.109242] ACPI Error: AE_ALREADY_EXISTS, During name lookup/catalog (20210730/psobject-220)
Don't add MPTS to the SSDT if HAVE_WWAN_POWER_SEQUENCE is selected.
There are no variants which use both, so this should only result in
empty MPTS methods being removed.
BUG=b:260380268
TEST=On pujjo, the SSDT no longer contains an empty MPTS method, there's
no kernel error, and the WWAN power-off sequence is met.
Change-Id: I9f411aae81ea87aa9c8fc7754c3709e398771a32
Signed-off-by: Reka Norman <rekanorman(a)chromium.org>
---
M src/mainboard/google/brya/mainboard.c
1 file changed, 56 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/70146/2
--
To view, visit https://review.coreboot.org/c/coreboot/+/70146
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9f411aae81ea87aa9c8fc7754c3709e398771a32
Gerrit-Change-Number: 70146
Gerrit-PatchSet: 2
Gerrit-Owner: Reka Norman <rekanorman(a)chromium.org>
Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Reka Norman <rekanorman(a)google.com>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Kangheui Won <khwon(a)chromium.org>
Gerrit-Attention: Reka Norman <rekanorman(a)chromium.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69410 )
Change subject: soc/amd/*: Enable override of MAINBOARD_BLOBS_DIR
......................................................................
Patch Set 2:
(1 comment)
File src/soc/amd/common/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/69410/comment/15c5bb01_289d63e7
PS2, Line 2: ifeq ($(CONFIG_SOC_AMD_COMMON),y)
Somewhat unrelated to this patch, but I think this could be extended around most of this file.
--
To view, visit https://review.coreboot.org/c/coreboot/+/69410
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0702fdb97fbc2c73d97994ab4d5161ff0f467518
Gerrit-Change-Number: 69410
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-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
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-Comment-Date: Wed, 30 Nov 2022 20:25:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger, Felix Held.
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69410 )
Change subject: soc/amd/*: Enable override of MAINBOARD_BLOBS_DIR
......................................................................
Patch Set 2:
(2 comments)
File src/soc/amd/common/Kconfig.common:
https://review.coreboot.org/c/coreboot/+/69410/comment/13f02603_c12829bc
PS2, Line 19:
Nit: get rid of 2nd blank line.
File src/soc/amd/common/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/69410/comment/a1127deb_9e14b48b
PS2, Line 49: $(patsubst
There's a macro for this already.
$(call strip_quotes,$(CONFIG_APCB_BLOBS_DIR))
--
To view, visit https://review.coreboot.org/c/coreboot/+/69410
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0702fdb97fbc2c73d97994ab4d5161ff0f467518
Gerrit-Change-Number: 69410
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-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
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-Comment-Date: Wed, 30 Nov 2022 20:20:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Lance Zhao, Tarun Tuli, Kapil Porwal, Tim Wawrzynczak.
Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/70063 )
Change subject: acpi: Helper functions to add certain _DSD properties
......................................................................
Patch Set 8:
(1 comment)
File src/acpi/device.c:
https://review.coreboot.org/c/coreboot/+/70063/comment/8a5c8d8e_9cbeb28a
PS8, Line 1209: acpi_device_add_integer_property_with_uuid
do u see anyone calling into this func directly ? if not then consider to make it static ?
--
To view, visit https://review.coreboot.org/c/coreboot/+/70063
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5bb432dd4e8f320d2c0d7f378dc2d7b3a770b541
Gerrit-Change-Number: 70063
Gerrit-PatchSet: 8
Gerrit-Owner: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Lance Zhao
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: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Lance Zhao
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com>
Gerrit-Comment-Date: Wed, 30 Nov 2022 19:19:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Tarun Tuli, Paul Menzel.
Kapil Porwal has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69639 )
Change subject: mb/google/brya/acpi: Update NVPCF_FUNC_UPDATE_DYNAMIC_PARAMS
......................................................................
Patch Set 12: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/69639
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I69b80f4af2ecef6cf91034fc15fb6e8715eeca4f
Gerrit-Change-Number: 69639
Gerrit-PatchSet: 12
Gerrit-Owner: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)google.com>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Comment-Date: Wed, 30 Nov 2022 19:13:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment