public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Chris Jones" <christopher.jones@arm.com>
To: <devel@edk2.groups.io>
Cc: <Sami.Mujawar@arm.com>, <Akanksha.Jain2@arm.com>,
	<Ben.Adderson@arm.com>, <michael.d.kinney@intel.com>,
	<gaoliming@byosoft.com.cn>, <zhiguang.liu@intel.com>,
	<Matteo.Carlini@arm.com>, <nd@arm.com>
Subject: [PATCH v1 11/13] MdePkg: Add Secure Access Components in the SDEV table
Date: Fri, 30 Jul 2021 09:26:47 +0100	[thread overview]
Message-ID: <20210730082649.15343-12-christopher.jones@arm.com> (raw)
In-Reply-To: <20210730082649.15343-1-christopher.jones@arm.com>

Make changes to ACPI 6.4 header according to the latest specification:
- ACPI 6.4 January 2021, Section 5.2.26.1.1
- Mantis ID 2111 (https://mantis.uefi.org/mantis/view.php?id=2111)

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 MdePkg/Include/IndustryStandard/Acpi64.h | 84 ++++++++++++++------
 1 file changed, 58 insertions(+), 26 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h
index cd093003805799541696516e809d0c800137510e..4faed17a9e99525f9e09f0eac884264ba31ca47d 100644
--- a/MdePkg/Include/IndustryStandard/Acpi64.h
+++ b/MdePkg/Include/IndustryStandard/Acpi64.h
@@ -1661,15 +1661,16 @@ typedef struct {
 #define EFI_ACPI_6_4_SECURE_DEVICES_TABLE_REVISION      0x01
 
 ///
-/// Secure Devcice types
+/// Secure Device types
 ///
-#define EFI_ACPI_6_4_SDEV_TYPE_PCIE_ENDPOINT_DEVICE     0x01
 #define EFI_ACPI_6_4_SDEV_TYPE_ACPI_NAMESPACE_DEVICE    0x00
+#define EFI_ACPI_6_4_SDEV_TYPE_PCIE_ENDPOINT_DEVICE     0x01
 
 ///
-/// Secure Devcice flags
+/// Secure Device flags
 ///
-#define EFI_ACPI_6_4_SDEV_FLAG_ALLOW_HANDOFF            BIT0
+#define EFI_ACPI_6_4_SDEV_FLAG_ALLOW_HANDOFF                      BIT0
+#define EFI_ACPI_6_4_SDEV_FLAG_SECURE_ACCESS_COMPONENTS_PRESENT   BIT1
 
 ///
 /// SDEV Structure Header
@@ -1680,34 +1681,65 @@ typedef struct {
   UINT16                        Length;
 } EFI_ACPI_6_4_SDEV_STRUCTURE_HEADER;
 
-///
-/// PCIe Endpoint Device based Secure Device Structure
-///
-typedef struct {
-  UINT8                         Type;
-  UINT8                         Flags;
-  UINT16                        Length;
-  UINT16                        PciSegmentNumber;
-  UINT16                        StartBusNumber;
-  UINT16                        PciPathOffset;
-  UINT16                        PciPathLength;
-  UINT16                        VendorSpecificDataOffset;
-  UINT16                        VendorSpecificDataLength;
-} EFI_ACPI_6_4_SDEV_STRUCTURE_PCIE_ENDPOINT_DEVICE;
-
 ///
 /// ACPI_NAMESPACE_DEVICE based Secure Device Structure
 ///
 typedef struct {
-  UINT8                         Type;
-  UINT8                         Flags;
-  UINT16                        Length;
-  UINT16                        DeviceIdentifierOffset;
-  UINT16                        DeviceIdentifierLength;
-  UINT16                        VendorSpecificDataOffset;
-  UINT16                        VendorSpecificDataLength;
+  EFI_ACPI_6_4_SDEV_STRUCTURE_HEADER  Header;
+  UINT16                              DeviceIdentifierOffset;
+  UINT16                              DeviceIdentifierLength;
+  UINT16                              VendorSpecificDataOffset;
+  UINT16                              VendorSpecificDataLength;
+  UINT16                              SecureAccessComponentsOffset;
+  UINT16                              SecureAccessComponentsLength;
 } EFI_ACPI_6_4_SDEV_STRUCTURE_ACPI_NAMESPACE_DEVICE;
 
+///
+/// Secure Access Component Types
+///
+#define EFI_ACPI_6_4_SDEV_SECURE_ACCESS_COMPONENT_TYPE_IDENTIFICATION   0x00
+#define EFI_ACPI_6_4_SDEV_SECURE_ACCESS_COMPONENT_TYPE_MEMORY           0x01
+
+///
+/// Identification Based Secure Access Component
+///
+typedef struct {
+  EFI_ACPI_6_4_SDEV_STRUCTURE_HEADER  Header;
+  UINT16                              HardwareIdentifierOffset;
+  UINT16                              HardwareIdentifierLength;
+  UINT16                              SubsystemIdentifierOffset;
+  UINT16                              SubsystemIdentifierLength;
+  UINT16                              HardwareRevision;
+  UINT8                               HardwareRevisionPresent;
+  UINT8                               ClassCodePresent;
+  UINT8                               PciCompatibleBaseClass;
+  UINT8                               PciCompatibleSubClass;
+  UINT8                               PciCompatibleProgrammingInterface;
+} EFI_ACPI_6_4_SDEV_SECURE_ACCESS_COMPONENT_IDENTIFICATION_STRUCTURE;
+
+///
+/// Memory-based Secure Access Component
+///
+typedef struct {
+  EFI_ACPI_6_4_SDEV_STRUCTURE_HEADER  Header;
+  UINT32                              Reserved;
+  UINT64                              MemoryAddressBase;
+  UINT64                              MemoryLength;
+} EFI_ACPI_6_4_SDEV_SECURE_ACCESS_COMPONENT_MEMORY_STRUCTURE;
+
+///
+/// PCIe Endpoint Device based Secure Device Structure
+///
+typedef struct {
+  EFI_ACPI_6_4_SDEV_STRUCTURE_HEADER  Header;
+  UINT16                              PciSegmentNumber;
+  UINT16                              StartBusNumber;
+  UINT16                              PciPathOffset;
+  UINT16                              PciPathLength;
+  UINT16                              VendorSpecificDataOffset;
+  UINT16                              VendorSpecificDataLength;
+} EFI_ACPI_6_4_SDEV_STRUCTURE_PCIE_ENDPOINT_DEVICE;
+
 ///
 /// Boot Error Record Table (BERT)
 ///
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")


  parent reply	other threads:[~2021-07-30  8:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30  8:26 [PATCH v1 00/13] Add ACPI 6.4 header file Chris Jones
2021-07-30  8:26 ` [PATCH v1 01/13] MdePkg: " Chris Jones
2021-07-30  8:26 ` [PATCH v1 02/13] MdePkg: Increment FADT version Chris Jones
2021-07-30  8:26 ` [PATCH v1 03/13] MdePkg: Rename SBSA Generic Watchdog to Arm Generic Watchdog Chris Jones
2021-07-30  8:26 ` [PATCH v1 04/13] MdePkg: Update PMTT to ACPI 6.4 Chris Jones
2021-07-30  8:26 ` [PATCH v1 05/13] MdePkg: Add SPA Location Cookie field to SPA Range structure Chris Jones
2021-07-30  8:26 ` [PATCH v1 06/13] MdePkg: Remove DPPT table Chris Jones
2021-07-30  8:26 ` [PATCH v1 07/13] MdePkg: Add flags and MinTransferSize to Generic Initiator Chris Jones
2021-07-30  8:26 ` [PATCH v1 08/13] MdePkg: Add 'Type 5' PCC structure Chris Jones
2021-07-30  8:26 ` [PATCH v1 09/13] MdePkg: Add Multiprocessor Wakeup structure Chris Jones
2021-07-30  8:26 ` [PATCH v1 10/13] MdePkg: Add the Platform Health Assessment Table (PHAT) Chris Jones
2021-07-30  8:26 ` Chris Jones [this message]
2021-07-30  8:26 ` [PATCH v1 12/13] MdePkg: Add Cache ID to PPTT Chris Jones
2021-07-30  8:26 ` [PATCH v1 13/13] MdePkg: Fix broken coding style in Acpi64.h Chris Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210730082649.15343-12-christopher.jones@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox