From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail03.groups.io (mail03.groups.io [45.79.227.220]) by spool.mail.gandi.net (Postfix) with ESMTPS id C2ABBD81164 for ; Fri, 12 Apr 2024 14:34:19 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=U11wXA819/jDQ/1/PJFnVvKUTJGEpJu2UKZImFEdnlc=; c=relaxed/simple; d=groups.io; h=Received-SPF: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:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20240206; t=1712932458; v=1; b=OFc1zcaVlTxKmUNx/KIjKr379GhbBV3pwdFHRmKstsDUmDrh1yY3STjXCPUznGCL5u/BbzZz f8C3o8eAH9iYY2pOGrvAFPTmuDJaUxepJ2iPGyMDjj/n58rUkKjWSxcZ71U2a5OJSTSrPUgaTAc jABL4r/e7a8OS5EFLX0MpfHl9eO3gBwYOrmnzwUJMLe7njjFnLpIYiyrtINO5Bq8t8fV5lFB2Fu OCZDSW+WjHKa1UISPvuLQStozrtGzq5ugSiXrrhiwjSO8Crf6j4igc6N/vUUIxm0cZmfQajLeMa p3VGaS8Qc1sDH7KEjyoOc9TvI627iwiNNp5kUYfCJGFVg== X-Received: by 127.0.0.2 with SMTP id CJrdYY7687511xIXzxDvl1AJ; Fri, 12 Apr 2024 07:34:18 -0700 X-Received: from EUR02-DB5-obe.outbound.protection.outlook.com (EUR02-DB5-obe.outbound.protection.outlook.com [40.107.249.54]) by mx.groups.io with SMTP id smtpd.web11.47974.1712932448185190453 for ; Fri, 12 Apr 2024 07:34:08 -0700 X-Received: from DU7P189CA0001.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:552::27) by DU0PR08MB7592.eurprd08.prod.outlook.com (2603:10a6:10:311::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Fri, 12 Apr 2024 14:33:59 +0000 X-Received: from DB1PEPF000509E3.eurprd03.prod.outlook.com (2603:10a6:10:552:cafe::14) by DU7P189CA0001.outlook.office365.com (2603:10a6:10:552::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.13 via Frontend Transport; Fri, 12 Apr 2024 14:33:59 +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 DB1PEPF000509E3.mail.protection.outlook.com (10.167.242.53) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Fri, 12 Apr 2024 14:33:58 +0000 X-Received: ("Tessian outbound 88c46f8f09a7:v313"); Fri, 12 Apr 2024 14:33:58 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4590f7ddc9dfb139 X-CR-MTA-TID: 64aa7808 X-Received: from cfee6db87aad.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2F2E9DF0-FC84-48A9-A3E4-60E6DA65836C.1; Fri, 12 Apr 2024 14:33:51 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id cfee6db87aad.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Apr 2024 14:33:51 +0000 X-Received: from DB7PR03CA0082.eurprd03.prod.outlook.com (2603:10a6:10:72::23) by DB9PR08MB7423.eurprd08.prod.outlook.com (2603:10a6:10:370::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 12 Apr 2024 14:33:48 +0000 X-Received: from DU2PEPF00028D02.eurprd03.prod.outlook.com (2603:10a6:10:72:cafe::ac) by DB7PR03CA0082.outlook.office365.com (2603:10a6:10:72::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26 via Frontend Transport; Fri, 12 Apr 2024 14:33:48 +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 DU2PEPF00028D02.mail.protection.outlook.com (10.167.242.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Fri, 12 Apr 2024 14:33:48 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.35; Fri, 12 Apr 2024 14:33:42 +0000 X-Received: from E114225.Arm.com (10.1.196.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 12 Apr 2024 14:33:41 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , Subject: [edk2-devel] [PATCH v2 33/45] ArmVirtPkg: RMM 1.0-bet2 - Increase number of RSI host call args Date: Fri, 12 Apr 2024 15:33:10 +0100 Message-ID: <20240412143322.5244-34-sami.mujawar@arm.com> In-Reply-To: <20240412143322.5244-1-sami.mujawar@arm.com> References: <20240412143322.5244-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DU2PEPF00028D02:EE_|DB9PR08MB7423:EE_|DB1PEPF000509E3:EE_|DU0PR08MB7592:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d9e29ab-e4f6-4eb2-68b7-08dc5afd970d 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: y1ScilpkrszJgzKjWcKFuxKxBPGD5a59wGPAnfSTINYu5GPSQCYvSWETzaeH0Z4M6mMrRT3MFK4OuZwUm8XzAlSdcBqYYxUDLm6UbwwqnmkThL5tFD5T3CFuhwlV/nezUlKrJeWiUIyIgK2+8YbPnTMo/45+nAv6M9Qh9RyqSu+LbKKmmzyLo994RD4o0Nl/g14xFMZzCddbI0EukoeFyUYv020xnOyTs8J7PLBYXMKINQ0huO+dieIlafqlsUuLxjadL88t27Z/tYiX/3/0rAnXe8dR0kEzgRFLl62ANEcL5kEdXBvuFx5Gb0S9UBVir4ZEMvFX3cYyi1RVR0WMXuobxyJP8L0j8zWagW/t1R2Uvv+gdmIMw6GH6708jUXqOyfeOzQsoUDLnEEFMDFFL0YZNBOSXLkBN/JJULTPd1wc8zAW9rrpVjgGFMDBGbfwdsw1BkURIAcRodQgaVmJDFKaIDPuBSBX3BCYhp/VVclmBakPRoD9Qvawue6uQNWX2vjW5SSK0osZGeOuHu04+0HG4lOgxcfRxsHuPZBKdAmoCFhYEJ0XA+atUO7UJSu6aUJDAgZViDtfcDs0YIJ0cf89zvSYaZm0w3x66UjzElFS7XOGcBlxqJZGNO9tex5lpbBNC55gwbPys//q3fpyY6wCi0Lv7lQGpazZaI4GymF5dR+5DdCRrHj/ppPPK8ZC2DHEwFxbMXaFQj5KbdHQ2uUiQ5ZfiJ6IjGl/6jC/owGS5smlH+TY3luaaq2hpUqF 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)(82310400014)(36860700004)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7423 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB1PEPF000509E3.eurprd03.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 0b613f92-f231-4427-80fa-08dc5afd90d9 X-Microsoft-Antispam-Message-Info: R8IptFgJm4G4Hx/j4Ae8QjU9+DLKoePKr/BnZE+9glzrhTsdnb3Kc4RBYPtIXNqihk/pw/ARpUTt27gtzjDIF/CgURd4lUBnSieDwTwYV5bCQX8+qaLjeWuLr3DkRHpUr/z1peTogCws6Uaya/jzHOuwVE2eLkCLIh61AtSSlb2ovFvcNzJMJGL3py8O5K9GOGdgxn5qgxzBay9ta2zGoqGp3JANlJMw7J+wnvvhPxqvf+W4OZLjxMljw/QjvlL0ww1DXDKYYwu8YRNfKZrsSYCGE0bdwQoJECpGITz3Fw8eFtRI4EiyphCPMbMakAyysR6Ui9AmfPMgVJ1RgcskYHq+ZrKnHqjuc2qeKwP05EXKGYcIMunduKVkKlTO0W7pSffIRAi+r789dNg4d4JhubqhDnk0F3cDcIePAYWG7HZ5SjdgC5/f+UniDgQPkESUnobAjTeAmy5FE5sYmp0QK1Hn/bcqp8fT5TGhnPau5V3zlgeXy77TQx4OpBdwHjRSyxF307lDNPCkYarUZWSP0mTCkN/r/cRcIKy0ez3LIpEpXg16GsOCYuCT2UdND0iqEzOwrHFQk0ol8NzhoeJMduIJLDlzwbmjQeamwWWJIoSP01tTF8hNI/mgK5ep/XWM/GTXHj2XKz/Ayk76E9BxWryKI0qt8qUkRWYx1cvkQOs8zxvJuRpZ+nBTDx6suQPRr/PZ5/bWCPlQoCslykvlzsNKHsOo4dzrwiQfV5LVrLpJQoTU2AhX3Akky2/wqFqP X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 14:33:58.6919 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d9e29ab-e4f6-4eb2-68b7-08dc5afd970d 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: DB1PEPF000509E3.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7592 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 Resent-Date: Fri, 12 Apr 2024 07:34:08 -0700 Resent-From: sami.mujawar@arm.com Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: RMy0UwoSkp79gXJfUDmTNywFx7686176AA= Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=OFc1zcaV; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.227.220 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none) The RMM 1.0-bet2 spec expands the set of GPRs for RSI host call to X0-X30. Therefore, update the RSI HOST_CALL_ARGS structure to reflect these changes. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Gerd Hoffmann Signed-off-by: Sami Mujawar --- ArmVirtPkg/Include/Library/ArmCcaRsiLib.h | 29 ++++++++++++++++++-- ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c | 3 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h b/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h index 81d125a81941cc1680cfdfb08e001193851d50e5..3d6ace866def5f10dd74afd4e9340530150f6f43 100644 --- a/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h +++ b/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h @@ -11,7 +11,7 @@ - REM - Realm Extensible Measurement @par Reference(s): - - Realm Management Monitor (RMM) Specification, version 1.0-bet1 + - Realm Management Monitor (RMM) Specification, version 1.0-bet2 (https://developer.arm.com/documentation/den0137/) **/ @@ -82,7 +82,7 @@ typedef struct RealmConfig { } REALM_CONFIG; /** A structure describing the Host Call arguments - See Section 4.4.2 RsiHostCall type, RMM Specification, version 1.0-bet1 + See Section 4.4.2 RsiHostCall type, RMM Specification, version 1.0-bet2 */ typedef struct HostCallArgs { UINT16 Imm; @@ -95,7 +95,30 @@ typedef struct HostCallArgs { UINT64 Gprs4; UINT64 Gprs5; UINT64 Gprs6; - UINT8 Reserved[0x100 - (sizeof (UINT64) * 8)]; + UINT64 Gprs7; + UINT64 Gprs8; + UINT64 Gprs9; + UINT64 Gprs10; + UINT64 Gprs11; + UINT64 Gprs12; + UINT64 Gprs13; + UINT64 Gprs14; + UINT64 Gprs15; + UINT64 Gprs16; + UINT64 Gprs17; + UINT64 Gprs18; + UINT64 Gprs19; + UINT64 Gprs20; + UINT64 Gprs21; + UINT64 Gprs22; + UINT64 Gprs23; + UINT64 Gprs24; + UINT64 Gprs25; + UINT64 Gprs26; + UINT64 Gprs27; + UINT64 Gprs28; + UINT64 Gprs29; + UINT64 Gprs30; } HOST_CALL_ARGS; /** diff --git a/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c b/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c index 5984651f6d9d627d9fee30a4fbf11c45b3951877..ceec0477d7ec9ba0ae831aa5a4f31d8a3791b9d1 100644 --- a/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c +++ b/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c @@ -11,7 +11,7 @@ - REM - Realm Extensible Measurement @par Reference(s): - - Realm Management Monitor (RMM) Specification, version 1.0-bet1 + - Realm Management Monitor (RMM) Specification, version 1.0-bet2 (https://developer.arm.com/documentation/den0137/) **/ @@ -522,7 +522,6 @@ RsiHostCall ( // Clear the reserved fields ZeroMem (&Args->Reserved1, sizeof (Args->Reserved1)); - ZeroMem (&Args->Reserved, sizeof (Args->Reserved)); ZeroMem (&SmcCmd, sizeof (SmcCmd)); SmcCmd.Arg0 = FID_RSI_HOST_CALL; -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117703): https://edk2.groups.io/g/devel/message/117703 Mute This Topic: https://groups.io/mt/105483446/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-