From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: eric.dong@intel.com) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Mon, 06 May 2019 17:25:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 17:25:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,439,1549958400"; d="scan'208";a="155801859" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 06 May 2019 17:25:42 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 17:25:42 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.249]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.126]) with mapi id 14.03.0415.000; Tue, 7 May 2019 08:25:40 +0800 From: "Dong, Eric" To: "Wu, Hao A" , "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Ni, Ray" , "Zeng, Star" , "Gao, Liming" Subject: Re: [PATCH] MdeModulePkg/DumpDynPcd: Add a new application to dump dynamic PCD settings Thread-Topic: [PATCH] MdeModulePkg/DumpDynPcd: Add a new application to dump dynamic PCD settings Thread-Index: AQHVBA2dxeY99RIcb0ixlFUxWGYasqZezixw Date: Tue, 7 May 2019 00:25:39 +0000 Message-ID: References: <20190505055025.14116-1-shenglei.zhang@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.dong@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Hao, Shenglei has sync with me before about this gap. Both me and Liming is fine= with this change. Thanks, Eric > -----Original Message----- > From: Wu, Hao A > Sent: Monday, May 6, 2019 9:14 PM > To: Zhang, Shenglei ; Dong, Eric > ; devel@edk2.groups.io > Cc: Wang, Jian J ; Ni, Ray ; Zen= g, > Star > Subject: RE: [PATCH] MdeModulePkg/DumpDynPcd: Add a new application > to dump dynamic PCD settings >=20 > Loop in Eric. >=20 > Hello Shenglei, >=20 > One general level comment, could you help to follow the recommendation in > https://edk2.groups.io/g/devel/message/39655?p=3D,,,20,0,0,0::Created,,Ue= fi > DebugLibStdErr,20,2,0,31318888 >=20 > to add 'static' for global variables/functions whose scope is limited wit= hin a > single file? >=20 >=20 > Also, some inline comments below. >=20 > > -----Original Message----- > > From: Zhang, Shenglei > > Sent: Sunday, May 05, 2019 1:50 PM > > To: devel@edk2.groups.io > > Cc: Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star > > Subject: [PATCH] MdeModulePkg/DumpDynPcd: Add a new application to > > dump dynamic PCD settings >=20 > Could you help to shorten the title to: >=20 > MdeModulePkg/DumpDynPcd: Add application to dump dynamic PCD > settings >=20 > so as to address the issue reported by PatchCheck script? >=20 > > > > This is a shell application to dump dynamic PCD settings. > > Type DumpDynPcd -?/h/H to get help information. > > Type DumpDynPcd -v/V to get version information. >=20 > I think you can add the (normal) usage "DumpDynPcd [PcdName]" of this > application here as well. >=20 > > After test, this application can be run on NT32, OVMF and KabyLake. > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1541 >=20 > According to the description in the above BZ: >=20 > ''' > DumpDynPcd [-b] [PcdName] > -b Display one screen at a time. > ''' >=20 > But I do not see there is a handle for the '-b' option. >=20 > Hello Eric, >=20 > As the BZ tracker submitter, are you okay with the missing of above optio= n > support? >=20 > > > > Cc: Jian J Wang > > Cc: Hao Wu > > Cc: Ray Ni > > Cc: Star Zeng > > Signed-off-by: Shenglei Zhang > > --- > > .../Application/DumpDynPcd/DumpDynPcd.c | 608 > ++++++++++++++++++ > > .../Application/DumpDynPcd/DumpDynPcd.inf | 51 ++ > > .../Application/DumpDynPcd/DumpDynPcdStr.uni | 28 + > > MdeModulePkg/MdeModulePkg.dsc | 1 + > > 4 files changed, 688 insertions(+) > > create mode 100644 > > MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c > > create mode 100644 > > MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.inf > > create mode 100644 > > MdeModulePkg/Application/DumpDynPcd/DumpDynPcdStr.uni > > > > diff --git a/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c > > b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c > > new file mode 100644 > > index 0000000000..9753c49311 > > --- /dev/null > > +++ b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.c > > @@ -0,0 +1,608 @@ > > +/** @file > > + A shell application to dump dynamic PCD settings. > > + > > + Copyright (c) 2019, Intel Corporation. All rights reserved.
> > + SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include > > +#include > > +#include > > +#include > > +#include #include > > + > > +#include > > + > > + > > +#include #include > > +#include #include #include > > + #include #include > > + > > + > > + > > +// > > +// String token ID of help message text. > > +// Shell supports to find help message in the resource section of an > > +application > > image if > > +// .MAN file is not found. This global variable is added to make > > +build tool > > recognizes > > +// that the help string is consumed by user and then build tool will > > +add the > > string into > > +// the resource section. Thus the application can use '-?' option to > > +show help > > message in > > +// Shell. > > +// > > +GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID > > mStrDumpDynPcdHelpTokenId =3D STRING_TOKEN > > (STR_DUMP_DYN_PCD_HELP_INFORMATION); > > + > > +#define MAJOR_VERSION 1 > > +#define MINOR_VERSION 0 > > + > > +EFI_UNICODE_COLLATION_PROTOCOL *mUnicodeCollation =3D NULL; > > +EFI_PCD_PROTOCOL *mPiPcd =3D NULL; > > +PCD_PROTOCOL *mPcd =3D NULL; > > +EFI_GET_PCD_INFO_PROTOCOL *mPiPcdInfo =3D NULL; > > +GET_PCD_INFO_PROTOCOL *mPcdInfo =3D NULL; > > +CHAR16 *mTempPcdNameBuffer =3D NULL; > > +UINTN mTempPcdNameBufferSize =3D 0; > > +CONST CHAR8 mHex[] =3D {'0', '1', '2', '3', '4', '5', '6', '7', '8', > > +'9', 'A', 'B', 'C', 'D', > > 'E', 'F'}; > > + > > +UINTN Argc; > > +CHAR16 **Argv; > > + > > + > > +/** > > + > > + This function parse application ARG. > > + > > + @return Status > > +**/ > > +EFI_STATUS > > +GetArg ( > > + VOID > > + ) > > +{ > > + EFI_STATUS Status; > > + EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters; > > + > > + Status =3D gBS->HandleProtocol ( > > + gImageHandle, > > + &gEfiShellParametersProtocolGuid, > > + (VOID**)&ShellParameters > > + ); > > + if (EFI_ERROR(Status)) { > > + return Status; > > + } > > + > > + Argc =3D ShellParameters->Argc; > > + Argv =3D ShellParameters->Argv; > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Display current version. > > +**/ > > +VOID > > +ShowVersion ( > > + ) > > +{ > > + Print (L"DumpDynPcd Version %d.%02d\n", MAJOR_VERSION, > > MINOR_VERSION); > > +} > > + > > +/** > > + Display Usage and Help information. > > +**/ > > +VOID > > +ShowHelp ( > > + ) > > +{ > > + Print (L"Dump dynamic[ex] PCD info.\n"); > > + Print (L"\n"); > > + Print (L"DumpDynPcd [PcdName]\n"); > > + Print (L"\n"); > > + Print (L" PcdName Specifies the name of PCD.\n"); > > + Print (L" A literal[or partial] name or a pattern as spe= cified in\n"); > > + Print (L" the MetaiMatch() function of the > > EFI_UNICODE_COLLATION2_PROCOOL.\n"); > > + Print (L" If it is absent, dump all PCDs' info.\n"); > > + Print (L"The PCD data is printed as hexadecimal dump.\n"); } > > + > > +/** > > + Dump some hexadecimal data to the screen. > > + > > + @param[in] Indent How many spaces to indent the output. > > + @param[in] Offset The offset of the printing. > > + @param[in] DataSize The size in bytes of UserData. > > + @param[in] UserData The data to print out. > > +**/ > > +VOID > > +DumpHex ( > > + IN UINTN Indent, > > + IN UINTN Offset, > > + IN UINTN DataSize, > > + IN VOID *UserData > > + ) > > +{ > > + UINT8 *Data; > > + > > + CHAR8 Val[50]; > > + > > + CHAR8 Str[20]; > > + > > + UINT8 TempByte; > > + UINTN Size; > > + UINTN Index; > > + > > + Data =3D UserData; > > + while (DataSize !=3D 0) { > > + Size =3D 16; > > + if (Size > DataSize) { > > + Size =3D DataSize; > > + } > > + > > + for (Index =3D 0; Index < Size; Index +=3D 1) { > > + TempByte =3D Data[Index]; > > + Val[Index * 3 + 0] =3D mHex[TempByte >> 4]; > > + Val[Index * 3 + 1] =3D mHex[TempByte & 0xF]; > > + Val[Index * 3 + 2] =3D (CHAR8) ((Index =3D=3D 7) ? '-' : ' '); > > + Str[Index] =3D (CHAR8) ((TempByte < ' ' || TempByte > '= z') ? '.' : > > TempByte); > > + } > > + > > + Val[Index * 3] =3D 0; > > + Str[Index] =3D 0; > > + Print (L"%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str); > > + > > + Data +=3D Size; > > + Offset +=3D Size; > > + DataSize -=3D Size; > > + } > > +} > > + > > + > > +/** > > + Safely append with automatic string resizing given length of > > +Destination and > > + desired length of copy from Source. > > + > > + append the first D characters of Source to the end of Destination, > > + where D is the lesser of Count and the StrLen() of Source. If > > + appending those D > > characters > > + will fit within Destination (whose Size is given as CurrentSize) > > + and still leave room for a NULL terminator, then those characters > > + are appended, starting at the original terminating NULL of > > + Destination, and a new > > terminating > > + NULL is appended. > > + > > + If appending D characters onto Destination will result in a > > + overflow of the > > size > > + given in CurrentSize the string will be grown such that the copy > > + can be > > performed > > + and CurrentSize will be updated to the new size. > > + > > + If Source is NULL, there is nothing to append, just return the > > + current buffer in Destination. > > + > > + if Destination is NULL, then ASSERT() if Destination's current > > + length (including NULL terminator) is already more > > then > > + CurrentSize, then ASSERT() > > + > > + @param[in, out] Destination The String to append onto > > + @param[in, out] CurrentSize on call the number of bytes in Destina= tion. > On > > + return possibly the new size (still in= bytes). if NULL > > + then allocate whatever is needed. > > + @param[in] Source The String to append from > > + @param[in] Count Maximum number of characters to append= . if 0 > > then > > + all are appended. > > + > > + @return Destination return the resultant string. > > +**/ > > +CHAR16* > > +EFIAPI > > +InternalStrnCatGrow ( >=20 > This one is an application internal function, 'EFIAPI' is not needed here= . >=20 > > + IN OUT CHAR16 **Destination, > > + IN OUT UINTN *CurrentSize, > > + IN CONST CHAR16 *Source, > > + IN UINTN Count >=20 > Seems to me that the 'Count' parameter is always set to 0 among the calls > within this proposed application. Maybe it is better to just eliminate it= . >=20 > > + ) > > +{ > > + UINTN DestinationStartSize; > > + UINTN NewSize; > > + > > + // > > + // ASSERTs > > + // > > + ASSERT(Destination !=3D NULL); > > + > > + // > > + // If there's nothing to do then just return Destination // if > > + (Source =3D=3D NULL) { > > + return (*Destination); > > + } > > + > > + // > > + // allow for un-initialized pointers, based on size being 0 // if > > + (CurrentSize !=3D NULL && *CurrentSize =3D=3D 0) { > > + *Destination =3D NULL; > > + } > > + > > + // > > + // allow for NULL pointers address as Destination > > + // > > + if (*Destination !=3D NULL) { > > + ASSERT(CurrentSize !=3D 0); > > + DestinationStartSize =3D StrSize(*Destination); > > + ASSERT(DestinationStartSize <=3D *CurrentSize); > > + } else { > > + DestinationStartSize =3D 0; > > +// ASSERT(*CurrentSize =3D=3D 0); > > + } > > + > > + // > > + // Append all of Source? > > + // > > + if (Count =3D=3D 0) { > > + Count =3D StrLen(Source); > > + } > > + > > + // > > + // Test and grow if required > > + // > > + if (CurrentSize !=3D NULL) { > > + NewSize =3D *CurrentSize; > > + if (NewSize < DestinationStartSize + (Count * sizeof(CHAR16))) { > > + while (NewSize < (DestinationStartSize + (Count*sizeof(CHAR16)))= ) { > > + NewSize +=3D 2 * Count * sizeof(CHAR16); > > + } > > + *Destination =3D ReallocatePool(*CurrentSize, NewSize, *Destinat= ion); > > + *CurrentSize =3D NewSize; > > + } > > + } else { > > + NewSize =3D (Count+1)*sizeof(CHAR16); > > + *Destination =3D AllocateZeroPool(NewSize); } > > + > > + // > > + // Now use standard StrnCat on a big enough buffer // if > > + (*Destination =3D=3D NULL) { > > + return (NULL); > > + } > > + > > + StrnCatS(*Destination, NewSize/sizeof(CHAR16), Source, Count); > > + return *Destination; > > +} > > + > > +/** > > + Get PCD type string based on input PCD type. > > + > > + @param[in] TokenSpace PCD Token Space. > > + @param[in] PcdType The input PCD type. > > + > > + @return Pointer to PCD type string. > > +**/ > > +CHAR16 * > > +GetPcdTypeString ( > > + IN CONST EFI_GUID *TokenSpace, > > + IN EFI_PCD_TYPE PcdType > > + ) > > +{ > > + UINTN BufLen; > > + CHAR16 *RetString; > > + > > + BufLen =3D 0; > > + RetString =3D NULL; > > + > > + switch (PcdType) { > > + case EFI_PCD_TYPE_8: > > + InternalStrnCatGrow (&RetString, &BufLen, L"UINT8", 0); > > + break; > > + case EFI_PCD_TYPE_16: > > + InternalStrnCatGrow (&RetString, &BufLen, L"UINT16", 0); > > + break; > > + case EFI_PCD_TYPE_32: > > + InternalStrnCatGrow (&RetString, &BufLen, L"UINT32", 0); > > + break; > > + case EFI_PCD_TYPE_64: > > + InternalStrnCatGrow (&RetString, &BufLen, L"UINT64", 0); > > + break; > > + case EFI_PCD_TYPE_BOOL: > > + InternalStrnCatGrow (&RetString, &BufLen, L"BOOLEAN", 0); > > + break; > > + case EFI_PCD_TYPE_PTR: > > + InternalStrnCatGrow (&RetString, &BufLen, L"POINTER", 0); > > + break; > > + default: > > + InternalStrnCatGrow (&RetString, &BufLen, L"UNKNOWN", 0); > > + break; > > + } > > + > > + if (TokenSpace =3D=3D NULL) { > > + InternalStrnCatGrow (&RetString, &BufLen, L":DYNAMIC", 0); } > > + else { > > + InternalStrnCatGrow (&RetString, &BufLen, L":DYNAMICEX", 0); } > > + > > + return RetString; > > +} > > + > > +/** > > + Dump PCD info. > > + > > + @param[in] TokenSpace PCD Token Space. > > + @param[in] TokenNumber PCD Token Number. > > + @param[in] PcdInfo Pointer to PCD info. > > +**/ > > +VOID > > +DumpPcdInfo ( > > + IN CONST EFI_GUID *TokenSpace, > > + IN UINTN TokenNumber, > > + IN EFI_PCD_INFO *PcdInfo > > + ) > > +{ > > + CHAR16 *RetString; > > + UINT8 Uint8; > > + UINT16 Uint16; > > + UINT32 Uint32; > > + UINT64 Uint64; > > + BOOLEAN Boolean; > > + VOID *PcdData; > > + > > + RetString =3D NULL; > > + > > + if (PcdInfo->PcdName !=3D NULL) { > > + Print (L"%a\n", PcdInfo->PcdName); } else { > > + if (TokenSpace =3D=3D NULL) { > > + Print (L"Default Token Space\n"); > > + } else { > > + Print (L"%g\n", TokenSpace); > > + } > > + } > > + > > + RetString =3D GetPcdTypeString (TokenSpace, PcdInfo->PcdType); > > + > > + switch (PcdInfo->PcdType) { > > + case EFI_PCD_TYPE_8: > > + if (TokenSpace =3D=3D NULL) { > > + Uint8 =3D mPcd->Get8 (TokenNumber); > > + } else { > > + Uint8 =3D mPiPcd->Get8 (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= - > > + Value =3D > > 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint8); > > + break; > > + case EFI_PCD_TYPE_16: > > + if (TokenSpace =3D=3D NULL) { > > + Uint16 =3D mPcd->Get16 (TokenNumber); > > + } else { > > + Uint16 =3D mPiPcd->Get16 (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= - > > + Value =3D > > 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint16); > > + break; > > + case EFI_PCD_TYPE_32: > > + if (TokenSpace =3D=3D NULL) { > > + Uint32 =3D mPcd->Get32 (TokenNumber); > > + } else { > > + Uint32 =3D mPiPcd->Get32 (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= - > > + Value =3D > > 0x%x\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint32); > > + break; > > + case EFI_PCD_TYPE_64: > > + if (TokenSpace =3D=3D NULL) { > > + Uint64 =3D mPcd->Get64 (TokenNumber); > > + } else { > > + Uint64 =3D mPiPcd->Get64 (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= - > > + Value =3D > > 0x%lx\n", TokenNumber, RetString, PcdInfo->PcdSize, Uint64); > > + break; > > + case EFI_PCD_TYPE_BOOL: > > + if (TokenSpace =3D=3D NULL) { > > + Boolean =3D mPcd->GetBool (TokenNumber); > > + } else { > > + Boolean =3D mPiPcd->GetBool (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= - > > + Value > > =3D %a\n", TokenNumber, RetString, PcdInfo->PcdSize, Boolean ? "TRUE" : > > "FALSE"); > > + break; > > + case EFI_PCD_TYPE_PTR: > > + if (TokenSpace =3D=3D NULL) { > > + PcdData =3D mPcd->GetPtr (TokenNumber); > > + } else { > > + PcdData =3D mPiPcd->GetPtr (TokenSpace, TokenNumber); > > + } > > + Print (L" Token =3D 0x%08x - Type =3D %H%-17s%N - Size =3D 0x%x= \n", > > TokenNumber, RetString, PcdInfo->PcdSize); > > + DumpHex (2, 0, PcdInfo->PcdSize, PcdData); > > + break; > > + default: > > + return; > > + } > > + > > + if (RetString !=3D NULL) { > > + FreePool (RetString); > > + } > > + Print (L"\n"); > > +} > > + > > +/** > > + Show one or all PCDs' info. > > + > > + @param[in] InputPcdName Pointer to PCD name to show. If NULL, > show > > all PCDs' info. > > + > > + @retval EFI_SUCCESS Command completed successfully. > > + @retval EFI_OUT_OF_RESOURCES Not enough resources were available > to > > run the command. > > + @retval EFI_ABORTED Aborted by user. > > + @retval EFI_NOT_FOUND The specified PCD is not found. > > +**/ > > +EFI_STATUS > > +ProcessPcd ( > > + IN CHAR16 *InputPcdName > > + ) > > +{ > > + EFI_STATUS Status; > > + EFI_GUID *TokenSpace; > > + UINTN TokenNumber; > > + EFI_PCD_INFO PcdInfo; > > + BOOLEAN Found; > > + UINTN PcdNameSize; > > + > > + PcdInfo.PcdName =3D NULL; > > + PcdInfo.PcdSize =3D 0; > > + PcdInfo.PcdType =3D 0xFF; > > + Found =3D FALSE; > > + > > + Print (L"Current system SKU ID: 0x%x\n\n", mPiPcdInfo->GetSku ()); > > + > > + TokenSpace =3D NULL; > > + do { > > + TokenNumber =3D 0; > > + do { > > + Status =3D mPiPcd->GetNextToken (TokenSpace, &TokenNumber); > > + if (!EFI_ERROR (Status) && TokenNumber !=3D 0) { > > + if (TokenSpace =3D=3D NULL) { > > + // > > + // PCD in default Token Space. > > + // > > + mPcdInfo->GetInfo (TokenNumber, &PcdInfo); > > + } else { > > + mPiPcdInfo->GetInfo (TokenSpace, TokenNumber, &PcdInfo); > > + } > > + if (InputPcdName !=3D NULL) { > > + if (PcdInfo.PcdName =3D=3D NULL) { > > + continue; > > + } > > + PcdNameSize =3D AsciiStrSize (PcdInfo.PcdName) * sizeof (CHA= R16); > > + if (mTempPcdNameBuffer =3D=3D NULL) { > > + mTempPcdNameBufferSize =3D PcdNameSize; > > + mTempPcdNameBuffer =3D AllocatePool > (mTempPcdNameBufferSize); > > + } else if (mTempPcdNameBufferSize < PcdNameSize) { > > + mTempPcdNameBuffer =3D ReallocatePool > > + (mTempPcdNameBufferSize, > > PcdNameSize, mTempPcdNameBuffer); > > + mTempPcdNameBufferSize =3D PcdNameSize; > > + } > > + if (mTempPcdNameBuffer =3D=3D NULL) { > > + return EFI_OUT_OF_RESOURCES; > > + } > > + AsciiStrToUnicodeStrS (PcdInfo.PcdName, mTempPcdNameBuffer, > > mTempPcdNameBufferSize / sizeof (CHAR16)); > > + // > > + // Compare the input PCD name with the PCD name in PCD datab= ase. > > + // > > + if ((StrStr (mTempPcdNameBuffer, InputPcdName) !=3D NULL) || > > + (mUnicodeCollation !=3D NULL && > > + mUnicodeCollation->MetaiMatch > > (mUnicodeCollation, mTempPcdNameBuffer, InputPcdName))) { > > + // > > + // Found matched PCD. > > + // > > + DumpPcdInfo (TokenSpace, TokenNumber, &PcdInfo); > > + Found =3D TRUE; > > + } > > + } else { > > + DumpPcdInfo (TokenSpace, TokenNumber, &PcdInfo); > > + } > > + } > > + } while (!EFI_ERROR (Status) && TokenNumber !=3D 0); > > + > > + Status =3D mPiPcd->GetNextTokenSpace ((CONST EFI_GUID **) > > + &TokenSpace); } while (!EFI_ERROR (Status) && TokenSpace !=3D NULL); > > + > > + if ((InputPcdName !=3D NULL) && !Found) { > > + // > > + // The specified PCD is not found, print error. > > + // > > + Print (L"%EError. %NNo matching PCD found: %s.\n", InputPcdName); > > + return EFI_NOT_FOUND; > > + } > > + return EFI_SUCCESS; > > +} > > + > > +/** > > + Main entrypoint for DumpDynPcd shell application. > > + > > + @param[in] ImageHandle The image handle. > > + @param[in] SystemTable The system table. > > + > > + @retval EFI_SUCCESS Command completed successfully. > > + @retval EFI_INVALID_PARAMETER Command usage error. > > + @retval EFI_OUT_OF_RESOURCES Not enough resources were available > to > > run the command. > > + @retval EFI_ABORTED Aborted by user. > > + @retval EFI_NOT_FOUND The specified PCD is not found. > > + @retval Others Error status returned from gBS->Locat= eProtocol. > > +**/ > > +EFI_STATUS > > +EFIAPI > > +DumpDynPcdMain ( > > + IN EFI_HANDLE ImageHandle, > > + IN EFI_SYSTEM_TABLE *SystemTable > > + ) > > +{ > > + EFI_STATUS Status; > > + CHAR16 *InputPcdName; > > + > > + InputPcdName =3D NULL; > > + > > + Status =3D gBS->LocateProtocol(&gEfiUnicodeCollation2ProtocolGuid, > > + NULL, > > (VOID **) &mUnicodeCollation); > > + if (EFI_ERROR (Status)) { > > + mUnicodeCollation =3D NULL; > > + } > > + > > + Status =3D gBS->LocateProtocol (&gEfiPcdProtocolGuid, NULL, (VOID **= ) > > &mPiPcd); > > + if (EFI_ERROR (Status)) { > > + Print (L"DumpDynPcd: %EError. %NPI PCD protocol is not present.\n"= ); > > + return Status; > > + } > > + > > + Status =3D gBS->LocateProtocol (&gEfiGetPcdInfoProtocolGuid, NULL, > > + (VOID **) > > &mPiPcdInfo); > > + if (EFI_ERROR (Status)) { > > + Print (L"DumpDynPcd: %EError. %NPI PCD info protocol is not > present.\n"); > > + return Status; > > + } > > + > > + Status =3D gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **) > > + &mPcd); if (EFI_ERROR (Status)) { > > + Print (L"DumpDynPcd: %EError. %NPCD protocol is not present.\n"); > > + return Status; > > + } > > + > > + Status =3D gBS->LocateProtocol (&gGetPcdInfoProtocolGuid, NULL, (VOI= D > > + **) > > &mPcdInfo); > > + if (EFI_ERROR (Status)) { > > + Print (L"DumpDynPcd: %EError. %NPCD info protocol is not present.\= n"); > > + return Status; > > + } > > + > > + // > > + // get the command line arguments > > + // > > + Status =3D GetArg(); > > + if (EFI_ERROR(Status)){ > > + Print (L"DumpDynPcd: %EError. %NThe input parameters are not > > recognized.\n"); > > + Status =3D EFI_INVALID_PARAMETER; > > + return Status; > > + } > > + > > + if (Argc > 2){ > > + Print (L"DumpDynPcd: %EError. %NToo many arguments specified.\n"); > > + Status =3D EFI_INVALID_PARAMETER; > > + return Status; > > + } > > + > > + if (Argc =3D=3D 1){ > > + Status =3D ProcessPcd (InputPcdName); > > + goto Done; > > + } > > + > > + if ((StrCmp(Argv[1], L"-?") =3D=3D 0)||(StrCmp(Argv[1], L"-h") =3D= =3D > > 0)||(StrCmp(Argv[1], L"-H") =3D=3D 0)){ > > + ShowHelp (); > > + goto Done; > > + } else >=20 > Please put an open brace after 'else'. >=20 > Seems to me there is a hard requirement according to EDK II C Coding > Standards Specification Version 2.1, Section 5.7.3.4.2: >=20 > ''' > An open brace always follows the else > ''' >=20 > > + if ((StrCmp(Argv[1], L"-v") =3D=3D 0)||(StrCmp(Argv[1], L"-V") =3D= =3D 0)){ > > + ShowVersion (); > > + goto Done; > > + } else >=20 > Similar comment as above. >=20 > > + if (StrStr(Argv[1], L"-") !=3D NULL){ > > + Print (L"DumpDynPcd: %EError. %NThe argument '%B%s%N' is > > + invalid.\n", > > Argv[1]); > > + goto Done; > > + } > > + > > + InputPcdName =3D Argv[1]; > > + Status =3D ProcessPcd (InputPcdName); > > + > > + Done: > > + > > + if (mTempPcdNameBuffer !=3D NULL) { > > + FreePool (mTempPcdNameBuffer); > > + } > > + > > + return Status; > > +} > > + > > diff --git a/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.inf > > b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.inf > > new file mode 100644 > > index 0000000000..af63eccca7 > > --- /dev/null > > +++ b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.inf > > @@ -0,0 +1,51 @@ > > +# > > +# DumpDynPcd is a shell application to dump dynamic pcd information. > > +# > > +# Copyright (c) 2019, Intel Corporation. All rights reserved.
# > > +SPDX-License-Identifier: BSD-2-Clause-Patent # ## > > + > > +[Defines] > > + INF_VERSION =3D 0x00010006 > > + BASE_NAME =3D DumpDynPcd > > + FILE_GUID =3D 31ADA2B2-62EA-4866-9B87-03FEA8425= 974 > > + MODULE_TYPE =3D UEFI_APPLICATION > > + VERSION_STRING =3D 1.0 > > + ENTRY_POINT =3D DumpDynPcdMain > > + > > +# > > +# This flag specifies whether HII resource section is generated into P= E > image. > > +# > > + UEFI_HII_RESOURCE_SECTION =3D TRUE > > + > > +# > > +# The following information is for reference only and not required by > > +the build > > tools. > > +# > > +# VALID_ARCHITECTURES =3D IA32 X64 IPF EBC >=20 > Please help to remove 'IPF' in the above comment. >=20 > > +# > > + > > +[Sources] > > + DumpDynPcd.c > > + DumpDynPcdStr.uni > > + > > +[Packages] > > + MdePkg/MdePkg.dec > > + ShellPkg/ShellPkg.dec >=20 > Please help to drop the ShellPkg.dec here. > I do not think there is any library/protocol dependency in ShellPkg. >=20 > Best Regards, > Hao Wu >=20 > > + > > +[LibraryClasses] > > + BaseLib > > + UefiApplicationEntryPoint > > + DebugLib > > + MemoryAllocationLib > > + UefiLib > > + UefiBootServicesTableLib > > + > > +[Protocols] > > + gEfiUnicodeCollation2ProtocolGuid ## SOMETIMES_CONSUMES > > + gEfiPcdProtocolGuid ## CONSUMES > > + gPcdProtocolGuid ## CONSUMES > > + gEfiGetPcdInfoProtocolGuid ## CONSUMES > > + gGetPcdInfoProtocolGuid ## CONSUMES > > + gEfiShellParametersProtocolGuid ## CONSUMES > > + > > diff --git a/MdeModulePkg/Application/DumpDynPcd/DumpDynPcdStr.uni > > b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcdStr.uni > > new file mode 100644 > > index 0000000000..f0ee98219b > > --- /dev/null > > +++ b/MdeModulePkg/Application/DumpDynPcd/DumpDynPcdStr.uni > > @@ -0,0 +1,28 @@ > > +// > > +// DumpDynPcd is a shell application to dump dynamic pcd information. > > +// > > +// Copyright (c) 2019, Intel Corporation. All rights reserved.
// > > +SPDX-License-Identifier: BSD-2-Clause-Patent // //**/ > > + > > +/=3D# > > + > > +#langdef en-US "English" > > + > > +#string STR_DUMP_DYN_PCD_HELP_INFORMATION #language en-US > "" > > + ".TH > > +DumpDynPcd 0 "Dump > > dynamic[ex] PCD info."\r\n" > > + ".SH N= AME\r\n" > > + "Dump = dynamic[ex] PCD info.\r\n" > > + ".SH S= YNOPSIS\r\n" > > + " \r\n= " > > + "DumpD= ynPcd [PcdName].\r\n" > > + ".SH O= PTIONS\r\n" > > + " \r\n= " > > + " Pcd= Name Specifies the name of > > PCD.\r\n" > > + " = A literal[or partial] name or a > > pattern as specified in\r\n" > > + " = the MetaiMatch() function of > > the EFI_UNICODE_COLLATION2_PROCOOL.\r\n" > > + " = If it is absent, dump all PCDs' > > info.\r\n" > > + "The > > + PCD data is printed as > > hexadecimal dump.\n" > > + "\r\n" > > + > > diff --git a/MdeModulePkg/MdeModulePkg.dsc > > b/MdeModulePkg/MdeModulePkg.dsc index b302f4a4f3..a8b9d8d027 > 100644 > > --- a/MdeModulePkg/MdeModulePkg.dsc > > +++ b/MdeModulePkg/MdeModulePkg.dsc > > @@ -206,6 +206,7 @@ > > > > [Components] > > MdeModulePkg/Application/HelloWorld/HelloWorld.inf > > + MdeModulePkg/Application/DumpDynPcd/DumpDynPcd.inf > > MdeModulePkg/Application/MemoryProfileInfo/MemoryProfileInfo.inf > > > > MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf > > -- > > 2.18.0.windows.1