From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=212.186.127.180; helo=proxmox-new.maurer-it.com; envelope-from=t.lamprecht@proxmox.com; receiver=edk2-devel@lists.01.org Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7CFAA22135D3E for ; Tue, 13 Mar 2018 01:26:52 -0700 (PDT) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2DB3142729; Tue, 13 Mar 2018 09:33:12 +0100 (CET) To: Liming Gao , edk2-devel@lists.01.org References: <1520410518-17144-1-git-send-email-liming.gao@intel.com> From: Thomas Lamprecht Message-ID: Date: Tue, 13 Mar 2018 09:33:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1520410518-17144-1-git-send-email-liming.gao@intel.com> Subject: Re: [Patch] MdeModulePkg PCD: Remove unused PCD attribute PCD_TYPE_SKU_ENABLED X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 08:26:54 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 03/07/2018 09:15 AM, Liming Gao wrote: > PcdDb optimization has handled PCD DB for each SKU, not for single PCD.= > So, this PCD attribute is not used any more. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Liming Gao > Cc: Reviewed-by: Liming Gao This fails my build here: [snip] "gcc" -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -W= no-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -f= no-common -DSTRING_ARRAY_NAME=3DUefiShellDebug1CommandsLibStrings -m64 -f= no-stack-protector "-DEFIAPI=3D__attribute__((ms_abi))" -maccumulate-outg= oing-args -mno-red-zone -Wno-address -mcmodel=3Dsmall -fpie -fno-asynchro= nous-unwind-tables -Wno-address -flto -DUSING_LTO -Os -Wno-unused-but-set= -variable -Wno-unused-const-variable -DMDEPKG_NDEBUG -mno-mmx -mno-sse -D= DISABLE_NEW_DEPRECATED_INTERFACES -c -o /root/sources/pve/pve-edk2-firmw= are/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellD= ebug1CommandsLib/UefiShellDebug1CommandsLib/OUTPUT/./Dmem.obj -I/root/sou= rces/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShellDebug1Com= mandsLib/HexEdit -I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPk= g/Library/UefiShellDebug1CommandsLib/Edit -I/root/sources/pve/pve-edk2-fi= rmware/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView = -I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg/Library/UefiShe= llDebug1CommandsLib -I/root/sources/pve/pve-edk2-firmware/edk2.build/Buil= d/OvmfX64/RELEASE_GCC5/X64/ShellPkg/Library/UefiShellDebug1CommandsLib/Ue= fiShellDebug1CommandsLib/DEBUG -I/root/sources/pve/pve-edk2-firmware/edk2= =2Ebuild/MdePkg -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/I= nclude -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X6= 4 -I/root/sources/pve/pve-edk2-firmware/edk2.build/ShellPkg -I/root/sourc= es/pve/pve-edk2-firmware/edk2.build/ShellPkg/Include -I/root/sources/pve/= pve-edk2-firmware/edk2.build/MdeModulePkg -I/root/sources/pve/pve-edk2-fi= rmware/edk2.build/MdeModulePkg/Include /root/sources/pve/pve-edk2-firmwar= e/edk2.build/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c In file included from /root/sources/pve/pve-edk2-firmware/edk2.build/MdeM= odulePkg/Universal/PCD/Pei/Service.h:25:0, from /root/sources/pve/pve-edk2-firmware/edk2.build/MdeM= odulePkg/Universal/PCD/Pei/Service.c:16: /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD= /Pei/Service.c: In function =E2=80=98SetWorker=E2=80=99: /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:35:78: error: =E2=80=98PCD_TYPE_SKU_ENABLED=E2= =80=99 undeclared (first use in this function) "gcc" -E -x assembler-with-cpp -include /root/sources/pve/pve-edk2-firmwa= re/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/Au= toGen.h -I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64 = -I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec -I/root/sour= ces/pve/pve-edk2-firmware/edk2.build/Build/OvmfX64/RELEASE_GCC5/X64/OvmfP= kg/Sec/SecMain/DEBUG -I/root/sources/pve/pve-edk2-firmware/edk2.build/Mde= Pkg -I/root/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include -I/ro= ot/sources/pve/pve-edk2-firmware/edk2.build/MdePkg/Include/X64 -I/root/so= urces/pve/pve-edk2-firmware/edk2.build/MdeModulePkg -I/root/sources/pve/p= ve-edk2-firmware/edk2.build/MdeModulePkg/Include -I/root/sources/pve/pve-= edk2-firmware/edk2.build/UefiCpuPkg -I/root/sources/pve/pve-edk2-firmware= /edk2.build/UefiCpuPkg/Include -I/root/sources/pve/pve-edk2-firmware/edk2= =2Ebuild/OvmfPkg -I/root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg= /Include /root/sources/pve/pve-edk2-firmware/edk2.build/OvmfPkg/Sec/X64/S= ecEntry.nasm > /root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX= 64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/OUTPUT/X64/SecEntry.i #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_V= PD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING) = ^ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:55:37: note: in expansion of macro =E2=80=98PC= D_TYPE_ALL_SET=E2=80=99 #define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_AL= L_SET | PCD_DATUM_TYPE_UINT8_BOOLEAN)) ^~~~~~~~~~~~~~~~ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD= /Pei/Service.c:683:40: note: in expansion of macro =E2=80=98PCD_DATABASE_= OFFSET_MASK=E2=80=99 Offset =3D LocalTokenNumber & PCD_DATABASE_OFFSET_MASK; ^~~~~~~~~~~~~~~~~~~~~~~~ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:35:78: note: each undeclared identifier is rep= orted only once for each function it appears in #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_V= PD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING) = ^ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:55:37: note: in expansion of macro =E2=80=98PC= D_TYPE_ALL_SET=E2=80=99 #define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_AL= L_SET | PCD_DATUM_TYPE_UINT8_BOOLEAN)) ^~~~~~~~~~~~~~~~ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD= /Pei/Service.c:683:40: note: in expansion of macro =E2=80=98PCD_DATABASE_= OFFSET_MASK=E2=80=99 Offset =3D LocalTokenNumber & PCD_DATABASE_OFFSET_MASK; ^~~~~~~~~~~~~~~~~~~~~~~~ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD= /Pei/Service.c: In function =E2=80=98GetWorker=E2=80=99: /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:35:78: error: =E2=80=98PCD_TYPE_SKU_ENABLED=E2= =80=99 undeclared (first use in this function) #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_V= PD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING) = ^ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Include/Guid/= PcdDataBaseSignatureGuid.h:55:37: note: in expansion of macro =E2=80=98PC= D_TYPE_ALL_SET=E2=80=99 #define PCD_DATABASE_OFFSET_MASK (~(PCD_TYPE_ALL_SET | PCD_DATUM_TYPE_AL= L_SET | PCD_DATUM_TYPE_UINT8_BOOLEAN)) ^~~~~~~~~~~~~~~~ /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Universal/PCD= /Pei/Service.c:884:36: note: in expansion of macro =E2=80=98PCD_DATABASE_= OFFSET_MASK=E2=80=99 Offset =3D LocalTokenNumber & PCD_DATABASE_OFFSET_MASK; ^~~~~~~~~~~~~~~~~~~~~~~~ GNUmakefile:419: recipe for target '/root/sources/pve/pve-edk2-firmware/e= dk2.build/Build/OvmfX64/RELEASE_GCC5/X64/MdeModulePkg/Universal/PCD/Pei/P= cd/OUTPUT/Service.obj' failed make[3]: Leaving directory '/root/sources/pve/pve-edk2-firmware/edk2.buil= d/Build/OvmfX64/RELEASE_GCC5/X64/MdeModulePkg/Universal/PCD/Pei/Pcd' make[3]: *** [/root/sources/pve/pve-edk2-firmware/edk2.build/Build/OvmfX6= 4/RELEASE_GCC5/X64/MdeModulePkg/Universal/PCD/Pei/Pcd/OUTPUT/Service.obj]= Error 1 build.py... : error 7000: Failed to execute command make tbuild [/root/sources/pve/pve-edk2-firmware/edk2.build/Build= /OvmfX64/RELEASE_GCC5/X64/MdeModulePkg/Universal/PCD/Pei/Pcd] build.py... : error F002: Failed to build module /root/sources/pve/pve-edk2-firmware/edk2.build/MdeModulePkg/Unive= rsal/PCD/Pei/Pcd.inf [X64, GCC5, RELEASE] - Failed - Build end time: 09:08:35, Mar.13 2018 Build total time: 00:00:18 debian/rules:40: recipe for target 'build-ovmf' failed make[2]: *** [build-ovmf] Error 1 make[2]: Leaving directory '/root/sources/pve/pve-edk2-firmware/edk2.buil= d' debian/rules:28: recipe for target 'build' failed make[1]: *** [build] Error 2 make[1]: Leaving directory '/root/sources/pve/pve-edk2-firmware/edk2.buil= d' dpkg-buildpackage: error: debian/rules build gave error exit status 2 Makefile:18: recipe for target 'pve-edk2-firmware_1.20180108-1_all.deb' f= ailed make: *** [pve-edk2-firmware_1.20180108-1_all.deb] Error 2 Was the last pushed commit, I never found a culprit that fast :) git checkout HEAD^=20 allows to build me again successfully Sys info: Debian 9 Stretch # gcc -v=20 Using built-in specs. COLLECT_GCC=3Dgcc COLLECT_LTO_WRAPPER=3D/usr/lib/gcc/x86_64-linux-gnu/6/lto-wrapper Target: x86_64-linux-gnu Configured with: ../src/configure -v --with-pkgversion=3D'Debian 6.3.0-18= +deb9u1' --with-bugurl=3Dfile:///usr/share/doc/gcc-6/README.Bugs --enable= -languages=3Dc,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=3D/usr --p= rogram-suffix=3D-6 --program-prefix=3Dx86_64-linux-gnu- --enable-shared -= -enable-linker-build-id --libexecdir=3D/usr/lib --without-included-gettex= t --enable-threads=3Dposix --libdir=3D/usr/lib --enable-nls --with-sysroo= t=3D/ --enable-clocale=3Dgnu --enable-libstdcxx-debug --enable-libstdcxx-= time=3Dyes --with-default-libstdcxx-abi=3Dnew --enable-gnu-unique-object = --disable-vtable-verify --enable-libmpx --enable-plugin --enable-default-= pie --with-system-zlib --disable-browser-plugin --enable-java-awt=3Dgtk -= -enable-gtk-cairo --with-java-home=3D/usr/lib/jvm/java-1.5.0-gcj-6-amd64/= jre --enable-java-home --with-jvm-root-dir=3D/usr/lib/jvm/java-1.5.0-gcj-= 6-amd64 --with-jvm-jar-dir=3D/usr/lib/jvm-exports/java-1.5.0-gcj-6-amd64 = --with-arch-directory=3Damd64 --with-ecj-jar=3D/usr/share/java/eclipse-ec= j.jar --with-target-system-zlib --enable-objc-gc=3Dauto --enable-multiarc= h --with-arch-32=3Di686 --with-abi=3Dm64 --with-multilib-list=3Dm32,m64,m= x32 --enable-multilib --with-tune=3Dgeneric --enable-checking=3Drelease -= -build=3Dx86_64-linux-gnu --host=3Dx86_64-linux-gnu --target=3Dx86_64-lin= ux-gnu Thread model: posix gcc version 6.3.0 20170516 (Debian 6.3.0-18+deb9u1) Building with: OvmfPkg/build.sh -a X64 -b RELEASE -DSECURE_BOOT_ENABLE=3DFALSE -DFD_SIZE= _4MB -t GCC5 cheers, Thomas > --- > MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 3 +-- > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 3 +-- > MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni | 3 +-- > MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 3 +-- > MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni | 3 +-- > 5 files changed, 5 insertions(+), 10 deletions(-) >=20 > diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/Mde= ModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h > index d670af1..5767ac8 100644 > --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h > +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h > @@ -1,7 +1,7 @@ > /** @file > Guid for Pcd DataBase Signature. > =20 > -Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
= > +Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
= > This program and the accompanying materials are licensed and made avai= lable under > the terms and conditions of the BSD License that accompanies this dist= ribution. > The full text of the license may be found at > @@ -30,7 +30,6 @@ typedef UINT64 SKU_ID; > #define PCD_TYPE_DATA (0x0U << PCD_TYPE_SHIFT) > #define PCD_TYPE_HII (0x8U << PCD_TYPE_SHIFT) > #define PCD_TYPE_VPD (0x4U << PCD_TYPE_SHIFT) > -#define PCD_TYPE_SKU_ENABLED (0x2U << PCD_TYPE_SHIFT) > #define PCD_TYPE_STRING (0x1U << PCD_TYPE_SHIFT) > =20 > #define PCD_TYPE_ALL_SET (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE= _VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING) > diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Univ= ersal/PCD/Dxe/Pcd.inf > index 54cd8d9..a20b645 100644 > --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > @@ -174,7 +174,6 @@ > # PCD_TYPE_DATA > # PCD_TYPE_HII > # PCD_TYPE_VPD > -# PCD_TYPE_SKU_ENABLED > # PCD_TYPE_STRING > # Datum Type : indicate PCD vaue type from following macro:= > # PCD_DATUM_TYPE_POINTER > @@ -279,7 +278,7 @@ > # - Variable GUID for HII type PCD > # - Token space GUID for dynamicex type PCD=20 > # =20 > -# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<= BR> > +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<= BR> > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of t= he BSD License > diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/U= niversal/PCD/Dxe/PcdDxe.uni > index 922391c..0883ad8 100644 > --- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni > +++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni > @@ -174,7 +174,6 @@ > // PCD_TYPE_DATA > // PCD_TYPE_HII > // PCD_TYPE_VPD > -// PCD_TYPE_SKU_ENABLED > // PCD_TYPE_STRING > // Datum Type : indicate PCD vaue type from following macro: > // PCD_DATUM_TYPE_POINTER > @@ -279,7 +278,7 @@ > // - Variable GUID for HII type PCD > // - Token space GUID for dynamicex type PCD > // > -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<= BR> > +// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<= BR> > // > // This program and the accompanying materials > // are licensed and made available under the terms and conditions of t= he BSD License > diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Univ= ersal/PCD/Pei/Pcd.inf > index e1ea5be..3cba289 100644 > --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf > +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf > @@ -173,7 +173,6 @@ > # PCD_TYPE_DATA > # PCD_TYPE_HII > # PCD_TYPE_VPD > -# PCD_TYPE_SKU_ENABLED > # PCD_TYPE_STRING > # Datum Type : indicate PCD vaue type from following macro:= > # PCD_DATUM_TYPE_POINTER > @@ -278,7 +277,7 @@ > # - Variable GUID for HII type PCD > # - Token space GUID for dynamicex type PCD=20 > # =20 > -# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<= BR> > +# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<= BR> > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of t= he BSD License > diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/= Universal/PCD/Pei/PcdPeim.uni > index b0d3f1f..3e7c556 100644 > --- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni > +++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni > @@ -173,7 +173,6 @@ > // PCD_TYPE_DATA > // PCD_TYPE_HII > // PCD_TYPE_VPD > -// PCD_TYPE_SKU_ENABLED > // PCD_TYPE_STRING > // Datum Type : indicate PCD vaue type from following macro: > // PCD_DATUM_TYPE_POINTER > @@ -278,7 +277,7 @@ > // - Variable GUID for HII type PCD > // - Token space GUID for dynamicex type PCD > // > -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<= BR> > +// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<= BR> > // > // This program and the accompanying materials > // are licensed and made available under the terms and conditions of t= he BSD License >=20