[coreboot-gerrit] Patch set updated for coreboot: ddf62b9 Add support for XHCI (USB 3.0)

[Dave Frodin (dave.frodin@se-eng.com)]

Dave Frodin (dave.frodin at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3465

-gerrit

commit ddf62b9f5f6e04274fb720bc60e50bfa568eb388
Author: Dave Frodin <dave.frodin at se-eng.com>
Date:   Thu Jun 13 17:30:48 2013 -0600

    Add support for XHCI (USB 3.0)
    
    CONFIG_HUDSON_XHCI_ENABLE will control the XHCI flags in the
    amd/parmer and asus/f2a85-m mainboards.  The XHCI ports on
    amd/thatcher are not wired to USB jacks so always disable the flags.
    This was tested on amd/parmer using a USB 3.0 thumbdrive.
    
    Change-Id: I596b040fec30882d8d4dee34ab9f866dc1f8896b
    Signed-off-by: Dave Frodin <dave.frodin at se-eng.com>
---
 src/mainboard/amd/parmer/BiosCallOuts.c   | 8 ++++++++
 src/mainboard/amd/parmer/agesawrapper.c   | 4 ++++
 src/mainboard/amd/thatcher/agesawrapper.c | 2 ++
 src/mainboard/asus/f2a85-m/BiosCallOuts.c | 5 +++++
 src/mainboard/asus/f2a85-m/agesawrapper.c | 4 ++++
 5 files changed, 23 insertions(+)

diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c
index 9592c9d..ba33b85 100644
--- a/src/mainboard/amd/parmer/BiosCallOuts.c
+++ b/src/mainboard/amd/parmer/BiosCallOuts.c
@@ -293,6 +293,14 @@ AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
 		/* Fan Control */
 		oem_fan_control(FchParams_env);
 
+		/* XHCI configuration */
+#if CONFIG_HUDSON_XHCI_ENABLE
+		FchParams_env->Usb.Xhci0Enable = TRUE;
+#else
+		FchParams_env->Usb.Xhci0Enable = FALSE;
+#endif
+		FchParams_env->Usb.Xhci1Enable = FALSE;
+
 		/* sata configuration */
 	}
 	printk(BIOS_DEBUG, "Done\n");
diff --git a/src/mainboard/amd/parmer/agesawrapper.c b/src/mainboard/amd/parmer/agesawrapper.c
index a81a997..c160106 100644
--- a/src/mainboard/amd/parmer/agesawrapper.c
+++ b/src/mainboard/amd/parmer/agesawrapper.c
@@ -202,6 +202,10 @@ agesawrapper_amdinitreset (
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
 	AmdResetParams.HtConfig.Depth = 0;
+#if !CONFIG_HUDSON_XHCI_ENABLE
+	AmdResetParams.FchInterface.Xhci0Enable = FALSE;
+#endif
+	AmdResetParams.FchInterface.Xhci1Enable = FALSE;
 
 	status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
 	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
diff --git a/src/mainboard/amd/thatcher/agesawrapper.c b/src/mainboard/amd/thatcher/agesawrapper.c
index f7577fd..9480bdc 100644
--- a/src/mainboard/amd/thatcher/agesawrapper.c
+++ b/src/mainboard/amd/thatcher/agesawrapper.c
@@ -202,6 +202,8 @@ agesawrapper_amdinitreset (
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
 	AmdResetParams.HtConfig.Depth = 0;
+	AmdResetParams.FchInterface.Xhci0Enable = FALSE;
+	AmdResetParams.FchInterface.Xhci1Enable = FALSE;
 
 	status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
 	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);
diff --git a/src/mainboard/asus/f2a85-m/BiosCallOuts.c b/src/mainboard/asus/f2a85-m/BiosCallOuts.c
index e913896..cc3ed72 100644
--- a/src/mainboard/asus/f2a85-m/BiosCallOuts.c
+++ b/src/mainboard/asus/f2a85-m/BiosCallOuts.c
@@ -117,8 +117,13 @@ AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
 		FchParams_env->Hwm.HwmFchtsiAutoPoll = FALSE;/* 1 enable, 0 disable TSI Auto Polling */
 
 		/* XHCI configuration */
+#if CONFIG_HUDSON_XHCI_ENABLE
 		FchParams_env->Usb.Xhci0Enable = TRUE;
 		FchParams_env->Usb.Xhci1Enable = TRUE;
+#else
+		FchParams_env->Usb.Xhci0Enable = FALSE;
+		FchParams_env->Usb.Xhci1Enable = FALSE;
+#endif
 	}
 	printk(BIOS_DEBUG, "Done\n");
 
diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.c b/src/mainboard/asus/f2a85-m/agesawrapper.c
index df45148..66b8d4f 100644
--- a/src/mainboard/asus/f2a85-m/agesawrapper.c
+++ b/src/mainboard/asus/f2a85-m/agesawrapper.c
@@ -202,6 +202,10 @@ agesawrapper_amdinitreset (
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
 	AmdResetParams.HtConfig.Depth = 0;
+#if !CONFIG_HUDSON_XHCI_ENABLE
+	AmdResetParams.FchInterface.Xhci0Enable = FALSE;
+	AmdResetParams.FchInterface.Xhci1Enable = FALSE;
+#endif
 
 	status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
 	if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(AmdParamStruct.StdHeader.HeapStatus);