soc/braswell: Add interface to program USB2_COMPBG register

Add interface to program USB2_COMPBG register to set
HS_DISC_BG and HS_SQ reference voltage for each project.

TEST=Get build success and do EFT test

Original-Reviewed-on: https://chromium-review.googlesource.com/300846
Original-Reviewed-by: Shawn N <shawnn@chromium.org>
Original-Tested-by: shkim <sh_.kim@samsung.com>
Change-Id: If2201829e1a16b4f9916547f08c24e9291358325
Signed-off-by: Kenji Chen <kenji.chen@intel.com>
Signed-off-by: shkim <sh_.kim@samsung.com>
Signed-off-by: Hannah Williams <hannah.williams@intel.com>
Reviewed-on: https://review.coreboot.org/12739
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

5 files changed, 107 insertions, 1 deletions

diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index 4a107ec48c..867ce43f16 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -41,6 +41,7 @@ ramstage-y += southcluster.c
 ramstage-y += spi.c
 ramstage-$(CONFIG_ALT_CBFS_LOAD_PAYLOAD) += spi_loading.c
 ramstage-y += tsc_freq.c
+ramstage-y += xhci.c
 
 # Remove as ramstage gets fleshed out
 ramstage-y += placeholders.c
diff --git a/src/soc/intel/braswell/chip.h b/src/soc/intel/braswell/chip.h
index e302d6cdf5..864f214008 100644
--- a/src/soc/intel/braswell/chip.h
+++ b/src/soc/intel/braswell/chip.h
@@ -38,6 +38,18 @@ enum lpe_clk_src {
         LPE_CLK_SRC_PLL,
 };
 
+enum usb_comp_bg_value {
+	USB_COMP_BG_575_MV = 7,
+	USB_COMP_BG_650_MV = 6,
+	USB_COMP_BG_550_MV = 5,
+	USB_COMP_BG_537_MV = 4,
+	USB_COMP_BG_625_MV = 3,
+	USB_COMP_BG_700_MV = 2,
+	USB_COMP_BG_600_MV = 1,
+	USB_COMP_BG_675_MV = 0,
+};
+
+
 struct soc_intel_braswell_config {
 	uint8_t enable_xdp_tap;
 	uint8_t clkreq_enable;
@@ -61,6 +73,14 @@ struct soc_intel_braswell_config {
 	/* Allow PCIe devices to wake system from suspend. */
 	int pcie_wake_enable;
 
+	/* Program USB2_COMPBG register.
+         * [10:7] - select vref to AFE port
+         *  x111 - 575mV, x110 - 650mV, x101 - 550mV, x100 - 537.5mV,
+         *  x011 - 625mV, x010 - 700mV, x001 - 600mV, x000 - 675mV
+         */
+	enum usb_comp_bg_value usb_comp_bg;
+
+
 	/*
 	 * The following fields come from fsp_vpd.h .aka. VpdHeader.h.
 	 * These are configuration values that are passed to FSP during
diff --git a/src/soc/intel/braswell/include/soc/iosf.h b/src/soc/intel/braswell/include/soc/iosf.h
index add602f47b..5afca3e123 100644
--- a/src/soc/intel/braswell/include/soc/iosf.h
+++ b/src/soc/intel/braswell/include/soc/iosf.h
@@ -69,6 +69,8 @@ uint32_t iosf_port58_read(int reg);
 void iosf_port58_write(int reg, uint32_t val);
 uint32_t iosf_scc_read(int reg);
 void iosf_scc_write(int reg, uint32_t val);
+uint32_t iosf_usbphy_read(int reg);
+void iosf_usbphy_write(int reg, uint32_t val);
 
 #if ENV_RAMSTAGE
 uint64_t reg_script_read_iosf(struct reg_script_context *ctx);
@@ -91,6 +93,7 @@ void reg_script_write_iosf(struct reg_script_context *ctx);
 #define IOSF_PORT_0x5a		0x5a
 #define IOSF_PORT_USHPHY	0x61 /* USB XHCI PHY */
 #define IOSF_PORT_SCC		0x63 /* Storage Control Cluster */
+#define IOSF_PORT_USBPHY	0x43 /* USB PHY */
 #define IOSF_PORT_LPSS		0xa0 /* LPSS - Low Power Subsystem */
 #define IOSF_PORT_0xa2		0xa2
 #define IOSF_PORT_SSUS		0xa8 /* SUS */
@@ -109,6 +112,8 @@ void reg_script_write_iosf(struct reg_script_context *ctx);
 #define IOSF_OP_WRITE_0x58	(IOSF_OP_READ_0x58 | 1)
 #define IOSF_OP_READ_SCC        0x06
 #define IOSF_OP_WRITE_SCC       (IOSF_OP_READ_SCC | 1)
+#define IOSF_OP_READ_USBPHY     0x06
+#define IOSF_OP_WRITE_USBPHY    (IOSF_OP_READ_USBPHY | 1)
 
 /*
  * BUNIT Registers.
@@ -176,6 +181,11 @@ void reg_script_write_iosf(struct reg_script_context *ctx);
 # define LPE_PCICFGCTR1_ACPI_INT_EN		(1 << 1)
 
 /*
+ * USBPHY Registers
+ */
+#define USBPHY_COMPBG			0x7f04
+
+/*
  * IO Sideband Function
  */
 
diff --git a/src/soc/intel/braswell/iosf.c b/src/soc/intel/braswell/iosf.c
index 1e7b924bbe..98d1610ec3 100644
--- a/src/soc/intel/braswell/iosf.c
+++ b/src/soc/intel/braswell/iosf.c
@@ -122,6 +122,15 @@ void iosf_scc_write(int reg, uint32_t val)
 	return iosf_write_port(IOSF_WRITE(SCC), reg, val);
 }
 
+uint32_t iosf_usbphy_read(int reg)
+{
+	return iosf_read_port(IOSF_READ(USBPHY), reg);
+}
+
+void iosf_usbphy_write(int reg, uint32_t val)
+{
+	return iosf_write_port(IOSF_WRITE(USBPHY), reg, val);
+}
 
 #if ENV_RAMSTAGE
 uint64_t reg_script_read_iosf(struct reg_script_context *ctx)
@@ -140,6 +149,8 @@ uint64_t reg_script_read_iosf(struct reg_script_context *ctx)
 		return iosf_port58_read(step->reg);
 	case IOSF_PORT_SCC:
 		return iosf_scc_read(step->reg);
+	case IOSF_PORT_USBPHY:
+		return iosf_usbphy_read(step->reg);
 	default:
 		printk(BIOS_DEBUG, "No read support for IOSF port 0x%x.\n",
 		       step->id);
@@ -169,7 +180,9 @@ void reg_script_write_iosf(struct reg_script_context *ctx)
 	case IOSF_PORT_SCC:
 		iosf_scc_write(step->reg, step->value);
 		break;
-
+	case IOSF_PORT_USBPHY:
+		iosf_usbphy_write(step->reg, step->value);
+		break;
 	default:
 		printk(BIOS_DEBUG, "No write support for IOSF port 0x%x.\n",
 		       step->id);
diff --git a/src/soc/intel/braswell/xhci.c b/src/soc/intel/braswell/xhci.c
new file mode 100644
index 0000000000..e3e3462fa5
--- /dev/null
+++ b/src/soc/intel/braswell/xhci.c
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2013 Google Inc.
+ * Copyright (C) 2015 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; version 2 of the License.
+ *
+ * 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.
+ *
+ */
+
+#include <arch/acpi.h>
+#include <console/console.h>
+#include <device/device.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <stdint.h>
+#include <reg_script.h>
+
+#include <soc/iomap.h>
+#include <soc/iosf.h>
+#include <soc/pci_devs.h>
+#include <soc/pm.h>
+#include <soc/ramstage.h>
+#include <soc/xhci.h>
+
+#include "chip.h"
+
+static void xhci_init(device_t dev)
+{
+	struct soc_intel_braswell_config *config = dev->chip_info;
+
+	if (config && config->usb_comp_bg) {
+		struct reg_script ops[] = {
+			REG_IOSF_WRITE(IOSF_PORT_USBPHY, USBPHY_COMPBG,
+				config->usb_comp_bg),
+			REG_SCRIPT_END
+		};
+		printk(BIOS_INFO, "Override USB2_COMPBG to: 0x%X\n", config->usb_comp_bg);
+		reg_script_run(ops);
+	}
+}
+
+static struct device_operations xhci_device_ops = {
+	.read_resources		= pci_dev_read_resources,
+	.set_resources		= pci_dev_set_resources,
+	.enable_resources	= pci_dev_enable_resources,
+	.init			= xhci_init,
+	.ops_pci		= &soc_pci_ops,
+};
+
+static const struct pci_driver soc_xhci __pci_driver = {
+	.ops	= &xhci_device_ops,
+	.vendor	= PCI_VENDOR_ID_INTEL,
+	.device	= XHCI_DEVID
+};