Ren Kuo has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37808 )
Change subject: mb/google/octopus: Enable DRAM_PART_NUM_IN_CBI feature for Dood
......................................................................
mb/google/octopus: Enable DRAM_PART_NUM_IN_CBI feature for Dood
Enable DRAM_PART_NUM_IN_CBI feature to get DRAM part number from CBI
and set DRAM_PART_IN_CBI_BOARD_ID_MIN to 3 for dood EVT
BUG=b:146317464
TEST=build coreboot
Change-Id: Ic7c8fa254eff540f244b1f9c6229c11d07397b26
---
M src/mainboard/google/octopus/Kconfig
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/37808/1
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 3139716..414d848 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -118,6 +118,7 @@
config DRAM_PART_NUM_NOT_ALWAYS_IN_CBI
bool
default y if BOARD_GOOGLE_BOBBA
+ default y if BOARD_GOOGLE_DOOD
default y if BOARD_GOOGLE_FLEEX
default y if BOARD_GOOGLE_MEEP
default y if BOARD_GOOGLE_OCTOPUS
@@ -133,5 +134,6 @@
default 3 if BOARD_GOOGLE_BOBBA
default 1 if BOARD_GOOGLE_MEEP
default 255 if BOARD_GOOGLE_OCTOPUS
+ default 3 if BOARD_GOOGLE_DOOD
endif # BOARD_GOOGLE_OCTOPUS
--
To view, visit https://review.coreboot.org/c/coreboot/+/37808
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic7c8fa254eff540f244b1f9c6229c11d07397b26
Gerrit-Change-Number: 37808
Gerrit-PatchSet: 1
Gerrit-Owner: Ren Kuo <ren.kuo(a)quanta.corp-partner.google.com>
Gerrit-MessageType: newchange
Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37651 )
Change subject: mainboard/variant/puff: set PL values for puff
......................................................................
mainboard/variant/puff: set PL values for puff
To be safe for now, don't differentiate between SKUs and use lower
values to ensure board won't be browned out.
BUG=b:143246320
TEST=none
BRANCH=none
Change-Id: I041ebaa33bf2582386198290e625099ba8e2f3c9
Signed-off-by: Kangheui Won <khwon(a)chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37651
Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
---
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/hatch/variants/puff/Makefile.inc
A src/mainboard/google/hatch/variants/puff/mainboard.c
4 files changed, 100 insertions(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Edward O'Callaghan: Looks good to me, approved
diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c
index e84aa18..e4de3a2 100644
--- a/src/mainboard/google/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/ramstage.c
@@ -36,6 +36,11 @@
/* Default weak implementation */
}
+void __weak variant_mainboard_enable(struct device *dev)
+{
+ /* Override mainboard settings per board */
+}
+
static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
@@ -45,6 +50,7 @@
{
dev->ops->init = mainboard_init;
dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
+ variant_mainboard_enable(dev);
}
static void mainboard_chip_init(void *chip_info)
diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
index 1542d9b..9d1b91e 100644
--- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
@@ -53,4 +53,7 @@
/* Perform variant specific initialization early on in ramstage. */
void variant_ramstage_init(void);
+/* Perform variant specific mainboard initialization */
+void variant_mainboard_enable(struct device *dev);
+
#endif /* BASEBOARD_VARIANTS_H */
diff --git a/src/mainboard/google/hatch/variants/puff/Makefile.inc b/src/mainboard/google/hatch/variants/puff/Makefile.inc
index 30daaf7..2d1440e 100644
--- a/src/mainboard/google/hatch/variants/puff/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/puff/Makefile.inc
@@ -13,4 +13,5 @@
##
ramstage-y += gpio.c
+ramstage-y += mainboard.c
bootblock-y += gpio.c
diff --git a/src/mainboard/google/hatch/variants/puff/mainboard.c b/src/mainboard/google/hatch/variants/puff/mainboard.c
new file mode 100644
index 0000000..9c2b5fb
--- /dev/null
+++ b/src/mainboard/google/hatch/variants/puff/mainboard.c
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2019 Google Inc.
+ *
+ * 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.
+ */
+
+#include <baseboard/variants.h>
+#include <chip.h>
+#include <device/device.h>
+#include <ec/google/chromeec/ec.h>
+
+/*
+ * For type-C chargers, set PL2 to 90% of max power to account for
+ * cable loss and FET Rdson loss in the path from the source.
+ */
+#define SET_PSYSPL2(w) (9 * (w) / 10)
+
+#define PUFF_PL2 (35)
+
+#define PUFF_PSYSPL2 (58)
+
+#define PUFF_MAX_TIME_WINDOW 6
+#define PUFF_MIN_DUTYCYCLE 4
+
+/*
+ * mainboard_set_power_limits
+ *
+ * Set Pl2 and SysPl2 values based on detected charger.
+ * Values are defined below but we use U22 value for all SKUs for now.
+ * definitions:
+ * x = no value entered. Use default value in parenthesis.
+ * will set 0 to anything that shouldn't be set.
+ * n = max value of power adapter.
+ * +-------------+-----+---------+-----------+-------+
+ * | sku_id | PL2 | PsysPL2 | PsysPL3 | PL4 |
+ * +-------------+-----+---------+-----------+-------+
+ * | i7 U42 | 51 | 81 | x(.85PL4) | x(82) |
+ * | celeron U22 | 35 | 58 | x(.85PL4) | x(51) |
+ * +-------------+-----+---------+-----------+-------+
+ * For USB C charger:
+ * +-------------+-----+---------+---------+-------+
+ * | Max Power(W)| PL2 | PsysPL2 | PsysPL3 | PL4 |
+ * +-------------+-----+---------+---------+-------+
+ * | 60 (U42) | 44 | 54 | 54 | 54 |
+ * | 60 (U22) | 29 | 54 | 54 | x(43) |
+ * | n (U42) | 44 | .9n | .9n | .9n |
+ * | n (U22) | 29 | .9n | .9n | x(43) |
+ * +-------------+-----+---------+---------+-------+
+ */
+static void mainboard_set_power_limits(config_t *conf)
+{
+ enum usb_chg_type type;
+ u32 watts;
+ u32 psyspl2 = PUFF_PSYSPL2; // default barrel jack value for U22
+ int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
+
+ /* use SoC default value for PsysPL3 and PL4 unless we're on USB-PD*/
+ conf->tdp_psyspl3 = 0;
+ conf->tdp_pl4 = 0;
+
+ if (rv == 0 && type == USB_CHG_TYPE_PD) {
+ /* Detected USB-PD. Base on max value of adapter */
+ psyspl2 = watts;
+ conf->tdp_psyspl3 = SET_PSYSPL2(psyspl2);
+ /* set max possible time window */
+ conf->tdp_psyspl3_time = PUFF_MAX_TIME_WINDOW;
+ /* set minimum duty cycle */
+ conf->tdp_psyspl3_dutycycle = PUFF_MIN_DUTYCYCLE;
+ conf->tdp_pl4 = SET_PSYSPL2(psyspl2);
+ }
+
+ conf->tdp_pl2_override = PUFF_PL2;
+ /* set psyspl2 to 90% of max adapter power */
+ conf->tdp_psyspl2 = SET_PSYSPL2(psyspl2);
+}
+
+void variant_mainboard_enable(struct device *dev)
+{
+ config_t *conf = config_of_soc();
+ mainboard_set_power_limits(conf);
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/37651
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I041ebaa33bf2582386198290e625099ba8e2f3c9
Gerrit-Change-Number: 37651
Gerrit-PatchSet: 3
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Sridhar Siricilla has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35546 )
Change subject: soc/intel/common/block/cse: Minor clean up some late comments
......................................................................
Patch Set 13:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35546/13/src/soc/intel/common/bloc…
File src/soc/intel/common/block/include/intelblocks/cse.h:
https://review.coreboot.org/c/coreboot/+/35546/13/src/soc/intel/common/bloc…
PS13, Line 49: u32 bist_test_result: 1;
> Where is this documented?
The bit fields have been documented in the respective SOC's ME BIOS Writer Guide.
--
To view, visit https://review.coreboot.org/c/coreboot/+/35546
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If7ea6043d7b5473d0c16e83d7b2d4b620c125652
Gerrit-Change-Number: 35546
Gerrit-PatchSet: 13
Gerrit-Owner: Rizwan Qureshi <rizwan.qureshi(a)intel.com>
Gerrit-Reviewer: Aamir Bohra <aamir.bohra(a)intel.com>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Rizwan Qureshi <riz.pro(a)gmail.com>
Gerrit-Reviewer: Rizwan Qureshi <rizwan.qureshi(a)intel.com>
Gerrit-Reviewer: Sridhar Siricilla <sridhar.siricilla(a)intel.com>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: V Sowmya <v.sowmya(a)intel.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 24 Dec 2019 17:48:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: comment
Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37879 )
Change subject: vendorcode/amd/pi/Kconfig: Add promot to pre/post pi files
......................................................................
vendorcode/amd/pi/Kconfig: Add promot to pre/post pi files
This allows the values to be set in a .config
BUG=none
TEST=Was able to set the value from a .config and built careena firmware
Change-Id: I757e4b9a0b80ff42c1f49143a44f15550366fd0b
Signed-off-by: Raul E Rangel <rrangel(a)chromium.org>
---
M src/vendorcode/amd/pi/Kconfig
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/37879/1
diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig
index 265a381..9dcdf34 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -68,7 +68,7 @@
post-memory.
config AGESA_PRE_MEMORY_BINARY_PI_FILE
- string
+ string "Pre memory Binary PI file name"
depends on AGESA_SPLIT_MEMORY_FILES
default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_premem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS
help
@@ -76,7 +76,7 @@
initialization.
config AGESA_POST_MEMORY_BINARY_PI_FILE
- string
+ string "Post memory Binary PI file name"
depends on AGESA_SPLIT_MEMORY_FILES
default "3rdparty/blobs/pi/amd/00670F00/FT4/AGESA_postmem.elf" if SOC_AMD_STONEYRIDGE && USE_AMD_BLOBS
help
--
To view, visit https://review.coreboot.org/c/coreboot/+/37879
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I757e4b9a0b80ff42c1f49143a44f15550366fd0b
Gerrit-Change-Number: 37879
Gerrit-PatchSet: 1
Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org>
Gerrit-MessageType: newchange
Marco Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37923 )
Change subject: mb/google/octopus/variants/garg: update new SKU
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/37923
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic74ce14db7060f3124c1a277eb3625ce0ff0b9f0
Gerrit-Change-Number: 37923
Gerrit-PatchSet: 2
Gerrit-Owner: Kevin Chiu <Kevin.Chiu(a)quantatw.com>
Gerrit-Reviewer: Henry Sun <henrysun(a)google.com>
Gerrit-Reviewer: Justin TerAvest <teravest(a)google.com>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Reviewer: Kevin Chiu <Kevin.Chiu(a)quantatw.com>
Gerrit-Reviewer: Marco Chen <marcochen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 24 Dec 2019 15:36:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37651 )
Change subject: mainboard/variant/puff: set PL values for puff
......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37651/1/src/mainboard/google/hatch…
File src/mainboard/google/hatch/variants/puff/variant.c:
https://review.coreboot.org/c/coreboot/+/37651/1/src/mainboard/google/hatch…
PS1, Line 89: config_t *conf = config_of_soc();
> Okay I'll prepare separate patch when I can test on puff board.
Ack
--
To view, visit https://review.coreboot.org/c/coreboot/+/37651
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I041ebaa33bf2582386198290e625099ba8e2f3c9
Gerrit-Change-Number: 37651
Gerrit-PatchSet: 2
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 24 Dec 2019 11:14:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org>
Comment-In-Reply-To: Kangheui Won <khwon(a)chromium.org>
Gerrit-MessageType: comment
Kangheui Won has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37651 )
Change subject: mainboard/variant/puff: set PL values for puff
......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37651/1/src/mainboard/google/hatch…
File src/mainboard/google/hatch/variants/puff/variant.c:
https://review.coreboot.org/c/coreboot/+/37651/1/src/mainboard/google/hatch…
PS1, Line 89: config_t *conf = config_of_soc();
> It should be the root 0,0. I don't mind this change being a follow up.
Okay I'll prepare separate patch when I can test on puff board.
--
To view, visit https://review.coreboot.org/c/coreboot/+/37651
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I041ebaa33bf2582386198290e625099ba8e2f3c9
Gerrit-Change-Number: 37651
Gerrit-PatchSet: 2
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 24 Dec 2019 10:21:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org>
Comment-In-Reply-To: Kangheui Won <khwon(a)chromium.org>
Gerrit-MessageType: comment
Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37651 )
Change subject: mainboard/variant/puff: set PL values for puff
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/37651
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I041ebaa33bf2582386198290e625099ba8e2f3c9
Gerrit-Change-Number: 37651
Gerrit-PatchSet: 2
Gerrit-Owner: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Kangheui Won <khwon(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Shelley Chen <shchen(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Tue, 24 Dec 2019 10:18:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment