From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.42]) by mx.groups.io with SMTP id smtpd.web10.53230.1670873266987381934 for ; Mon, 12 Dec 2022 11:27:47 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nvidia.com header.s=selector2 header.b=L6F/xfaS; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.244.42, mailfrom: jbrasen@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NmHkqnepQMUshK7Y/Kn4QQ4vHW8Wo+dxmhZSiAdi+3jzwVqJJUTLSSrPAoaNhbS3BdiPOFk8P3MbDoQV/XvUX/k+dGDpnFqev0VEGlRR5F0d/IW7eOBJTeKy1rNo+2JQ/sANWcFIShBP17jA0SBmtFhUuKh+pxPoeFJBt18P/IAb63iXk+rSOtRISvbL85+4Y+C/713Akof5jatQoj2nFVJVYrnY1bKyKa+gpnb7TbDt7uEpvS7CKSSvlZlQk//Uoy05VhNsZEcC4CtG+4DzpbB32rrtXxP2UaMETS0xsTj5MNGz07pKXDFOBH014h7Gta81m+JS5C9qo5Wj4J4T2A== 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=LhiVckB938NEbFhU2+xElwOhkEX+5iUBn8QPt2+dK/Q=; b=Gbx3CdAsfvrkdeXFEQn6if+sNUoxKIZqlTYiOtVwdemrnedjAmrryCYtIoN7WjY9PqlAV7gQ3PrDNwPQ9cxtC9SXiTzY7X1Bt1PACYOZC+qK/Wd8AuKdAIWbsuHZ0fRX11uHm2Kb06P9A4QCsULw+O2XCMjLtBkLa/oWqK80TrpWZMh7kaBsiY7kTT0rM7myyXIktsCu/hbKAh3GXmCxfbPVVifA9m6mn/JEqZc5d/rmA3uM733ci6HGv4BC27ASDvWovPPT5FuvDvExtHSUB0By+IJddmDUvRDQrAukCbW9X8WubwDitWyGjcQUOFjo2bCMvXtpBlzQqTit7CU5hQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LhiVckB938NEbFhU2+xElwOhkEX+5iUBn8QPt2+dK/Q=; b=L6F/xfaSZTAW+rppflgpweIdUkOFCGYfLMAxI/hbDEV924t4xV61d/TfRd2l9ghTXZsJBkO9zNPSahstO5fphkzmq3vqCplfr+2Xtz4Wdq9yz1wcJ7lLMkcg0wJY7QSMV6lGVkNQ7DtL4qKRe5ubuvRLVD8YJBxfsi4Ue+jLdN4Gbni43KYer2nRy+5KJlOpkVHq8pLUuFFw248vSSIGQUis9201c99ZufxO0nZXS3obEdR4yQcSQAsCFZ/LiKRlxgdg4LeOsjQZ0krQrwjzutNkzs0wiyCfMFztgJnzIoPazDaODMVsI0Ufx7IZ2gL23kNfJpAtfd3gzRHyjMgyXA== Received: from MW3PR05CA0019.namprd05.prod.outlook.com (2603:10b6:303:2b::24) by PH7PR12MB6809.namprd12.prod.outlook.com (2603:10b6:510:1af::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Mon, 12 Dec 2022 19:27:45 +0000 Received: from CO1PEPF00001A5E.namprd05.prod.outlook.com (2603:10b6:303:2b:cafe::1f) by MW3PR05CA0019.outlook.office365.com (2603:10b6:303:2b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.5 via Frontend Transport; Mon, 12 Dec 2022 19:27:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF00001A5E.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.7 via Frontend Transport; Mon, 12 Dec 2022 19:27:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 12 Dec 2022 11:27:30 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 12 Dec 2022 11:27:30 -0800 Received: from localhost.localdomain (10.127.8.9) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Mon, 12 Dec 2022 11:27:30 -0800 From: "Jeff Brasen" To: CC: , , , Jeff Brasen Subject: [PATCH v2] MdeModulePkg/EsrtFmpDxe: Support multiple devices with 0 HardwareInstance Date: Mon, 12 Dec 2022 12:27:26 -0700 Message-ID: <3c3226e6c05a868f3f88d300181a157998c2786e.1670873141.git.jbrasen@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-NVConfidentiality: public Return-Path: jbrasen@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A5E:EE_|PH7PR12MB6809:EE_ X-MS-Office365-Filtering-Correlation-Id: d4e9aac2-5be7-41d9-41d2-08dadc76f1f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KxFNnNFDWkojWI5T4qsWs9GuE7gWfkHEy4Ll0m76h8P6hP051frGg8ADS24atjGvIY/PA2fUgeCzbMO9hXmQuUktNagkMzZvqxlzwKAAnvhI/atfRMiMZDljsRAIeNkcfuWetvGl/uW/MIV7LcHi4rXXlcIowIeNLk4q+baSgb72/KUa3PJqsAn2L853y+6Zj8CnpMHt3FRj3y3+kQMnVWAEnbJfQ19I//KiVgte128CmTpikUQdhsjmsqEclxwAhFduUW/YoN3HBDpD4n2iiVo58xguoGju1mSaC1Tbp+TosHkmgKVr0jE6t0yd/838Gi2BZ/H3S2CpAPW+H3eo8eInKlqkIscw7Z7dzZuiBNLyHZOgvm5PuEdRcNZlCubsFlQxBNOq/uWw6rEpaXNcZ438oS9+nGU6XdNqe5lQ8lrtuUqObpswjkF1nkVVGanUbeYLiBOvALBkWWFiNU9cgvlfMGmBKrcAXHF8rglY+2jPc++SrWwDJ6DRipvrCkMSFkkyP2K5Pd8dqqb+buZNwdP3YsQOB0WZ6C8SirLPmL6Wl2kNvbAiqQaIW+hgD+7Bx8gPt8Ip5jUR8VE7qfaA2COhGUBR/Kjk1666LIYNVTLRoAjyLbUo/VTW1HND8oksy01UXy6GN/Awp+1kU/50QfunYiPX+As8PTZLS01m5sJcSQvpCSXCkzL7JUKea48ou3d9bCvtawmiQwHNvkWMrQ== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(376002)(346002)(136003)(39860400002)(396003)(451199015)(46966006)(36840700001)(40470700004)(2906002)(70586007)(26005)(36756003)(70206006)(82740400003)(426003)(47076005)(7636003)(5660300002)(8676002)(4326008)(356005)(86362001)(54906003)(6916009)(316002)(8936002)(41300700001)(478600001)(82310400005)(6666004)(40480700001)(83380400001)(186003)(107886003)(336012)(2616005)(36860700001)(40460700003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 19:27:44.8574 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4e9aac2-5be7-41d9-41d2-08dadc76f1f5 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF00001A5E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6809 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain 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