Hello Chris Wang,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/48203
to review the following change.
Change subject: mb/zork: set APU_EDP_BL_DISABLE to low as default
......................................................................
mb/zork: set APU_EDP_BL_DISABLE to low as default
set APU_EDP_BL_DISABLE(GPIO_85) to low to avoid the VARY_BL fast than
APU_DP_BLON.
BUG=b:171954512
BRANCH=zork
TEST=validate the panel sequence with scope.
Signed-off-by: Chris Wang <chris.wang(a)amd.corp-partner.google.com>
Change-Id: Ia6d3f4335583bb2d91a6bce96d89cff84247d0ad
---
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/48203/1
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 884862d..e928d8c 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -95,8 +95,8 @@
/* GPIO_77 - GPIO_83: Not available */
/* HP_INT_ODL */
PAD_GPI(GPIO_84, PULL_NONE),
- /* APU_EDP_BL_DISABLE TODP: Set low in depthcharge */
- PAD_GPO(GPIO_85, HIGH),
+ /* APU_EDP_BL_DISABLE */
+ PAD_GPO(GPIO_85, LOW),
/* RAM ID 2 - Keep High */
PAD_GPO(GPIO_86, HIGH),
/* EMMC_DATA7 */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index 818c39b..bb99f5d 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -99,8 +99,8 @@
/* GPIO_77 - GPIO_83: Not available */
/* RAM_ID_4 */
PAD_GPI(GPIO_84, PULL_NONE),
- /* APU_EDP_BL_DISABLE TODP: Set low in depthcharge */
- PAD_GPO(GPIO_85, HIGH),
+ /* APU_EDP_BL_DISABLE */
+ PAD_GPO(GPIO_85, LOW),
/* WIFI_AUX_RESET_L */
PAD_GPO(GPIO_86, HIGH),
/* EMMC_DATA7 */
--
To view, visit https://review.coreboot.org/c/coreboot/+/48203
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia6d3f4335583bb2d91a6bce96d89cff84247d0ad
Gerrit-Change-Number: 48203
Gerrit-PatchSet: 1
Gerrit-Owner: chris wang <Chris.Wang(a)amd.com>
Gerrit-Reviewer: Chris Wang <chris.wang(a)amd.corp-partner.google.com>
Gerrit-MessageType: newchange
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48136 )
Change subject: mb/google/volteer: Create copano variant
......................................................................
mb/google/volteer: Create copano variant
Create the copano variant of the volteer reference board by
copying the template files to a new directory named for the variant.
(Auto-Generated by create_coreboot_variant.sh version 4.3.1).
BUG=b:174413884
BRANCH=None
TEST=util/abuild/abuild -p none -t google/volteer -x -a
make sure the build includes GOOGLE_COPANO
Signed-off-by: FrankChu <frank_chu(a)pegatron.corp-partner.google.com>
Change-Id: Ib06625f492f68a6a6f5c6b382772b68f1eb681ef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48136
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Zhuohao Lee <zhuohao(a)chromium.org>
---
M src/mainboard/google/volteer/Kconfig
M src/mainboard/google/volteer/Kconfig.name
A src/mainboard/google/volteer/variants/copano/include/variant/ec.h
A src/mainboard/google/volteer/variants/copano/include/variant/gpio.h
A src/mainboard/google/volteer/variants/copano/memory/mem_parts_used.txt
A src/mainboard/google/volteer/variants/copano/overridetree.cb
6 files changed, 39 insertions(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Zhuohao Lee: Looks good to me, approved
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index f2e4adc..c776ba1 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -107,6 +107,7 @@
default "Elemi" if BOARD_GOOGLE_ELEMI
default "Voema" if BOARD_GOOGLE_VOEMA
default "Drobit" if BOARD_GOOGLE_DROBIT
+ default "Copano" if BOARD_GOOGLE_COPANO
config MAX_CPUS
int
@@ -148,6 +149,7 @@
default "elemi" if BOARD_GOOGLE_ELEMI
default "voema" if BOARD_GOOGLE_VOEMA
default "drobit" if BOARD_GOOGLE_DROBIT
+ default "copano" if BOARD_GOOGLE_COPANO
config VARIANT_HAS_MIPI_CAMERA
bool
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 7536dc5..676054c 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -93,3 +93,7 @@
config BOARD_GOOGLE_DROBIT
bool "-> Drobit"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_COPANO
+ bool "-> Copano"
+ select BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/variants/copano/include/variant/ec.h b/src/mainboard/google/volteer/variants/copano/include/variant/ec.h
new file mode 100644
index 0000000..7a2a6ff
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/copano/include/variant/ec.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __VARIANT_EC_H__
+#define __VARIANT_EC_H__
+
+#include <baseboard/ec.h>
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/copano/include/variant/gpio.h b/src/mainboard/google/volteer/variants/copano/include/variant/gpio.h
new file mode 100644
index 0000000..b5fa8c5
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/copano/include/variant/gpio.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef VARIANT_GPIO_H
+#define VARIANT_GPIO_H
+
+#include <baseboard/gpio.h>
+
+/* Memory configuration board straps */
+/* Copied from baseboard and may need to change for the new variant. */
+#define GPIO_MEM_CONFIG_0 GPP_C12
+#define GPIO_MEM_CONFIG_1 GPP_C15
+#define GPIO_MEM_CONFIG_2 GPP_C14
+#define GPIO_MEM_CONFIG_3 GPP_D15
+
+#endif
diff --git a/src/mainboard/google/volteer/variants/copano/memory/mem_parts_used.txt b/src/mainboard/google/volteer/variants/copano/memory/mem_parts_used.txt
new file mode 100644
index 0000000..f51b3af
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/copano/memory/mem_parts_used.txt
@@ -0,0 +1,4 @@
+# This is a CSV file containing a list of memory parts used by this variant.
+# Generate an updated Makefile.inc and dram_id.generated.txt by running the
+# gen_part_id tool from util/spd_tools/ddr4 or util/spd_tools/lp4x
+# See util/spd_tools/{ddr4,lp4x}/README.md for more details and instructions.
diff --git a/src/mainboard/google/volteer/variants/copano/overridetree.cb b/src/mainboard/google/volteer/variants/copano/overridetree.cb
new file mode 100644
index 0000000..32204c5
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/copano/overridetree.cb
@@ -0,0 +1,6 @@
+chip soc/intel/tigerlake
+
+ device domain 0 on
+ end
+
+end
--
To view, visit https://review.coreboot.org/c/coreboot/+/48136
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ib06625f492f68a6a6f5c6b382772b68f1eb681ef
Gerrit-Change-Number: 48136
Gerrit-PatchSet: 3
Gerrit-Owner: Frank Chu <frank_chu(a)pegatron.corp-partner.google.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)chromium.org>
Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Daniel Peng <daniel_peng(a)pegatron.corp-partner.google.com>
Gerrit-CC: Hank Lin <hank2_lin(a)pegatron.corp-partner.google.com>
Gerrit-CC: Kane Chen <kane_chen(a)pegatron.corp-partner.google.com>
Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com>
Gerrit-MessageType: merged
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48202 )
Change subject: drivers/intel/fsp2_0/memory_init: Wrap calls into FSP
......................................................................
drivers/intel/fsp2_0/memory_init: Wrap calls into FSP
Use a wrapper code that does nothing on x86_32, but drops to protected
mode to call into FSP when running on x86_64.
Tested on Intel Skylake when running in long mode. Successfully run the
FSP-M which is compiled for x86_32 and then continued booting in long mode.
Change-Id: I9fb37019fb0d04f74d00733ce2e365f484d97d66
Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com>
---
M src/drivers/intel/fsp2_0/memory_init.c
M src/drivers/intel/fsp2_0/silicon_init.c
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/48202/1
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 27e34fe..00927ac 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -22,6 +22,7 @@
#include <security/tpm/tspi.h>
#include <vb2_api.h>
#include <types.h>
+#include <mode_switch.h>
static uint8_t temp_ram[CONFIG_FSP_TEMP_RAM_SIZE] __aligned(sizeof(uint64_t));
@@ -296,7 +297,7 @@
post_code(POST_FSP_MEMORY_INIT);
timestamp_add_now(TS_FSP_MEMORY_INIT_START);
- status = fsp_raminit(&fspm_upd, fsp_get_hob_list_ptr());
+ status = protected_mode_call_2arg(fsp_raminit, (uintptr_t)&fspm_upd, (uintptr_t)fsp_get_hob_list_ptr());
post_code(POST_FSP_MEMORY_EXIT);
timestamp_add_now(TS_FSP_MEMORY_INIT_END);
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 0b6540e..fc5b41b 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -13,6 +13,7 @@
#include <string.h>
#include <timestamp.h>
#include <types.h>
+#include <mode_switch.h>
struct fsp_header fsps_hdr;
@@ -117,7 +118,11 @@
timestamp_add_now(TS_FSP_SILICON_INIT_START);
post_code(POST_FSP_SILICON_INIT);
- status = silicon_init(upd);
+
+ status = protected_mode_call_1arg(silicon_init, (uintptr_t)upd);
+
+ printk(BIOS_ERR, "FSPS returned %x\n", status);
+
timestamp_add_now(TS_FSP_SILICON_INIT_END);
post_code(POST_FSP_SILICON_EXIT);
--
To view, visit https://review.coreboot.org/c/coreboot/+/48202
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9fb37019fb0d04f74d00733ce2e365f484d97d66
Gerrit-Change-Number: 48202
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-MessageType: newchange