On 11/20/2018 2:42 AM, Leif Lindholm wrote:
> On Fri, Nov 16, 2018 at 02:56:47PM +0800, Ming Huang wrote:
>> Main Change since v1:
>> 1. Add IORT patch;
>> 2. Add HIDs/UIDs bug for PciHostBridgeLib;
>> 3. Drop Pv660;
>> 4. Drop two patchs:
>> Modify for SBBR fwts SetTime_Func test case;
>> Fix SBBR-SCT AuthVar issue
>>
>> Code can also be found in github:
>> https://github.com/hisilicon/OpenPlatformPkg.git
>> branch: d06-acs-platforms-v2
>>
>>
>> Ming Huang (15):
>> Hisilicon/D0x: Modify IORT
>> Silicon/Hisilicon/D06: Add watchdog to GTDT
>> Silicon/Hisilicon/D06: Drop _CID for fwts issue
>> Silicon/Hisilicon/D06: Fix fwts issue in Dbg2
>> Silicon/Hisilicon/D06: Fix fwts issue in FADT
>> Hisilicon/D06: Move some functions to OemMiscLib
>> Hisilicon/D0x: Fix secure boot bug in FlashFvbDxe
>> Silicon/Hisilicon/D06: Reserve ECAM resource in DSDT
>> Silicon/Hisilicon/D06: Modify GTDT timer flag
>> Hisilicon/D06: Modify Gic base
>> Silicon/Hisilicon/D06: Set TA as Node 0 for TA boot
>> Silicon/Hisilicon/D03: Drop _CID for fwts issue
>> Silicon/Hisilicon/D05: Drop _CID for fwts issue
>> Hisilicon: Drop Pv660 source code
>> Hisilicon/D06: Correct HIDs/UIDs of PCI host bridges
>
> The following patches (in this order):
> Hisilicon: Drop Pv660 source code
> Hisilicon/D0x: Modify IORT
> Silicon/Hisilicon/D03: Drop _CID for fwts issue
> Silicon/Hisilicon/D05: Drop _CID for fwts issue
> Silicon/Hisilicon/D06: Drop _CID for fwts issue
> Silicon/Hisilicon/D06: Add watchdog to GTDT
> Silicon/Hisilicon/D06: Fix fwts issue in Dbg2
> Silicon/Hisilicon/D06: Fix fwts issue in FADT
> Silicon/Hisilicon/D06: Reserve ECAM resource in DSDT
> Silicon/Hisilicon/D06: Modify GTDT timer flag
> Hisilicon/D06: Correct HIDs/UIDs of PCI host bridges
>
> Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
>
> Pushed as 46d3a977b9..ce4f7528ed.
>
> Please rebase on new master and address comments for v3.
> If you can merge
> Silicon/Hisilicon/D06: Set TA as Node 0 for TA boot
> and
> Hisilicon/D06: Modify Gic base
> as requested and get those sent out before I start work tomorrow,
> we are in pretty good shape for me to roll out an -rc1 tomorrow.
> (Which would be good, because I hope to have Wednesday-Friday as
> holiday :)
>
> If you can also address "Fix secure boot bug in FlashFvbDxe", that
> should be all remaining functional changes.
I have address all comment include "Fix secure boot bug in FlashFvbDxe".
>
> FYI: I am now working against edk2 tag edk2-stable201811.
I update edk2 to edk2-stable201811, but can't build in my build server,
maybe my build environment has some problems, it can build with edk2
commit (52437cb7633b Star Zeng 2018-08-01 10:15:45).
Build error log:
---------------------------------------
huangming@EstBuildSvr1:~/source/new$ ./uefi-tools/edk2-build.sh d06
Loading previous configuration from
/home/huangming/source/new/edk2/Conf/BuildEnv.sh
WORKSPACE: /home/huangming/source/new
EDK_TOOLS_PATH: /home/huangming/source/new/edk2/BaseTools
CONF_PATH: /home/huangming/source/new/edk2/Conf
Copying $EDK_TOOLS_PATH/Conf/build_rule.template
to /home/huangming/source/new/edk2/Conf/build_rule.txt
Copying $EDK_TOOLS_PATH/Conf/tools_def.template
to /home/huangming/source/new/edk2/Conf/tools_def.txt
Copying $EDK_TOOLS_PATH/Conf/target.template
to /home/huangming/source/new/edk2/Conf/target.txt
make: Entering directory '/home/huangming/source/new/edk2/BaseTools'
make -C Source/C
make[1]: Entering directory '/home/huangming/source/new/edk2/BaseTools/Source/C'
Attempting to detect HOST_ARCH from 'uname -m': x86_64
Detected HOST_ARCH of X64 using uname.
mkdir -p .
make -C Common
make[2]: Entering directory
'/home/huangming/source/new/edk2/BaseTools/Source/C/Common'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory
'/home/huangming/source/new/edk2/BaseTools/Source/C/Common'
make -C BrotliCompress
make[2]: Entering directory
'/home/huangming/source/new/edk2/BaseTools/Source/C/BrotliCompress'
make[2]: *** No rule to make target 'common/././types.h', needed by
'common/dictionary.o'. Stop.
make[2]: Leaving directory
'/home/huangming/source/new/edk2/BaseTools/Source/C/BrotliCompress'
GNUmakefile:85: recipe for target 'BrotliCompress' failed
make[1]: *** [BrotliCompress] Error 2
make[1]: Leaving directory '/home/huangming/source/new/edk2/BaseTools/Source/C'
GNUmakefile:25: recipe for target 'Source/C' failed
make: *** [Source/C] Error 2
make: Leaving directory '/home/huangming/source/new/edk2/BaseTools'
/home/huangming/source/new
!!! BaseTools failed to build !!!
---------------------------------------
>
> /
> Leif
>
>> Silicon/Hisilicon/HisiPkg.dec
>> | 1 +
>> Platform/Hisilicon/D03/D03.dsc
>> | 5 +
>> Platform/Hisilicon/D05/D05.dsc
>> | 5 +
>> Platform/Hisilicon/D06/D06.dsc
>> | 7 +-
>> Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf
>> | 2 +
>> Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf
>> | 2 +-
>> Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>> | 2 +-
>> Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf
>> | 1 -
>> Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/IoInitDxe.inf
>> | 58 --
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitDxe.inf
>> | 56 --
>> Silicon/Hisilicon/Pv660/Drivers/SasInitDxe/SasV1Init.inf
>> | 48 -
>>
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.inf
>> | 57 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/AcpiTables.inf
>> | 60 --
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h
>> | 2 +-
>> Silicon/Hisilicon/Include/Library/OemMiscLib.h
>> | 9 +
>> Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h
>> | 4 -
>> Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/Smmu.h
>> | 36 -
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInit.h
>> | 93 --
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitLib.h
>> | 239 -----
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieKernelApi.h
>> | 346 -------
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.h
>> | 30 -
>> Silicon/Hisilicon/Pv660/Include/Library/SerdesLib.h
>> | 120 ---
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
>> | 48 -
>> Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c
>> | 82 ++
>> Platform/Hisilicon/D06/Library/PciHostBridgeLib/PciHostBridgeLib.c
>> | 28 +-
>> Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c
>> | 14 +-
>> Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c
>> | 90 +-
>> Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/IoInitDxe.c
>> | 94 --
>> Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/Smmu.c
>> | 442 ---------
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInit.c
>> | 103 --
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitLib.c
>> | 1048 --------------------
>> Silicon/Hisilicon/Pv660/Drivers/SasInitDxe/SasV1Init.c
>> | 114 ---
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.c
>> | 119 ---
>> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/D03Iort.asl
>> | 24 +-
>> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/Com.asl
>> | 1 -
>> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Mbig.asl
>> | 8 -
>> Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl
>> | 64 +-
>> Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/Com.asl
>> | 1 -
>> Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Mbig.asl
>> | 13 -
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl
>> | 1 -
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl
>> | 48 -
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl
>> | 36 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc
>> | 2 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc
>> | 35 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc
>> | 4 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl
>> | 40 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl
>> | 6 +-
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc
>> | 194 ++--
>> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc
>> | 2 +-
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dbg2.aslc
>> | 94 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/CPU.asl
>> | 88 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
>> | 38 -
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Ctl.asl
>> | 38 -
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
>> | 29 -
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Hns.asl
>> | 956 ------------------
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Mbig.asl
>> | 86 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Pci.asl
>> | 181 ----
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Usb.asl
>> | 136 ---
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Facs.aslc
>> | 67 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Fadt.aslc
>> | 93 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Gtdt.aslc
>> | 96 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
>> | 274 -----
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Madt.aslc
>> | 130 ---
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Mcfg.aslc
>> | 80 --
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL
>> | 169 ----
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL
>> | 51 -
>> Silicon/Hisilicon/Pv660/Pv660AcpiTables/Spcr.aslc
>> | 64 --
>> 67 files changed, 361 insertions(+), 6153 deletions(-)
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/IoInitDxe.inf
>> delete mode 100644
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitDxe.inf
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/SasInitDxe/SasV1Init.inf
>> delete mode 100644
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.inf
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/AcpiTables.inf
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/Smmu.h
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInit.h
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitLib.h
>> delete mode 100644
>> Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieKernelApi.h
>> delete mode 100644
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.h
>> delete mode 100644 Silicon/Hisilicon/Pv660/Include/Library/SerdesLib.h
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/IoInitDxe.c
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/IoInitDxe/Smmu.c
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInit.c
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/PcieInitDxe/PcieInitLib.c
>> delete mode 100644 Silicon/Hisilicon/Pv660/Drivers/SasInitDxe/SasV1Init.c
>> delete mode 100644
>> Silicon/Hisilicon/Pv660/Drivers/UnInstallAcpiTableDxe/UnInstallAcpiTable.c
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dbg2.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/CPU.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Com.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Ctl.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Hns.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Mbig.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Pci.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Usb.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Facs.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Fadt.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Gtdt.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Madt.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Mcfg.aslc
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/SASSSDT.ASL
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/SATASSDT.ASL
>> delete mode 100644 Silicon/Hisilicon/Pv660/Pv660AcpiTables/Spcr.aslc
>>
>> --
>> 2.9.5
>>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
