summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Chen <jamie.chen@intel.com>2021-07-20 18:33:57 +0800
committerPatrick Georgi <pgeorgi@google.com>2021-07-28 11:40:27 +0000
commit1ebcb2ab62b9fa258b4fe614df70250efebec54a (patch)
tree904bc9431bfd8227a60145118f9240d2e3f1bc0c
parent0f93a7b781b220b3bcddf1edabff7c8be52c9aeb (diff)
soc/intel/jasperlake: add pcie modphy settings
This patch adds device tree settings to control pcie modphy tuning FSP UPDs. With this patch, the pcie modphy can be tuned per board. BUG=b:192716633 BRANCH=NONE TEST=build dedede variant coreboot with fw_debug enable and check if these settings have been changed successfully on fsp debug log. Change-Id: I80a91d45f9dd8ef218846e1284fdad309313e831 Signed-off-by: Jamie Chen <jamie.chen@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/56336 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
-rw-r--r--src/soc/intel/jasperlake/chip.h4
-rw-r--r--src/soc/intel/jasperlake/include/soc/pcie_modphy.h24
-rw-r--r--src/soc/intel/jasperlake/romstage/fsp_params.c34
3 files changed, 62 insertions, 0 deletions
diff --git a/src/soc/intel/jasperlake/chip.h b/src/soc/intel/jasperlake/chip.h
index 4a9d9a0cf1..001597e308 100644
--- a/src/soc/intel/jasperlake/chip.h
+++ b/src/soc/intel/jasperlake/chip.h
@@ -13,6 +13,7 @@
#include <soc/gpio.h>
#include <soc/pch.h>
#include <soc/pci_devs.h>
+#include <soc/pcie_modphy.h>
#include <soc/pmc.h>
#include <soc/serialio.h>
#include <soc/usb.h>
@@ -122,6 +123,9 @@ struct soc_intel_jasperlake_config {
/* PCIe RP L1 substate */
enum L1_substates_control PcieRpL1Substates[CONFIG_MAX_ROOT_PORTS];
+ /* PCIe ModPhy related */
+ struct pcie_modphy_config pcie_mp_cfg[CONFIG_MAX_ROOT_PORTS];
+
/* SMBus */
uint8_t SmbusEnable;
diff --git a/src/soc/intel/jasperlake/include/soc/pcie_modphy.h b/src/soc/intel/jasperlake/include/soc/pcie_modphy.h
new file mode 100644
index 0000000000..60f145195f
--- /dev/null
+++ b/src/soc/intel/jasperlake/include/soc/pcie_modphy.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef _SOC_JASPERLAKE_PCIE_MODPHY_H_
+#define _SOC_JASPERLAKE_PCIE_MODPHY_H_
+
+struct pcie_modphy_config {
+ /* TX Output Downscale Amplitude Adjustment */
+ bool tx_gen1_downscale_amp_override;
+ uint8_t tx_gen1_downscale_amp;
+ /* TX Output Downscale Amplitude Adjustment */
+ bool tx_gen2_downscale_amp_override;
+ uint8_t tx_gen2_downscale_amp;
+ /* TX Output Downscale Amplitude Adjustment */
+ bool tx_gen3_downscale_amp_override;
+ uint8_t tx_gen3_downscale_amp;
+ /* TX Output -3.5dB Mode De-Emphasis Adjustment Setting */
+ uint8_t tx_gen1_de_emph;
+ /* TX Output -3.5dB Mode De-Emphasis Adjustment Setting */
+ uint8_t tx_gen2_de_emph_3p5;
+ /* TX Output -6.0dB Mode De-Emphasis Adjustment Setting */
+ uint8_t tx_gen2_de_emph_6p0;
+};
+
+#endif
diff --git a/src/soc/intel/jasperlake/romstage/fsp_params.c b/src/soc/intel/jasperlake/romstage/fsp_params.c
index c1208e3cb9..1241b0b72c 100644
--- a/src/soc/intel/jasperlake/romstage/fsp_params.c
+++ b/src/soc/intel/jasperlake/romstage/fsp_params.c
@@ -27,6 +27,40 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
m_cfg->SaGv = config->SaGv;
m_cfg->RMT = config->RMT;
+ /* PCIe ModPhy configuration */
+ for (i = 0; i < CONFIG_MAX_ROOT_PORTS; i++) {
+ if (config->pcie_mp_cfg[i].tx_gen1_downscale_amp_override) {
+ m_cfg->PchPcieHsioTxGen1DownscaleAmpEnable[i] = 1;
+ m_cfg->PchPcieHsioTxGen1DownscaleAmp[i] =
+ config->pcie_mp_cfg[i].tx_gen1_downscale_amp;
+ }
+ if (config->pcie_mp_cfg[i].tx_gen2_downscale_amp_override) {
+ m_cfg->PchPcieHsioTxGen2DownscaleAmpEnable[i] = 1;
+ m_cfg->PchPcieHsioTxGen2DownscaleAmp[i] =
+ config->pcie_mp_cfg[i].tx_gen2_downscale_amp;
+ }
+ if (config->pcie_mp_cfg[i].tx_gen3_downscale_amp_override) {
+ m_cfg->PchPcieHsioTxGen3DownscaleAmpEnable[i] = 1;
+ m_cfg->PchPcieHsioTxGen3DownscaleAmp[i] =
+ config->pcie_mp_cfg[i].tx_gen3_downscale_amp;
+ }
+ if (config->pcie_mp_cfg[i].tx_gen1_de_emph) {
+ m_cfg->PchPcieHsioTxGen1DeEmphEnable[i] = 1;
+ m_cfg->PchPcieHsioTxGen1DeEmph[i] =
+ config->pcie_mp_cfg[i].tx_gen1_de_emph;
+ }
+ if (config->pcie_mp_cfg[i].tx_gen2_de_emph_3p5) {
+ m_cfg->PchPcieHsioTxGen2DeEmph3p5Enable[i] = 1;
+ m_cfg->PchPcieHsioTxGen2DeEmph3p5[i] =
+ config->pcie_mp_cfg[i].tx_gen2_de_emph_3p5;
+ }
+ if (config->pcie_mp_cfg[i].tx_gen2_de_emph_6p0) {
+ m_cfg->PchPcieHsioTxGen2DeEmph6p0Enable[i] = 1;
+ m_cfg->PchPcieHsioTxGen2DeEmph6p0[i] =
+ config->pcie_mp_cfg[i].tx_gen2_de_emph_6p0;
+ }
+ }
+
/* PCIe root port configuration */
for (i = 0; i < ARRAY_SIZE(config->PcieRpEnable); i++) {
if (config->PcieRpEnable[i])