Attention is currently required from: Tarun Tuli, Kyle Lin.
Frank Chu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/71693 )
Change subject: mb/google/brya/var/marasov: Remove wlan RTD3 driver for meet design change
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit https://review.coreboot.org/c/coreboot/+/71693
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I22448a8cb28ddadb93b114c096e364980feab6fd
Gerrit-Change-Number: 71693
Gerrit-PatchSet: 4
Gerrit-Owner: Frank Chu <frank_chu(a)pegatron.corp-partner.google.com>
Gerrit-Reviewer: Frank Chu <frank_chu(a)pegatron.corp-partner.google.com>
Gerrit-Reviewer: Kyle Lin <kylelinck(a)google.com>
Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Ken Lu <ken_lu(a)pegatron.corp-partner.google.com>
Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com>
Gerrit-Attention: Kyle Lin <kylelinck(a)google.com>
Gerrit-Comment-Date: Sat, 07 Jan 2023 09:03:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Christian Walter, Andrey Pronin.
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/71724 )
Change subject: drivers/spi/tpm: Wait for STS_COMMAND_READY
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://review.coreboot.org/c/coreboot/+/71724/comment/df690105_daabb473
PS1, Line 8:
Andrey, I need your opinion about the following questions:
1. Should we apply same the logic for Cr50? How about non-Google TPMs?
2. Do we need to keep calling `write_tpm_sts`? Or just need to write once and waiting for `read_tpm_sts` to return the expected status?
3. What's the suggested timeout (currently 1ms)?
4. What's the suggested delay in the loop (currently 10us)?
--
To view, visit https://review.coreboot.org/c/coreboot/+/71724
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06fd8f400622f6b9afea520cec19ea962ebe8568
Gerrit-Change-Number: 71724
Gerrit-PatchSet: 1
Gerrit-Owner: Yu-Ping Wu <yupingso(a)google.com>
Gerrit-Reviewer: Andrey Pronin <apronin(a)chromium.org>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Andrey Pronin <apronin(a)chromium.org>
Gerrit-Comment-Date: Sat, 07 Jan 2023 08:42:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71724 )
Change subject: drivers/spi/tpm: Wait for STS_COMMAND_READY
......................................................................
drivers/spi/tpm: Wait for STS_COMMAND_READY
If we reset Ti50 in the middle of a command, it will not become ready
for the 1st command after reboot until the TPM app returns the buffer
from the previously ongoing command. Therefore, add a loop to retry
writing TPM_STS_COMMAND_READY to STS register.
BUG=b:263531882
TEST=emerge-corsola coreboot
BRANCH=none
Change-Id: I06fd8f400622f6b9afea520cec19ea962ebe8568
Signed-off-by: Yu-Ping Wu <yupingso(a)chromium.org>
---
M src/drivers/spi/tpm/tpm.c
1 file changed, 42 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/71724/1
diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c
index 976a8d8..050edd3 100644
--- a/src/drivers/spi/tpm/tpm.c
+++ b/src/drivers/spi/tpm/tpm.c
@@ -604,6 +604,7 @@
uint8_t *rsp_body = tpm2_response;
union fifo_transfer_buffer fifo_buffer;
const int HEADER_SIZE = 6;
+ struct stopwatch sw;
/* Do not try using an uninitialized TPM. */
if (!tpm_info.vendor_id)
@@ -622,11 +623,28 @@
return 0;
}
- /* Let the TPM know that the command is coming. */
- if (write_tpm_sts(TPM_STS_COMMAND_READY) != CB_SUCCESS) {
- printk(BIOS_ERR, "TPM_STS_COMMAND_READY failed\n");
- return 0;
- }
+ /*
+ * Let the TPM know that the command is coming.
+ *
+ * If we reset Ti50 in the middle of a command, it will not become ready for the 1st
+ * command after reboot until the TPM app returns the buffer from the previously ongoing
+ * command.
+ */
+ expected_status_bits = TPM_STS_VALID | TPM_STS_COMMAND_READY;
+ stopwatch_init_usecs_expire(&sw, 1000);
+ status = 0;
+ do {
+ enum cb_err ret = write_tpm_sts(TPM_STS_COMMAND_READY);
+ udelay(10);
+ if (ret == CB_SUCCESS)
+ read_tpm_sts(&status);
+ else
+ printk(BIOS_WARNING, "failed to write TPM_STS_COMMAND_READY\n");
+ if (stopwatch_expired(&sw)) {
+ printk(BIOS_ERR, "timeout waiting for TPM_STS_COMMAND_READY\n");
+ return 0;
+ }
+ } while (!(status & expected_status_bits));
/*
* TPM commands and responses written to and read from the FIFO
--
To view, visit https://review.coreboot.org/c/coreboot/+/71724
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06fd8f400622f6b9afea520cec19ea962ebe8568
Gerrit-Change-Number: 71724
Gerrit-PatchSet: 1
Gerrit-Owner: Yu-Ping Wu <yupingso(a)google.com>
Gerrit-MessageType: newchange
Cliff Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71740 )
Change subject: mb/intel/adlrvp: Enable ISH and UFS for reworked ADL-P RVP
......................................................................
mb/intel/adlrvp: Enable ISH and UFS for reworked ADL-P RVP
UFS support is added to ADL-P RVP. Rework is required for UFS to work.
Secondary CPU and PCH SSD slots will be disabled after rework.
ISH is also enabled as part of UFS enablement.
ISH UART0 is enabled. The SW5C1 on MICA3 needs to be set properly to
route ISH UART signals instead of CR50.
To enable PCH SSD slot, comment out the following in the overrides.cb:
device ref pcie_rp9 off end
device ref pcie_rp11 off end
device ref ufs on end
BUG=b:252785850
TEST=Check that UFS device is detected from lspci command.
Signed-off-by: Cliff Huang <cliff.huang(a)intel.com>
Change-Id: I812786b9a25c31bc008f055af90467d4edf6158e
---
M src/mainboard/intel/adlrvp/Kconfig
M src/mainboard/intel/adlrvp/gpio.c
M src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb
3 files changed, 49 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/71740/1
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 7a5f1ec..1a10304 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -43,6 +43,7 @@
select MAINBOARD_HAS_TPM2
select SPI_TPM
select TPM_GOOGLE_CR50
+ select DRIVERS_INTEL_ISH
config BOARD_INTEL_ADLRVP_P_MCHP
select BOARD_INTEL_ADLRVP_COMMON
diff --git a/src/mainboard/intel/adlrvp/gpio.c b/src/mainboard/intel/adlrvp/gpio.c
index 3c43a74..d9b11cc 100644
--- a/src/mainboard/intel/adlrvp/gpio.c
+++ b/src/mainboard/intel/adlrvp/gpio.c
@@ -11,16 +11,16 @@
/* GPIO A0-A6, A9-A10 default function is NF1 for eSPI interface when
eSPI is enabled */
- /* SSD1_PWREN CPU SSD1 */
- PAD_CFG_GPO(GPP_D14, 1, PLTRST),
+ /* ISH UART0 TXD */
+ PAD_CFG_NF(GPP_D14, NONE, DEEP, NF1),
/* SSD1_RESET CPU SSD1 */
PAD_CFG_GPO(GPP_F20, 1, PLTRST),
/* BT_RF_KILL_N */
PAD_CFG_GPO(GPP_A13, 1, PLTRST),
/* WLAN RST# */
PAD_CFG_GPO(GPP_H2, 1, PLTRST),
- /* WIFI_WAKE_N */
- PAD_CFG_GPI_IRQ_WAKE(GPP_D13, NONE, DEEP, LEVEL, INVERT),
+ /* ISH UART0 RXD */
+ PAD_CFG_NF(GPP_D13, NONE, DEEP, NF1),
/* x4 PCIE slot1 PWREN */
PAD_CFG_GPO(GPP_H17, 0, PLTRST),
/* x4 PCIE slot 1 RESET */
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb
index c78189f..7c16b2f 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_rpl_ext_ec/overridetree.cb
@@ -103,5 +103,26 @@
end
end
end
+ # NOTE: The following changes are for ADL-P LP5 RVP with rework for UFS2.1 or UFS3.1.
+ # RVP UFS support changed to default, whereas rework is required.
+ # a. Rework to route clk_src 4 that connected to the 2nd CPU SSD slot for UFS.
+ # b. Rework to change rp9 and rp10, which is used to be PCH SSD lanes, for UFS1.
+ # c. Rework for UFS reset signal.
+ # d. Additional rework is needed to change 3.3v to 2.5v and 1.8v to 1.2v for UFS3.1.
+ # d. When UFS is enabled, rp9 and rp10 function as UFS link.
+ # For RVP without UFS rework, NVMe/SSD device can only be connected to the first CPU
+ # SSD slot with the device config below.
+ #
+ device ref pcie4_1 off end
+ device ref pcie_rp9 off end
+ device ref pcie_rp11 off end
+ device ref ish on
+ chip drivers/intel/ish
+ register "add_acpi_dma_property" = "true"
+ device generic 0 on
+ end
+ end
+ end
+ device ref ufs on end
end
end
--
To view, visit https://review.coreboot.org/c/coreboot/+/71740
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I812786b9a25c31bc008f055af90467d4edf6158e
Gerrit-Change-Number: 71740
Gerrit-PatchSet: 1
Gerrit-Owner: Cliff Huang <cliff.huang(a)intel.com>
Gerrit-CC: Cliff Huang <cliff.huang(a)intel.corp-partner.google.com>
Gerrit-MessageType: newchange