[coreboot-gerrit] Patch set updated for coreboot: AMD Merlin Falcon: update vendorcode header files to CarrizoPI 1.1.0.1
Zheng Bao (zheng.bao@amd.com)
gerrit at coreboot.org
Fri Nov 6 16:00:40 CET 2015
Zheng Bao (zheng.bao at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11752
-gerrit
commit 00932ad3b738e905d71615dc0481e41256369648
Author: WANG Siyuan <wangsiyuanbuaa at gmail.com>
Date: Thu Aug 13 01:22:33 2015 +0800
AMD Merlin Falcon: update vendorcode header files to CarrizoPI 1.1.0.1
1. This is required the BLOB change Ie86bb0cf
AMD Merlin Falcon: Update to CarrizoPI 1.1.0.1 (Binary PI 1.5)
2. The PSP firmwares' location should be changed or some firmwares can't be
added.
3. This is tested on Bettong Alfa(DDR3) and Beta(DDR4). Both of the
boards can boot to Windows 10. PCIe slots, USB and NIC work.
Change-Id: I6cf3e333899f1eb2c00ca84c96deadeea0e23b07
Signed-off-by: WANG Siyuan <wangsiyuanbuaa at gmail.com>
Signed-off-by: WANG Siyuan <SiYuan.Wang at amd.com>
---
src/southbridge/amd/pi/hudson/Makefile.inc | 2 +-
.../amd/pi/00660F01/Proc/Fch/Common/FchDef.h | 2 ++
src/vendorcode/amd/pi/00660F01/Proc/Fch/Fch.h | 18 ++++++++++++++----
.../amd/pi/00660F01/Proc/Psp/PspBaseLib/PspBaseLib.h | 2 ++
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 00d150f..c50ef2a 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -108,7 +108,7 @@ HUDSON_PSP_DIRECTORY_POSITION=$(call int-align,\
HUDSON_PSP_DIRECTORY_SIZE=256
else ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)
ifeq ($(CONFIG_HUDSON_IMC_FWM), y)
-HUDSON_PSP_OFFSET=131072
+HUDSON_PSP_OFFSET=196608
else
HUDSON_PSP_OFFSET=0
endif
diff --git a/src/vendorcode/amd/pi/00660F01/Proc/Fch/Common/FchDef.h b/src/vendorcode/amd/pi/00660F01/Proc/Fch/Common/FchDef.h
index d0063a4..41f103b 100644
--- a/src/vendorcode/amd/pi/00660F01/Proc/Fch/Common/FchDef.h
+++ b/src/vendorcode/amd/pi/00660F01/Proc/Fch/Common/FchDef.h
@@ -340,6 +340,8 @@ VOID FchInitEnvLpcProgram (IN VOID *FchDataPtr);
///
VOID FchSpiUnlock (IN VOID *FchDataPtr);
VOID FchSpiLock (IN VOID *FchDataPtr);
+VOID FchUsb3D3ColdCallback (IN VOID *FchDataPtr);
+VOID FchUsb3D0Callback (IN VOID *FchDataPtr);
/*--------------------------- Documentation Pages ---------------------------*/
VOID FchStall (IN UINT32 uSec, IN AMD_CONFIG_PARAMS *StdHeader);
diff --git a/src/vendorcode/amd/pi/00660F01/Proc/Fch/Fch.h b/src/vendorcode/amd/pi/00660F01/Proc/Fch/Fch.h
index 7576cad..92201b8 100644
--- a/src/vendorcode/amd/pi/00660F01/Proc/Fch/Fch.h
+++ b/src/vendorcode/amd/pi/00660F01/Proc/Fch/Fch.h
@@ -2007,8 +2007,9 @@ FCH_MISC_REGF0 EQU 0F0h
#define FCH_PMIOxC0_S5ResetStatus 0xFED803C0ul // S5ResetStatus
#define FCH_PMIOxC0_S5ResetStatus_ThermalTrip (1 << 0)
#define FCH_PMIOxC0_S5ResetStatus_FourSecondPwrBtn (1 << 1)
-#define FCH_PMIOxC0_S5ResetStatus_S_Status (0x3ff | (1 << 20))
+#define FCH_PMIOxC0_S5ResetStatus_S_Status (0x3fe | (1 << 20))
#define FCH_PMIOxC0_S5ResetStatus_All_Status 0x3FFF03FFul
+#define FCH_PMIOxC0_S5ResetStatus_Clr_Status 0x3FFF03FEul
#define FCH_PMxC8_Misc 0xFED803C8ul // Misc
#define FCH_PMxC8_Misc_UseAcpiStraps (1 << 4)
@@ -2020,6 +2021,8 @@ FCH_MISC_REGF0 EQU 0F0h
// offset : 0x0E00
//
#define FCH_MISCx28_ClkDrvStr2 0xFED80E28ul // ClkDrvStr2
+#define FCH_MISCx28_ClkDrvStr2_USB2_RefClk_Pwdn (1 << 30)
+#define FCH_MISCx28_ClkDrvStr2_USB3_RefClk_Pwdn (1 << 31)
#define FCH_MISCx40_MiscClkCntl1 0xFED80E40ul // MiscClkCntl1
#define FCH_MISCx40_MiscClkCntl1_CG1PLL_FBDIV_Test (1 << 26)
@@ -2038,7 +2041,8 @@ FCH_MISC_REGF0 EQU 0F0h
// offset : 0x1C00
//
#define FCH_XHC_PMx00_Configure0 0xFED81C00ul //
-#define FCH_XHC_PMx00_Configure0_XHC_SMIB_EN BIT21
+#define FCH_XHC_PMx00_Configure0_U3P_D3Cold_PWRDN BIT15
+#define FCH_XHC_PMx00_Configure0_XHC_SMIB_EN BIT21
#define FCH_XHC_PMx10_Xhc_Memory_Configure 0xFED81C10ul //
#define FCH_XHC_PMx18_Usb20_Link_Status 0xFED81C18ul //
#define FCH_XHC_PMx20_Usb20_Wake_Control 0xFED81C20ul //
@@ -2057,9 +2061,12 @@ FCH_MISC_REGF0 EQU 0F0h
#define FCH_AOACx40_D3_CONTROL 0xFED81E40ul //
#define FCH_AOACx41_D3_STATUS 0xFED81E40ul //
#define FCH_AOACx5E_SATA_D3_CONTROL 0xFED81E5Eul //
+#define FCH_AOACx64_EHCI_D3_CONTROL 0xFED81E64ul //
+#define FCH_AOACx65_EHCI_D3_STATE 0xFED81E65ul //
#define FCH_AOACx6E_USB3_D3_CONTROL 0xFED81E6Eul //
-#define FCH_AOACx70_SD_D3_CONTROL 0xFED81E70ul //
-#define FCH_AOACx7A_IMC_D3_CONTROL 0xFED81E7Aul //
+#define FCH_AOACx6F_USB3_D3_STATE 0xFED81E6Ful //
+#define FCH_AOACx70_SD_D3_CONTROL 0xFED81E70ul //
+#define FCH_AOACx7A_IMC_D3_CONTROL 0xFED81E7Aul //
#define FCH_AOACx88Shadow_Register_SRAM_Addr 0xFED81E88ul //
#define FCH_AOACx8CShadow_Register_SRAM_Data 0xFED81E8Cul //
#define FCH_AOACx94S013_CONTROL 0xFED81E94ul //
@@ -2070,6 +2077,9 @@ FCH_MISC_REGF0 EQU 0F0h
#define FCH_AOACx9C_Shadow_Timer_Control_ShadowAcpiTimerEn (1 << 1) //
#define FCH_AOACxA0_PwrGood_Control 0xFED81EA0ul //
+#define FCH_AOACxA0_PwrGood_Control_XhcPwrGood (1 << 3) //
+#define FCH_AOACxA0_PwrGood_Control_SwUsb3SlpShutdown (1 << 29) //
+#define FCH_AOACxA0_PwrGood_Control_SwUsb2S5RstB (1 << 30) //
#define FCH_AOAC_REG00 0x00 // PerfMonControl
#define FCH_AOAC_REG04 0x04 // PerfMonTimeLimit
diff --git a/src/vendorcode/amd/pi/00660F01/Proc/Psp/PspBaseLib/PspBaseLib.h b/src/vendorcode/amd/pi/00660F01/Proc/Psp/PspBaseLib/PspBaseLib.h
index 6108274..6115396 100644
--- a/src/vendorcode/amd/pi/00660F01/Proc/Psp/PspBaseLib/PspBaseLib.h
+++ b/src/vendorcode/amd/pi/00660F01/Proc/Psp/PspBaseLib/PspBaseLib.h
@@ -63,6 +63,8 @@
#define PSP_PCI_EXTRAPCIHDR_REG 0x48 ///< Extra PCI Header Ctr
#define PSP_PCI_HTMSICAP_REG 0x5C ///< HT MSI Capability
+#define PSP_MSR_PRIVATE_BLOCK_BAR 0xC00110A2 ///< PSP Private Block Base Address (PSP_ADDR)
+
#define D8F0x44_PmNxtPtrW_MASK 0xff
#define PSP_MAILBOX_BASE 0x70 ///< Mailbox base offset on PCIe BAR
More information about the coreboot-gerrit
mailing list