From fe18f433265652ba1cee67bf914a22d03ac1a005 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Mon, 8 May 2017 15:22:03 -0400 Subject: [PATCH] UPSTREAM: soc/broadwell: Allow disabling of PCIe ASPM options The ASPM options (L1 substates, CLKREQ support, Common Clock and ASPM) are hardcoded for broadwell chips, but some boards may not support these ASPM options even if the SoC does support it (non-wired CLKREQ pin for example). This is required to disable L1 substates on the Purism/Librem 13 which seems to have issues with NVMe drives falling into L1.2 state and not being able to exit that state. BUG=none BRANCH=none TEST=none Change-Id: Ifde46a1db3702a6e1ad49cf3cb03a61d6ffe82d4 Signed-off-by: Patrick Georgi Original-Commit-Id: b191c9f0ab5e9c4fb3f355a0cc2674e7861b0a68 Original-Change-Id: I2c7173af1d482cccdc784e3fa44ecbb5d38ddc34 Original-Signed-off-by: Youness Alaoui Original-Reviewed-on: https://review.coreboot.org/19899 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/531203 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/soc/intel/broadwell/Kconfig | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 34f515f145..51322012d0 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -27,10 +27,6 @@ config CPU_SPECIFIC_OPTIONS select RELOCATABLE_RAMSTAGE select REG_SCRIPT select PARALLEL_MP - select PCIEXP_ASPM - select PCIEXP_COMMON_CLOCK - select PCIEXP_CLK_PM - select PCIEXP_L1_SUB_STATE select RTC select SMM_TSEG select SMP @@ -46,6 +42,22 @@ config CPU_SPECIFIC_OPTIONS select HAVE_SPI_CONSOLE_SUPPORT select CPU_INTEL_COMMON +config PCIEXP_ASPM + bool + default y + +config PCIEXP_COMMON_CLOCK + bool + default y + +config PCIEXP_CLK_PM + bool + default y + +config PCIEXP_L1_SUB_STATE + bool + default y + config VBOOT select VBOOT_STARTS_IN_ROMSTAGE