UefiCpuPkg: Update default for PcdCpuProcTraceMemSize/PcdCpuProcTraceOutputScheme.

These two definitions have redundant definition which can be handle by code.
This patch update them to follow new code definitions.

V2: Add more comments for the PCDs and keep consistent in .dec and .uni files.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>

diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
index b4e099d43ec63353da6227cfb252c8be1be57b66..3bd8740c987f47d01a641f66f43273dbe3c31a52 100644 (file)
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/UefiCpuPkg/UefiCpuPkg.dec
@@ -286,7 +286,9 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuFeaturesSetting|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}|VOID*|0x00000019\r
 \r
   ## Contains the size of memory required when CPU processor trace is enabled.<BR><BR>\r
-  #  Default value is 0x10 which disables the processor trace.<BR>\r
+  #  Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\r
+  #  This PCD is ignored if CPU processor trace is disabled.<BR><BR>\r
+  #  Default value is 0x00 which means 4KB of memory is allocated if CPU processor trace is enabled.<BR>\r
   #  0x0  -  4K.<BR>\r
   #  0x1  -  8K.<BR>\r
   #  0x2  -  16K.<BR>\r
@@ -303,19 +305,19 @@
   #  0xD  -  32M.<BR>\r
   #  0xE  -  64M.<BR>\r
   #  0xF  -  128M.<BR>\r
-  #  0x10 -  ProcTraceMemDisable.<BR>\r
-  # @Prompt The memory size used for processor trace.\r
-  # @ValidRange  0x80000001 | 0 - 0x10\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceMemSize|0x10|UINT32|0x60000012\r
+  # @Prompt The memory size used for processor trace if processor trace is enabled.\r
+  # @ValidRange  0x80000001 | 0 - 0xF\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceMemSize|0x0|UINT32|0x60000012\r
 \r
   ## Contains the processor trace output scheme when CPU processor trace is enabled.<BR><BR>\r
-  #  Default value is 2 which disables the processor trace.<BR>\r
+  #  Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\r
+  #  This PCD is ignored if CPU processor trace is disabled.<BR><BR>\r
+  #  Default value is 0 which means single range output scheme will be used if CPU processor trace is enabled.<BR>\r
   #  0 - Single Range output scheme.<BR>\r
   #  1 - ToPA(Table of physical address) scheme.<BR>\r
-  #  2 - Invalid scheme.<BR>\r
-  # @Prompt The processor trace output scheme.\r
-  # @ValidRange  0x80000001 | 0 - 2\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceOutputScheme|0x2|UINT8|0x60000015\r
+  # @Prompt The processor trace output scheme used when processor trace is enabled.\r
+  # @ValidRange  0x80000001 | 0 - 1\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceOutputScheme|0x0|UINT8|0x60000015\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   UefiCpuPkgExtra.uni\r

diff --git a/UefiCpuPkg/UefiCpuPkg.uni b/UefiCpuPkg/UefiCpuPkg.uni
index 858e4a7235330889691966e035b1a0d7cfc36141..9472b185e46e6d6f6315f4370e23a3e122cdd0f8 100644 (file)
--- a/UefiCpuPkg/UefiCpuPkg.uni
+++ b/UefiCpuPkg/UefiCpuPkg.uni
@@ -197,8 +197,10 @@
 \r
 #string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_PROMPT  #language en-US "Memory size used by Processor Trace feature."\r
 \r
-#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_HELP  #language en-US "User input the memory size can be used by processor trace feature.<BR><BR>\n"\r
-                                                                                   "Default value is 0x10 which disables the processor memory trace.<BR>\n"\r
+#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_HELP  #language en-US "User input the size of memory required when CPU processor trace is enabled.<BR><BR>\n"\r
+                                                                                   "Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\n"\r
+                                                                                   "This PCD is ignored if CPU processor trace is disabled.<BR><BR>\n"\r
+                                                                                   "Default value is 0x00 which means 4KB of memory is allocated if CPU processor trace is enabled.<BR>\n"\r
                                                                                    "0x0  -  4K.<BR>\n"\r
                                                                                    "0x1  -  8K.<BR>\n"\r
                                                                                    "0x2  -  16K.<BR>\n"\r
@@ -215,12 +217,12 @@
                                                                                    "0xD  -  32M.<BR>\n"\r
                                                                                    "0xE  -  64M.<BR>\n"\r
                                                                                    "0xF  -  128M.<BR>\n"\r
-                                                                                   "0x10 -  ProcTraceMemDisable.<BR>\n"\r
 \r
 #string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_PROMPT  #language en-US "Processor Trace output scheme type."\r
 \r
-#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_HELP  #language en-US "User input the processor trace output scheme type.<BR><BR>\n"\r
-                                                                                        "Default value is 2 which disables the processor memory trace.<BR>\n"\r\r
+#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_HELP  #language en-US "User input the processor trace output scheme when CPU processor trace is enabled.<BR><BR>\n"\r
+                                                                                        "Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\n"\r
+                                                                                        "This PCD is ignored if CPU processor trace is disabled.<BR><BR>\n"\r
+                                                                                        "Default value is 0 which means single range output scheme will be used if CPU processor trace is enabled.<BR>\n"\r
                                                                                         "0 - Single Range output scheme.<BR>\n"\r\r
-                                                                                        "1 - ToPA(Table of physical address) scheme.<BR>\n"\r\r
-                                                                                        "2 - Invalid scheme.<BR>\n"\r
\ No newline at end of file
+                                                                                        "1 - ToPA(Table of physical address) scheme.<BR>\n"\r
\ No newline at end of file