Re: [edk2] [PATCH] MdeModulePkg PcdDxe: ASSERT PcdSetNvStoreDefaultId set

2018-10-14 Thread Wang, Jian J 
Reviewed-by: Jian J Wang 

> -Original Message-
> From: Zeng, Star
> Sent: Friday, October 12, 2018 6:23 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star ; Gao, Liming ;
> Yao, Jiewen ; Wang, Jian J 
> Subject: [PATCH] MdeModulePkg PcdDxe: ASSERT PcdSetNvStoreDefaultId set
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1245
> 
> In current implementation and according to the description in
> MdeModulePkg.dec, PcdSetNvStoreDefaultId should be set in PEI
> phase to take effect.
> 
> This patch ASSERTs PcdSetNvStoreDefaultId set in PcdDxe to alert
> the invalid operation.
> 
> Cc: Liming Gao 
> Cc: Jiewen Yao 
> Cc: Jian J Wang 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng 
> ---
>  MdeModulePkg/Universal/PCD/Dxe/Pcd.c   | 5 +
>  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 4 +++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
> b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
> index bc308af1c5d8..f977c7f18e19 100644
> --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
> +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
> @@ -890,6 +890,11 @@ DxePcdSet16Ex (
>IN UINT16Value
>)
>  {
> +  //
> +  // PcdSetNvStoreDefaultId should be set in PEI phase to take effect.
> +  //
> +  ASSERT (!(CompareGuid (Guid, ) &&
> +(ExTokenNumber == PcdToken(PcdSetNvStoreDefaultId;
>return  ExSetValueWorker (ExTokenNumber, Guid, , sizeof (Value));
>  }
> 
> diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> index 066b86aaa5f3..1f41a316bd89 100644
> --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> @@ -331,6 +331,7 @@ [LibraryClasses]
>  [Guids]
>gPcdDataBaseHobGuid   ## SOMETIMES_CONSUMES  ## HOB
>gPcdDataBaseSignatureGuid ## CONSUMES  ## GUID  # PCD
> database signature GUID.
> +  gEfiMdeModulePkgTokenSpaceGuid## SOMETIMES_CONSUMES  ##
> GUID
> 
>  [Protocols]
>gPcdProtocolGuid  ## PRODUCES
> @@ -342,7 +343,8 @@ [Protocols]
>gEdkiiVariableLockProtocolGuid
> 
>  [Pcd]
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ##
> SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ##
> SOMETIMES_CONSUMES
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId ##
> SOMETIMES_CONSUMES
> 
>  [Depex]
>TRUE
> --
> 2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg PcdDxe: ASSERT PcdSetNvStoreDefaultId set

2018-10-14 Thread Gao, Liming 
Reviewed-by: Liming Gao 

>-Original Message-
>From: Zeng, Star
>Sent: Friday, October 12, 2018 6:23 PM
>To: edk2-devel@lists.01.org
>Cc: Zeng, Star ; Gao, Liming ;
>Yao, Jiewen ; Wang, Jian J 
>Subject: [PATCH] MdeModulePkg PcdDxe: ASSERT PcdSetNvStoreDefaultId
>set
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1245
>
>In current implementation and according to the description in
>MdeModulePkg.dec, PcdSetNvStoreDefaultId should be set in PEI
>phase to take effect.
>
>This patch ASSERTs PcdSetNvStoreDefaultId set in PcdDxe to alert
>the invalid operation.
>
>Cc: Liming Gao 
>Cc: Jiewen Yao 
>Cc: Jian J Wang 
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Star Zeng 
>---
> MdeModulePkg/Universal/PCD/Dxe/Pcd.c   | 5 +
> MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 4 +++-
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
>b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
>index bc308af1c5d8..f977c7f18e19 100644
>--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
>+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
>@@ -890,6 +890,11 @@ DxePcdSet16Ex (
>   IN UINT16Value
>   )
> {
>+  //
>+  // PcdSetNvStoreDefaultId should be set in PEI phase to take effect.
>+  //
>+  ASSERT (!(CompareGuid (Guid, ) &&
>+(ExTokenNumber == PcdToken(PcdSetNvStoreDefaultId;
>   return  ExSetValueWorker (ExTokenNumber, Guid, , sizeof (Value));
> }
>
>diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>index 066b86aaa5f3..1f41a316bd89 100644
>--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>@@ -331,6 +331,7 @@ [LibraryClasses]
> [Guids]
>   gPcdDataBaseHobGuid   ## SOMETIMES_CONSUMES  ## HOB
>   gPcdDataBaseSignatureGuid ## CONSUMES  ## GUID  # PCD
>database signature GUID.
>+  gEfiMdeModulePkgTokenSpaceGuid## SOMETIMES_CONSUMES
>## GUID
>
> [Protocols]
>   gPcdProtocolGuid  ## PRODUCES
>@@ -342,7 +343,8 @@ [Protocols]
>   gEdkiiVariableLockProtocolGuid
>
> [Pcd]
>-  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ##
>SOMETIMES_CONSUMES
>+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ##
>SOMETIMES_CONSUMES
>+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId ##
>SOMETIMES_CONSUMES
>
> [Depex]
>   TRUE
>--
>2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH] MdeModulePkg PcdDxe: ASSERT PcdSetNvStoreDefaultId set

2018-10-12 Thread Star Zeng 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1245

In current implementation and according to the description in
MdeModulePkg.dec, PcdSetNvStoreDefaultId should be set in PEI
phase to take effect.

This patch ASSERTs PcdSetNvStoreDefaultId set in PcdDxe to alert
the invalid operation.

Cc: Liming Gao 
Cc: Jiewen Yao 
Cc: Jian J Wang 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng 
---
 MdeModulePkg/Universal/PCD/Dxe/Pcd.c   | 5 +
 MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c 
b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index bc308af1c5d8..f977c7f18e19 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -890,6 +890,11 @@ DxePcdSet16Ex (
   IN UINT16Value
   )
 {
+  //
+  // PcdSetNvStoreDefaultId should be set in PEI phase to take effect.
+  //
+  ASSERT (!(CompareGuid (Guid, ) &&
+(ExTokenNumber == PcdToken(PcdSetNvStoreDefaultId;
   return  ExSetValueWorker (ExTokenNumber, Guid, , sizeof (Value));
 }
 
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf 
b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 066b86aaa5f3..1f41a316bd89 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -331,6 +331,7 @@ [LibraryClasses]
 [Guids]
   gPcdDataBaseHobGuid   ## SOMETIMES_CONSUMES  ## HOB
   gPcdDataBaseSignatureGuid ## CONSUMES  ## GUID  # PCD 
database signature GUID.
+  gEfiMdeModulePkgTokenSpaceGuid## SOMETIMES_CONSUMES  ## GUID
 
 [Protocols]
   gPcdProtocolGuid  ## PRODUCES
@@ -342,7 +343,8 @@ [Protocols]
   gEdkiiVariableLockProtocolGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress  ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId ## SOMETIMES_CONSUMES
 
 [Depex]
   TRUE
-- 
2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel