Attention is currently required from: Patrick Rudolph. Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52099 )
Change subject: soc/intel/skylake: Move `SataTestMode` to Kconfig ......................................................................
soc/intel/skylake: Move `SataTestMode` to Kconfig
This option is not mainboard-specific, and should be user-visible.
Change-Id: I9ff2ca984cd238a112af4efd7685f142cc6e5459 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/hp/280_g2/devicetree.cb M src/soc/intel/skylake/Kconfig M src/soc/intel/skylake/chip.c M src/soc/intel/skylake/chip.h 4 files changed, 5 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/52099/1
diff --git a/src/mainboard/hp/280_g2/devicetree.cb b/src/mainboard/hp/280_g2/devicetree.cb index 8784080..98fccc9 100644 --- a/src/mainboard/hp/280_g2/devicetree.cb +++ b/src/mainboard/hp/280_g2/devicetree.cb @@ -75,9 +75,6 @@ [3] = 1, }" # DevSlp not supported - - # Enable test mode for SATA margining - register "SataTestMode" = "1" end device pci 19.0 on end # UART #2 device pci 1c.0 off end # RP #1 diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 29f8159..6a0de2c 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -91,6 +91,10 @@ bool "Enable Hyper-Threading" default y
+config ENABLE_SATA_TEST_MODE + bool "Enable SATA test mode" + default n + config CPU_INTEL_NUM_FIT_ENTRIES int default 10 diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 2a7c02a..6bc0922 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -314,7 +314,7 @@ * write" errors and others. Enabling this option solves these problems. */ params->SataPwrOptEnable = 1; - tconfig->SataTestMode = config->SataTestMode; + tconfig->SataTestMode = CONFIG(ENABLE_SATA_TEST_MODE); }
memcpy(params->PcieRpClkReqSupport, config->PcieRpClkReqSupport, diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 99eb8e6..e207be4 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -480,9 +480,6 @@ */ u8 IslVrCmd;
- /* Enable/Disable Sata test mode */ - u8 SataTestMode; - /* i915 struct for GMA backlight control */ struct i915_gpu_controller_info gfx; };