From patchwork Wed Oct 22 13:21:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 39291 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A46E2202DB for ; Wed, 22 Oct 2014 13:22:32 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf1986703lab.11 for ; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=FUs0du5nJLX9IsyCNMeMXZhOauNdoeXD7K/RVvWDtOw=; b=dlCp/9XvC4G7XxHbwdBCNKrQn8dLIzh3uOKcy4JzXFXTA/EORnnIBdumCC71gdMRTS K4EYug1P7GPgIMfLsiYfwlBYnXVNFgEVV17vYydfDTl1zGEfP+fEd7yZK41O0U5SuHn7 URcZxn1EqIQUQRpEzWy7TWz0EI+4SI6j8GDDbYdvYNCFRPuJnPJjubNf4NgyP1T+xHLU OkCNk7n2a02+5rs+uJxGovT6M+XBDrFog2MVdcDtTCXbEExKnZNhm+cNNOS82VYthr1c as30gNk8ciSaTd9TkSJk4B6EOH/k3+RdKriQwRee6Lh8clMoqSNIq8C/44OzPbq5NCIP 5DSQ== X-Gm-Message-State: ALoCoQlorA0zWAC2t0watxy9EFrzigpzsjQ5kvwhz/78KTKE6VDqGkiiRnSP0hXkprseREncwRJ7 X-Received: by 10.112.225.135 with SMTP id rk7mr6523981lbc.6.1413984151514; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.130 with SMTP id z2ls200512laa.61.gmail; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) X-Received: by 10.112.140.8 with SMTP id rc8mr41143158lbb.2.1413984151341; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id zw4si23277224lbb.116.2014.10.22.06.22.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Oct 2014 06:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id hz20so2937362lab.11 for ; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) X-Received: by 10.152.6.228 with SMTP id e4mr41670158laa.71.1413984151224; Wed, 22 Oct 2014 06:22:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp69739lbz; Wed, 22 Oct 2014 06:22:30 -0700 (PDT) X-Received: by 10.107.168.39 with SMTP id r39mr1677738ioe.79.1413984149565; Wed, 22 Oct 2014 06:22:29 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id pm10si1842170igb.42.2014.10.22.06.22.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Oct 2014 06:22:29 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Xgvro-0000uq-Hq; Wed, 22 Oct 2014 13:22:20 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Xgvrm-0000uV-15 for edk2-devel@lists.sourceforge.net; Wed, 22 Oct 2014 13:22:18 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=lersek@redhat.com; helo=mx1.redhat.com; Received: from mx1.redhat.com ([209.132.183.28]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1Xgvrl-0006J0-34 for edk2-devel@lists.sourceforge.net; Wed, 22 Oct 2014 13:22:18 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9MDMAhH021970 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 22 Oct 2014 09:22:10 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-81.ams2.redhat.com [10.36.116.81]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9MDM2M5016088 for ; Wed, 22 Oct 2014 09:22:08 -0400 From: Laszlo Ersek To: edk2-devel@lists.sourceforge.net Date: Wed, 22 Oct 2014 15:21:53 +0200 Message-Id: <1413984117-20000-4-git-send-email-lersek@redhat.com> In-Reply-To: <1413984117-20000-1-git-send-email-lersek@redhat.com> References: <1413984117-20000-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Spam-Score: -2.9 (--) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1Xgvrl-0006J0-34 Subject: [edk2] [PATCH 3/7] OvmfPkg: BDS: don't overwrite the BDS Front Page timeout X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The PlatformBdsEnterFrontPage() function's first parameter, "TimeoutDefault", determines the behavior of the setup utility: - If (TimeoutDefault == 0), then the setup utility is not supposed to be entered (ie. PlatformBdsEnterFrontPage() is not supposed to be called in the first place), and the usual boot order is to be acted upon immediately. - If (TimeoutDefault == 0xFFFF), then the setup utility is entered unconditionally. - If (0 < TimeoutDefault && TimeoutDefault < 0xFFFF), then the PlatformBdsEnterFrontPage() function displays a progress bar, waiting for TimeoutDefault seconds. If the user presses a key, then the setup utility is entered, otherwise the normal boot option processing takes place. The TimeoutDefault parameter is supposed to be set from gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut which has the following (matching) documentation in "IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec": The number of seconds that the firmware will wait before initiating the original default boot selection. A value of 0 indicates that the default boot selection is to be initiated immediately on boot. The value of 0xFFFF then firmware will wait for user input before booting. OVMF does this actually -- see the Timeout variable in PlatformBdsPolicyBehavior() -- but right before calling PlatformBdsEnterFrontPage(), OVMF hardwires TimeoutDefault to 0xFFFF. This has been acceptable until now, because OVMF implements its own "wait for keypress at the splash screen" logic in PlatformBdsPolicyBehavior(), completely avoiding the progress bar mentioned above. OVMF only calls PlatformBdsEnterFrontPage() when the user presses a key during its own "splash screen wait", and *then* it indeed makes sense to enter the setup utility unconditionally. However, even that way, the Timeout = 0xffff; assignment is superfluous, because 0xFFFF is already the default value of PcdPlatformBootTimeOut in "IntelFrameworkModulePkg.dec", and OvmfPkg doesn't override it in its DSC files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c | 1 - 1 file changed, 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c index 9a079ab..f2ece66 100644 --- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1193,7 +1193,6 @@ Returns: // // Enter Setup if user input // - Timeout = 0xffff; PlatformBdsEnterFrontPage (Timeout, FALSE); } }