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.64]) by mx.groups.io with SMTP id smtpd.web11.21375.1627633665230251085 for ; Fri, 30 Jul 2021 01:27:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=njIM/04f; spf=pass (domain: arm.com, ip: 40.107.21.64, 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=uPbQMCRH8oreLTC+oOd046K1AdTk9BRlg1jZbXyU1lU=; b=njIM/04fMIGzg36RHRUruwBm6lmsdH1UihBm6kPGjlkPmu6HBqz3cvaTCEqYbAe4C+2b6CG/+Qg1ZVAOOmKX6X1TEaPpM+bBb9mv6oPMf6DJOYmWlxALtcs7nKMJ79GCaWwJt6X92vB7MTNVbbtQMV9siZhbjtTw+szjq7KV6Mk= Received: from AS8PR04CA0205.eurprd04.prod.outlook.com (2603:10a6:20b:2f3::30) by VE1PR08MB5021.eurprd08.prod.outlook.com (2603:10a6:803:108::22) 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 08:27:38 +0000 Received: from AM5EUR03FT054.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f3:cafe::5c) by AS8PR04CA0205.outlook.office365.com (2603:10a6:20b:2f3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.17 via Frontend Transport; Fri, 30 Jul 2021 08:27:38 +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 AM5EUR03FT054.mail.protection.outlook.com (10.152.16.212) 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 08:27:37 +0000 Received: ("Tessian outbound 5f693336bfca:v100"); Fri, 30 Jul 2021 08:27:37 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: acaeec3ffc6baf3f X-CR-MTA-TID: 64aa7808 Received: from 009ef14b2532.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 642D07BF-8697-493A-B05E-B0F1E9D8BBB3.1; Fri, 30 Jul 2021 08:27:30 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 009ef14b2532.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 30 Jul 2021 08:27:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hwVcHGLgoYTlriwmZIaqMe9odMnlZOaCtgA0HY7zBUJndb/9AtpbGQz42ag2CN3w12gFnyixGP0xmuhCkpbEa52znDz1za3yQJjZvffojtGDaK0dXPph+SxCYtkdlLWifxa56th9wNf7t5V1M8Nop/t8P2Qx2FH1FnRPyYV/PW5FJFGk5V29icCkEuw6ex3JNfIDREmKn1Q91AA5YB417wQUI6xwyGyCGB4cVBnKopQKg20nb3IT3+WnokJ8XnP21MEVxDwHEssYBBL2+0OGIBkWKLNh/Pgz1DwI/Ip6w2hte26lPpUwyQwFW20nBi7Aj8fP8X0qaWRFBUMAZ1S8Nw== 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=uPbQMCRH8oreLTC+oOd046K1AdTk9BRlg1jZbXyU1lU=; b=LrzcOz11wuI/ORD7+B253Pw6dVdVFQOBVAAbfO6wJBQUL/RUvt+zcma+zT6qohGjCYS+JZXVOknFlNGEvxaNP/Dwysv3oEAfEOpHZTQR5uF3Njiq1AFJTJbNRkz0eofRud05OCEj9oYw03koOwgPsUHzn/pBSw2sj+N8yxHSd84txui5WVAqVFzJAHrUHpeVFZD3FV5FRiKw7aDvZDR3Z8sT6NkbzmTLsRtYh1YbeqYfbLqj2AJeZOMsfjGqP44G0jf9OyDV9J08FdU1g2CiopULDHWoetNhVQSIdlGktI28klIR2VfV01e4Q859IGGpHHivmpfnDBZHi0oUCe02pA== 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=uPbQMCRH8oreLTC+oOd046K1AdTk9BRlg1jZbXyU1lU=; b=njIM/04fMIGzg36RHRUruwBm6lmsdH1UihBm6kPGjlkPmu6HBqz3cvaTCEqYbAe4C+2b6CG/+Qg1ZVAOOmKX6X1TEaPpM+bBb9mv6oPMf6DJOYmWlxALtcs7nKMJ79GCaWwJt6X92vB7MTNVbbtQMV9siZhbjtTw+szjq7KV6Mk= Received: from AS8PR05CA0010.eurprd05.prod.outlook.com (2603:10a6:20b:311::15) by AM8PR08MB5793.eurprd08.prod.outlook.com (2603:10a6:20b:1d8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Fri, 30 Jul 2021 08:27:29 +0000 Received: from AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:311:cafe::c1) by AS8PR05CA0010.outlook.office365.com (2603:10a6:20b:311::15) 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 08:27:29 +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 AM5EUR03FT014.mail.protection.outlook.com (10.152.16.130) 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 08:27:28 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Fri, 30 Jul 2021 08:26:54 +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 08:26:54 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v1 11/13] MdePkg: Add Secure Access Components in the SDEV table Date: Fri, 30 Jul 2021 09:26:47 +0100 Message-ID: <20210730082649.15343-12-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210730082649.15343-1-christopher.jones@arm.com> References: <20210730082649.15343-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc6f51c1-4ad5-40a0-e59e-08d95333e3c1 X-MS-TrafficTypeDiagnostic: AM8PR08MB5793:|VE1PR08MB5021: 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: BeIiXIU5oknVRoJSdKDoOhcltCV7mWpl/iqtdfb6L3i33a2gQc6WdFdzNiGuk0dbVhtn6sP4+QeRORTWg8fwATnEcTzBGmMAKyn6E5uJnPmaAkiLD2U4QNxIXrbL7PeiPtYFol44pdDpuYshNLwXo1bnUQ+ATVh2WwQ2LGeR2djGjeiItaOHOxJSklxkjCCO0Zlcvs7WAr+DBDl1KqbKBOc4TRFXUw2cmspELKHBetIJsH3BAF5Xn1RqpM1pvlHCLtIW0G8afpj6zhHEVg5+Ny7Xc5HO6v1DMNqH47tqyBqUlD187KNrNulmDMplYawEwRhTS9aGGRAd3vsUer6mAGS6j5gjHSkuotxGYEJL9CAVxYeNKJhUBJrAIPHpCXHQ7K47QGGR3z3f1iETbwwjip6GzCGk0a628C3QsL9FnFH9xsVQ/4aKSHsF40gy+FZ7dn9Xu5+UXx8suQ6DO0ye/hPZE7Yz1BjpL12/7UuhQIPe4R6jOAwUirFiEHFItn48GMgnmb9pr1Y8IN8fNeRnskPqGLq+t6+GplJ/r+Ka9se67+v4he3nW9Wj+ykpDX+dHOFcFRnT2FH636Rwjf3CUJpmK4MeTPiaiYc72nZxtTemz/PBf/vypAicjFJ5HVP1uJHA5msH5CkYIOsA7pC06Twh//LkQIUZuVkBfzM47pTaPIPhYGE1pMSzp6lTrLfDpD0NvG6Kec8PezPdCNpcmyHRDIqUac4Ve4SEhl6A7Z6vPjq6Mdqc8EgSD7N+idKMvmeL+XPpqRys9E0AG4QibiA5vLUNvHBwW561cGed2y/N0yErSzcmHpNYwZpPTaBd 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)(346002)(39850400004)(136003)(396003)(36840700001)(46966006)(26005)(186003)(82740400003)(86362001)(478600001)(2616005)(83380400001)(336012)(1076003)(2906002)(7696005)(426003)(4326008)(6916009)(8936002)(316002)(356005)(5660300002)(70586007)(82310400003)(36756003)(81166007)(8676002)(54906003)(36860700001)(16799955002)(19627235002)(47076005)(6666004)(70206006)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5793 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT054.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 45fde40c-21c4-4a0a-c3ab-08d95333de42 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1sYIbDolk6SE0JcuBT7VzumeQaI1alCtN1xA0AhQCsOgLUKAC3pysbBPQIPX8Gp5J/p2DOAn4E9DY0+38CaRu9ap50EY9fRJTDzI0/GCiz4LVcBVmkyiJhAiwEbVPW7kckdLQJgLZHgCzATIIoyxftkM2ZdFneiYMoSyR6skrpjPd+PzQll8m9msLqji/xL7T2VOq4dh3iY0zjoO6yzY7GJj9vSaIC7Vo31+LyZ0cCNujZc1Fw3oNLPVdWuS0/img0XQYB9krEu9zFgn8hOrlVR95CbfaKa1exVoy0iMM2J+4ywgnkXP+Umcp3nhGII5WVaoSKXPm+HBSFCEYCAQqb7VlB8Fi6xSYlIyUMvcnIdKE0VPRpkBigTGmZIZ5nA/aBVjTpyxye/8gKxD9PUZY1DD0i8NSktuOM4EMR1HKI6rWlrPLrOW0Bv2LCqNI54yXvllLCUDk8L2PUAGdYq1BpolWIuvS8Lx69/z35sGCF7uUvaf1uVBVt2Gir2kPoK4i01G2v5yIK8j9xtuzIMnMkh+PqN/JwjEVZm2NplJu81MV+KhoyEbO0fQ0mDcw4ro+uFVlJ0gjrFIXWOd4/Sc4z/T+Wha0opYD9V/OyUB9+iRlha5DEhOadDKTQWPD+Piudc87uZGqlz9ngVJ73fyY5OLzHm0GzTXbJY268fQjYVUOIsvIJ9ZkUB+ShCkKJHnI06HTgkwn2dUzn9VkYQ2cRF+k4+kFfxJ1SI5/3Y39WsHznOXktpWyMls/5PCUFNtNlv6C7jGLqrUJkHOqP1BOXm8kHBY3SdJkYkmCPqpgUk= 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)(36840700001)(46966006)(316002)(5660300002)(54906003)(70586007)(8676002)(186003)(16799955002)(8936002)(26005)(86362001)(6666004)(81166007)(36860700001)(4326008)(508600001)(83380400001)(2906002)(82310400003)(36756003)(6916009)(19627235002)(47076005)(2616005)(426003)(336012)(1076003)(7696005)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2021 08:27:37.8688 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc6f51c1-4ad5-40a0-e59e-08d95333e3c1 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: AM5EUR03FT054.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5021 Content-Type: text/plain 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")