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 E6D3D7803CD for ; Fri, 12 Apr 2024 14:34:09 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=+GcojPVxL6pSaFlsNtoyCJMUU9S2389LMwHXFVYaT/8=; 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=1712932448; v=1; b=5KiYW598yVVemAKPGvVnjaXFcZWJcFFwwxFL7QoRD0rjb4uVZN1zxcnxs6+IO6ZFOlrJIESc GCeGej8luKtvsI9fdpJEqnP4JWJS+dDm3gecRpBdBgMnJtcyYrxJ/dISnuO83hKBBEoxdpRe/wb qbyrxrTrSiIhmZgG5COqjl4hoskgvU5fdcghw58xjDQI4SF5mrRo1j4Do/AOCUwe3DTWKpDMyMB epPcXkEI41cKh1y5zhWOVVeVoqBHe/P4x1UT724eOnGG8ABT9GAgc9l55QOdahE82rVUG9EXyFL 2P+kTQaHLSRCtXVJYKgYObDdBKjXW+5EVXwgw5loqV97g== X-Received: by 127.0.0.2 with SMTP id AvOfYY7687511xAFNk5nkcQZ; Fri, 12 Apr 2024 07:34:08 -0700 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.71]) by mx.groups.io with SMTP id smtpd.web10.48546.1712932440639751456 for ; Fri, 12 Apr 2024 07:34:01 -0700 X-Received: from AS4P190CA0001.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5de::7) by DBBPR08MB6185.eurprd08.prod.outlook.com (2603:10a6:10:207::22) 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:56 +0000 X-Received: from AMS0EPF000001B6.eurprd05.prod.outlook.com (2603:10a6:20b:5de:cafe::7) by AS4P190CA0001.outlook.office365.com (2603:10a6:20b:5de::7) 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:56 +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 AMS0EPF000001B6.mail.protection.outlook.com (10.167.16.170) 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:56 +0000 X-Received: ("Tessian outbound caed45120527:v313"); Fri, 12 Apr 2024 14:33:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 66d3a2c0fbec7d9f X-CR-MTA-TID: 64aa7808 X-Received: from bc29c114d0c5.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B3502B67-B12F-4636-BB5D-9CC910D4E851.1; Fri, 12 Apr 2024 14:33:50 +0000 X-Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id bc29c114d0c5.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Apr 2024 14:33:50 +0000 X-Received: from DB7PR03CA0087.eurprd03.prod.outlook.com (2603:10a6:10:72::28) by AM0PR08MB5315.eurprd08.prod.outlook.com (2603:10a6:208:18e::23) 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:47 +0000 X-Received: from DU2PEPF00028D02.eurprd03.prod.outlook.com (2603:10a6:10:72:cafe::73) by DB7PR03CA0087.outlook.office365.com (2603:10a6:10:72::28) 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:46 +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:46 +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:41 +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 31/45] ArmVirtPkg: ArmCcaRsiLib: Fix size of Imm field in HostCallArgs Date: Fri, 12 Apr 2024 15:33:08 +0100 Message-ID: <20240412143322.5244-32-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_|AM0PR08MB5315:EE_|AMS0EPF000001B6:EE_|DBBPR08MB6185:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e1cc97a-d661-418a-cfc3-08dc5afd95d7 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: m85Oql8jj2hLDBmtWZ5jnn3vQwZrWveYiKer8S7QIO7eIpsTdW5T4DIgVika5lggDbZpmoMCT6Ju+upLUAf/bPy/p8MAC24TFiBD78AKA2NZ/c+Honn39DB8exLYqKLB9atOSeaYpSi1oCje0gRbLrebyvviANEIMAx8uJEsvlpUxN/9MD7kM2L4+7frNMLS2cwVRXY5rEwkKuixxD91F5Oit4cUmTj35YMHcyaGSsHdU30DJiptkwFPiG0ljUpRbOxqb4abcBPcF4/qBCNysQqdkRIC/GrwBXwQw772o76HY/UsQavc6GyF1nzcfsrl1fqsAHkHKkz+u7YNaJ4zHen5Kf7A6XhdHF9mpW86XW8BCPpukqkNNi5DhOvjdq/dQw/4deHCtkTDOEkE3Q1Az2XGQrK+Z0jvjcDbKv/rnQcz202hY3++q/13ZYv8IcjLT5eMGH/jqSlrRO7zMCHgfx6ppvUc0Rv/pq//ie39CqToTfPX9vf6KegI1ionSPiq5qhiDpRjP0ELAhbhw+96Ia0mQOjdCa5vsHefkeb9ANTCHE2WqtqBT1hlND846x0tlqcSYNVqKr/5S/YbGTyh+JVSXP2/mZXncQtVpb+F5ldRGzka7mxp71PVNSKxDzI3fBIwKG7R835Tor26pcfZkI6TrmJT9GDguWc27LSdfdfBD6F8r7pEbc4idVDfWfG6Fwjk9JLlaboYw3Ae4VvbqokZfRkRU1SgZvRkG80SSp+M3hNkXYTZWwBUKu/cs8D4 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)(36860700004)(82310400014)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5315 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF000001B6.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: d4a425c6-ffd7-4ce0-c773-08dc5afd8fdc X-Microsoft-Antispam-Message-Info: Lzlr36Wdcf7sdlK6fMXiK1Pgh1KGNVTJpDpVbWXN1UsYRgwRPStF1N/Ln9zTS5MSLgCGCtMHgHWczldQ8GzHp/58g9dnZLBcJ3PhHOtmYRubG3Px3El2NOS87MF076J+vewGFjmhy3ehfvLZll9FXZe4hCt7sHdjeqRdYOKBW97SjV/0EPAPOc9fnA43A+ZiONATy0F9EPchIiwiPePsMBN1S/st2iK70FzQVM9nKHJ1Du1ZSxgy5oLl+RAKoBISb49YwXi9RjdP/5SjSRiK2YxLaCNE3OiB9L4kGeGFF2ziD8KgMYwwauPTnqpmJdc1UVXWwVuN/R/M1eg/6h4Biu6oZp2sWl8sbp6m/t8MA4GfXH/QWlsN6Q2f8j5qKEq83PbTZTC1JgLbNicv68v/C3mfFZswcWUeJ6t0U0BME2GESzyc4vOBbeLZi2ExPeHoSweZLFB2k5+x1W+IIqgCEcrXh7rPaF98RRhDkXPZDa436mr0nBj00l7QsYVs6mnz5AvAxFS4BBgHHNXI1y4BVsdMfjZpDPSIvrpFhl0PKgNldZ1IPhnotf0ffZS7xMJDHNxbHeEN0dhUCyhk5z2mv7LfBlnLVsU2HEfh8lmi9gKXMqVmQ93YFJwx5u4NYuCg0faE60LZBXgcFdmieRBd5IJhFOB7brn2mAcqL1ZyNDt2xT5N5tX58R3Qwfw9SyUfgj16C9zTQvqnetISE5/u8jpGHtoFB0+Npf2K80BqKpWMYAVmblg9cJYWPn2vRmrx X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 14:33:56.6473 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e1cc97a-d661-418a-cfc3-08dc5afd95d7 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: AMS0EPF000001B6.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6185 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:01 -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: OoNZh2eNdWnhzi2KtDily2znx7686176AA= 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=5KiYW598; 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 45.79.227.220 as permitted sender) smtp.mailfrom=bounce@groups.io The section B4.4.2 'RsiHostCall type' of the RMM specification version A-bet0 specifies the Imm field in HostCallArgs structure as a 16 bit wide value and the offset for the gprs[0] field is 0x8, which means the 6 bytes after the Imm field are padded. Therefore, define the Imm field as UINT16 and add an additional field UINT8 Reserved1[6] for padding. Also update the RsiHostCall() to initialise the Reserved1 field to zero. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Gerd Hoffmann Signed-off-by: Sami Mujawar --- ArmVirtPkg/Include/Library/ArmCcaRsiLib.h | 4 +++- ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h b/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h index db1ae5b4c1a6475a275ce6be3383ea933ec9af20..af4be275d37f0376335de5344f9626c9a92c70d2 100644 --- a/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h +++ b/ArmVirtPkg/Include/Library/ArmCcaRsiLib.h @@ -85,7 +85,9 @@ typedef struct RealmConfig { See Section 4.4.2 RsiHostCall type, RMM Specification, version A-bet0 */ typedef struct HostCallArgs { - UINT64 Imm; + UINT16 Imm; + UINT8 Reserved1[6]; + UINT64 Gprs0; UINT64 Gprs1; UINT64 Gprs2; diff --git a/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c b/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c index 79a65300f05af665b3afebe2a8f8b1f6faf76f23..dc41e77b55f4369e89592b5437e525baf80aa0b3 100644 --- a/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c +++ b/ArmVirtPkg/Library/ArmCcaRsiLib/ArmCcaRsiLib.c @@ -519,6 +519,7 @@ RsiHostCall ( STATIC_ASSERT (sizeof (HOST_CALL_ARGS) == SIZE_4KB); // Clear the reserved fields + ZeroMem (&Args->Reserved1, sizeof (Args->Reserved1)); ZeroMem (&Args->Reserved, sizeof (Args->Reserved)); ZeroMem (&SmcCmd, sizeof (SmcCmd)); -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117693): https://edk2.groups.io/g/devel/message/117693 Mute This Topic: https://groups.io/mt/105483432/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-