diff options
| author | Eric Dong <eric.dong@intel.com> | 2017-08-23 10:28:55 +0800 |
|---|---|---|
| committer | Eric Dong <eric.dong@intel.com> | 2017-08-28 15:13:49 +0800 |
| commit | 34b6a0e22210b825ca5ea8447ac8bc513c0c96c5 (patch) | |
| tree | 01c35ead33b8c0b88abc95958ca7733410c1c17f /UefiCpuPkg | |
| parent | 330021fa41e41ef4b4aafc20e853d91179fd1b80 (diff) | |
| download | edk2-34b6a0e22210b825ca5ea8447ac8bc513c0c96c5.tar.gz edk2-34b6a0e22210b825ca5ea8447ac8bc513c0c96c5.tar.bz2 edk2-34b6a0e22210b825ca5ea8447ac8bc513c0c96c5.zip | |
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>
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/UefiCpuPkg.dec | 22 | ||||
| -rw-r--r-- | UefiCpuPkg/UefiCpuPkg.uni | 16 |
2 files changed, 21 insertions, 17 deletions
diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index b4e099d43e..3bd8740c98 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -286,7 +286,9 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuFeaturesSetting|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}|VOID*|0x00000019
## Contains the size of memory required when CPU processor trace is enabled.<BR><BR>
- # Default value is 0x10 which disables the processor trace.<BR>
+ # Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>
+ # This PCD is ignored if CPU processor trace is disabled.<BR><BR>
+ # Default value is 0x00 which means 4KB of memory is allocated if CPU processor trace is enabled.<BR>
# 0x0 - 4K.<BR>
# 0x1 - 8K.<BR>
# 0x2 - 16K.<BR>
@@ -303,19 +305,19 @@ # 0xD - 32M.<BR>
# 0xE - 64M.<BR>
# 0xF - 128M.<BR>
- # 0x10 - ProcTraceMemDisable.<BR>
- # @Prompt The memory size used for processor trace.
- # @ValidRange 0x80000001 | 0 - 0x10
- gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceMemSize|0x10|UINT32|0x60000012
+ # @Prompt The memory size used for processor trace if processor trace is enabled.
+ # @ValidRange 0x80000001 | 0 - 0xF
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceMemSize|0x0|UINT32|0x60000012
## Contains the processor trace output scheme when CPU processor trace is enabled.<BR><BR>
- # Default value is 2 which disables the processor trace.<BR>
+ # Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>
+ # This PCD is ignored if CPU processor trace is disabled.<BR><BR>
+ # Default value is 0 which means single range output scheme will be used if CPU processor trace is enabled.<BR>
# 0 - Single Range output scheme.<BR>
# 1 - ToPA(Table of physical address) scheme.<BR>
- # 2 - Invalid scheme.<BR>
- # @Prompt The processor trace output scheme.
- # @ValidRange 0x80000001 | 0 - 2
- gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceOutputScheme|0x2|UINT8|0x60000015
+ # @Prompt The processor trace output scheme used when processor trace is enabled.
+ # @ValidRange 0x80000001 | 0 - 1
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuProcTraceOutputScheme|0x0|UINT8|0x60000015
[UserExtensions.TianoCore."ExtraFiles"]
UefiCpuPkgExtra.uni
diff --git a/UefiCpuPkg/UefiCpuPkg.uni b/UefiCpuPkg/UefiCpuPkg.uni index 858e4a7235..9472b185e4 100644 --- a/UefiCpuPkg/UefiCpuPkg.uni +++ b/UefiCpuPkg/UefiCpuPkg.uni @@ -197,8 +197,10 @@ #string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_PROMPT #language en-US "Memory size used by Processor Trace feature."
-#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_HELP #language en-US "User input the memory size can be used by processor trace feature.<BR><BR>\n"
- "Default value is 0x10 which disables the processor memory trace.<BR>\n"
+#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceMemSize_HELP #language en-US "User input the size of memory required when CPU processor trace is enabled.<BR><BR>\n"
+ "Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\n"
+ "This PCD is ignored if CPU processor trace is disabled.<BR><BR>\n"
+ "Default value is 0x00 which means 4KB of memory is allocated if CPU processor trace is enabled.<BR>\n"
"0x0 - 4K.<BR>\n"
"0x1 - 8K.<BR>\n"
"0x2 - 16K.<BR>\n"
@@ -215,12 +217,12 @@ "0xD - 32M.<BR>\n"
"0xE - 64M.<BR>\n"
"0xF - 128M.<BR>\n"
- "0x10 - ProcTraceMemDisable.<BR>\n"
#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_PROMPT #language en-US "Processor Trace output scheme type."
-#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_HELP #language en-US "User input the processor trace output scheme type.<BR><BR>\n"
- "Default value is 2 which disables the processor memory trace.<BR>\n"
+#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuProcTraceOutputScheme_HELP #language en-US "User input the processor trace output scheme when CPU processor trace is enabled.<BR><BR>\n"
+ "Processor trace is enabled through set BIT44(CPU_FEATURE_PROC_TRACE) in PcdCpuFeaturesSetting.<BR><BR>\n"
+ "This PCD is ignored if CPU processor trace is disabled.<BR><BR>\n"
+ "Default value is 0 which means single range output scheme will be used if CPU processor trace is enabled.<BR>\n"
"0 - Single Range output scheme.<BR>\n"
- "1 - ToPA(Table of physical address) scheme.<BR>\n"
- "2 - Invalid scheme.<BR>\n"
\ No newline at end of file + "1 - ToPA(Table of physical address) scheme.<BR>\n"
\ No newline at end of file |