From nobody Thu May 2 08:50:25 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+48842+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+48842+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1570808634; cv=none; d=zoho.com; s=zohoarc; b=eHdg9pS3F8+TadU+rEpsaoef3dPtubBk4QE8Qa/fWK3A7IicdNXVzAUENHK5i5Fl9D8QL2r7iSdOwcUtSZW/qVfLuYkhJnzGDSc/lZmvo/sdUet1s2cbK2nNfhhGQaPmmiscyqv07r4syT/UTQJNfoR1qwbQD5V9LXmt5tGVvLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570808634; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=o8ZbFOWzE/uBvJOIov7ZSPv86zKL9l0hC5C1lJnSmrk=; b=B3oz77tkzYJCd+InezaIQSgFOjREaX3ik+RiUn7tehimCPIIlnTTJF8Tl5/yIJk0bQqfAzjPcdT+4A/QSDbyF8Mql4BrudqFc9hw3dujdypDRsbZYULYsR78uneyRNR3tpzQ+qlbns9GMAeESGuJUNihDEn1P8nejN5vxUhfziU= 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+48842+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1570808634225496.59513417864775; Fri, 11 Oct 2019 08:43:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Fri, 11 Oct 2019 08:43:53 -0700 X-Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web10.2004.1570808632256191683 for ; Fri, 11 Oct 2019 08:43:52 -0700 X-Received: by mail-wr1-f68.google.com with SMTP id o18so12415262wrv.13 for ; Fri, 11 Oct 2019 08:43:52 -0700 (PDT) X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= X-Google-Smtp-Source: APXvYqwUG4wMpBjML+eG0kesmiAGo5aL8NyYTOcwEJcR60SxuXonvF7jUT63r8pw5B8iN773+nRaKg== X-Received: by 2002:a5d:66c7:: with SMTP id k7mr13421832wrw.210.1570808630528; Fri, 11 Oct 2019 08:43:50 -0700 (PDT) X-Received: from localhost.localdomain ([84.203.40.122]) by smtp.gmail.com with ESMTPSA id e3sm9436052wme.39.2019.10.11.08.43.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Oct 2019 08:43:49 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: afish@apple.com, lersek@redhat.com, liming.gao@intel.com Subject: [edk2-devel] [PATCH 1/1] MdeModulePkg/BdsDxe: Fix calling PlatformBootManagerWaitCallback on 0 Date: Fri, 11 Oct 2019 16:43:37 +0100 Message-Id: <20191011154337.1652-2-pete@akeo.ie> In-Reply-To: <20191011154337.1652-1-pete@akeo.ie> References: <20191011154337.1652-1-pete@akeo.ie> MIME-Version: 1.0 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,pete@akeo.ie Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1570808633; bh=gOynVIP78602XYBLLe59l6C9Yb0Uy5kflDPBTTA8i2c=; h=Cc:Date:From:Reply-To:Subject:To; b=YNx5bm/7VpHYyr9uwNllfGjeXVhTIBpb0OeqNLMpfFArR18GY+uxKeEc7oYQ9cM5FWt DlWJY2kiiRa/3r3WdYilsb+Ti4FOnR+7ecD9odexDPKE8obrqyx6mxpfNLI8nJWW8IlSe 0NIFChFDx950UFcqmw27T8y9/HHPFPm/X08= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Laszlo Ersek Commit 2de1f611be06ded3a59726a4052a9039be7d459b introduced a regression whereas platforms that did set PcdPlatformBootTimeOut to 0 are now getting an unexpected call to PlatformBootManagerWaitCallback(). This patch also ensures that, if PcdPlatformBootTimeOut is 0xFFFF we don't call PlatformBootManagerWaitCallback() with a zero argument as doing so would produce an unwarranted jump to full progress completion which is likely to throw off users. Signed-off-by: Pete Batard Reviewed-by: Liming Gao --- MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Univer= sal/BdsDxe/BdsEntry.c index 7968a58f3454..d6ec31118c1f 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -341,7 +341,17 @@ BdsWait ( TimeoutRemain--; } } - PlatformBootManagerWaitCallback (0); + + // + // If the platform configured a nonzero and finite time-out, and we have + // actually reached that, report 100% completion to the platform. + // + // Note that the (TimeoutRemain =3D=3D 0) condition excludes + // PcdPlatformBootTimeOut=3D0xFFFF, and that's deliberate. + // + if (PcdGet16 (PcdPlatformBootTimeOut) !=3D 0 && TimeoutRemain =3D=3D 0) { + PlatformBootManagerWaitCallback (0); + } DEBUG ((EFI_D_INFO, "[Bds]Exit the waiting!\n")); } =20 --=20 2.21.0.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 (#48842): https://edk2.groups.io/g/devel/message/48842 Mute This Topic: https://groups.io/mt/34494978/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-