coreboot-gerrit March 2022

coreboot-gerrit@coreboot.org

1 participants
6700 discussions

Change in coreboot[master]: mb/google/skyrim: Implement mb_set_up_early_espi
by Jon Murphy (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Raul Rangel, Karthik Ramasubramanian. Jon Murphy has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/63094 ) Change subject: mb/google/skyrim: Implement mb_set_up_early_espi ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/63094 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6ff32bf840aa4b757e98d876cbd4e2ba15a760da Gerrit-Change-Number: 63094 Gerrit-PatchSet: 2 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Jon Murphy <jpmurphy(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Thu, 24 Mar 2022 23:27:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL
by Jon Murphy (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Raul Rangel, Karthik Ramasubramanian. Jon Murphy has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/63093 ) Change subject: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL ...................................................................... Patch Set 2: (1 comment) File src/mainboard/google/skyrim/variants/baseboard/gpio.c: https://review.coreboot.org/c/coreboot/+/63093/comment/4510d828_53797cf9 PS2, Line 86: /* SPI1_CLK */ Update other SPI1 names to be ESPI? -- To view, visit https://review.coreboot.org/c/coreboot/+/63093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a Gerrit-Change-Number: 63093 Gerrit-PatchSet: 2 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Jon Murphy <jpmurphy(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Thu, 24 Mar 2022 23:27:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL
by Jon Murphy (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Raul Rangel, Karthik Ramasubramanian. Jon Murphy has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/63093 ) Change subject: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/63093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a Gerrit-Change-Number: 63093 Gerrit-PatchSet: 2 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Jon Murphy <jpmurphy(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Thu, 24 Mar 2022 23:22:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: include/espi.h: Switch to types.h
by Jon Murphy (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Raul Rangel, Karthikeyan Ramasubramanian, Felix Held. Jon Murphy has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/63092 ) Change subject: include/espi.h: Switch to types.h ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/63092 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I78b579de4e3832dd49a18413bf5d03870e347c91 Gerrit-Change-Number: 63092 Gerrit-PatchSet: 2 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jon Murphy <jpmurphy(a)google.com> Gerrit-Reviewer: Karthikeyan Ramasubramanian <kramasub(a)chromium.org> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Karthikeyan Ramasubramanian <kramasub(a)chromium.org> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 23:22:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Jon Murphy, Karthik Ramasubramanian. Hello Jon Murphy, Karthik Ramasubramanian, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/63093 to look at the new patch set (#2). Change subject: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL ...................................................................... mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL The eSPI CS function only exists on AGPIO30. We will need to rework all boards to make eSPI function. BUG=b:226635441 TEST=Build skyrim Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a --- M src/mainboard/google/skyrim/variants/baseboard/gpio.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/63093/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/63093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a Gerrit-Change-Number: 63093 Gerrit-PatchSet: 2 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Jon Murphy <jpmurphy(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Attention: Jon Murphy <jpmurphy(a)google.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: mb/google/skyrim: Call espi_switch_to_spi2_pads
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63096 ) Change subject: mb/google/skyrim: Call espi_switch_to_spi2_pads ...................................................................... mb/google/skyrim: Call espi_switch_to_spi2_pads We are using the second SPI pads for eSPI. BUG=b:226635441 TEST=Build skyrim Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: I43713d7376a28ced2be635668836464ceec46392 --- M src/mainboard/google/skyrim/bootblock.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/63096/1 diff --git a/src/mainboard/google/skyrim/bootblock.c b/src/mainboard/google/skyrim/bootblock.c index a475cc4..ac6bd8a 100644 --- a/src/mainboard/google/skyrim/bootblock.c +++ b/src/mainboard/google/skyrim/bootblock.c @@ -1,7 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <bootblock_common.h> +#include <amdblocks/espi.h> #include <baseboard/variants.h> +#include <bootblock_common.h> +#include <soc/espi.h> void mb_set_up_early_espi(void) { @@ -10,6 +12,8 @@ variant_espi_gpio_table(&gpios, &num_gpios); gpio_configure_pads(gpios, num_gpios); + + espi_switch_to_spi2_pads(); } void bootblock_mainboard_early_init(void) -- To view, visit https://review.coreboot.org/c/coreboot/+/63096 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I43713d7376a28ced2be635668836464ceec46392 Gerrit-Change-Number: 63096 Gerrit-PatchSet: 1 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: soc/amd/sabrina: Add espi_switch_to_spi2_pads
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Attention is currently required from: Jason Glenesk, Marshall Dawson, Fred Reitberger, Felix Held. Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63095 ) Change subject: soc/amd/sabrina: Add espi_switch_to_spi2_pads ...................................................................... soc/amd/sabrina: Add espi_switch_to_spi2_pads The way to select the pads has changed from Cezanne. We don't have a public PPR for these definitions yet, so I hard coded the values. BUG=b:226635441 TEST=Build skyrim Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: I96baf6b9c169ed61d221352b29ac676bca40da21 --- M src/soc/amd/sabrina/Makefile.inc A src/soc/amd/sabrina/espi_util.c A src/soc/amd/sabrina/include/soc/espi.h 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/63095/1 diff --git a/src/soc/amd/sabrina/Makefile.inc b/src/soc/amd/sabrina/Makefile.inc index 74124d2..99abda8 100644 --- a/src/soc/amd/sabrina/Makefile.inc +++ b/src/soc/amd/sabrina/Makefile.inc @@ -12,6 +12,7 @@ bootblock-y += bootblock.c bootblock-y += early_fch.c +bootblock-y += espi_util.c bootblock-y += gpio.c bootblock-y += i2c.c bootblock-y += reset.c diff --git a/src/soc/amd/sabrina/espi_util.c b/src/soc/amd/sabrina/espi_util.c new file mode 100644 index 0000000..993fc10 --- /dev/null +++ b/src/soc/amd/sabrina/espi_util.c @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <amdblocks/spi.h> +#include <soc/espi.h> +#include <types.h> + +void espi_switch_to_spi2_pads(void) +{ + uint8_t reg = spi_read8(0x10); + + reg |= BIT(2); + + spi_write8(0x10, reg); +} diff --git a/src/soc/amd/sabrina/include/soc/espi.h b/src/soc/amd/sabrina/include/soc/espi.h new file mode 100644 index 0000000..d7de153 --- /dev/null +++ b/src/soc/amd/sabrina/include/soc/espi.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_SABRINA_ESPI_H +#define AMD_SABRINA_ESPI_H + +void espi_switch_to_spi2_pads(void); + +#endif /* AMD_SABRINA_ESPI_H */ -- To view, visit https://review.coreboot.org/c/coreboot/+/63095 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I96baf6b9c169ed61d221352b29ac676bca40da21 Gerrit-Change-Number: 63095 Gerrit-PatchSet: 1 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/google/skyrim: Implement mb_set_up_early_espi
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63094 ) Change subject: mb/google/skyrim: Implement mb_set_up_early_espi ...................................................................... mb/google/skyrim: Implement mb_set_up_early_espi This will setup the eSPI GPIOs in bootblock right before eSPI init. BUG=b:226635441 TEST=build skyrim Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: I6ff32bf840aa4b757e98d876cbd4e2ba15a760da --- M src/mainboard/google/skyrim/bootblock.c M src/mainboard/google/skyrim/variants/baseboard/gpio.c M src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/63094/1 diff --git a/src/mainboard/google/skyrim/bootblock.c b/src/mainboard/google/skyrim/bootblock.c index 5a1c4da..a475cc4 100644 --- a/src/mainboard/google/skyrim/bootblock.c +++ b/src/mainboard/google/skyrim/bootblock.c @@ -3,6 +3,15 @@ #include <bootblock_common.h> #include <baseboard/variants.h> +void mb_set_up_early_espi(void) +{ + size_t num_gpios; + const struct soc_amd_gpio *gpios; + + variant_espi_gpio_table(&gpios, &num_gpios); + gpio_configure_pads(gpios, num_gpios); +} + void bootblock_mainboard_early_init(void) { size_t num_gpios, override_num_gpios; diff --git a/src/mainboard/google/skyrim/variants/baseboard/gpio.c b/src/mainboard/google/skyrim/variants/baseboard/gpio.c index 9eb6bd3..a7e6d56 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/gpio.c +++ b/src/mainboard/google/skyrim/variants/baseboard/gpio.c @@ -141,6 +141,23 @@ PAD_NF(GPIO_148, I2C1_SDA, PULL_NONE), }; +static const struct soc_amd_gpio espi_gpio_table[] = { + /* ESPI_CS_L */ + PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE), + /* ESPI_SOC_CLK */ + PAD_NF(GPIO_77, SPI1_CLK, PULL_NONE), + /* ESPI1_DATA0 */ + PAD_NF(GPIO_81, SPI1_DAT0, PULL_NONE), + /* ESPI1_DATA1 */ + PAD_NF(GPIO_80, SPI1_DAT1, PULL_NONE), + /* ESPI1_DATA2 */ + PAD_NF(GPIO_68, SPI1_DAT2, PULL_NONE), + /* ESPI1_DATA3 */ + PAD_NF(GPIO_69, SPI1_DAT3, PULL_NONE), + /* ESPI_ALERT_L */ + PAD_NF(GPIO_22, ESPI_ALERT_D1, PULL_NONE), +}; + static const struct soc_amd_gpio tpm_gpio_table[] = { /* I2C3_SCL */ PAD_NF(GPIO_19, I2C3_SCL, PULL_NONE), @@ -222,6 +239,12 @@ *gpio = sleep_gpio_table; } +__weak void variant_espi_gpio_table(const struct soc_amd_gpio **gpio, size_t *size) +{ + *size = ARRAY_SIZE(espi_gpio_table); + *gpio = espi_gpio_table; +} + __weak void variant_tpm_gpio_table(const struct soc_amd_gpio **gpio, size_t *size) { *size = ARRAY_SIZE(tpm_gpio_table); diff --git a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h index 0fa3491..bbc153f 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/skyrim/variants/baseboard/include/baseboard/variants.h @@ -31,6 +31,9 @@ /* This function provides GPIO settings before entering sleep. */ void variant_sleep_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); +/* This function provides GPIO settings for eSPI bus. */ +void variant_espi_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); + /* This function provides GPIO settings for TPM i2c bus. */ void variant_tpm_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); -- To view, visit https://review.coreboot.org/c/coreboot/+/63094 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6ff32bf840aa4b757e98d876cbd4e2ba15a760da Gerrit-Change-Number: 63094 Gerrit-PatchSet: 1 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63093 ) Change subject: mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL ...................................................................... mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL The eSPI CS function only exists on AGPIO30. We will need to rework all boards to make eSPI function. BUG=b:226635441 TEST=Build skyrim Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a --- M src/mainboard/google/skyrim/variants/baseboard/gpio.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/63093/1 diff --git a/src/mainboard/google/skyrim/variants/baseboard/gpio.c b/src/mainboard/google/skyrim/variants/baseboard/gpio.c index f095651..9eb6bd3 100644 --- a/src/mainboard/google/skyrim/variants/baseboard/gpio.c +++ b/src/mainboard/google/skyrim/variants/baseboard/gpio.c @@ -60,8 +60,8 @@ /* GPIO_28: Not available */ /* EN_PP3300_TCHSCR */ PAD_GPO(GPIO_29, HIGH), - /* SOC_DISABLE_DISP_BL */ - PAD_GPO(GPIO_30, HIGH), + /* ESPI_CS_L */ + PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE), /* Unused */ PAD_NC(GPIO_31), /* LPC_RST_L */ @@ -79,8 +79,8 @@ PAD_NF(GPIO_68, SPI1_DAT2, PULL_NONE), /* SPI1_DATA3 */ PAD_NF(GPIO_69, SPI1_DAT3, PULL_NONE), - /* ESPI_CS_L */ - PAD_NF(GPIO_74, SPI1_CS1_L, PULL_NONE), + /* SOC_DISABLE_DISP_BL */ + PAD_GPO(GPIO_74, LOW), /* TCHSCR_REPORT_EN */ PAD_GPO(GPIO_76, LOW), /* SPI1_CLK */ -- To view, visit https://review.coreboot.org/c/coreboot/+/63093 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a Gerrit-Change-Number: 63093 Gerrit-PatchSet: 1 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: include/espi.h: Switch to types.h
by Raul Rangel (Code Review) 24 Mar '22

24 Mar '22

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63092 ) Change subject: include/espi.h: Switch to types.h ...................................................................... include/espi.h: Switch to types.h We use bool in this file, so switch to using types.h. BUG=b:226635441 TEST=Build skyrim with DEBUG_ESPI Signed-off-by: Raul E Rangel <rrangel(a)chromium.org> Change-Id: I78b579de4e3832dd49a18413bf5d03870e347c91 --- M src/include/espi.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/63092/1 diff --git a/src/include/espi.h b/src/include/espi.h index 851b0d9..2444783 100644 --- a/src/include/espi.h +++ b/src/include/espi.h @@ -3,7 +3,7 @@ #ifndef __ESPI_H__ #define __ESPI_H__ -#include <stdint.h> +#include <types.h> /* ESPI Slave Registers (Document # 327432-004 Revision 1.0 Chapter 7) */ -- To view, visit https://review.coreboot.org/c/coreboot/+/63092 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I78b579de4e3832dd49a18413bf5d03870e347c91 Gerrit-Change-Number: 63092 Gerrit-PatchSet: 1 Gerrit-Owner: Raul Rangel <rrangel(a)chromium.org> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2022