From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5D7F29414A6 for ; Fri, 19 Jan 2024 09:33:33 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=FwYgvlZFd/dHLJH8Qy1UvoVd7iTiUHDjJdBHi5dx3wM=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:NoDisclaimer:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1705656812; v=1; b=pltEuwLYMup1IOtv4+x6cjNysE3LWBv4WZRut1Zw/6M3itZt3oXnvFiPIKQXX+hp8gHMRuNo EvjTYpu+WZR12VWfDcQwEXRbiqfSNHJVerWezfjjT0HnOMxKGpJb1+JYpXAz+7qI1IZYDLzLGDa ZnJT1C9d342hUPHXV1DvkwlE= X-Received: by 127.0.0.2 with SMTP id vcuRYY7687511x2k6IqsMlxa; Fri, 19 Jan 2024 01:33:32 -0800 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.89]) by mx.groups.io with SMTP id smtpd.web10.18427.1705656811110428515 for ; Fri, 19 Jan 2024 01:33:31 -0800 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=AuEpBJTpFTR1mkBECyRRXU02s915RHL6IYmyH0MBe/Olh3FB/HxFYvdz8k4pzjU0wcFGw+tkwyUd27obH32A4399lIwVx2HjRS0LM0ZIaEc3GcJpDdlnOiCfCeyqOXa2owh48rlkLh4XVqt5mr+4EsWkLW6qtuZk1LV1Zg7V33kbyBG2RqzRWWnAOqZfGSUmgLxRV0Enq/8nhO/zbgNwywyyJoFytH68wHdRBQiMRj/fe/FNyz9yx1q5xal29mbiuoHYqLXY/pKmV3Am25KeJBluaI4ePUDOLUDJJxDgoqbgdgCQAWmUyOlyaQT9Vju/Sn9tLusVpqBdJeIvJwOehQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r+/YD+3SOnfEvJywQIMj1OFwXjWqLUj4z8mZc8iKOe8=; b=WsTqD5Wm0tdT0rnHX8ovfaHaM/quPWF4t/gbGqK8/J3k4/Z4dE5BggM1ieX1/dtG858gbge0552oCuRTHM4wIooHjT6OuQnecFmPIG4HdL3akNKq6mimz1Wa8brYAhBt1u2pBtru0Yny1CEifr8gzM0PKthNFIgBNYBIKkNl0RQAcbrgc1aBrw24jmd6bCtWuEHOc5mUdc4ajWI5xT6d21OiSIS4bFOmNtMPb381u5e0XLrhfcGdOW7QpbVKR/Y23G5oIZaueE1Dxiiy701XDRqIAjQk+7uD7gJzcuz/o5bLzpCr/CY0qc9SVK/uJJP+b+YEMBQXHfPOpTSZM9dY1A== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) X-Received: from DU2PR04CA0251.eurprd04.prod.outlook.com (2603:10a6:10:28e::16) by DU0PR08MB8469.eurprd08.prod.outlook.com (2603:10a6:10:407::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 09:33:26 +0000 X-Received: from DB5PEPF00014B9B.eurprd02.prod.outlook.com (2603:10a6:10:28e:cafe::4e) by DU2PR04CA0251.outlook.office365.com (2603:10a6:10:28e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24 via Frontend Transport; Fri, 19 Jan 2024 09:33:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5PEPF00014B9B.mail.protection.outlook.com (10.167.8.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Fri, 19 Jan 2024 09:33:26 +0000 X-Received: ("Tessian outbound 94d82ba85b1d:v228"); Fri, 19 Jan 2024 09:33:26 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ecfb74cd12a9a267 X-CR-MTA-TID: 64aa7808 X-Received: from a3ca384e9b56.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 03B44A89-0BD9-48E1-AC46-A137C2CA35AD.1; Fri, 19 Jan 2024 09:33:19 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a3ca384e9b56.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 19 Jan 2024 09:33:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CcmcJioIJpGauxbq3AS7yXUvstbc0Bzwy0hRCbAlkM4XaeJlEnuXwlREINo3mEnx7SX8RwuvALJ27ZlrjvePraLIivLRxowTBzRRW+DUaqjD2tppJmnywIhd05vqwi1w/3AUhLzqJoTlVdJKcjSCxoBDU33sG9nFwbjOqHwtJN3iMz9YfeB/9j5lWeJWOHSykf6r1+RODQ2wqJIAlJ3FCalcQoosCITTeT2qEvOOiMCPsXJBeredm+KqrPbWlHtubtHszzPYDeKUsNLMz7Zcwh7NgOgdXeT4mcUOWuCRKzvejreYFu983Cg5PPM/rQm0CouvHdGJUoQ9HYcs138zjw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r+/YD+3SOnfEvJywQIMj1OFwXjWqLUj4z8mZc8iKOe8=; b=JfeIO0tk2tnKCsoxqgwzQQiMHDr4pXy69KU2H7JKO0KxDT8142LyKS5dXT6tZr6/BzHhQFzP5E5FxzFW+HAO4acDUMc8OneMNBgTD1uT9V6tCbCoDTw8oCopMx9Ce2EcQraGG+Z3bTBv+jmrB9Qjm3HtN8lMeWFbwrebozgjGcmSV2d4UwnZi3dA/1cbh1mfKLGUPty7u9BfaEJx2kr/segs2/y7cc7Axuydwt1SSN3VBTrmxRY9OGRetpg9s40EMKAVuW4mJCfiuIxCsBWPJUlq1ptymJUiB8wbXpKYqTy4X0PjvcwAvDIs9tC9TsyOn5w9bVtBIA1FDgtQsm289Q== 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 (0) X-Received: from DB6PR0301CA0080.eurprd03.prod.outlook.com (2603:10a6:6:30::27) by DBBPR08MB6172.eurprd08.prod.outlook.com (2603:10a6:10:1f4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.23; Fri, 19 Jan 2024 09:33:17 +0000 X-Received: from DU6PEPF0000A7E1.eurprd02.prod.outlook.com (2603:10a6:6:30:cafe::53) by DB6PR0301CA0080.outlook.office365.com (2603:10a6:6:30::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24 via Frontend Transport; Fri, 19 Jan 2024 09:33:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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; pr=C X-Received: from nebula.arm.com (40.67.248.234) by DU6PEPF0000A7E1.mail.protection.outlook.com (10.167.8.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7202.16 via Frontend Transport; Fri, 19 Jan 2024 09:33:17 +0000 X-Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) 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.2507.32; Fri, 19 Jan 2024 09:33:09 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Fri, 19 Jan 2024 09:33:08 +0000 X-Received: from e129823.cambridge.arm.com (10.1.197.6) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.32 via Frontend Transport; Fri, 19 Jan 2024 09:33:08 +0000 From: "levi.yun" To: , , CC: , levi.yun Subject: [edk2-devel] [PATCH RESEND edk2-platforms v1 2/3] Platform/Arm: Enable UEFI Secure Variable support for FVP Date: Fri, 19 Jan 2024 09:33:04 +0000 Message-ID: <20240119093305.2258464-3-yeoreum.yun@arm.com> In-Reply-To: <20240119093305.2258464-1-yeoreum.yun@arm.com> References: <20240119093305.2258464-1-yeoreum.yun@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DU6PEPF0000A7E1:EE_|DBBPR08MB6172:EE_|DB5PEPF00014B9B:EE_|DU0PR08MB8469:EE_ X-MS-Office365-Filtering-Correlation-Id: e3a2ec42-d4b8-40b8-3c57-08dc18d1b02d x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: jRGR1n06YUvPGeLYiacjgzqHly0tbf4taFWYFP2+cV6rDDqlc2Abh1M99lsy+ejWmMlhknwKJ1QolUYBQmvrICb9NBSxJdqkpHw5pNUO41Q2R/jCdJEgxt06UmxiEdBooGAfJiXfisEaG5Ss1mt8uPfbd9WJ9V6EFFqTV2VKE4K9t/b2TJ8mG2k8iDFW1pgmUurivHqxxptoC22MehrJbVWMT4eA7Zznzq1AmV0sHMZtnuwL8gFrV8K93ozgex21Du1dbzhNEgos92cYa9K8qo4cB9ZteJ9Rk0oHeja/eks1jW1/8Paaa9MdFoz7IsdOboeAPogrmr35XC8Xynj1XmEZP21uemBndr3QKXrr/JqHR0IamTBD2KlpGu12Yz7RA0O/UCcMDoHyOFhWgqnXyn7yyX+DbcPG0qqX1uSF8ycpP0zg9L9gbVVMZmYjpk3BEdN2VXM+zONeXb3MWi9q/XXsjA4nCvIq4oyn23PTSNWuHwsBprFwVkd56pCvzuONVC6izXeG0vpiAr5HgkNZBH8SC8TgeeJ7f5SERogfhYq0D395lchTkYXOJNB69gajCja0JbIpfRoTZORz6IWtrjuy5gpVfEfP3XGcZKH5SAHxZ30mQM1FSfRoKw5a2CY4l9zY5XIiCAw+041C1KjZoV8vPRTrF6Z3sZZCCXCqMMHDhpZ1bxuYTkFXMtmDc8JuQlTNYEp1x1jWHY6DErD/G2KX1jEQ/DHy9IgChqqlyR3cmvhanFuFxKBZWZz8gkRq80He+pe8k4HfwWGAHB1Vxg== 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:(13230031)(4636009)(39860400002)(376002)(346002)(396003)(136003)(230922051799003)(1800799012)(64100799003)(186009)(82310400011)(451199024)(40470700004)(36840700001)(46966006)(40460700003)(40480700001)(336012)(1076003)(26005)(7696005)(6666004)(83380400001)(426003)(86362001)(36756003)(356005)(81166007)(2616005)(47076005)(4326008)(41300700001)(5660300002)(36860700001)(82740400003)(110136005)(2906002)(70206006)(54906003)(70586007)(8676002)(8936002)(316002)(478600001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6172 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5PEPF00014B9B.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: b14f0e82-453f-4caa-605c-08dc18d1aac0 X-Microsoft-Antispam-Message-Info: G4CxnhxSStXBkIaNOBdNr4LJaBIRI1hq2/pwiuaI6V1skII3rSG10VHXv+ledWCv4L/RODMT2aDg0i19C0lputq3EOaItF7MuQxdp39ZNDdGjhD1ZG9b8LJynMenuKUNCIImlHxEUcTZQLYVWxi6xdyPErG8tCStbElCsUxYKi7h85k2JwRYLnY5vK10e/wAgRUfKj4fPrd+SOtGsQyyZFQw0ktay9KO0uqKAWkN7hphRtIeWjEvwpKJeLJJ0HrLNmJDkEdzofJ8llmkhU1sJRlbQnNy273oA1r0mCKJPr10x8GDx0b4E5kl/YylXV2zE+ac3MInjwXZT8E5sTP/+0/RnrQGqcNO5OpDEuoPiHjP8yRVzCwM/dzICXxqXjl/lxOJ6eq5mf8MBcWbRqyhmkNouDRiQyXr6gLR2ZJwxlZkjuHjwv1M1FDPxXz7fv9VpdN+vFq+zGbQMuHoJqb1Y0zIp571XNcaRG6JWio4ATfJnFgxhfpWcbTivTQqrWzHNcdW2loXT7dPY6TZVKIM2nZ1uvTYy64bbHvyEQORpUYH+tZDd4I2DgZvdkixHlk8bIHtiU36U6t2eI9P+jyLVPmSflhE1rNMUB05oKhpsusdIdoli8TPQ1mj8Mwr6Lc0Tg40kT4Gevo2WWRhAEydQpmE/uCqmhkeFI4EA3P9OtlIKwajp/LDloJtz7ZhAihu66MQ/ipk4lObcr/s29LYYAAFkRLrKHZnxncaQdB1q3FqPNRUC5s6rmygVKH+W7q+ X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 09:33:26.2753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3a2ec42-d4b8-40b8-3c57-08dc18d1b02d 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: DB5PEPF00014B9B.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8469 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yeoreum.yun@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: BgZqXotIlER6xfZnWk5cDmAcx7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=pltEuwLY; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io UEFI Secure variable support can be enabled using Standalone MM for FVP RevC model. The following steps enable UEFI variable service using StandaloneMm: 1. Add MmComminucationDxe. - Enables communication with StandaloneMm. The PcdMmBufferBase & PcdBufferSize definitions are used as the NS Shared Buffer for communication. 2. Use VariableSmmRuntimeDxe - Use Standalone MM instance of Variable Runtime Dxe. 3. Disable caching of variable data as this is cached on the normal world side. This is done to prevent arbitrary accesses. Therefore, set PcdEnableVariableRuntimeCache to FALSE. 4. Although MmUnblockMemoryLib is required for supporting variable caching (which we disabled), we need a NULL instance of the MmUnblockMemoryLib for the build to succeed. Also, the Arm implementation does not support modification of the StandaloneMm memory map from normal world, so we have no real need for MmUnblockMemoryLib. Signed-off-by: levi.yun --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 49 ++++++++++++++++= +++- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 9 ++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index f70a4d52ba06f570e017ab5286f06d87193753e5..e7c011cc8abe874ad24f7b6a0c8= b8d0ab0d933f7 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -25,6 +25,15 @@ [Defines] SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/ARM/VExpressPkg/ArmVExpress-= FVP-AArch64.fdf + # To allow the use of ueif secure variable feature, set this to TRUE. + DEFINE ENABLE_UEFI_SECURE_VARIABLE =3D FALSE + +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + DEFINE ENABLE_STMM =3D TRUE +!else + DEFINE ENABLE_STMM =3D FALSE +!endif + !ifndef ARM_FVP_RUN_NORFLASH DEFINE EDK2_SKIP_PEICORE=3D1 !endif @@ -53,6 +62,10 @@ [LibraryClasses.common] FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !endif +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf +!endif + DtPlatformDtbLoaderLib|Platform/ARM/VExpressPkg/Library/ArmVExpressDtPla= tformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] @@ -71,7 +84,9 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common= .UEFI_APPLICATION, Libr [BuildOptions] GCC:*_*_AARCH64_PLATFORM_FLAGS =3D=3D -I$(WORKSPACE)/Platform/ARM/VExpre= ssPkg/Include/Platform/RTSM - +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + GCC:*_*_*_CC_FLAGS =3D -DENABLE_UEFI_SECURE_VARIABLE +!endif ##########################################################################= ###### # @@ -85,6 +100,11 @@ [PcdsFeatureFlag.common] # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + ## Disable Runtime Variable Cache. + gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE +!endif + [PcdsFixedAtBuild.common] # Only one core enters UEFI, and PSCI is implemented in EL3 by ATF gArmPlatformTokenSpaceGuid.PcdCoreCount|1 @@ -92,12 +112,26 @@ [PcdsFixedAtBuild.common] # # NV Storage PCDs. Use base of 0x0C000000 for NOR1 # +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0FFC0000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x00010000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0FFD000= 0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0001000= 0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0FFE0000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00010000 +!endif + + # + # Set the base address and size of the buffer used + # by MM_COMMUNICATE for communication between the + # Normal world edk2 and the StandaloneMm image at S-EL0. + # This buffer is allocated in TF-A. + # +!if $(ENABLE_STMM) =3D=3D TRUE + ## MM Communicate + gArmTokenSpaceGuid.PcdMmBufferBase|0xFF600000 + gArmTokenSpaceGuid.PcdMmBufferSize|0x10000 +!endif gArmTokenSpaceGuid.PcdVFPEnabled|1 @@ -252,6 +286,10 @@ [Components.common] MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf + +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf +!else MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedL= ib.inf @@ -259,6 +297,8 @@ [Components.common] BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf } MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf +!endif + MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf @@ -368,3 +408,10 @@ [Components.common] # SATA Controller # MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + +!if $(ENABLE_STMM) =3D=3D TRUE + ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf { + + NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependen= cy.inf + } +!endif diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index e836691ddf6f9fd7e9abff97a560af6886b14ccb..612535caa7ee518a0bb083461f2= 573e182c78281 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -80,8 +80,14 @@ [FV.FvMain] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConf= igDxe.inf !endif + +!if $(ENABLE_UEFI_SECURE_VARIABLE) =3D=3D TRUE + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf +!else INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.i= nf +!endif + INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRu= ntimeDxe.inf INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.i= nf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf @@ -168,6 +174,9 @@ [FV.FvMain] INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf +!if $(ENABLE_STMM) =3D=3D TRUE + INF ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf +!endif # # PCI Support -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease 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. -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114034): https://edk2.groups.io/g/devel/message/114034 Mute This Topic: https://groups.io/mt/103827100/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-