[PATCH 0/2] Add FPDT Acpi table

[PATCH 0/2] Add FPDT Acpi table

[evan.lloyd]

From: EvanLloyd <evan.lloyd@arm.com>


Paired patches for edk2 and edk2-platforms that add an FPDT
acpi table.
This is useful for monitoring firmware performance, etc.


Alexei Fedorov (1):
  ArmPlatformPkg: Store initial timer value

 ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
 ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
 ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

See https://github.com/EvanLloyd/tianocore/tree/164_FPDT_v1

Alexei Fedorov (1):
  ARM/JunoPkg: Add support for FPDT table.

 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
 Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
 Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

See https://github.com/EvanLloyd/edk2-platforms/tree/164_FPDT_v1

-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

[PATCH 1/2] ArmPlatformPkg: Store initial timer value

[evan.lloyd]

From: Alexei Fedorov <Alexei.Fedorov@arm.com>

This commit adds support for storing initial timer value
logged at the beginning of firmware image execution.
This timer value is required for firmware basic boot performance
data record referenced by Firmware Performance Data Table (FPDT).

Change-Id: Ic93bd3e509053e818187bcc153de493050e794aa
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Alexei Fedorov <Alxei.Fedorov@arm.com>
---
 ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
 ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
 ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index 4ce4a52784726a89fd09228fcd52aa1e6f87c85f..636049d4f44d29092bc9748caa99371d6538c554 100644
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -1,7 +1,7 @@
 #/** @file
 #
 #  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011-2017, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -68,6 +68,7 @@ [Ppis]
 
 [Guids]
   gArmMpCoreInfoGuid
+  gEfiFirmwarePerformanceGuid
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index 85114af7d1a8c37ea941a0714de697dc2bef754d..f37ddec9d13dad75882a186816b5ecb8856c7c86 100644
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -1,7 +1,7 @@
 #/** @file
 #
 #  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
+#  Copyright (c) 2011-2017, ARM Ltd. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -67,6 +67,7 @@ [Ppis]
 
 [Guids]
   gArmMpCoreInfoGuid
+  gEfiFirmwarePerformanceGuid
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c
index e548ccace09730b78851b987d7b902a5bb7a84c5..e5016ea45359f74e7688adb2504784070dde0dce 100644
--- a/ArmPlatformPkg/PrePi/PrePi.c
+++ b/ArmPlatformPkg/PrePi/PrePi.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
+*  Copyright (c) 2011-2017, ARM Limited. All rights reserved.
 *
 *  This program and the accompanying materials
 *  are licensed and made available under the terms and conditions of the BSD License
@@ -24,6 +24,7 @@
 
 #include <Ppi/GuidedSectionExtraction.h>
 #include <Ppi/ArmMpCoreInfo.h>
+#include <Ppi/SecPerformance.h>
 #include <Guid/LzmaDecompress.h>
 
 #include "PrePi.h"
@@ -86,6 +87,7 @@ PrePiMain (
   CHAR8                         Buffer[100];
   UINTN                         CharCount;
   UINTN                         StacksSize;
+  FIRMWARE_SEC_PERFORMANCE      Performance;
 
   // If ensure the FD is either part of the System Memory or totally outside of the System Memory (XIP)
   ASSERT (IS_XIP() ||
@@ -146,6 +148,12 @@ PrePiMain (
     }
   }
 
+  // Store timer value logged at the beginning of firmware image execution
+  Performance.ResetEnd = GetTimeInNanoSecond (StartTimeStamp);
+
+  // Build SEC Performance Data Hob
+  BuildGuidDataHob (&gEfiFirmwarePerformanceGuid, &Performance, sizeof (Performance));
+
   // Set the Boot Mode
   SetBootMode (ArmPlatformGetBootMode ());
 
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

[PATCH 2/2] [edk2-platforms] ARM/JunoPkg: Add support for FPDT table.

[evan.lloyd]

From: Alexei Fedorov <Alexei.Fedorov@arm.com>

This commmit adds support for building FPDT table
with firmware basic boot performance record data.

Change-Id: Ib62b7c829e7891769f88e747343d4fed846e1acb
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Alexei Fedorov <Alxei.Fedorov@arm.com>
---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
 Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
 Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 25cdc60737b5b8e6bbc608115db6436278b8026a..8bcb84869c841e4698f2897713bc5fc2d0af1ce0 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -153,7 +153,7 @@ [LibraryClasses.common]
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
 
-  ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
 
 [LibraryClasses.common.SEC]
   ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
@@ -303,6 +303,11 @@ [PcdsFeatureFlag.common]
 
   gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE
 
+  ## Indicates if S3 performance data will be supported in ACPI FPDT table.
+  #   TRUE  - S3 performance data will be supported in ACPI FPDT table.
+  #   FALSE - S3 performance data will not be supported in ACPI FPDT table.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support|FALSE
+
 [PcdsFixedAtBuild.common]
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"
 !ifdef $(FIRMWARE_VER)
@@ -353,6 +358,8 @@ [PcdsFixedAtBuild.common]
   #  DEBUG_ERROR     0x80000000  // Error
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F
 
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
+
   gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|""
   gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07
   gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index 72eab8b5be22a5516b243b2b5e70f6b919854707..df74627a65764ef3eb5488c7288e55e58959ea57 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -264,6 +264,15 @@ [Components.common]
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
   ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf
 
+  #
+  # Firmware Performance Data Table (FPDT)
+  #
+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
+    <LibraryClasses>
+      LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
+  }
+
   #
   # Semi-hosting filesystem
   #
diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf
index e67c703d0ecd112df0e13f703c3903cfb8dffbdc..527e131de5a452ded1b3cb0951d86903b4495cae 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.fdf
+++ b/Platform/ARM/JunoPkg/ArmJuno.fdf
@@ -89,6 +89,12 @@ [FV.FvMain]
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 
+  #
+  # Firmware Performance Data Table (FPDT)
+  #
+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+  INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
+
   #
   # PI DXE Drivers producing Architectural Protocols (EFI Services)
   #
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

Re: [PATCH 0/2] Add FPDT Acpi table

[Graeme Gregory]

On 22 September 2017 at 17:18,  <evan.lloyd@arm.com> wrote:
> From: EvanLloyd <evan.lloyd@arm.com>
>
>
> Paired patches for edk2 and edk2-platforms that add an FPDT
> acpi table.
> This is useful for monitoring firmware performance, etc.
>
>From ACPI on ARM point of view this looks fine to me.

Reviewed-by: Graeme Gregory <graeme.gregory@linaro.org>

>
> Alexei Fedorov (1):
>   ArmPlatformPkg: Store initial timer value
>
>  ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
>  ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
>  ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
>  3 files changed, 13 insertions(+), 3 deletions(-)
>
> See https://github.com/EvanLloyd/tianocore/tree/164_FPDT_v1
>
> Alexei Fedorov (1):
>   ARM/JunoPkg: Add support for FPDT table.
>
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
>  Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
>  Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
>  3 files changed, 23 insertions(+), 1 deletion(-)
>
> See https://github.com/EvanLloyd/edk2-platforms/tree/164_FPDT_v1
>
> --
> Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [PATCH 0/2] Add FPDT Acpi table

[Leif Lindholm]

On Fri, Sep 22, 2017 at 05:18:05PM +0100, evan.lloyd@arm.com wrote:
> From: EvanLloyd <evan.lloyd@arm.com>
> Paired patches for edk2 and edk2-platforms that add an FPDT
> acpi table.
> This is useful for monitoring firmware performance, etc.

With Graeme's Reviewed-by, I'm happy with thise series.
However, can you confirm your intent was to submit this series
under Tianocore Contribution Agreement 1.1?

I can fold that in when pushing.

Regards,

Leif

> Alexei Fedorov (1):
>   ArmPlatformPkg: Store initial timer value
> 
>  ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
>  ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
>  ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
>  3 files changed, 13 insertions(+), 3 deletions(-)
> 
> See https://github.com/EvanLloyd/tianocore/tree/164_FPDT_v1
> 
> Alexei Fedorov (1):
>   ARM/JunoPkg: Add support for FPDT table.
> 
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
>  Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
>  Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
>  3 files changed, 23 insertions(+), 1 deletion(-)
> 
> See https://github.com/EvanLloyd/edk2-platforms/tree/164_FPDT_v1
> 
> -- 
> Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> 

Re: [PATCH 0/2] Add FPDT Acpi table

[Evan Lloyd]

Hi Leif.
Firstly - sorry I thought we had this sorted.

> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: 09 October 2017 12:22
> To: Evan Lloyd <Evan.Lloyd@arm.com>
> Cc: edk2-devel@lists.01.org
> Subject: Re: [PATCH 0/2] Add FPDT Acpi table
>
> On Fri, Sep 22, 2017 at 05:18:05PM +0100, evan.lloyd@arm.com wrote:
> > From: EvanLloyd <evan.lloyd@arm.com>
> > Paired patches for edk2 and edk2-platforms that add an FPDT acpi
> > table.
> > This is useful for monitoring firmware performance, etc.
>
> With Graeme's Reviewed-by, I'm happy with thise series.
> However, can you confirm your intent was to submit this series under
> Tianocore Contribution Agreement 1.1?

[[Evan Lloyd]] Secondly - yes I did intend to submit under Tianocore Contribution Agreement 1.1.  Frankly, I'm a bit baffled by how this 1.0 got through.

Regards,
Evan
>
> I can fold that in when pushing.
>
> Regards,
>
> Leif
>
> > Alexei Fedorov (1):
> >   ArmPlatformPkg: Store initial timer value
> >
> >  ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
> > ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
> >  ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
> >  3 files changed, 13 insertions(+), 3 deletions(-)
> >
> > See https://github.com/EvanLloyd/tianocore/tree/164_FPDT_v1
> >
> > Alexei Fedorov (1):
> >   ARM/JunoPkg: Add support for FPDT table.
> >
> >  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
> >  Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
> >  Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
> >  3 files changed, 23 insertions(+), 1 deletion(-)
> >
> > See https://github.com/EvanLloyd/edk2-platforms/tree/164_FPDT_v1
> >
> > --
> > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> >
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Re: [PATCH 0/2] Add FPDT Acpi table

[Leif Lindholm]

Thanks.

Pushed as a63be426f8 (edk2) and 5d6506e4e9 (edk2-platforms).

(I also deleted a stray "Change-id" tag from each commit message.)

Regards,

Leif

On Tue, Oct 10, 2017 at 04:11:15PM +0000, Evan Lloyd wrote:
> Hi Leif.
> Firstly - sorry I thought we had this sorted.
> 
> > -----Original Message-----
> > From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> > Sent: 09 October 2017 12:22
> > To: Evan Lloyd <Evan.Lloyd@arm.com>
> > Cc: edk2-devel@lists.01.org
> > Subject: Re: [PATCH 0/2] Add FPDT Acpi table
> >
> > On Fri, Sep 22, 2017 at 05:18:05PM +0100, evan.lloyd@arm.com wrote:
> > > From: EvanLloyd <evan.lloyd@arm.com>
> > > Paired patches for edk2 and edk2-platforms that add an FPDT acpi
> > > table.
> > > This is useful for monitoring firmware performance, etc.
> >
> > With Graeme's Reviewed-by, I'm happy with thise series.
> > However, can you confirm your intent was to submit this series under
> > Tianocore Contribution Agreement 1.1?
> 
> [[Evan Lloyd]] Secondly - yes I did intend to submit under Tianocore Contribution Agreement 1.1.  Frankly, I'm a bit baffled by how this 1.0 got through.
> 
> Regards,
> Evan
> >
> > I can fold that in when pushing.
> >
> > Regards,
> >
> > Leif
> >
> > > Alexei Fedorov (1):
> > >   ArmPlatformPkg: Store initial timer value
> > >
> > >  ArmPlatformPkg/PrePi/PeiMPCore.inf  |  3 ++-
> > > ArmPlatformPkg/PrePi/PeiUniCore.inf |  3 ++-
> > >  ArmPlatformPkg/PrePi/PrePi.c        | 10 +++++++++-
> > >  3 files changed, 13 insertions(+), 3 deletions(-)
> > >
> > > See https://github.com/EvanLloyd/tianocore/tree/164_FPDT_v1
> > >
> > > Alexei Fedorov (1):
> > >   ARM/JunoPkg: Add support for FPDT table.
> > >
> > >  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 9 ++++++++-
> > >  Platform/ARM/JunoPkg/ArmJuno.dsc             | 9 +++++++++
> > >  Platform/ARM/JunoPkg/ArmJuno.fdf             | 6 ++++++
> > >  3 files changed, 23 insertions(+), 1 deletion(-)
> > >
> > > See https://github.com/EvanLloyd/edk2-platforms/tree/164_FPDT_v1
> > >
> > > --
> > > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> > >
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.