From nobody Sat Apr 20 06:15:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+46864+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46864+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1567657726; cv=none; d=zoho.com; s=zohoarc; b=hIDr/PfMAnaq60txs/KQAnk1a3UHTFxzudG9NuFhRl9FpcdQ212y0qdhFqqwWbMh4YJVukpSybcJdchuOFQHc7kkKT8uont6YRAR/bRnFMS89J+jIYNF7CzyLgZ007rkAO65snAYXgFb65mycezGnwfxPiCcgwVjn6KIOVbySy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567657726; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=1vgdwOq69+ItGvQZJUBE2lyWZ0t1FfOtimgwaDQH6EI=; b=G7hpUNUHuR588ywxw1uQDAsXBPuu2I1SnVFApFlOduRIUHIgkMJzS1TykmXGiFTNqs9jlZ8zJNyKFHd+NqoVC0w2OObafCtRBey3z2rQg1l++k8iZokwWwqWK+/zA6NgiNVJzKvseilbSC82PlCspAGwO6b7Nn0BCxyPR99dsb8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46864+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1567657726251283.21369582219245; Wed, 4 Sep 2019 21:28:46 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Wed, 04 Sep 2019 21:28:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2019 21:28:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,469,1559545200"; d="scan'208";a="182704250" X-Received: from cchiu4-mobl1.gar.corp.intel.com ([10.5.215.135]) by fmsmga008.fm.intel.com with ESMTP; 04 Sep 2019 21:28:43 -0700 From: "Chiu, Chasel" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek Subject: [edk2-devel] [PATCH v2] UefiCpuPkg: support single EFI_PEI_CORE_FV_LOCATION_PPI in PpiList Date: Thu, 5 Sep 2019 12:27:29 +0800 Message-Id: <20190905042729.16032-1-chasel.chiu@intel.com> Precedence: Bulk List-Unsubscribe: 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,chasel.chiu@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1567657725; bh=6XOO7CiQzqQoomYg6Ml9kEbLbs6Bws+FZA+fLnHyaGo=; h=Cc:Date:From:Reply-To:Subject:To; b=Prnkl7LX14RQ7gDgI1AvhVqNpTdGzu5Ovib8xc/Q58tLxf/MDMdAkiLz2jgZBoSmI23 x2kxfkmuAxyuHqNpr9IPh526PsHoGhuix/mN+ZJL9G2HQhasm9KNFeOjvGGY/Y9DzsJgZ gaKWz7yTWBDQHWhP+KzOwg4MbUBdz/y8TbM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2153 Current logic will skip searching EFI_PEI_CORE_FV_LOCATION_PPI when the PPI in PpiList having EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST flag, but platform may pass single PPI in PpiList that should be supported. Changed the logic to verify PpiList first before checking EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST flag. Test: Verified both single EFI_PEI_CORE_FV_LOCATION_PPI and multiple PPIs in PpiList cases and both can boot with the PeiCore specified by EFI_PEI_CORE_FV_LOCATION_PPI. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Chasel Chiu Reviewed-by: Eric Dong Reviewed-by: Ray Ni Reviewed-by: Star Zeng --- UefiCpuPkg/SecCore/SecMain.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/SecCore/SecMain.c b/UefiCpuPkg/SecCore/SecMain.c index 66c952b897..5d5e7f17dc 100644 --- a/UefiCpuPkg/SecCore/SecMain.c +++ b/UefiCpuPkg/SecCore/SecMain.c @@ -238,9 +238,8 @@ SecStartupPhase2( // is enabled. // if (PpiList !=3D NULL) { - for (Index =3D 0; - (PpiList[Index].Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST) !=3D = EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; - Index++) { + Index =3D 0; + do { if (CompareGuid (PpiList[Index].Guid, &gEfiPeiCoreFvLocationPpiGuid)= && (((EFI_PEI_CORE_FV_LOCATION_PPI *) PpiList[Index].Ppi)->PeiCoreF= vLocation !=3D 0) ) { @@ -256,12 +255,12 @@ SecStartupPhase2( break; } else { // - // PeiCore not found + // Invalid PeiCore FV provided by platform // CpuDeadLoop (); } } - } + } while ((PpiList[Index++].Flags & EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LI= ST) !=3D EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST); } // // If EFI_PEI_CORE_FV_LOCATION_PPI not found, try to locate PeiCore from= BFV. --=20 2.13.3.windows.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 (#46864): https://edk2.groups.io/g/devel/message/46864 Mute This Topic: https://groups.io/mt/33150264/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-