From nobody Sat Apr 20 05:08:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96436+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1668613850644202.19257874177367; Wed, 16 Nov 2022 07:50:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id LM3LYY1788612xH9yXSCRTS0; Wed, 16 Nov 2022 07:50:50 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.82]) by mx.groups.io with SMTP id smtpd.web08.8627.1668613849662379960 for ; Wed, 16 Nov 2022 07:50:49 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CC2Yjfem5t/itUhPDJ18eCaIa47veQ8b5pHYndFZofmMYIBmlnIwTjI5vmZupqizX4t4DxDm0zrnX8mzBTdrmSTb3+y+Rqhe0xAqgyrMam0Ne90XhswhMD8hU+mPR1ngEgag89QvDhwxULHTT55nh2ckQcnN6Gt/RgKFBKXPFgo3fdW07lzjjGLBN37NWHscZqhhqK8tgPYhViCL7A438KAoaTu5wDFDStkuQafxkYfVixWsin9V8UfGOP3r1k5ZHnSfeDOZ0DCky8SZ5PVduT33exZtQMYb/NZA7gLnr9sjgmfRT4uwtFHzxIgxfY9nJUTIIZN965nU3Qmy/sv4Hw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gW2sSp/g1NvTUq89UwQDBhKPmk3MLa6ZdEAox8Mnw+k=; b=RR5EZ0qHwCfCMD9xF3D9RxHXHd4ZQpXr7rVsFSq2ccgFGlV34Mq5lUkTcs1YIbwLX4bRb/jC+Nqf7wk5oP8EOy/kWzf1A8p7bh4pkSF2V6KU170cI3q20ZLgDrRcdIZS69OjDF7T1f+p/fiRjgkLtcXClNkGT/Y1FD8zqDl57idb1LCN3HT28DjQLVVQrGiA5NfwvCaycsibZClh5b1/ek20h1+F+TLXpm0irCLwZIp3zrEgVCQNPvQsLmRNjkqr6Y4KBkxbGXHH/dKaFIqBIbXMu8a1vJ4rhW5Mn9RRWP589lgIL5LR79DBVh6VH1osHXWh8QxAqCuvFZl0px95jA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from BN9PR03CA0675.namprd03.prod.outlook.com (2603:10b6:408:10e::20) by CH0PR12MB5372.namprd12.prod.outlook.com (2603:10b6:610:d7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.18; Wed, 16 Nov 2022 15:50:47 +0000 X-Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10e:cafe::92) by BN9PR03CA0675.outlook.office365.com (2603:10b6:408:10e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17 via Frontend Transport; Wed, 16 Nov 2022 15:50:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96436+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 16 Nov 2022 15:50:47 +0000 X-Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 16 Nov 2022 07:50:38 -0800 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 16 Nov 2022 07:50:37 -0800 X-Received: from localhost.localdomain (10.127.8.9) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Wed, 16 Nov 2022 07:50:37 -0800 From: "Jeff Brasen via groups.io" To: CC: , , , Jeff Brasen Subject: [edk2-devel] [PATCH] DynamicTablesPkg/EsrtFmpDxe: Support multiple devices with 0 HardwareInstance Date: Wed, 16 Nov 2022 08:50:33 -0700 Message-ID: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT017:EE_|CH0PR12MB5372:EE_ X-MS-Office365-Filtering-Correlation-Id: eb2a512e-1639-49bd-3872-08dac7ea5449 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: BqkgUSoVVXCZkVB9lALZLVhFa9K9Z39VwUcsMupMmaU3tEQTUk3+tv98HRtXSeB4akQd/DZ15Fe7oXVkpi+9hWCu5idGvRxdTnd8iG6Wgs2srPPeIPOTzPRJEq0HOsoZg4oN5DrkXe4Qaf731oeki9EYvSQ4mJZTod/AkfQ1cwUKkoXDRdzMFVMAThzAhe7F6F5Y0gIKJERn/9LYh3TncnHctSF/rNmSEz/7LlgB+kutibScqpb1hhXuLB0ppNqCG1L8qZm91GnPy88NefuWVBr4uDdoRkMFtf2KkOsFrUxLidjsUa1urQ2C0YLK30T8MLbgJ79W+mitDJBb0oJEzSPcTJNM94DnoNAhvIlCeYysoTh8zBdlhRXPfpLrScBJSRAjlbwY4Cp+3qty4HXWXG1fjUE7mWS+zE8k+4KxNKXz3PJmn0QtB3r5DnbM+jQHYgK5bQ0OKcp5kDNlW41muheHrk0dA8Mjgy04NxOM6zduOVHpkvHbw4aJVvGI2f060B404MNUT7+z7HH4DA70ioi5W07lb17Yye//d1lfkVG8tgQ8X4/V8wOTdvADQD9ad3kohpcK4cxeyqJ6mZsGkPemf/kjzwYkke8U2ClaJP1a7BDVTHbZD5hpss679h+UG6RN5mo14LP2Dp6VSLJNbapMf1Sq4b1/u4mbTxNNil9H6+n1FlCNmfoEdyOHOLdkeRveYeB7Dq7+8TWF2o9piYklnggh5nOizwFACLf+uHmoQ/KJd2MReY6aRt49oRShlRobtADhuOZXRiFR5RwFkA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 15:50:47.4674 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb2a512e-1639-49bd-3872-08dac7ea5449 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5372 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jbrasen@nvidia.com X-Gm-Message-State: Uh35K2N8Ayd8QdH8COLs91Vpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1668613850; bh=eK4/Is8w6aguPT601puEHhRJ1akhgDMkH4GXHidE2To=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=DGzs4FVTNKmRhWt1k1CWi3PzAISuB8SL2PQQkGbaHwx7zJPuEaYrVDRw1QnJx0nvxjm /eBETzdZGOFCF0N9r7V9vQeXa48q8VWEJCgTlvVv1nMe1lwXXUvopnnmkkjrgAYidQyU9 fYtFrOi95/JYMy+uxD7+JIpDvKc46IsvofY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1668613851832100001 Content-Type: text/plain; charset="utf-8" Skip error check if HardwareInstance is 0 as this either means that FmpVersion < 3 and not supported or, "A zero means the FMP provider is not able to determine a unique hardware instance number or a hardware instance number is not needed." per UEFI specification. As the FmpInstances are merged and HardwareInstance is not used remove error check in this case. Signed-off-by: Jeff Brasen --- MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmp.c | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmp.c b/MdeModulePkg/Uni= versal/EsrtFmpDxe/EsrtFmp.c index 4f47c55cce..5bc627461d 100644 --- a/MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmp.c +++ b/MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmp.c @@ -153,16 +153,20 @@ CreateEsrtEntry ( =20 // // Check to see of FmpImageInfoBuf GUID/HardwareInstance is unique + // Skip if HardwareInstance is 0 as this is the case if FmpVersion < 3 + // or the device can not create a unique ID per UEFI specification // - for (Index =3D 0; Index < *NumberOfDescriptors; Index++) { - if (CompareGuid (&HardwareInstances[Index].ImageTypeGuid, &FmpImageInf= oBuf->ImageTypeId)) { - if (HardwareInstances[Index].HardwareInstance =3D=3D FmpHardwareInst= ance) { - DEBUG ((DEBUG_ERROR, "EsrtFmpDxe: Duplicate firmware image descrip= tor with GUID %g HardwareInstance:0x%x\n", &FmpImageInfoBuf->ImageTypeId, F= mpHardwareInstance)); - ASSERT ( - !CompareGuid (&HardwareInstances[Index].ImageTypeGuid, &FmpImage= InfoBuf->ImageTypeId) || - HardwareInstances[Index].HardwareInstance !=3D FmpHardwareInstan= ce - ); - return EFI_UNSUPPORTED; + if (FmpHardwareInstance !=3D 0) { + for (Index =3D 0; Index < *NumberOfDescriptors; Index++) { + if (CompareGuid (&HardwareInstances[Index].ImageTypeGuid, &FmpImageI= nfoBuf->ImageTypeId)) { + if (HardwareInstances[Index].HardwareInstance =3D=3D FmpHardwareIn= stance) { + DEBUG ((DEBUG_ERROR, "EsrtFmpDxe: Duplicate firmware image descr= iptor with GUID %g HardwareInstance:0x%x\n", &FmpImageInfoBuf->ImageTypeId,= FmpHardwareInstance)); + ASSERT ( + !CompareGuid (&HardwareInstances[Index].ImageTypeGuid, &FmpIma= geInfoBuf->ImageTypeId) || + HardwareInstances[Index].HardwareInstance !=3D FmpHardwareInst= ance + ); + return EFI_UNSUPPORTED; + } } } } --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96436): https://edk2.groups.io/g/devel/message/96436 Mute This Topic: https://groups.io/mt/95069050/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-