From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.89]) by mx.groups.io with SMTP id smtpd.web11.1292.1620758766597440474 for ; Tue, 11 May 2021 11:46:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=YSpQmji0; spf=pass (domain: arm.com, ip: 40.107.8.89, mailfrom: sami.mujawar@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=WGUAQgk6O6Xy/VZMMwNyrQe8KMeSpNfknBqA9lygX5I=; b=YSpQmji0mHeXKriPBH1egU4YDS9A93or7jZ09tTtu79E55rd1bkslDRaPo5pNf5qj87W1U1Co5mLvzz9HxOTM58s5i4iolVjR98veAT4F7lUOwDxhR08ImajcgWZY0+rL8lPReOtEOz6XLMUee9lfMrj+3fumGyBd3sAqI9U5hg= Received: from DB9PR01CA0020.eurprd01.prod.exchangelabs.com (2603:10a6:10:1d8::25) by VE1PR08MB4941.eurprd08.prod.outlook.com (2603:10a6:803:112::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Tue, 11 May 2021 18:46:03 +0000 Received: from DB5EUR03FT034.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1d8:cafe::5d) by DB9PR01CA0020.outlook.office365.com (2603:10a6:10:1d8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 18:46: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 DB5EUR03FT034.mail.protection.outlook.com (10.152.20.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Tue, 11 May 2021 18:46:03 +0000 Received: ("Tessian outbound 9a5bb9d11315:v91"); Tue, 11 May 2021 18:46:02 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8d4f5e8fc6fc55cf X-CR-MTA-TID: 64aa7808 Received: from b88e28ff6f75.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 46A782D5-891C-4FEF-8017-F9CC6FF53C04.1; Tue, 11 May 2021 18:45:56 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b88e28ff6f75.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 11 May 2021 18:45:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AKn5f85plNsKfjCqEtP/AVz8XZ41JN6cSjHB4Wvfu/cyK4BkyE/RGnP1NZWQPF5Jpy5vvshJNH3nYpy4zF61YND9T/+L0TtaQ2UPzOpi/r5yeTG5PFHcddRWF9/IoLdkoce0/7UbpzO8eBl50BC/5QPblSYYu6Jv6oaTlq/lsf1Kl59gNkzIPrW36nQPK8egieB7zaYaJmADUC6+ycwgMxi42hoQxAb6btf8s/XobnBdOLlIbY/+fs3DpNLGgZUU/SkVbadIKHur6Zm0XgAl2HrwOCDsasjHGhMYyZzWqUSk4+3Q3PwBIywcl48/yM/HpsBHDpeuMk8xyeQzmNwH9w== 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=WGUAQgk6O6Xy/VZMMwNyrQe8KMeSpNfknBqA9lygX5I=; b=JQ5JlymEfhonSIVaRq3IZ33QZr7RmLPXe7qTgxqq9WvZ9pWIxA0o+9RvrTOxnbhOnsRktBoj97nQ/Y8F00vJLgG60u86JV5dgFLiEEmdWxDZ8gB9Bkrt8AFwHyApZ+6yIvQWfECiaTKCuMUr/K0vjAeM6OelrNW/bRVI8BJFApi494Hqe21DxtRsOGcyi59hLQa79IfEYSedEibXsCnbYJ/URN6p3Fhyqaicjc8ae5SDo0OpYMK+j+V9fUWv965yw1AeaD85jh4HULJkDDfj306xbVE7It5jWvZMRqEyIvo6c+ChQxaPrj0hrijaIF/yt6QjiOFGMF52YNF2+0NyjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; 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=WGUAQgk6O6Xy/VZMMwNyrQe8KMeSpNfknBqA9lygX5I=; b=YSpQmji0mHeXKriPBH1egU4YDS9A93or7jZ09tTtu79E55rd1bkslDRaPo5pNf5qj87W1U1Co5mLvzz9HxOTM58s5i4iolVjR98veAT4F7lUOwDxhR08ImajcgWZY0+rL8lPReOtEOz6XLMUee9lfMrj+3fumGyBd3sAqI9U5hg= Authentication-Results-Original: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) by AS8PR08MB6855.eurprd08.prod.outlook.com (2603:10a6:20b:398::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Tue, 11 May 2021 18:45:55 +0000 Received: from AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::80cb:878d:c8f1:2688]) by AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::80cb:878d:c8f1:2688%7]) with mapi id 15.20.4108.031; Tue, 11 May 2021 18:45:55 +0000 Subject: Re: [PATCH 2/5] ArmPkg: prepare 32bit ARM build of StandaloneMmPkg To: Etienne Carriere , devel@edk2.groups.io Cc: Achin Gupta , Ard Biesheuvel , Jiewen Yao , Leif Lindholm , Sughosh Ganu , nd@arm.com References: <20210504152048.8739-1-etienne.carriere@linaro.org> <20210504152048.8739-3-etienne.carriere@linaro.org> From: "Sami Mujawar" Message-ID: <9204b9c8-bb5a-c71c-1e48-9718e6e71d6b@arm.com> Date: Tue, 11 May 2021 19:45:52 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 In-Reply-To: <20210504152048.8739-3-etienne.carriere@linaro.org> X-Originating-IP: [217.140.106.52] X-ClientProxiedBy: LO4P123CA0211.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a5::18) To AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.1.196.43] (217.140.106.52) by LO4P123CA0211.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Tue, 11 May 2021 18:45:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6578ae2-3312-4d40-76a6-08d914ad0713 X-MS-TrafficTypeDiagnostic: AS8PR08MB6855:|VE1PR08MB4941: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: JmkytOEx8iSGThBIame1/gZp4ToTORXx3cpx4WE5kHCHQObPhpfVvNW+NdQkYR0DTlsEtNUo0gfFyPBAxY1Y6mNSUecljYXjvrIitjXMJTBdfoMxlT3jEyRgtFuGpgl+12Cwjs6TvPwQrQTHts23Xo3azwpWbRfh5/RRJH3uoD/6nKYB/yno8Lh9B1UFcd90nXo4pYQ2buXG0rX4KbuZ2DIB01Xc6OrUpNASBZmIktRUKLgHmKLCfs52v6QkHZvtqn6/JF4pCcdNCdWT3ad5sOcNxziTsh/pXhdZeAevcMNIbQv00y9rwgPGGNTBoBFy9BXdghzGuDxFwZQRSss07BpUKpY2pX/Bn1UAWqfstmsusEVhX/x962ihywfc2KukoWlMewgWWpYmhcFrFe4zoYAxzShpOekgfOp7l1jPVfeqfk7E7/S1TT8jNKVqc6YFkUbhJ7wA2xFf2dcQ6rH+sRLdd0hNWd0XzVOvG1taNeiHCz8kDa58SZKcaOcvNYRa9dsnVEuDamhwyLcNnHNP2GL8Xza6TFw3iG5oXDxzaizsCQvCY4wrl8IzBPbCw/dZlFEJea85nvxK/kCT1twudtzRM1n+9hX649YfMp9qq32U7/vBr4oUdDZ9shJ9FbApjPvbzvunaJ/8PtBRhBvMZYRu5esMxJ3epqF3MikHZHDjfZs8pdKudQ1e29sxJtAO/80ikUFmnfGpXiAlfTR1DShew4dSaC4jS30m1CNkv4M= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6806.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(4636009)(346002)(136003)(396003)(39840400004)(376002)(366004)(66946007)(31696002)(8936002)(5660300002)(66476007)(186003)(2906002)(53546011)(52116002)(66556008)(16526019)(19627235002)(4326008)(44832011)(54906003)(478600001)(956004)(31686004)(26005)(8676002)(86362001)(6486002)(36756003)(38350700002)(316002)(38100700002)(2616005)(83380400001)(16576012)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?WXJRNUhaSStZVEpJMzFQbjFYZ21KaGQ4a1FZOGx2bjRuRlVtekZRYXVuTkV3?= =?utf-8?B?dmhhUVd3cXdIcllwYWpTR0JOdzBBczNUckJVUWdBUE15ZENLS2Z5U0l2QWtX?= =?utf-8?B?blNaczRTb2FUOGdYWXFTNVNPRmlyS2EwWUhuN2psUG9KZlNyVXV1OXlLQlQ2?= =?utf-8?B?WXFZdk92a245aG5qaFBMdkd6NkwwUEFkc2FhRW9HczA2Q25YVW5RUkJJR001?= =?utf-8?B?U3k4NFBKQ2JQVkxxcmFOeHoyTzl3NGxzY0FDZDYxWEk0YlpGclpSSDd3OFhY?= =?utf-8?B?NWswQWNYcnl3UEZSeWx2SHhqREc0bS9mUEd6aEEzd3paWEJQa29hK3NRNkVB?= =?utf-8?B?a3d2UEUva01xTVAzZ3FSZjNyWTZBbEF5cG9JSTcyOVZGZlhWbEcyTWhsamNP?= =?utf-8?B?eXd0OTQrNkRjUUYrMS9sOVFmc25zeDZncUFpeW15NDhRUWR2UVQ3ZSs2SE9w?= =?utf-8?B?eTN1YmRCZkpyb2k1ZEhMVmJzZUZ0T1dFdXFpa2kwN3NJLzZrZHFUcGVRU3VG?= =?utf-8?B?VmhLWmY4emh2UXBPUTZ2TFNzSFEvTEs4L0kzYm5adWpvbUcvNnhiYzZhSW1T?= =?utf-8?B?WGhpWlJQZWtIOWNNdFU1NzZSa21vYnBodllqK0RMNnVYQ3lsWHNYOEZLYnY4?= =?utf-8?B?TENNYnE2aTlrSUVkQkFJdUsrSjNFaXlzZFk3OXdLaDBTbjBIZG9OdXpwekdn?= =?utf-8?B?cHZSak9IMVFDcExiTlR3VVYrWFZ1dnk0czJXdHRkamRWU1dkd1ZFUlMzY0dI?= =?utf-8?B?M2pCV0d4SmphdThsZmRzeWg4Smxzcjd0SkMxL21JM2hGcmFPdkZHSTRWQlVF?= =?utf-8?B?cXUyMXNMalQ5SlJpeXdIWVhkb1hDSWd2UlRkUU5FV2Y3Ly9sYmN3S2ZoUXdk?= =?utf-8?B?SE9GV1IxSnpzUHhnZ1VUZ3R4MVJmQ1FHb0RvanA0UWNTVmZvWEV2aklJMG1m?= =?utf-8?B?VG1iOEtUNUJKMHVHK0hpZDl2QmtSa2JaMndKSVV4akVPUWs2d0MxMHdJMXNi?= =?utf-8?B?R0UxcmFlVzVzeVpsVExOTk9lL2dxNHZzcWUrWGVDSXZscGVtY0EwMFVuSXFK?= =?utf-8?B?Y1FVQWZVY3RoVFk0ZGFNWS8wYjNUUHdXaEM3QkVyV215RmQxT1A3YXZuL25N?= =?utf-8?B?MnlWNlh0UGc0VTFhS092VGZyb093K3ZqeWxZZFVBSnd6NDhCVHcwS3A2VUhq?= =?utf-8?B?Vk5TZ0ppUXg3cnVQL1pJQmFyOHhqTkoySEVTMVVMTkJNMFY4bDJwUUdLaHR4?= =?utf-8?B?T2F2WnllamhJUjlPNjVrRzZqRDNGVHlOSmo0SkRza0hBeFdpRWhkNDg5czRj?= =?utf-8?B?ZGp2L25GbmNGaGZCS3RCL28rajl3Z1VkSXdvQ0hDem1uZzJpS3FDS0pMb2pP?= =?utf-8?B?TW1FaThmOFZlREd3T2xTbjczUFNkenl2RnRkTDQ5UkRmaysxUUtSYnczbkND?= =?utf-8?B?bEdTTmFsay9rREtYZkFINW8yUk8rQ1dIV0Q4QkVMZ2dmY0Y2ZFFucE9lcnkv?= =?utf-8?B?UkN5WUVaN2cyekhVcVFKMEhvWVZlNnBKVERNSU9YbWJ1MTZUc2l5Wm5RWi9Y?= =?utf-8?B?VVRac3NvUzUwSXZDMmN2bHdsTEdhT0l3L3V4UTNrc08xTVdFOGNiZS95WDNp?= =?utf-8?B?c1lLR1ZkMHNYNEF4NWxRdE03NjBKU3AwSnl0UEduUlVpRG9pU2xjSGphd29C?= =?utf-8?B?aEI1TzlWOVNqWTZtSkYySlJJVXV6MWFNSjRwc2xyeTR6TlEzc0FJK2Jtdklz?= =?utf-8?Q?AEzSFt57+aoaSw8OaIsrwZDe/eJwR+VA2m7GjoO?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6855 Original-Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com; Return-Path: Sami.Mujawar@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 23596295-372d-4939-bdd4-08d914ad01ee X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qOtJT9Pc8VW6KewJpnw1+uW7GhEK2qInnGtTrESs4y7+IQrWB0xCsLHPEJ209n93oSimyou7/YoZOwTZxD6RVquzoWau2AhRETAbA7k7+QsuVlgAOR7YD3DzZ7LfL2NjKj+5Xjbr0T/LWE7ldsxx2R42EHAhRpHuJHn2iSmqg4N+RG36YZVfetPDAaxC+mjgIZC89T8t59RHiOYk5us65uMak5jo/X13eRhJ2udYcPtkETRbThCXmIYXCJmw/oLCLk0dZOzhYxjgNcs4Jwa18ARRoX/eJidOPnZSZv6M0iRHu4+O1Wp9CDGczVba5VJ8Cuq3/4mjNU/cg2F3XbpqK80nOPqgUmaV5G82bzXUUTXLhXaKsGf8oeeJMzDDx5LCIZdyqs5G72IUg2WYeiKE1Puu2pixHjnd+/lSyN/ZERr1fBVYjZrw79DrLc8PCUgPfmW87HGk6LGbNSN39cb7aUf1SUcM25JSiEhNkccuI6JkxVEYzYPsahHACMvFSbksby4b5WMVcpJaUJXwHy123/fqT3rgN0OG1yhfiFiRyoD0GaIki4xtdgKblPY6A3tiIdADUJV6OalxKuPxqbGmMwtk4bPnyRxWHcmZZZtCGoNmuUOX+lQ0/yMeS/LN6jDEGUa6ICLczhOVpFDqoUDw3BX7mOKBtHEjwHFopYPjyQWMWo3d3DcfRCB1idE3WEdf 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:(6029001)(4636009)(376002)(396003)(136003)(39860400002)(346002)(46966006)(36840700001)(26005)(5660300002)(86362001)(36756003)(81166007)(36860700001)(356005)(44832011)(2616005)(53546011)(478600001)(82740400003)(956004)(336012)(6486002)(70586007)(70206006)(16526019)(83380400001)(54906003)(31696002)(47076005)(82310400003)(16576012)(316002)(2906002)(8676002)(31686004)(19627235002)(186003)(4326008)(8936002)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2021 18:46:03.0169 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6578ae2-3312-4d40-76a6-08d914ad0713 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: DB5EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4941 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Hi Etienne, Thank you for this patch. Reviewed-by: Sami Mujawar Regards, Sami Mujawar On 04/05/2021 04:20 PM, Etienne Carriere wrote: > Changes in ArmPkg to prepare building StandaloneMm firmware for > 32bit Arm architectures. > > Adds MmCommunicationDxe driver and ArmMmuPeiLib and > ArmmmuStandaloneMmLib libraries to the list of the standard > components build for ArmPkg on when ARM architectures. > > Changes path of source file AArch64/ArmMmuStandaloneMmLib.c > and compile it for both 32bit and 64bit architectures. > > Cc: Achin Gupta > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Sughosh Ganu > Signed-off-by: Etienne Carriere > --- > ArmPkg/ArmPkg.dec | 2 +- > ArmPkg/ArmPkg.dsc | 2 +- > ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c | 2 +- > ArmPkg/Library/StandaloneMmMmuLib/{AArch64 => }/ArmMmuStandaloneMmLib.c | 15 ++++++++------- > ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf | 6 +++--- > 5 files changed, 14 insertions(+), 13 deletions(-) > > diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec > index 214b2f5892..6ed51edd03 100644 > --- a/ArmPkg/ArmPkg.dec > +++ b/ArmPkg/ArmPkg.dec > @@ -137,7 +137,7 @@ > # hardware coherency (i.e., no virtualization or cache coherent DMA) > gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride|FALSE|BOOLEAN|0x00000043 > > -[PcdsFeatureFlag.AARCH64] > +[PcdsFeatureFlag.AARCH64, PcdsFeatureFlag.ARM] > ## Used to select method for requesting services from S-EL1.

> # TRUE - Selects FF-A calls for communication between S-EL0 and SPMC.
> # FALSE - Selects SVC calls for communication between S-EL0 and SPMC.
> diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc > index 926986cf7f..4c79dadf9e 100644 > --- a/ArmPkg/ArmPkg.dsc > +++ b/ArmPkg/ArmPkg.dsc > @@ -158,7 +158,7 @@ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf > ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf > > -[Components.AARCH64] > +[Components.AARCH64, Components.ARM] > ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf > ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf > ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > diff --git a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c > index b1e3095809..4ae38a9f22 100644 > --- a/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c > +++ b/ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.c > @@ -125,7 +125,7 @@ MmCommunication2Communicate ( > } > > // SMC Function ID > - CommunicateSmcArgs.Arg0 = ARM_SMC_ID_MM_COMMUNICATE_AARCH64; > + CommunicateSmcArgs.Arg0 = ARM_SMC_ID_MM_COMMUNICATE; > > // Cookie > CommunicateSmcArgs.Arg1 = 0; > diff --git a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c > similarity index 92% > rename from ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c > rename to ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c > index dd014beec8..20f873e680 100644 > --- a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c > +++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c > @@ -2,6 +2,7 @@ > File managing the MMU for ARMv8 architecture in S-EL0 > > Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
> + Copyright (c) 2021, Linaro Limited > SPDX-License-Identifier: BSD-2-Clause-Patent > > @par Reference(s): > @@ -62,7 +63,7 @@ SendMemoryPermissionRequest ( > // for other Direct Request calls which are not atomic > // We therefore check only for Direct Response by the > // callee. > - if (SvcArgs->Arg0 == ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64) { > + if (SvcArgs->Arg0 == ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP) { > // A Direct Response means FF-A success > // Now check the payload for errors > // The callee sends back the return value > @@ -164,13 +165,13 @@ GetMemoryPermissions ( > ZeroMem (&SvcArgs, sizeof (ARM_SVC_ARGS)); > if (FeaturePcdGet (PcdFfaEnable)) { > // See [2], Section 10.2 FFA_MSG_SEND_DIRECT_REQ. > - SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64; > + SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ; > SvcArgs.Arg1 = ARM_FFA_DESTINATION_ENDPOINT_ID; > SvcArgs.Arg2 = 0; > - SvcArgs.Arg3 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64; > + SvcArgs.Arg3 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES; > SvcArgs.Arg4 = BaseAddress; > } else { > - SvcArgs.Arg0 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64; > + SvcArgs.Arg0 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES; > SvcArgs.Arg1 = BaseAddress; > SvcArgs.Arg2 = 0; > SvcArgs.Arg3 = 0; > @@ -219,15 +220,15 @@ RequestMemoryPermissionChange ( > ZeroMem (&SvcArgs, sizeof (ARM_SVC_ARGS)); > if (FeaturePcdGet (PcdFfaEnable)) { > // See [2], Section 10.2 FFA_MSG_SEND_DIRECT_REQ. > - SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64; > + SvcArgs.Arg0 = ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ; > SvcArgs.Arg1 = ARM_FFA_DESTINATION_ENDPOINT_ID; > SvcArgs.Arg2 = 0; > - SvcArgs.Arg3 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64; > + SvcArgs.Arg3 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES; > SvcArgs.Arg4 = BaseAddress; > SvcArgs.Arg5 = EFI_SIZE_TO_PAGES (Length); > SvcArgs.Arg6 = Permissions; > } else { > - SvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64; > + SvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES; > SvcArgs.Arg1 = BaseAddress; > SvcArgs.Arg2 = EFI_SIZE_TO_PAGES (Length); > SvcArgs.Arg3 = Permissions; > diff --git a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > index 6c71fe0023..ff20e58980 100644 > --- a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > +++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > @@ -16,14 +16,14 @@ > LIBRARY_CLASS = StandaloneMmMmuLib > PI_SPECIFICATION_VERSION = 0x00010032 > > -[Sources.AARCH64] > - AArch64/ArmMmuStandaloneMmLib.c > +[Sources] > + ArmMmuStandaloneMmLib.c > > [Packages] > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > > -[FeaturePcd.AARCH64] > +[FeaturePcd.ARM, FeaturePcd.AARCH64] > gArmTokenSpaceGuid.PcdFfaEnable > > [LibraryClasses]