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.49]) by mx.groups.io with SMTP id smtpd.web08.1254.1620758619607518348 for ; Tue, 11 May 2021 11:43:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=gCATkjmn; spf=pass (domain: arm.com, ip: 40.107.21.49, 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=8DBRpkA6S/uQqwE1OcIyGRqCANkjQNpnVHlrEc+ir7o=; b=gCATkjmn1l6dx0aDuTVdN+6PX3r5ed8b9wvEICmlN8I3UTnjPJ5cw/wKp9lHMxPtTbsVDs8kz46MFf/RZDCiPjJ8XYdx3wogDfTTK4P5smLuJzTOMUZdYsNWg4x4oB5CAkceYyh+FEZVKo/qKpqROV20fMrpiC+DjMiMtCm3HpE= Received: from AM5PR0601CA0078.eurprd06.prod.outlook.com (2603:10a6:206::43) by VE1PR08MB4685.eurprd08.prod.outlook.com (2603:10a6:802:ae::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Tue, 11 May 2021 18:43:35 +0000 Received: from VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:0:cafe::c7) by AM5PR0601CA0078.outlook.office365.com (2603:10a6:206::43) 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:43:35 +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 VE1EUR03FT017.mail.protection.outlook.com (10.152.18.90) 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:43:35 +0000 Received: ("Tessian outbound 6c4b4bc1cefb:v91"); Tue, 11 May 2021 18:43:34 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 9fa5602b6c960eca X-CR-MTA-TID: 64aa7808 Received: from 9491c2d6714c.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 967837D5-DDA5-4319-9026-32A80D708C50.1; Tue, 11 May 2021 18:43:23 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9491c2d6714c.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 11 May 2021 18:43:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PTaFhx4Yiv383ZHF+SjVF9vMEpNlYtbUlhyz53FvZ6MLwv1Z9xEefWNvyWMCf0P/phjFQCHt3M69iZyOTkKFNe7VySTU8a3tZ+UeITYNNFGIiis9VNbzocPXoCuzdOPJgnnmOIuO8VHA0jNfj2dh9377gPPqEpVPIWMyDGkw8Y8ZWb7p3fU1+EXnbbSH5jMEDafi95IpO5SaNGRdzbYZlu+UzWlxLT+yioO0qAcpM/2wuRhijXP+vm/TmK+eaCb8G+BJV6e7ZvbtTxY5KocNY9bpLiLmBoIrHvlpzMRdDOf7BmNwN+pFtC4s26rFj/REBLO74xJEPdB8cKT5MpGa5w== 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=8DBRpkA6S/uQqwE1OcIyGRqCANkjQNpnVHlrEc+ir7o=; b=fIgcfrTNl4Mr4I5Ipzc3R1IfXGRwrLVTiKvIsB9a9ZpApoQeBrgBRRYo9ze5WatmhtqiO+vc0H/9NFBEX0YIaCvmjEgcVCX3Gf9zZituqdoAk81LFlzuzlKD3BvINILpo6yXSI5r3WHQ3dngG5BOP2afnhN6465vbLYclkb7EbanGgvOueqspanFhppJ6c81jzqgvyHImhs2Zm8fteIaleCagMhPkJwr4hU4LmdGZk/un9nnPFlfZVjWaQ5f1EmAy8PYZkUYbFNnqYgueSyzThLPqqEvJ9OQ++1EBXVi9Z653k1Aq5jaSfpo/tE8iFlG9HHUqbAqGcE/7Fh91tqayA== 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=8DBRpkA6S/uQqwE1OcIyGRqCANkjQNpnVHlrEc+ir7o=; b=gCATkjmn1l6dx0aDuTVdN+6PX3r5ed8b9wvEICmlN8I3UTnjPJ5cw/wKp9lHMxPtTbsVDs8kz46MFf/RZDCiPjJ8XYdx3wogDfTTK4P5smLuJzTOMUZdYsNWg4x4oB5CAkceYyh+FEZVKo/qKpqROV20fMrpiC+DjMiMtCm3HpE= Authentication-Results-Original: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) by AS8PR08MB5911.eurprd08.prod.outlook.com (2603:10a6:20b:292::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Tue, 11 May 2021 18:43:13 +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:43:12 +0000 Subject: Re: [PATCH 1/5] ArmPkg/IndustryStandard: 32b/64b agnostic FF-A and Mm SVC IDs To: Etienne Carriere , devel@edk2.groups.io Cc: Achin Gupta , Ard Biesheuvel , Jiewen Yao , Leif Lindholm , Sughosh Ganu , nd@arm.com, Ard Biesheuvel References: <20210504152048.8739-1-etienne.carriere@linaro.org> <20210504152048.8739-2-etienne.carriere@linaro.org> From: "Sami Mujawar" Message-ID: Date: Tue, 11 May 2021 19:43:09 +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-2-etienne.carriere@linaro.org> X-Originating-IP: [217.140.106.52] X-ClientProxiedBy: LO2P265CA0320.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::20) 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 LO2P265CA0320.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::20) 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:43:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c36456be-fadf-4384-3096-08d914acaf15 X-MS-TrafficTypeDiagnostic: AS8PR08MB5911:|VE1PR08MB4685: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:923;OLM:923; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: fQAK8U597nB9FsWgr/eKNmWOdvQ0KvDd7DOP1hK1s/PR0W2yGfjcKNqbe23+u1NpuUAStwsgsFu5HczRoYKevJCx6r52DX4DmpnRAv0EccGLLQThWBoQgtvU7MImqxJDsSUJeiIr6L5zEhT30R9TsxnjQfkhdow0eI6IhCD8Oti/HQawz4Tx129eTjbVV0biDBnGB4rPgOKh1uycSH/IWQDBvCuUnQd2wuFBV9tJ7GeQtUWn6Zlf5LJV3BTlr4bmjl6C9BnqEOAX6NrIBFObfHe2cRf/Z6fD/zw9tHfKbsq8fFGhLBdEp2l0AMLBwRzdagxnS4IhJrI40aGXcVeDT0z4izv/c72hNQs8tH5d11qStRRLbX3kVxMgCih1m+irrfn10t49LkoREruADPuMEcEsPubRDMAUfYG6fxLgzyQMGwpqSBtCUa6kJ5LRARh2Gfh+klQ5jsxlgjsgUyh8F/UTLHdQWGv9NQzP8GkX8+AMj5dNabt0njaAuJYUlqitiM5XoEmznNsZvniWjKRMqVozYQUrsb5D/VmVoFG0D4U2KjSTILAQr9U7DBopMTe0kRuq+JFYvkLXBi/S2GGINvatPYqmOeVzvzgvMDzICob4sZkbtv7BKdCs3VHvdzPcEKjf/N1/9sQYygUigHouzQnm1C5qRESiT1JMKLeRmR0+4lqVq7iAfXqf9+iMGZTOfwdaHu5TWQ2so8b8/VzDYE+qFRKxa/JKUjvn2E7BZaQ= 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)(366004)(376002)(39860400002)(136003)(346002)(396003)(31696002)(44832011)(316002)(26005)(956004)(86362001)(8936002)(16576012)(53546011)(2616005)(83380400001)(52116002)(186003)(66556008)(66946007)(2906002)(16526019)(6486002)(8676002)(5660300002)(36756003)(4326008)(31686004)(54906003)(38100700002)(66476007)(478600001)(38350700002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?UWltY2tjZnZUcHM1WE81TG5Od2UyUG1hYlRwczlPMzFrTzFhSkhLcTEyekc0?= =?utf-8?B?enZsSEpFNFVxTGw4RzE4OFBSTmVNaW5CUzBYUisyeFQzSWo3RGZMTzUxT3pv?= =?utf-8?B?YVR5clVOQUxERWNUbHIyWkNrVWtkVkRNQi8yb0RCeEFpTzV6WDlTRDY0V0k1?= =?utf-8?B?enFZWTk0a1RqczRjMnU3RTF2ZmFxaVdIaENTL2YzbDJIR3dTc25YWEJ5b2xD?= =?utf-8?B?QUxqbEdwU3JoMmxMZjc3b3VNczdhQU9KY0htMXpmQk1zV0tCS3dXa241YzJn?= =?utf-8?B?anRJVzUrUFovZnpRejNZTEtQQ0RqZ1NpUDZKKytuRTB2WUJWdFc2S3hnRmN6?= =?utf-8?B?ODBITWhHc0FUdjFLU3ZYTVhiTzhMRytYOXFGcVN0bVJUaUVjbys0YW1JUDZG?= =?utf-8?B?MmlPaGx3c2lrREk0VEdYNUNjei9ZZkhmNllrcXlualY4c3hFaExjVVNXQnE1?= =?utf-8?B?d2Q0QnNxbkhmZnVCMEFLaUV5V1k0RWVJRlI2Nm96RGpQYlp0RWFsSnQvR05L?= =?utf-8?B?QWUyOU5VUytMUi9JU3RUUzR5ak5lc1o3WTU2cStMUnBjOXg2TmhpbVh4WVVP?= =?utf-8?B?dE1ObXh2RmZ3OXRYYzRQRFgvRi9RNExsR0xTMGorNGU3NkFSamVsZVlHUStx?= =?utf-8?B?N3R0WnlXcXAzMXF3bU5JaGFwNXUwN0ZoejNCUjE2S3pKSGdpZXFmdnB3Rm5N?= =?utf-8?B?cElOZlJYSDVtQ3VHMnV1ZEF0UTBQZHVhOGNDTC9jNFpDOTJsYWZnUG0zN05s?= =?utf-8?B?Q2h0UzdDYmh1aDlQcWliTVJBUXd0bDIyMnQ4emd3a09zSGVHWjJmVTFLUTlV?= =?utf-8?B?YjFpeFlsWmNJMGlHUWV1Y0pITXg2aHh4eTBKcDhjc0g3UUNRdmc4QlNmNGZE?= =?utf-8?B?eEVXQ1M2ajJGVkk2MjAyRGtuSjBHZm5ZemI4Ujc3V0FCTVkyWlVzeG5QVmxW?= =?utf-8?B?cDJraGM4d2NJenVTb0lUQzlTcjVOMmljdUNYMzc4dXB0OW1wclB5dTA1TS9D?= =?utf-8?B?M0RGbFdSMzBwZnFWclpCS1VBeWJmNHAydjR4cFE5Wjc1azMyQytyeWtselN3?= =?utf-8?B?K0RHdWlYaXRmVFc2OUV2LzFFL1pnWkR5eCtlNUZKSy95NSttcVRvYit6SkZ0?= =?utf-8?B?eDRlZmVZUDgvOWsrRlZrY3BGaERUWW1McjhJNTVWTzJNRUVhc3ZNREE2Tkl1?= =?utf-8?B?M2d6OFViQ3hUK3NaRkkyQXR4empnL1lWOUZzOTdZVDhMeUlESm5OM29pdEF4?= =?utf-8?B?b1E5WW1QcTcvWUpDbFRSdTFqSkdWSE1qanVmRlp5V2FlNC8zdFp1MjdaVmV3?= =?utf-8?B?MGl4Qlh0V21rR055TXAyY3kvTTJkUVZpUVNiQmNxR05iZURweVNDNk5FTWNa?= =?utf-8?B?eUNoZnYyTk5lcXFJWnZKNndLTStKaS9Oc3JPaFI3TTE0U3k4aFFiUkRSMVV0?= =?utf-8?B?YnJSU25HQ2FITEcrck9HUGlNV1Nya0hEc3E3WTJkTGN6b0RNTENoSnkrQ1da?= =?utf-8?B?T3NodDZnUTBhMWdmYTdyME50VitXOXNIcDJWdEZ5NXRSMjc4TXlVVnEzaDZw?= =?utf-8?B?V1JFbEUvZ0FOQ1ArVGUwZUduZkVhZjRISGdMRGZmdWM3R3FKVTdmcTgyUWRJ?= =?utf-8?B?SUhRUmhqbXBsLytlSVB2RFZrczl3UW5ZKzJOS0dJUG1HL3ZkQ1BmQ2ZKQzYy?= =?utf-8?B?Mi9hc05vRjlZdWJ0NlcvR3o1YS95dGNiNnJ5ZWVVOWdYNGV3K2xXdnpSY3k5?= =?utf-8?Q?W88XVz6oR1g+4V3kTEVKSgtP4B08vYZvJcdRGvZ?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5911 Original-Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=arm.com; Return-Path: Sami.Mujawar@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 213eda61-ffde-402b-743f-08d914aca0b1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zQZqvO0zlZref/REj1CrGMOFLMkymW6thP/qAtJvPZJNlPeeKNoyCl9KYPaDULB5o4Kb/2u9K3cZlafTNcjq+M2jD8TmlTTOj01BFBWrRWeN3P7dCmc7bvPei4lKMcP6+A9TRl7hyjkHwCiFGCrJny4dOa0VDc2pTAeTzHFYgWaaUpYKzUcaS/7jLvrys8jYSa4XA6hs+lW7yJO/ZhgHCxy8qjWgj+AUjPy11X3elhYVL6R6LsTMrljZJPyAE0Toxms13qRwE1ALDRtsQ1hpxIiQJl9S0XciNUTJmgk7Dg/pvYmtcYNkd5a0+mn0kVMkM7L4L55zlqgmJutfhRXIf2nQ2xtZ+9dovzRyw4Ek4KVUJJzSHF+qYN8CEtCKPbuZnLymHix/5l1y96FiTOriYU9bRKGkgMj1L2GihboifZOMt/6mIbyCj5cAZz2irAS33F9J7ferPId1l96SkqOy2xmh4yEInoeV5Dy8bLO4x8AjNPpcEXpjCs3G18JGEmG6KmlZ6aztR7Qn1pIbcUTjiv7d87tiMz9NE9HyZLIeKKjxAqZVnVLmn7/yjufqpNG0RzVmatKkoCXzw9O1GWab2o/B8wFDgkgDQifdYK5N7oc08kShzX5HN028+iFQ4rf7FRCqxs6+LzwRRmZSoSCodaYzfUhRBt5UV91xjo6CxP3ZU5vjWZR/hmAYPweo2wl1 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)(39860400002)(376002)(346002)(396003)(136003)(46966006)(36840700001)(36756003)(83380400001)(8676002)(36860700001)(5660300002)(44832011)(53546011)(336012)(16576012)(186003)(316002)(107886003)(2906002)(2616005)(478600001)(956004)(16526019)(86362001)(4326008)(6486002)(31696002)(31686004)(82740400003)(54906003)(70206006)(70586007)(47076005)(82310400003)(8936002)(356005)(81166007)(26005)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2021 18:43:35.2678 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c36456be-fadf-4384-3096-08d914acaf15 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: VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4685 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Hi Etienn, This patch looks good to me. Reviewed-by: Sami Mujawar Regards, Sami Mujawar On 04/05/2021 04:20 PM, 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 > --- > ArmPkg/Include/IndustryStandard/ArmFfaSvc.h | 12 ++++++++++++ > ArmPkg/Include/IndustryStandard/ArmMmSvc.h | 15 +++++++++++++++ > 2 files changed, 27 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