From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.89]) by mx.groups.io with SMTP id smtpd.web11.6994.1621335916826352993 for ; Tue, 18 May 2021 04:05:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=I2VP/4jj; spf=pass (domain: arm.com, ip: 40.107.20.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=hXJC2hgirG7l1bJl2f4qUSq02g36Ec1AJj5oV64Ujjc=; b=I2VP/4jjdXsoQeuFetZPdNm/j4FBHeks3SccIL/eU6NRzVdGQpDptnwj8CBOcaF8XSEslkC25/DZgb1f709u1PA9Im4W06PY/8fwP77quQxqyekG+NnRfW7CVxquIN98YgeE18K9RYOZZxpbGXnlH5vKT9khcE7csDNVtoaMauo= Received: from AM5PR0301CA0009.eurprd03.prod.outlook.com (2603:10a6:206:14::22) by AS8PR08MB6757.eurprd08.prod.outlook.com (2603:10a6:20b:39e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Tue, 18 May 2021 11:05:13 +0000 Received: from VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:14:cafe::87) by AM5PR0301CA0009.outlook.office365.com (2603:10a6:206:14::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Tue, 18 May 2021 11:05:13 +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 VE1EUR03FT009.mail.protection.outlook.com (10.152.18.92) 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, 18 May 2021 11:05:13 +0000 Received: ("Tessian outbound 3050e7a5b95d:v92"); Tue, 18 May 2021 11:05:12 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 423d3d2ed66e4e32 X-CR-MTA-TID: 64aa7808 Received: from 42ea20986161.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2E31F46C-AD51-4314-B578-9325E537DD96.1; Tue, 18 May 2021 11:05:02 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 42ea20986161.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 18 May 2021 11:05:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fH1TgYv9XFoVDa1BTEyzunCYK6gn3E7mUqC7I4WHnFHz/f7t3DWzO79fY+cItQ5ZNw2sdFLZGd4w1JxnMsvrXHV5/mlMUHdgWUk4UW4Uc08mRlnIMrpquzg4xYdXmKjAZkPFpccm6DKhiHFbZQdYPBNOeFgO1fEjsjdzYgTVIwXhaQoCxfieNdhDi3nSKjauYEgMgYQx06Y9fTQMmIzJimhLydj1+izBfQMF4koYUxgLIMI5yTmSS0aK7fJ1Z+ap9VuvcruHVBEipFRdElgXSSpQiNQ8QH8wfmnZ6+bP8lKp3Aea8L+wo56+Sgaqn90NgZvTzf/34MRhD7eU41e1vg== 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=hXJC2hgirG7l1bJl2f4qUSq02g36Ec1AJj5oV64Ujjc=; b=iNSahKRTXuf1E2IUxfjj3rcurcV/SzqYuGsGxtDxIBO9ELmlqqrbS8q8zBiGvYhW0lIwtXapY874axgM16AIzsPfRFNShJgXpP3Iy7nG4ak169ykUqpt5S8tca5k9D3ria9jkaFAH+afoU0VK9gIPQHBkjjp+nIpHeploJehO8pLht/mlfKKYDUbgdIytokzuWnHhKZfOxsFpYy5Z1J+IhrTS+CwEIe+WZ4Q++kqyFyjbIY8mpzzfNDoBfexPidkRgHNUPRCHU73YJlEipHnnHi4ZF1+e3q3ZIkIDLiatIBPPq1CvL79U2/cC31NKMLaJlnKUt2Yc9Zso2KeMNseXA== 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=hXJC2hgirG7l1bJl2f4qUSq02g36Ec1AJj5oV64Ujjc=; b=I2VP/4jjdXsoQeuFetZPdNm/j4FBHeks3SccIL/eU6NRzVdGQpDptnwj8CBOcaF8XSEslkC25/DZgb1f709u1PA9Im4W06PY/8fwP77quQxqyekG+NnRfW7CVxquIN98YgeE18K9RYOZZxpbGXnlH5vKT9khcE7csDNVtoaMauo= 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 AM6PR08MB4022.eurprd08.prod.outlook.com (2603:10a6:20b:b0::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Tue, 18 May 2021 11:04:59 +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.4129.031; Tue, 18 May 2021 11:04:59 +0000 Subject: Re: [PATCH v3 1/5] ArmPkg/IndustryStandard: 32b/64b agnostic FF-A, Mm SVC and Std SMC IDs To: Etienne Carriere , devel@edk2.groups.io Cc: Achin Gupta , Ard Biesheuvel , Jiewen Yao , Leif Lindholm , Sughosh Ganu , nd@arm.com References: <20210517074054.30281-1-etienne.carriere@linaro.org> From: "Sami Mujawar" Message-ID: <1b975ed1-c08a-b1b1-ec9d-5741c1bc10ca@arm.com> Date: Tue, 18 May 2021 12:04:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 In-Reply-To: <20210517074054.30281-1-etienne.carriere@linaro.org> X-Originating-IP: [217.140.106.52] X-ClientProxiedBy: LO4P123CA0039.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:152::8) 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 LO4P123CA0039.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:152::8) 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, 18 May 2021 11:04:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89e2bd96-8e16-48a7-a422-08d919eccf61 X-MS-TrafficTypeDiagnostic: AM6PR08MB4022:|AS8PR08MB6757: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1751;OLM:1751; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: GtEf8Z1dvxbBGZ42fDYlejMVuO2iwlfoVumNDJfn4Ca4Nsgg5enEISblj9lYBgP4oWcPiS/J9npxKmFcd40/z9YkZdSprYKlHOsR966bvpUIeoQsXJX5ksFta/FvVRTz+HZmHtPm5TziVJZgc9FdIgH0H4k+MC5EHX1c0ecW8g0mFDW+ahneQT2lK4pBn4WFKrqlT/4izyiflgkVkU7iiaOtFian5tKJugjS+mqOSm4RwyBRlsGIp+3wa3ZAoOcc2LpxrzeeKdSwTqI4Hv3ZA1CRHFUIB4YqmhURgdoTBedrIhiwPg48C2PfCz38cA/75O/KjdfH99ckDs1dYZIKu+3wZPZvVsVaIy710D/p1Wb5tBJh28qGNh8zBs2ywszD5lO64sNwSBfkVQxmzfk9N3c/oDC6YpsbAQ/umNrx2GIz6SfB28m1jqJTjxSGkuxV/F5ohiyxwLcyjtQA/kkkT9dkVt9H3e7Z3yvKw/scQQkR8tU9x0pse/vhxTIa2+FadC0VWG2X0liK0TWS0kGuScCUPbhLFmN5aX8byYPrL8FjQMnzmy3fvztQo0OLhRZvfWm264KeHqFzxkZPVevBrBRa2gokeXHV37E4MlgvNy1pk7oEAoHfJx57LeR3qJIxil4/9RBz+ckCzPzaa7zy/uQOdPry1Dt8qlgQv+45ZTHNQAMb+opNsFkCPjkKPz7k3qdzGWexTumDhyPRBDy4aw== 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:(4636009)(346002)(136003)(39850400004)(366004)(376002)(396003)(86362001)(956004)(31686004)(478600001)(53546011)(2616005)(4326008)(66946007)(44832011)(66476007)(66556008)(26005)(16526019)(31696002)(186003)(8936002)(5660300002)(83380400001)(8676002)(52116002)(2906002)(6486002)(54906003)(38350700002)(38100700002)(16576012)(316002)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?a3owYlhGUnBBZ2R0aFE3UVZpRmZVWFI1TUI2dG9DRmh0UCtiN3NaNnBZZElh?= =?utf-8?B?aUkycEsxQTZyVVVXWUNrbDFISFBSYjZyYjRqOEh4cVZEaFNmSG8xUldacWow?= =?utf-8?B?NnVFOFdFdG9TY2h2V1g0VGE3Smxhc3A2c01nL2pCZlV0T1hIK3ZXVTRJaG42?= =?utf-8?B?QXBGZnV3WFFwNCtXdWdUVTdTc2JrM2FLMUlqMUdQQ2l0L0RDdHdzMTd3WEdm?= =?utf-8?B?T0NYQ1lQdzlqM3hNd0VvWjIrWmhMR0xtR1ZSbDV3OTlpVk41YzhCOVg4SUdn?= =?utf-8?B?eHF0Yjl5MGpxWEZ0UFNqUGs5VkdnQ0JoWnlUd0NLOHZ5TUpaR2JNZm1rNENq?= =?utf-8?B?NTdiRDlwdGhsemp1Rk9tcUw3Z1MxQkdZV2RvL0o5eWxRU2JLeDNQRDhvYUdD?= =?utf-8?B?WVEzZVo3a2VkSjRyNE40UzJ3NHlFaGIvZ3NUa200a0kxcCtsc3c5TEhZdjd6?= =?utf-8?B?cjN5aGNoMjk0YTgyUjRzR1p4UmcySzlIazFwYmx4ZlZBeXVBNkRCSnFhT0pW?= =?utf-8?B?SFF3aC9KR0lvTi9kdDhmeW9iMVZnQkMzOUcxditXdUU3L0JNaThaNGttZm5z?= =?utf-8?B?dGRvUlE2RU9qM1hIdGp0aHRsVGVBaitGbFl5elVwZTZXdUxNQTZFcGFMNWMy?= =?utf-8?B?UXVJMndlcVhjanZLeGNpMUliV3UyRzNpZ3p3Y3dHbWtPaTdJNlYwYklsZmlG?= =?utf-8?B?WUdYeVR0VWxkYjg2cm9Dcnkxa01KVDNxZUZScWRwRUU5YWE2Q2ZlckFoK3pu?= =?utf-8?B?U0VudmplMHZEL2g2YkNUR1RVcUt4Z2ZJelJ3MU1xVFpDdkRIMkM1Z0FuS2tn?= =?utf-8?B?bS9kZ0NVV3NSeGYrQ3NZVVc0aHAzUmo0Q1NGUWF4SkplTzdCOWlCSUlRTzdF?= =?utf-8?B?eUJTNUI5TU52Um9odVRuZGFDS1c0ZFVCZWpUYkJZNXR3WVY5bHVraVRhVjYv?= =?utf-8?B?R1pNcURNWDhXT0gwbXQxZ2d5dDZwRDIvVFFaVXMrT2lsRzQ3WkhpYUpDMDBz?= =?utf-8?B?dllZWWFZMUY0OHdqbVh5V2t2YWRUeGNaRzFrRjlLUzVjRDRnWnVkSHJMbDhB?= =?utf-8?B?SHR6SE14aVNZbDNlV2ExQjRtMEpsdmVWZWcreFdYKy9FMnBWWTdIMUI2WUdn?= =?utf-8?B?VFZDOUwyT0Y5V1hKRy9mRFpBalZJSExzazRRclR2MlkvblF0aEJIM3JiNWJz?= =?utf-8?B?SkI0Y0RRRUZ3VWVielkxTWVDUXNlR3N2bEhwVEowMU1yV3ZWS3ArZnljMlI3?= =?utf-8?B?NlpaekprVTRIblFHUUdCcmxiV0hSVDhoYkFlWVA4Tzg5VXZ4WER1S3hGU0tY?= =?utf-8?B?cEpuYUk2aUNibjJnMmlJOHFmV2lYWGRrNUhpOTZ1RjB6MmdtSVVyY2paOUJD?= =?utf-8?B?VjFKalQxdDZNMVJkclphbWJ0c1I0QkRwZFRXaE1KTmdTVUl6M2VqN3VjaTNr?= =?utf-8?B?VmxwTjhxN3lXK09vcEJJVXlobzFUME15TDJtNzN2QXNBRE84YUVMc0UxWlls?= =?utf-8?B?RmJ1OXFuWHc2bUdOOXlpeHFFNjBYditRc1pUeUxSY3VmZ01ORDdnSUFyd3JZ?= =?utf-8?B?Uk55cXlMN3BVWGxoN2JWdlBTYi81QlJlcGM5ZlVmNms2eFFRMGh0dkhNclVi?= =?utf-8?B?ZWdVajRVTnY1SHV2MHRYMEJxOGdwZGdYZmhkUjk1b29qRjFuN0ZnL2x4a2JO?= =?utf-8?B?a0pWYWNicDNXZEJXb2hlWnNjbzdQNkZKdDRzdGx5SVE3dHJuVERXaExpSi9P?= =?utf-8?Q?bbKiokPNFotAdL6rhol8/vUBm8VD29kqOIv1wfF?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4022 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: VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: a70fe140-2155-4808-50c2-08d919ecc6ef X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: th9aqQt6qMHPDfUbPOBJSkfWkdTLc+WESwG+iLQfE/kAhYLXsRs3WeZRZ5DlUk4EbpO7HiLLdzs9EiL+gZYWBxDGiNmp0hKDLlvzMb7kt7ACz0zlZUEaBLzEQ/AqQFy7cgwL/u4I9bHYCvGU6MBoYmPDKVPCrUr5IJtE1E3BcEySXdhkQiIQI9g7SIsVEsqh8Z+vH4X+KvN+mudeYi60Mj+qxX5/5GJm6+jQALubn7ieptGhKkR6il8Kik0HESgP8nnOx+FbmY25mbtgOtFVBCWx1dQ6rjX0n8nfhyf9CE5mnzFow6GubVbqsfomwOw9fIcQyM7WUlDinetgC/dNYX3GsZoiUB5AN67X5hZx9bOEzJuqiYhxQKEYc7MqJsTmM+s4KHfMbzbPzM8vUUeECiE7AkbsTMS3DIYQncGa0L7/xIizkHNUyoL3rY3czxtoSglibkWo502BdTPMu3vQyxlYlXceMRf6ybm5UYGaVea1QirZqrIPD/eDe3+L6St342jstKipHPNmIrKl5ZBydWV6X76W7C2MxnIs38UcfzMDfYuxurD7njlk1t0NJu//bmu1rd61PL5Q1uhRzW7G7Pgny7feotMAJf3HHZuCkZxOoDdxUXfv9t6li6//IQTTZHtvtFWJxbyrYlg1nvBID6qVxNkCyuVhtX1L2vYgVOuP8r9XkulHnOgHAhx5cYdx 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)(136003)(346002)(376002)(396003)(39850400004)(36840700001)(46966006)(8936002)(44832011)(16576012)(478600001)(81166007)(316002)(36756003)(54906003)(83380400001)(36860700001)(4326008)(70586007)(86362001)(26005)(8676002)(70206006)(53546011)(5660300002)(2616005)(336012)(186003)(16526019)(82310400003)(2906002)(31686004)(31696002)(356005)(82740400003)(956004)(47076005)(6486002)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2021 11:05:13.0195 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89e2bd96-8e16-48a7-a422-08d919eccf61 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: VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6757 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Hi Etienne, Thank you for this patch. These changes look good to me. Reviewed-by: Sami Mujawar Regards, Sami Mujawar On 17/05/2021 08:40 AM, Etienne Carriere wrote: > Defines ARM_SVC_ID_FFA_* and ARM_SVC_ID_SP_* identifiers for 32bit > function IDs as per SMCCC specification. Defines also generic ARM > SVC identifier macros to wrap 32bit or 64bit identifiers upon target > built architecture. > > Cc: Achin Gupta > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Sughosh Ganu > Signed-off-by: Etienne Carriere > --- > No change since v2 > > Changes since v1: > - Define ARM_SMC_ID_MM_COMMUNICATE 32b/64b agnostic helper ID in > ArmStdSmc.h, as expected by few following commits in this series. > --- > ArmPkg/Include/IndustryStandard/ArmFfaSvc.h | 12 ++++++++++++ > ArmPkg/Include/IndustryStandard/ArmMmSvc.h | 15 +++++++++++++++ > ArmPkg/Include/IndustryStandard/ArmStdSmc.h | 8 ++++++++ > 3 files changed, 35 insertions(+) > > diff --git a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h > index 65b8343ade..ebcb54b28b 100644 > --- a/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h > +++ b/ArmPkg/Include/IndustryStandard/ArmFfaSvc.h > @@ -17,9 +17,21 @@ > #define ARM_FFA_SVC_H_ > > #define ARM_SVC_ID_FFA_VERSION_AARCH32 0x84000063 > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32 0x8400006F > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32 0x84000070 > #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 0xC400006F > #define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64 0xC4000070 > > +/* Generic IDs when using AArch32 or AArch64 execution state */ > +#ifdef MDE_CPU_AARCH64 > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64 > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH64 > +#endif > +#ifdef MDE_CPU_ARM > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH32 > +#define ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP ARM_SVC_ID_FFA_MSG_SEND_DIRECT_RESP_AARCH32 > +#endif > + > #define SPM_MAJOR_VERSION_FFA 1 > #define SPM_MINOR_VERSION_FFA 0 > > diff --git a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h > index 33d60ccf17..deb3bc99d2 100644 > --- a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h > +++ b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h > @@ -15,10 +15,25 @@ > * privileged operations on its behalf. > */ > #define ARM_SVC_ID_SPM_VERSION_AARCH32 0x84000060 > +#define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32 0x84000061 > +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32 0x84000064 > +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32 0x84000065 > #define ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64 0xC4000061 > #define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64 0xC4000064 > #define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64 0xC4000065 > > +/* Generic IDs when using AArch32 or AArch64 execution state */ > +#ifdef MDE_CPU_AARCH64 > +#define ARM_SVC_ID_SP_EVENT_COMPLETE ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH64 > +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64 > +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64 > +#endif > +#ifdef MDE_CPU_ARM > +#define ARM_SVC_ID_SP_EVENT_COMPLETE ARM_SVC_ID_SP_EVENT_COMPLETE_AARCH32 > +#define ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH32 > +#define ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH32 > +#endif > + > #define SET_MEM_ATTR_DATA_PERM_MASK 0x3 > #define SET_MEM_ATTR_DATA_PERM_SHIFT 0 > #define SET_MEM_ATTR_DATA_PERM_NO_ACCESS 0 > diff --git a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h > index 67afb0ea2d..9116a291da 100644 > --- a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h > +++ b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h > @@ -49,6 +49,14 @@ > #define ARM_SMC_ID_MM_COMMUNICATE_AARCH32 0x84000041 > #define ARM_SMC_ID_MM_COMMUNICATE_AARCH64 0xC4000041 > > +/* Generic ID when using AArch32 or AArch64 execution state */ > +#ifdef MDE_CPU_AARCH64 > +#define ARM_SMC_ID_MM_COMMUNICATE ARM_SMC_ID_MM_COMMUNICATE_AARCH64 > +#endif > +#ifdef MDE_CPU_ARM > +#define ARM_SMC_ID_MM_COMMUNICATE ARM_SMC_ID_MM_COMMUNICATE_AARCH32 > +#endif > + > /* MM return error codes */ > #define ARM_SMC_MM_RET_SUCCESS 0 > #define ARM_SMC_MM_RET_NOT_SUPPORTED -1