From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web12.9356.1615818484511385769 for ; Mon, 15 Mar 2021 07:28:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=Nyj4I8LI; spf=pass (domain: nuviainc.com, ip: 209.85.208.53, mailfrom: leif@nuviainc.com) Received: by mail-ed1-f53.google.com with SMTP id x21so17557438eds.4 for ; Mon, 15 Mar 2021 07:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=KMak/GZuiJE/b5KP1vw9UCpvFXY05qH3MdgRgP7TWfs=; b=Nyj4I8LIOkGiRbzrUQeFn1S0DBl/lNXsZeP7wbRYhELH1l+B4N0z2ntUIm/Vyfvhst l3mIcYFZqcCVXGajmdZYsuHt9lLpGzH4Na2y1DyJexRutGLISplzbH/qy1m7auajpf1t 6DUKifod8LpFYl0ahkhtJ4GR4KYCfV8cR3knHyH5Pend/UalAeh5R4bftSyEo68uGULu yPYho20jLaaCcIVKA7Ee5Ee4jo5x2ZF8KaEUgiOQZYGvSoxixniXubG0/g3M5aMAiS9t pVyZDJRxuR/rXDoDa6glBpm/lzwhxmUUQqwPU6/WYdQ3zTLiDNAFMOf/ZFqAjft0/Ry5 x3/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=KMak/GZuiJE/b5KP1vw9UCpvFXY05qH3MdgRgP7TWfs=; b=HacFi5twdcWOkVGgQfULcWFmaGv6LW0ZmybOHs4hgD+Iy610T3XfI5JfcA3KdbwjP5 amoa0VyB9rVwpesXjmpNx1ZXlHZFm/H0raqA4i9q8JDRpTznZY4on82jYN4S6HZ0ebKz Zcgbaf205dImXhfEAWAViqLmX3TpZLzVfmfMOxSqUgVMnSrHrQfKz5rNw1Gb2EPfLDqm I0J/a4IkCyJEIifFHDORVlOZY5sb+2dNlles0+jrhdlgtDQox4I9htdUrhgW/39IKyD7 mrFIfIcwOgpyy1QP0vH363NW6HSrH3EwexnjOsYk651lFiG5xjDwJ9cPPrqGWenPAkoq F2EA== X-Gm-Message-State: AOAM531yKnDSge0vKCQrHTcCMGvQK3RqjygqvmEsuEBb3gMdia6aUPtZ BmJYn8zsSdwlXXxJNy8IFF2aJ2KPPEM2kg== X-Google-Smtp-Source: ABdhPJx3vQ+KN54TcjHVw7iEsRi5P5H9lssekstdVSmHsotoXFPsjezZ8iYBuM27Xr0Jsaut0ROIyQ== X-Received: by 2002:aa7:cd0e:: with SMTP id b14mr30848355edw.354.1615818482945; Mon, 15 Mar 2021 07:28:02 -0700 (PDT) Return-Path: Received: from vanye (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id l18sm7432614ejk.86.2021.03.15.07.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 07:28:02 -0700 (PDT) Date: Mon, 15 Mar 2021 14:28:00 +0000 From: "Leif Lindholm" To: Ling Jia Cc: devel@edk2.groups.io, Peng Xie , Yiqi Shu Subject: Re: [PATCH v3 00/46] Added support for FT2000/4 chip Message-ID: <20210315142800.GU1664@vanye> References: <20210312110141.75749-1-jialing@phytium.com.cn> MIME-Version: 1.0 In-Reply-To: <20210312110141.75749-1-jialing@phytium.com.cn> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Ling, It would appear that you have merged master into your branch instead of rebasing your branch on top of current master. The most practical solution I can think of for getting out of this bind is to: - Create a new branch, based on current master. - Use git cherry-pick to copy your commits across from phytium_opensource_for_FT2000-4_v3 to the new branch. - Resubmit only the patches contrining. There are no code changes, so this is still v3. This should be a risk-free strategy for this set, where there are no conflicts with existing code. Please also do as Laszlo asked and subscribe to this mailing list, using the same email address you send patches from. If you do not actually want to receive the emails, you can disable delivery from the web interface once subscribed. Best Regards, Leif On Fri, Mar 12, 2021 at 19:01:20 +0800, Ling Jia wrote: > The modules could be runed at the silicon of FT2000/4. > They supported Acpi parameter configuration, Pci bus scaning, > flash read-write and erase abd operating system boot function. > Maintainers.txt: Added maintainers and reviewers for the DurianPkg. > > The public git repository is : > https://github.com/jialing2020/edk2-platforms/tree/phytium_opensource_for_FT2000-4_v3 > > v3: > Optimized the codes to meet the specification. > > In the process of submitting V3 version, the master branch is ahead of the current branch. > So, there was a lot of submission from someone else. In this case, what should we to do? > > *** BLURB HERE *** > > Heng Luo (2): > Fix wrong information of TigerLake in Readme.md > Fix wrong information of TigerLake in Readme.md > > Jeremy Linton (2): > Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs > Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs > > Leif Lindholm (2): > Silicon/Qemu: Move SbsaQemu MPIDR-retrieval function to FdtHelperLib > Silicon/Qemu: Move SbsaQemu MPIDR-retrieval function to FdtHelperLib > > Ling Jia (20): > Silicon/Phytium: Added PlatformLib to FT2000/4 > Silicon/Phytium: Added Acpi support to FT2000/4 > Silicon/Phytium: Added SMBIOS support to FT2000/4 > Silicon/Phytium: Added PciSegmentLib to FT2000/4 > Silicon/Phytium: Added PciHostBridgeLib to FT2000/4 > Silicon/Phytium: Added Spi driver support to FT2000/4 > Silicon/Phytium: Added flash driver support to Phytium Silicon > Silicon/Phytium: Added fvb driver for norflash > Silicon/Phytium: Added Rtc driver to FT2000/4 > Maintainers.txt: Added maintainers and reviewers for the DurianPkg > Silicon/Phytium: Added PlatformLib to FT2000/4 > Silicon/Phytium: Added Acpi support to FT2000/4 > Silicon/Phytium: Added SMBIOS support to FT2000/4 > Silicon/Phytium: Added PciSegmentLib to FT2000/4 > Silicon/Phytium: Added PciHostBridgeLib to FT2000/4 > Silicon/Phytium: Added Spi driver support to FT2000/4 > Silicon/Phytium: Added flash driver support to Phytium Silicon > Silicon/Phytium: Added fvb driver for norflash > Silicon/Phytium: Added Rtc driver to FT2000/4 > Maintainers.txt: Added maintainers and reviewers for the DurianPkg > > Liu, Zhiguang (2): > Intel/BoardModulePkg: sort load option in the first boot > Intel/BoardModulePkg: sort load option in the first boot > > Marcin Juszkiewicz (2): > drop Tanmay Jagdale from sbsa-ref maintainers > drop Tanmay Jagdale from sbsa-ref maintainers > > Rebecca Cran (8): > SbsaQemu: Add FdtHelperLib > SbsaQemu: Update SbsaQemuAcpiDxe to use FdtHelperLib > Platform/Qemu/SbsaQemu: Add SMBIOS tables > Silicon/Qemu: Don't re-use NumCores as loop index in AddMadtTable > SbsaQemu: Add FdtHelperLib > SbsaQemu: Update SbsaQemuAcpiDxe to use FdtHelperLib > Platform/Qemu/SbsaQemu: Add SMBIOS tables > Silicon/Qemu: Don't re-use NumCores as loop index in AddMadtTable > > Takuto Naito (8): > TigerlakeOpenBoardPkg: Fix build errors with GCC5 > TigerlakeSiliconPkg/IpBlock: Fix build errors with GCC5 > TigerlakeSiliconPkg: Fix build error with GCC5 > TigerlakeOpenBoardPkg: Fix build error with GCC5 > TigerlakeOpenBoardPkg: Fix build errors with GCC5 > TigerlakeSiliconPkg/IpBlock: Fix build errors with GCC5 > TigerlakeSiliconPkg: Fix build error with GCC5 > TigerlakeOpenBoardPkg: Fix build error with GCC5 > > Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dec | 52 + > Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 17 + > Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 345 +++++ > Platform/Phytium/DurianPkg/DurianPkg.dsc | 331 +++++ > Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 50 +- > Platform/Phytium/DurianPkg/DurianPkg.fdf | 235 ++++ > Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 7 + > Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf | 2 +- > Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf | 53 + > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/AcpiTables.inf | 56 + > Silicon/Phytium/FT2000-4Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 47 + > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.inf | 44 + > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.inf | 48 + > Silicon/Phytium/FT2000-4Pkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf | 47 + > Silicon/Phytium/FT2000-4Pkg/Library/PciSegmentLib/PciSegmentLib.inf | 28 + > Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf | 55 + > Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.inf | 39 + > Silicon/Phytium/PhytiumCommonPkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf | 53 + > Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 61 + > Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf | 3 +- > Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf | 33 + > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.h | 64 + > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.h | 99 ++ > Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.h | 24 + > Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.h | 104 ++ > Silicon/Phytium/PhytiumCommonPkg/Include/Platform.h | 80 ++ > Silicon/Phytium/PhytiumCommonPkg/Include/Protocol/SpiNorFlashProtocol.h | 74 + > Silicon/Phytium/PhytiumCommonPkg/Include/Protocol/SpiProtocol.h | 51 + > Silicon/Phytium/PhytiumCommonPkg/Include/SystemServiceInterface.h | 112 ++ > Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h | 36 + > Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib.c | 72 +- > Platform/Intel/TigerlakeOpenBoardPkg/Library/BasePlatformHookLib/BasePlatformHookLib.c | 196 --- > Platform/Intel/TigerlakeOpenBoardPkg/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLate.c | 2 +- > Platform/Intel/TigerlakeOpenBoardPkg/TigerlakeURvp/Library/BoardInitLib/PeiTigerlakeURvpInitPreMemLib.c | 2 + > Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c | 241 ++++ > Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/DxePchPcieRpPolicyLib/DxePchPcieRpPolicyLib.c | 2 +- > Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PcieClientRpLib/PcieClientRpLib.c | 2 - > Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Vtd/LibraryPrivate/DxeVtdInitLib/DxeVtdInitLib.c | 5 - > Silicon/Intel/TigerlakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiHelperClient.c | 2 - > Silicon/Phytium/FT2000-4Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 943 +++++++++++++ > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.c | 198 +++ > Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.c | 424 ++++++ > Silicon/Phytium/FT2000-4Pkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 181 +++ > Silicon/Phytium/FT2000-4Pkg/Library/PciSegmentLib/PciSegmentLib.c | 1434 ++++++++++++++++++++ > Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c | 137 ++ > Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLibMem.c | 156 +++ > Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.c | 462 +++++++ > Silicon/Phytium/PhytiumCommonPkg/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 250 ++++ > Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.c | 1304 ++++++++++++++++++ > Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 95 +- > Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c | 98 ++ > Maintainers.txt | 9 +- > Platform/Intel/Readme.md | 2 +- > Platform/RaspberryPi/AcpiTables/Emmc.asl | 2 +- > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/AcpiSsdtRootPci.asl | 209 +++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dbg2.aslc | 80 ++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Cpu.asl | 85 ++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Dsdt.asl | 15 + > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Uart.asl | 65 + > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Fadt.aslc | 77 ++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Gtdt.aslc | 83 ++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc | 89 ++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Madt.aslc | 67 + > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Mcfg.aslc | 65 + > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Pptt.aslc | 219 +++ > Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Spcr.aslc | 73 + > Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S | 76 ++ > Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.fdf.inc | 119 ++ > 68 files changed, 9456 insertions(+), 335 deletions(-) > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dec > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc > create mode 100644 Platform/Phytium/DurianPkg/DurianPkg.dsc > create mode 100644 Platform/Phytium/DurianPkg/DurianPkg.fdf > create mode 100644 Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/AcpiTables.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PciSegmentLib/PciSegmentLib.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.inf > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.inf > create mode 100644 Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.h > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.h > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.h > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.h > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Include/Platform.h > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Include/Protocol/SpiNorFlashProtocol.h > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Include/Protocol/SpiProtocol.h > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Include/SystemServiceInterface.h > create mode 100644 Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h > create mode 100644 Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiDxe/SpiDxe.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/SpiNorFlashDxe/SpiNorFlashDxe.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PciHostBridgeLib/PciHostBridgeLib.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PciSegmentLib/PciSegmentLib.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLibMem.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/RealTimeClockLib/RealTimeClockLib.c > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Drivers/AcpiPlatformDxe/AcpiPlatform.c > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/Drivers/FlashFvbDxe/FlashFvbDxe.c > create mode 100644 Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/AcpiSsdtRootPci.asl > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dbg2.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Cpu.asl > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Dsdt.asl > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Dsdt/Uart.asl > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Fadt.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Gtdt.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Madt.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Mcfg.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Pptt.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Spcr.aslc > create mode 100644 Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/AArch64/PhytiumPlatformHelper.S > create mode 100644 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.fdf.inc > > -- > 2.25.1 >