[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: Allow USB2 eye pattern configuration in devicetree

[Kane Chen (kane.chen@intel.com)]

Kane Chen (kane.chen at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18060

-gerrit

commit 1151c8cab2977888104b522f666a03bc4cbb605b
Author: Kane Chen <kane.chen at intel.com>
Date:   Mon Jan 9 10:45:20 2017 +0800

    soc/intel/apollolake: Allow USB2 eye pattern configuration in devicetree
    
    This code allows people to override the usb2 eye pattern
    UPD settings for boards.
    
    BUG=chrome-os-partner:61031
    BRANCH=None
    TEST=Usb2 function ok and make sure fsp upd is overridden
    
    Change-Id: I5fab620a29aba196edf1f24ffe6a1695de1e523e
    Signed-off-by: Kane Chen <kane.chen at intel.com>
---
 3rdparty/blobs                             |  2 +-
 src/soc/intel/apollolake/chip.c            | 32 +++++++++++++++++++++++++++++
 src/soc/intel/apollolake/chip.h            |  5 +++++
 src/soc/intel/apollolake/include/soc/usb.h | 33 ++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/3rdparty/blobs b/3rdparty/blobs
index 8090bdd..9ba0703 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 8090bdd59853599e469b7503ea473ca12e8c681b
+Subproject commit 9ba07035ed0acb28902cce826ea833cf531d57c1
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index a24ca33..1de41cf 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -436,6 +436,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 {
         FSP_S_CONFIG *silconfig = &silupd->FspsConfig;
 	static struct soc_intel_apollolake_config *cfg;
+	uint8_t port;
 
 	/* Load VBT before devicetree-specific config. */
 	silconfig->GraphicsConfigPtr = (uintptr_t)vbt;
@@ -491,6 +492,37 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 	/* Bios config lockdown Audio clk and power gate */
 	silconfig->BiosCfgLockDown = cfg->hdaudio_bios_config_lockdown;
 
+	/* USB2 eye diagram settings per port */
+	for (port = 0; port < APOLLOLAKE_USB2_PORT_MAX; port++) {
+		if (cfg->usb2eye[port].Usb20PerPortTxPeHalf != 0)
+			silconfig->PortUsb20PerPortTxPeHalf[port] =
+				cfg->usb2eye[port].Usb20PerPortTxPeHalf;
+
+		if (cfg->usb2eye[port].Usb20PerPortPeTxiSet != 0)
+			silconfig->PortUsb20PerPortPeTxiSet[port] =
+				cfg->usb2eye[port].Usb20PerPortPeTxiSet;
+
+		if (cfg->usb2eye[port].Usb20PerPortTxiSet != 0)
+			silconfig->PortUsb20PerPortTxiSet[port] =
+				cfg->usb2eye[port].Usb20PerPortTxiSet;
+
+		if (cfg->usb2eye[port].Usb20HsSkewSel != 0)
+			silconfig->PortUsb20HsSkewSel[port] =
+				cfg->usb2eye[port].Usb20HsSkewSel;
+
+		if (cfg->usb2eye[port].Usb20IUsbTxEmphasisEn != 0)
+			silconfig->PortUsb20IUsbTxEmphasisEn[port] =
+				cfg->usb2eye[port].Usb20IUsbTxEmphasisEn;
+
+		if (cfg->usb2eye[port].Usb20PerPortRXISet != 0)
+			silconfig->PortUsb20PerPortRXISet[port] =
+				cfg->usb2eye[port].Usb20PerPortRXISet;
+
+		if (cfg->usb2eye[port].Usb20HsNpreDrvSel != 0)
+			silconfig->PortUsb20HsNpreDrvSel[port] =
+				cfg->usb2eye[port].Usb20HsNpreDrvSel;
+	}
+
 }
 
 struct chip_operations soc_intel_apollolake_ops = {
diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h
index 5f8fed9..d60ffbf 100644
--- a/src/soc/intel/apollolake/chip.h
+++ b/src/soc/intel/apollolake/chip.h
@@ -24,6 +24,7 @@
 #include <soc/intel/common/lpss_i2c.h>
 #include <device/i2c.h>
 #include <soc/pm.h>
+#include <soc/usb.h>
 
 #define CLKREQ_DISABLED		0xf
 #define APOLLOLAKE_I2C_DEV_MAX	8
@@ -115,6 +116,10 @@ struct soc_intel_apollolake_config {
 
 	/* GPIO pin for PERST_0 */
 	uint16_t prt0_gpio;
+
+	/* USB2 eye diagram settings per port */
+	struct usb2_eye_per_port usb2eye[APOLLOLAKE_USB2_PORT_MAX];
+
 };
 
 #endif	/* _SOC_APOLLOLAKE_CHIP_H_ */
diff --git a/src/soc/intel/apollolake/include/soc/usb.h b/src/soc/intel/apollolake/include/soc/usb.h
new file mode 100644
index 0000000..7220023
--- /dev/null
+++ b/src/soc/intel/apollolake/include/soc/usb.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Intel Corp.
+ * (Written by Kane Chen <Kane.Chen at intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _SOC_APOLLOLAKE_USB_H_
+#define _SOC_APOLLOLAKE_USB_H_
+
+#define APOLLOLAKE_USB2_PORT_MAX 8
+
+struct usb2_eye_per_port {
+	uint8_t Usb20PerPortTxPeHalf;
+	uint8_t Usb20PerPortPeTxiSet;
+	uint8_t Usb20PerPortTxiSet;
+	uint8_t Usb20HsSkewSel;
+	uint8_t Usb20IUsbTxEmphasisEn;
+	uint8_t Usb20PerPortRXISet;
+	uint8_t Usb20HsNpreDrvSel;
+};
+
+#endif /* _SOC_APOLLOLAKE_USB_H_ */