summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wang <chris.wang@amd.corp-partner.google.com>2020-09-14 17:03:06 +0800
committerEdward O'Callaghan <quasisec@chromium.org>2020-10-08 01:30:02 +0000
commit3f929020c2ec3d039a3c5e1880e9dcf13628e705 (patch)
tree7b061f56ce4a55341bf42b87cbec7757343acca8
parent4b5c8b554154f290d509b6db3c44f850134581b7 (diff)
downloadcoreboot-3f929020c2ec3d039a3c5e1880e9dcf13628e705.tar.xz
soc/amd/picasso: Add UPD for support force USB3 to Gen1 by port
Add UPD usb3_port_force_gen1 for support USB3 port force to gen1. BUG=b:167651308 BRANCH=zork TEST=Build, verify the USB3 speed in gen1 Signed-off-by: Chris Wang <chris.wang@amd.corp-partner.google.com> Change-Id: I896c185988c3ea5dbdd72957b363ebdaa2747cff Reviewed-on: https://review.coreboot.org/c/coreboot/+/45333 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Sam McNally <sammc@google.com>
-rw-r--r--src/soc/amd/picasso/chip.h15
-rw-r--r--src/soc/amd/picasso/fsp_params.c1
2 files changed, 15 insertions, 1 deletions
diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h
index a39549e5a3..f4233de2ce 100644
--- a/src/soc/amd/picasso/chip.h
+++ b/src/soc/amd/picasso/chip.h
@@ -37,6 +37,17 @@ struct __packed usb2_phy_tune {
uint8_t tx_res_tune;
};
+/* force USB3 port to gen1, bit0 - controller0 Port0, bit1 - Port1, etc */
+union __packed usb3_force_gen1 {
+ struct {
+ uint8_t xhci0_port0:1;
+ uint8_t xhci0_port1:1;
+ uint8_t xhci0_port2:1;
+ uint8_t xhci0_port3:1;
+ } ports;
+ uint8_t usb3_port_force_gen1_en;
+};
+
#define USB_PORT_COUNT 6
enum sd_emmc_driver_strength {
@@ -190,8 +201,10 @@ struct soc_amd_picasso_config {
*/
uint16_t init_khz_preset;
} emmc_config;
-
+ /* set xhci0 from gen2 to gen1 */
uint8_t xhci0_force_gen1;
+ /* Force USB3 port to gen1, bit0 - controller0 Port0, bit1 - Port1 */
+ union usb3_force_gen1 usb3_port_force_gen1;
uint8_t has_usb2_phy_tune_params;
struct usb2_phy_tune usb_2_port_tune_params[USB_PORT_COUNT];
diff --git a/src/soc/amd/picasso/fsp_params.c b/src/soc/amd/picasso/fsp_params.c
index 95e691dc5d..973bb87d49 100644
--- a/src/soc/amd/picasso/fsp_params.c
+++ b/src/soc/amd/picasso/fsp_params.c
@@ -111,6 +111,7 @@ static void fsp_usb_oem_customization(FSP_S_CONFIG *scfg,
ASSERT(2 * sizeof(scfg->xhci_oc_pin_select) >= USB_PORT_COUNT);
scfg->xhci0_force_gen1 = cfg->xhci0_force_gen1;
+ scfg->fch_usb_3_port_force_gen1 = cfg->usb3_port_force_gen1.usb3_port_force_gen1_en;
if (cfg->has_usb2_phy_tune_params) {
for (i = 0; i < FSPS_UPD_USB2_PORT_COUNT; i++) {