From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.61]) by mx.groups.io with SMTP id smtpd.web09.11240.1628180768227345595 for ; Thu, 05 Aug 2021 09:26:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=jZgMF/FS; spf=pass (domain: arm.com, ip: 40.107.3.61, 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=jZgMF/FSgJyBB5qBZXoi3GHtl9v/z4DjeJNFGUgJ3Jww55JWDGGqBAe83K1ZuiWgFwvD/cKeNzms8R84kQ0YYzvWr9odLVtXBkv4n4wPUEenz6mz4qX3gldFaBZl/MPzE948RKXToCdQe4jk6sGddSXjTKblJFIy80QsiZq3sFs= Received: from AM6PR02CA0024.eurprd02.prod.outlook.com (2603:10a6:20b:6e::37) by DBAPR08MB5816.eurprd08.prod.outlook.com (2603:10a6:10:1b3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Thu, 5 Aug 2021 16:26:05 +0000 Received: from VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:6e:cafe::19) by AM6PR02CA0024.outlook.office365.com (2603:10a6:20b:6e::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16 via Frontend Transport; Thu, 5 Aug 2021 16:26:05 +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 VE1EUR03FT022.mail.protection.outlook.com (10.152.18.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16 via Frontend Transport; Thu, 5 Aug 2021 16:26:05 +0000 Received: ("Tessian outbound ab45ca2b67bc:v101"); Thu, 05 Aug 2021 16:26:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1712a2f58efaea00 X-CR-MTA-TID: 64aa7808 Received: from e01384fefc61.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id DDB5EBCB-D94D-40F9-8A84-DD2413AC8143.1; Thu, 05 Aug 2021 16:25:59 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e01384fefc61.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 05 Aug 2021 16:25:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bS+6DfSCt/EldWPe16msuiFnEs552Lzc7DghRw3pvbbu7illXduoA8XoZtTLktHqsH4GQw3qNLxAmVjioSpCBMTy2y4uTVVLR3nHU6HwjTsHJZeXIpiaIW8Lq8QrUYLKKgPd9iaJP4bgXPFibeTZ05KoQfBQFeDeL2+AtOUELGPJJvoGvDj2IyIdRmouXZGeYMiyNpcvvk7NpYZsHSqHn9DZqZrvxE+2VvY6UmIlLfcfXSyAj1MA7ipfOaKmJS+OFuP9ZeztV5Q0pCktALhvMwr04W6KdeHCGtLSlY15FJbOLb/yXUm4ENh2hORBvzC+nPAvJ0jTR5Uz7kXDCQDfdA== 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=Ui9vdLDSlY9ejLa99qxXSewoEHBEuoyhN4rDxsp13S/HIkVs8LedbUxnobcBZPFaZmzEXUVybZM/d2QrUUYnpjTuQY3XPnaGkxatTfTpDKMq8eSh/zeTMDzPlB4pOs6AialkQ3hBzbuuwRTw8e46TfwDxiHvxJ4NNpPEz6/Uz6K+wc2B+hC2TifminrvY0h5XkA5UPJSi+z9YkaHTP/CSf2KHk2ALFvCBc7i4JiSLXAg8Nzent2qZIRg9N+MGCBoIP6OCYYaZmaXMEnSOzGTf5n8zePcIFiGuvetFZfrgWVSi947i4ttvB8e17lPCVh2CnLHDTFIe4mQDptYmztx2w== 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=jZgMF/FSgJyBB5qBZXoi3GHtl9v/z4DjeJNFGUgJ3Jww55JWDGGqBAe83K1ZuiWgFwvD/cKeNzms8R84kQ0YYzvWr9odLVtXBkv4n4wPUEenz6mz4qX3gldFaBZl/MPzE948RKXToCdQe4jk6sGddSXjTKblJFIy80QsiZq3sFs= Received: from AM5PR0602CA0005.eurprd06.prod.outlook.com (2603:10a6:203:a3::15) by AM4PR08MB2897.eurprd08.prod.outlook.com (2603:10a6:205:a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.26; Thu, 5 Aug 2021 16:25:57 +0000 Received: from AM5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:a3:cafe::56) by AM5PR0602CA0005.outlook.office365.com (2603:10a6:203:a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17 via Frontend Transport; Thu, 5 Aug 2021 16:25:57 +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 AM5EUR03FT005.mail.protection.outlook.com (10.152.16.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4394.16 via Frontend Transport; Thu, 5 Aug 2021 16:25:55 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Thu, 5 Aug 2021 16:25:32 +0000 Received: from e125153.arm.com (10.57.67.54) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Thu, 5 Aug 2021 16:25:32 +0000 From: "Chris Jones" To: CC: Sami Mujawar , Akanksha Jain , Ben Adderson , Michael Kinney , , , Leif Lindholm , "Matteo Carlini" , Subject: [PATCH v2 11/13] MdePkg: Add Secure Access Components in the SDEV table Date: Thu, 5 Aug 2021 17:25:20 +0100 Message-ID: <20210805162522.13201-12-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210805162522.13201-1-christopher.jones@arm.com> References: <20210805162522.13201-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 554781fa-04e7-4997-cc94-08d9582db916 X-MS-TrafficTypeDiagnostic: AM4PR08MB2897:|DBAPR08MB5816: 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: w+odyY/vfeKDXJQYvuS8OkNxG/GKuGcbLgfszF5ZOUTaMlhkTmSY2nGedzmTOs7DBPRwPJLekHkxZlolvwPKaug+XDrFMhHE0AiC+vI/NxAqiRR4JenE0cx2orOSV76v02XiTLo10lSNQ8RQz2DL4HgRaOqU5j7rHPdJz/Yox7yy53HkxKmIICsKSewDLncRyaxYO+TPJgADbpbYeJhKZMguG6kh3GQGAMp36JhgwYYVZ0QwtyvCDLr+/9nh5+wjFaIRoaURiI2Ql3iUk0Eu6XHj8S4QGj+cfZYnInCSxWVlemJZbQXDFjuza64jQaN0X3Vbi/X0nwiEPjEYe2tvVVlGCDyVfYKR270hPR23+cMyFBMeW5u4ChEiPX7I7q19v1CAhxvBxyeFROLBlCMyBT7EwZgV1zoQzn3uE8Bk27Gc0++0Ta7BFkTA4L66+BEdxkQnV3CUsVO55LBJrSdUjvyfsBBTKdfJt1mEoZNrt7OreCW5toMOnUEz7SFE1tU48lS8AqZ3WTIPTQBhiGVbVajVeynXIFNR/gq6VOV4gnzK+w/fds8zwWph6WBvMtJaTi/kuaVsjxaT+/t6W5QK164mS02bmzgXqStskzdCOMPC/IpGupfYkrLu8cqziIF8erPMVItFG1gO46kN2wXyRoYkuMWIIBQ/t8Rsr3kfWA3hv+NVhLh6eMinmXUjWsCsGy+XInamLbS8uZDh6hufecW0pjDruxROUtbkmUxA81ePQ4fwiSZYb55FYRGxqX6XWB4WNQVakUK9ayHthc89RL0LWFAm3JfhJNjliPqyqsz+qPa5SU83d2A5gsTZiSSX 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)(39860400002)(376002)(136003)(396003)(346002)(36840700001)(46966006)(36756003)(82310400003)(47076005)(2616005)(426003)(6666004)(478600001)(8676002)(1076003)(8936002)(81166007)(5660300002)(7696005)(83380400001)(16799955002)(2906002)(86362001)(6916009)(316002)(26005)(54906003)(336012)(36860700001)(70586007)(186003)(70206006)(356005)(82740400003)(19627235002)(4326008)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2897 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 46936798-cbaa-4318-bd43-08d9582db377 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lxgK483rFfaaZGfegaczC2VFiIOjKaziOI/wnvjjhiUKpQC9IHgWhT7rn+Rcylwf7NhTNPdhbol8XjhsEqO2i6OKXItlQmAXXk9SOpoY3RioxB4oxERauh8O5HwO9JD2W9L6k0vIfQk4YPBas4pFsKgN4lgqkSvZlzcfwBID14jcnouB1YDN+Abfyt7t9ujTs2JqvaVOISwnwnCcyou3rFLdhKcDmRNavgBv7SE5KN50uAjicWrU6y2zq7wULbljkimaulNgESCWtgkfIpLeIAdKh+cmfxAvjKCxyoUpMZGK3Cm1Caxbqctz4WTanwhv5vC9UWT9M5Ta81RVboUAD3EnpydGI2cypsa7QfwVePlR36Xcb4aJMGjPG90wMu4UTcsGU22FPJ8rZvvaQXjsh+3OQJCPpXvxj4EFE74ZFNYOnFePYdyAa3WxUciAKtmXpR/3t5K20+BCuiflrHq34nEIYqYD/FVSYjoFx99RqvfOdRxicseQObrcPLHzHKkaEQCDQGyHEYNFR2xQ7tTlajVnl0yA8i6so5hMxXRyaNJqOd8sgOJFXTbtkCCVAjzIZQ7O1Q9YM8NaUOuxIql+PliWqRqvAI+XhpF4RYZzT7dy6pdWZ/sWJ0aSj7OOfp2sknSCFf9sSUZq1HPSqTg2s8imqJT65VJjuEJB07ZRBPm3n5FfR3n6GMYmwQ2CFBSbpdjeWFoqNkvtC2FUF47EDiIW0sD85JOYK2Stst2t04BfuZ25ZNCXzRmZPMSvf4YxunHUWwLft+tunS4vDAZfVDsm/kfdu4hvbV+OaWTF9I8= 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)(16799955002)(86362001)(36860700001)(1076003)(4326008)(26005)(498600001)(36756003)(5660300002)(6666004)(6916009)(81166007)(8936002)(336012)(7696005)(82310400003)(47076005)(19627235002)(70206006)(8676002)(54906003)(70586007)(2616005)(186003)(426003)(83380400001)(2906002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2021 16:26:05.0508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 554781fa-04e7-4997-cc94-08d9582db916 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: VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5816 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")