ShellPkg/DpDynamicCommand: Add ResetEnd support in DP command

DP command should be able to parse the FPDT ACPI table and dump
the ResetEnd which was logged at the beginning of the firmware
image execution. So that DP can calculate SEC phase time duration
start from the beginning of firmware image execution.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: zhenhuay <zhenhua.yang@intel.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c
index 1799ab176a16904e354a773eed8fae66555147fd..512a146da6dd2de9f2abaa082718199aa03ad0ad 100644 (file)
--- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c
+++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.c
@@ -57,6 +57,7 @@ UINT8    *mBootPerformanceTable;
 UINTN    mBootPerformanceTableSize;\r
 BOOLEAN  mPeiPhase = FALSE;\r
 BOOLEAN  mDxePhase = FALSE;\r
+UINT64   mResetEnd = 0;\r
 \r
 PERF_SUMMARY_DATA   SummaryData       = { 0 }; ///< Create the SummaryData structure and init. to ZERO.\r
 MEASUREMENT_RECORD  *mMeasurementList = NULL;\r
@@ -542,6 +543,8 @@ BuildMeasurementList (
 {\r
   EFI_ACPI_5_0_FPDT_PERFORMANCE_RECORD_HEADER  *RecordHeader;\r
   UINT8                                        *PerformanceTablePtr;\r
+  UINT8                                        *BasicBootTablePtr;\r
+  UINT64                                       ResetEnd;\r
   UINT16                                       StartProgressId;\r
   UINTN                                        TableLength;\r
   UINT8                                        *StartRecordEvent;\r
@@ -552,6 +555,17 @@ BuildMeasurementList (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
+  //\r
+  // Update the ResetEnd which was logged at the beginning of firmware image execution\r
+  //\r
+  TableLength       = sizeof (EFI_ACPI_5_0_FPDT_PERFORMANCE_TABLE_HEADER);\r
+  BasicBootTablePtr = (mBootPerformanceTable + TableLength);\r
+  ResetEnd          = ((EFI_ACPI_5_0_FPDT_FIRMWARE_BASIC_BOOT_RECORD *)BasicBootTablePtr)->ResetEnd;\r
+\r
+  if (ResetEnd > 0) {\r
+    mResetEnd = ResetEnd;\r
+  }\r
+\r
   TableLength         = sizeof (BOOT_PERFORMANCE_TABLE);\r
   PerformanceTablePtr = (mBootPerformanceTable + TableLength);\r
 \r

diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.uni b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.uni
index 8d8700573e3be23eb2a06d75cbd1a0e529011749..ef2e7708b865de4d927a59b63f9d808ddc875d2e 100644 (file)
--- a/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.uni
+++ b/ShellPkg/DynamicCommand/DpDynamicCommand/Dp.uni
@@ -41,6 +41,7 @@
 #string STR_DP_TIMER_PROPERTIES        #language en-US  "System Performance Timer counts %s from 0x%Lx to 0x%Lx\n"\r
 #string STR_DP_VERBOSE_THRESHOLD       #language en-US  "Measurements less than %,Ld microseconds are not displayed.\n"\r
 #string STR_DP_SECTION_PHASES          #language en-US  "Major Phases"\r
+#string STR_DP_RESET_END               #language en-US  "  Reset End:               %L8d (us)\n"\r
 #string STR_DP_SEC_PHASE               #language en-US  "  SEC Phase Duration:      %L8d (us)\n"\r
 #string STR_DP_PHASE_BDSTO             #language en-US  "         BDS Timeout:   %L8d (ms) included in BDS Duration\n"\r
 #string STR_DP_PHASE_DURATION          #language en-US  "%5a Phase Duration:   %L8d (ms)\n"\r

diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/DpInternal.h b/ShellPkg/DynamicCommand/DpDynamicCommand/DpInternal.h
index 39878c6085154b4e56b79a1e9a28cc379f05e4af..97f47f2960e6ef5020fb0a57fcd0db85e21d6300 100644 (file)
--- a/ShellPkg/DynamicCommand/DpDynamicCommand/DpInternal.h
+++ b/ShellPkg/DynamicCommand/DpDynamicCommand/DpInternal.h
@@ -28,6 +28,7 @@ extern UINT8               *mBootPerformanceTable;
 extern UINTN               mBootPerformanceTableLength;\r
 extern MEASUREMENT_RECORD  *mMeasurementList;\r
 extern UINTN               mMeasurementNum;\r
+extern UINT64              mResetEnd;\r
 \r
 extern PERF_SUMMARY_DATA  SummaryData;    ///< Create the SummaryData structure and init. to ZERO.\r
 \r

diff --git a/ShellPkg/DynamicCommand/DpDynamicCommand/DpTrace.c b/ShellPkg/DynamicCommand/DpDynamicCommand/DpTrace.c
index 0abb8797ec6006b63e7512b51b27f945264fcc98..9c0a9a06a1c985e918c3992f7d77915f79120dea 100644 (file)
--- a/ShellPkg/DynamicCommand/DpDynamicCommand/DpTrace.c
+++ b/ShellPkg/DynamicCommand/DpDynamicCommand/DpTrace.c
@@ -548,6 +548,15 @@ ProcessPhases (
 \r
   Total = 0;\r
 \r
+  // print Reset End if it's valid\r
+  //\r
+  if (SecTime > mResetEnd) {\r
+    SecTime     = SecTime - mResetEnd;                // Calculate sec time duration start from the beginning of firmware image execution\r
+    ElapsedTime = DurationInMicroSeconds (mResetEnd); // Calculate elapsed time in microseconds\r
+    Total      += DivU64x32 (ElapsedTime, 1000);      // Accumulate time in milliseconds\r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_RESET_END), mDpHiiHandle, ElapsedTime);\r
+  }\r
+\r
   // print SEC phase duration time\r
   //\r
   if (SecTime > 0) {\r