From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.84]) by mx.groups.io with SMTP id smtpd.web10.22188.1627640587369827492 for ; Fri, 30 Jul 2021 03:23:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=qtqBUJWJ; spf=pass (domain: arm.com, ip: 40.107.21.84, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sMbOPxqHyuVe/sTqOYrm81J3OdBibPGBgQiQO1IApG8=; b=qtqBUJWJgvfTP3X7F39crG5QVIQ8gfmGyonQqBpN12eGSm2ECQWzzoL9AZSPHp/oBBYnLKhB/yHnFlP+mTiI5mF78PXZ7MJxq7z4u+vGGCuVap8SW7VX9ND9+F29LKO8TqkeFLf3B/hqjfJx23T9S8UUXNulU8hNbDTYesI2B38= Received: from DB6PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:4:67::33) by AM0PR08MB3283.eurprd08.prod.outlook.com (2603:10a6:208:5e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Fri, 30 Jul 2021 10:23:04 +0000 Received: from DB5EUR03FT046.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:67:cafe::72) by DB6PR0501CA0047.outlook.office365.com (2603:10a6:4:67::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:23:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT046.mail.protection.outlook.com (10.152.21.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:23:03 +0000 Received: ("Tessian outbound 072c11bad1a2:v100"); Fri, 30 Jul 2021 10:23:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0d534df2c06e0344 X-CR-MTA-TID: 64aa7808 Received: from 05c6af33a6cc.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9A37AE8E-2B8A-4CB1-9CC8-BF7EC0AE0566.1; Fri, 30 Jul 2021 10:22:57 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 05c6af33a6cc.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 30 Jul 2021 10:22:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dUSwIBKWGT9m/7VT1CxhMkf9qzGxGEHVoKE0ht4DJ06rHsZjKkmwxCk7ouzM31KMzsHfpsjY3DBNo4KV13KYG9GCpiL/flLIyrl2hZB/8LkWistJpKxMkQfV/SASrf8xhSrIcJmVKutQfXo6D3WQsWm23oFOD1nBW1ohb9AIaywdDgL/o9Aen24UGvOCCCl7DjVWZaQ8SvhxigSOf0J/nUsT103BN4Pg+pSCPLGV9CkdGO5vlWFLPJ12U4J5j08mfkm9BXLfIAwv0yJ2unNEb40ZSoZVh/c8LHdbmKWDiY+F7hDX3mCsL9s1jQ05WAlT28LAkJzssTBs4E8lNwQPeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sMbOPxqHyuVe/sTqOYrm81J3OdBibPGBgQiQO1IApG8=; b=Kj8Q1INn9x6RoXJoyLXHkgS1u5PeBpgHHrOOOw9NbxegE7tqM/NtzfHdefjOCBtk0KwdpsYuHoikUuHg1cD232f5RVNvtWeLRpJ5tEXfRR/JEskc4/LR129xQf5t+os7rQg1JTJtwTBJRsQoZmuH6OJcrCPQ4+pif5ZAjOijbZ22cD30uxnoZMJS5sbNzESoAAHr3hCrj1kXtJXGgGhqXJql1wJ+ifgH2java2hteN5rjpzIeDiGjKbqiF/cpDpnjtxXZTVfDavTy8tC9iBrMU0wAbkpOzgZUH8a27zoBEQNNRXDEUcJ7KA2+AU7apI8fyh54N8I7H5yI8eC4nvoWQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sMbOPxqHyuVe/sTqOYrm81J3OdBibPGBgQiQO1IApG8=; b=qtqBUJWJgvfTP3X7F39crG5QVIQ8gfmGyonQqBpN12eGSm2ECQWzzoL9AZSPHp/oBBYnLKhB/yHnFlP+mTiI5mF78PXZ7MJxq7z4u+vGGCuVap8SW7VX9ND9+F29LKO8TqkeFLf3B/hqjfJx23T9S8UUXNulU8hNbDTYesI2B38= Received: from DB8PR03CA0011.eurprd03.prod.outlook.com (2603:10a6:10:be::24) by VI1PR08MB3581.eurprd08.prod.outlook.com (2603:10a6:803:79::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Fri, 30 Jul 2021 10:22:55 +0000 Received: from DB5EUR03FT016.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:be:cafe::8f) by DB8PR03CA0011.outlook.office365.com (2603:10a6:10:be::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:22:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT016.mail.protection.outlook.com (10.152.20.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:22:55 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.14; Fri, 30 Jul 2021 10:22:46 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.14; Fri, 30 Jul 2021 10:22:46 +0000 Received: from e125153.arm.com (10.57.39.90) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Fri, 30 Jul 2021 10:22:45 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH RESEND v1 11/13] MdePkg: Add Secure Access Components in the SDEV table Date: Fri, 30 Jul 2021 11:22:39 +0100 Message-ID: <20210730102241.508-12-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210730102241.508-1-christopher.jones@arm.com> References: <20210730102241.508-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67e16363-308f-4a19-0443-08d9534403fe X-MS-TrafficTypeDiagnostic: VI1PR08MB3581:|AM0PR08MB3283: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:989;OLM:989; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: UtE4OEDY6kazcTr2i7R8ASXNGsz53kVhA/FaDJSFOh0PkFWcpCzO7F6scWPJVK3KH07M3fOKkOm6ylX96eDgGPh+8WDXE93Lfbz/9qr3XqTb1OgudC/4fTOh0/ndcbccpGvLEeJ7+p/99YsDq9Q+Sp/JH8xwrzjjFBQ22J4c5/hSSuHTX+QxFQ/71xJavx5lTXRnGV/7W6xT6Bh/KfwATddnYolnodgWgrJGn4LpOsx3WkqP2s9R4gLSGNVREYSkRAzz5xTOWwtBB50seepDl5ecXOxI2wUmA0xa6kJsPfLhy8V/hYgDdAPhlweWMZ1GUCJ91viAfMBqqWZDUWha7NgyjoHbPPCJGJLMjA72yns8PZIK7X7165f6InSHqYl8na43QQP22P2g5KF8p3ENmXaIOssXtH+EMC44dWMnnP6VYC9EpFe1aMm31wHFYQNxx3S4iYpsXmSrLq/eBj3pj5xylT1fg0H0jM8PwPcNr+2DMNrsrZTVl/mxXtM5DA2q4gY3Gz04/0M00RPMBwjpE17ai1OsEEtHONeu58jGuQHeBXBHpqkoFZ1FX/vRb8xl80KucOmvJ5+eD9HdtMAw0jMUdAdNFwsbgXNUBoi8SbdWromOyUzwAzK/NH4rng4DabFjMYekxT1Dp9yDmckJFWusSniu/WVTsKln34CjWv1BpX6wlcyEHkKc/qJMzBFZ+k5+4Zq3e0/ePCu0T7oQz4wxYDcJCwrKkgXEPwIZZ9UyS9kVWRRxoZn9QIBUIz0UUjk1wzmcTYdmDMbKdN5ulHyOm1ni56F0vhTLwPzWe1ycHJgpqwh0YP+ZN8BsVUc1FVovCeX92KUAgN95byG5bo4IpqdDlEDzAMh/YXlC00w= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(376002)(39850400004)(346002)(136003)(396003)(36840700001)(46966006)(4326008)(82740400003)(47076005)(86362001)(16799955002)(186003)(316002)(8676002)(70206006)(54906003)(6666004)(70586007)(7696005)(36756003)(5660300002)(26005)(356005)(426003)(8936002)(2616005)(82310400003)(19627235002)(36860700001)(1076003)(2906002)(336012)(81166007)(83380400001)(478600001)(6916009)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3581 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 24917908-8ea3-4387-f8fb-08d95343fef6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v75Kj6Fx5c78pP53kKcW3pAPVDVRHkPhTAL1bYMypvW1kl0E400ESTiz+0PEvKlHm4NOb7ZzSeryt80npdiVmzw6UlmgGxELe3nLmkdbu8JGuvN+ksnTUTwfd1Ro9/Drc5LwqF9s+gsDFaY/J3SHA5RHDuj/6elf63vabog1GWNVIR20NkEFJv3+/dKZjVX/+JADy1U0f6vKEzzC4xlKeEh6VyImjKiN3zTMkzJoKv/558Um5dFMfr3cGVossaj6gfNAi4V46XgT0dYgGPIX6Eu/DH9SAC0hSMqnDQJRfvmNFlPS4ste4TFcjXTgGREvr4Ofx+zaPhDp2pOcsw3QrQJNJnuB3RHDoh6woFz0gK6DeH83cnMKiWE+xpfF4UONEI0w8yhVq1qICqCuuQdjyETuIlezWp0Fm1gU1zEXY0oluh0dToLA6ick+Kgfm+8vp1Hh6XetXGdC8khl8hXCqtVhRPVP/tPjOMPsaRvK4Eb5zSUKmBOJjn2AYcYBx7Iujgfv8bgTZJOH5ajA9zzyXFhxFNf8CqIe0GLEuac7FWPnkKAn5K/miulUX6MEkyKHeVm3ABSweog8auJZSifJDAV360ny7j+aUQ98BxrVcW8y0j9sRODRfGcmUSxh/E9MEHDT6k6Dx9HVToqNlwvkRsxLSbAI35UsLOw5rfcXOxpujBATOhY3vtqHopP0DAMDBuNNHlcy+N8g8mBQGFcoG5BV1zqoavPhjFJh3nBLL2nb2YCBChMdyDPks84ZnKD8Tzkfc1U4EE2aTZl8gMQzL/3TWSN95UXCGv5IL2RrWKA81ueGLSrMfy0fZkP+0hBn X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(39850400004)(396003)(136003)(346002)(376002)(46966006)(36840700001)(316002)(86362001)(8676002)(336012)(8936002)(186003)(36756003)(83380400001)(478600001)(36860700001)(2616005)(54906003)(26005)(426003)(1076003)(7696005)(6916009)(19627235002)(81166007)(47076005)(2906002)(82740400003)(5660300002)(4326008)(70586007)(82310400003)(16799955002)(6666004)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2021 10:23:03.9426 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67e16363-308f-4a19-0443-08d9534403fe X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3283 Content-Type: text/plain Bugzilla: 3516 (https://bugzilla.tianocore.org/show_bug.cgi?id=3516) 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 --- 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")