From c672043766dabc2bbaebc770fb20e0f63e5eedcb Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Tue, 10 Oct 2017 13:44:10 -0700 Subject: [PATCH] soc/intel/cannonlake: Set platform Debug Probe Type Add option for user to select what kind of probe can be used for platform debug. TEST=Set to XDP and boot up system with XDP hooked, able to halt. Change-Id: Ib6add93e3f1c8a646aa625a4cea9be0acecc0487 Signed-off-by: Lijian Zhao Reviewed-on: https://review.coreboot.org/21942 Reviewed-by: Aaron Durbin Reviewed-by: Pratikkumar V Prajapati Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/chip.h | 9 +++++++++ src/soc/intel/cannonlake/romstage/romstage.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 0cfa3c3eab..dbe211da35 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -212,6 +212,15 @@ struct soc_intel_cannonlake_config { */ uint32_t PrmrrSize; uint8_t PmTimerDisabled; + /* Desired platform debug type. */ + enum { + DebugConsent_Disabled, + DebugConsent_DCI_DBC, + DebugConsent_DCI, + DebugConsent_USB3_DBC, + DebugConsent_XDP, /* XDP/Mipi60 */ + DebugConsent_USB2_DBC, + } DebugConsent; /* * SerialIO device mode selection: * diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index 1775cae779..eb72a25ea0 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -101,6 +101,8 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) /* Enable SMBus controller based on config */ m_cfg->SmbusEnable = config->SmbusEnable; + /* Set debug probe type */ + m_cfg->PlatformDebugConsent = config->DebugConsent; mainboard_memory_init_params(mupd); }