Hi Laszlo, I am looking at the files on my local system from that github branch, and spot checking a few new files, they all have CRLF at the end of each line.
Can you give an example file where you are seeing this issue? Do I maybe have an incorrect git configuration? Thanks, Mike >-----Original Message----- >From: Laszlo Ersek [mailto:ler...@redhat.com] >Sent: Tuesday, October 13, 2015 11:42 AM >To: Kinney, Michael D; edk2-de...@ml01.01.org >Subject: Re: [edk2] [PATCH 0/7] UefiCpuPkg: Add CPU SMM and SecCore > >Mike, > >On 10/05/15 01:57, Michael Kinney wrote: >> This series adds IA32 and X64 support for SMM and SEC to the >> UefiCpuPkg. The SMM CPU modules and libraries work with the >> SMM IPL and SMM Core from the MdeModulePkg to initialize the SMM >> environment and provide the services required for a DXE_SMM_DRIVER >> to register SMI handlers that execute from SMRAM in SMM mode. >> >> Public branch: https://github.com/mdkinney/edk2/tree/AddSmmUefiCpuPkg > >I just realized that the new source files added by the above branch >don't have CRLF line terminators -- they have LF only. > >However, since the patches don't overlap on the new files, it is not >hard to run "git rebase -i" on the branch, stop for editing after each >patch, and run "unix2dos" on the new files, before continuing the >rebase. Because no new file is touched by another patch, there won't be >any conflicts. > >Thanks >Laszlo > >> Michael Kinney (7): >> UefiCpuPkg: Add Cpuid.h for CPUID related defines >> UefiCpuPkg: Update CPU MP drivers for PiSmmCpuDxeSmm >> UefiCpuPkg: Add SMM Communication PPI and Handler Modules >> UefiCpuPkg: Add SecCore module >> UefiCpuPkg: Add PiSmmCpuDxeSmm module include files >> UefiCpiPkg: Add PiSmmCpuDxeSmm module >> UefiCpuPkg: Add missing UefiCpuPkgTokenSpace GUID >> >> UefiCpuPkg/CpuDxe/CpuMp.c | 47 +- >> UefiCpuPkg/CpuMpPei/CpuMpPei.c | 34 +- >> UefiCpuPkg/CpuMpPei/CpuMpPei.h | 1 + >> UefiCpuPkg/Include/AcpiCpuData.h | 72 + >> UefiCpuPkg/Include/CpuHotPlugData.h | 33 + >> UefiCpuPkg/Include/Guid/UefiCpuPkgTokenSpace.h | 25 + >> UefiCpuPkg/Include/Library/PlatformSecLib.h | 70 + >> UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h | 366 +++++ >> UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h | 109 ++ >> UefiCpuPkg/Include/Protocol/SmmCpuService.h | 209 +++ >> UefiCpuPkg/Include/Register/Cpuid.h | 51 + >> UefiCpuPkg/Include/Register/LocalApic.h | 13 - >> UefiCpuPkg/Include/Register/SmramSaveStateMap.h | 190 +++ >> UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 1 + >> .../BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 1 + >> .../PlatformSecLibNull/PlatformSecLibNull.c | 90 ++ >> .../PlatformSecLibNull/PlatformSecLibNull.inf | 37 + >> .../PlatformSecLibNull/PlatformSecLibNull.uni | Bin 0 -> 1646 bytes >> .../Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 559 ++++++++ >> .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 39 + >> .../SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni | Bin 0 -> 1674 bytes >> .../SmmCpuPlatformHookLibNull.c | 108 ++ >> .../SmmCpuPlatformHookLibNull.inf | 40 + >> .../SmmCpuPlatformHookLibNull.uni | Bin 0 -> 1606 bytes >> .../PiSmmCommunication/PiSmmCommunicationPei.c | 425 ++++++ >> .../PiSmmCommunication/PiSmmCommunicationPei.inf | 70 + >> .../PiSmmCommunication/PiSmmCommunicationPei.uni | Bin 0 -> 2066 >bytes >> .../PiSmmCommunicationPeiExtra.uni | Bin 0 -> 1374 bytes >> .../PiSmmCommunication/PiSmmCommunicationPrivate.h | 30 + >> .../PiSmmCommunication/PiSmmCommunicationSmm.c | 269 ++++ >> .../PiSmmCommunication/PiSmmCommunicationSmm.inf | 82 ++ >> .../PiSmmCommunication/PiSmmCommunicationSmm.uni | Bin 0 -> 3004 >bytes >> .../PiSmmCommunicationSmmExtra.uni | Bin 0 -> 1396 bytes >> UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 491 +++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c | 486 +++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h | 181 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S | 165 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm | 168 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 132 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c | 45 + >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S | 191 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm | 193 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S | 911 >++++++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm | 738 >++++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S | 84 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm | 94 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c | 80 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h | 97 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 1334 >++++++++++++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 1485 >++++++++++++++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 638 >+++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 159 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni | Bin 0 -> 1868 >bytes >> UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni | Bin 0 -> >1382 bytes >> UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 1442 >+++++++++++++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h | 132 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h | 172 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c | 672 +++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c | 116 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S | 204 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm | 206 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 692 +++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c | 64 + >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S | 217 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm | 221 +++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S | 610 ++++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm | 413 ++++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S | 141 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm | 132 ++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c | 316 +++++ >> UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h | 105 ++ >> UefiCpuPkg/SecCore/FindPeiCore.c | 198 +++ >> UefiCpuPkg/SecCore/Ia32/ResetVec.asm16 | 106 ++ >> UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb | 103 ++ >> UefiCpuPkg/SecCore/SecCore.inf | 72 + >> UefiCpuPkg/SecCore/SecCore.uni | Bin 0 -> 2908 bytes >> UefiCpuPkg/SecCore/SecCoreExtra.uni | Bin 0 -> 1320 bytes >> UefiCpuPkg/SecCore/SecMain.c | 295 ++++ >> UefiCpuPkg/SecCore/SecMain.h | 109 ++ >> UefiCpuPkg/UefiCpuPkg.dec | 123 +- >> UefiCpuPkg/UefiCpuPkg.dsc | 29 +- >> UefiCpuPkg/UefiCpuPkg.uni | Bin 6628 -> 22066 >> bytes >> 82 files changed, 17478 insertions(+), 55 deletions(-) >> create mode 100644 UefiCpuPkg/Include/AcpiCpuData.h >> create mode 100644 UefiCpuPkg/Include/CpuHotPlugData.h >> create mode 100644 UefiCpuPkg/Include/Guid/UefiCpuPkgTokenSpace.h >> create mode 100644 UefiCpuPkg/Include/Library/PlatformSecLib.h >> create mode 100644 UefiCpuPkg/Include/Library/SmmCpuFeaturesLib.h >> create mode 100644 >UefiCpuPkg/Include/Library/SmmCpuPlatformHookLib.h >> create mode 100644 UefiCpuPkg/Include/Protocol/SmmCpuService.h >> create mode 100644 UefiCpuPkg/Include/Register/Cpuid.h >> create mode 100644 UefiCpuPkg/Include/Register/SmramSaveStateMap.h >> create mode 100644 >UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.c >> create mode 100644 >UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf >> create mode 100644 >UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.uni >> create mode 100644 >UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c >> create mode 100644 >UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf >> create mode 100644 >UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.uni >> create mode 100644 >UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibN >ull.c >> create mode 100644 >UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibN >ull.inf >> create mode 100644 >UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibN >ull.uni >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.c >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.uni >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPeiExtra.uni >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPrivate.h >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni >> create mode 100644 >UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.h >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/MpFuncs.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Semaphore.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.S >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.asm >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.h >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.uni >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmmExtra.uni >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/MpFuncs.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/Semaphore.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.S >> create mode 100644 >UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiException.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.S >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.asm >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c >> create mode 100644 UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.h >> create mode 100644 UefiCpuPkg/SecCore/FindPeiCore.c >> create mode 100644 UefiCpuPkg/SecCore/Ia32/ResetVec.asm16 >> create mode 100644 UefiCpuPkg/SecCore/Ia32/ResetVec.nasmb >> create mode 100644 UefiCpuPkg/SecCore/SecCore.inf >> create mode 100644 UefiCpuPkg/SecCore/SecCore.uni >> create mode 100644 UefiCpuPkg/SecCore/SecCoreExtra.uni >> create mode 100644 UefiCpuPkg/SecCore/SecMain.c >> create mode 100644 UefiCpuPkg/SecCore/SecMain.h >> _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
