From patchwork Sat Jun 27 01:08:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 50383 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EF6F922902 for ; Sat, 27 Jun 2015 01:09:17 +0000 (UTC) Received: by widjy10 with SMTP id jy10sf8151557wid.3 for ; Fri, 26 Jun 2015 18:09:17 -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:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=Vveu/eTuSI5ImZ/otnoKAeWXeZpKpDMFVuks/3Gi24Q=; b=GoXP2TtZcByLezOk3et+RPQ/iMftTlgdj8fAU0AAEl8OHbqWYM7o2+RWTiHxZFxpw0 FGNTfga03OoC2LfI5G6CT3ei6pya0oMuAD1Pue5CBG9TVTslu8i5VCTslmncNE2O86pD Kqk9jmRPlMjca2rTcq6hxi4zJMae5TSy2Y4nrl53VmXJi3o9NPaXeCdwOnSP+uTEzZYK 6KxPbUVq4N9bbCm8mEDAJAeeG8XrazATvZa97jMdkqv79Vk65Wh0oPDi8mF0+EyYAtes vg1EgzwOzQjf+JJMLiLNWifKP+9+1DYsPtPXlJ1y0it6HeLQAA1MgR1+8+AG3t41AjlM TV3g== X-Gm-Message-State: ALoCoQlk/Dy4FCNJa13zvsY0VvBMbAHQHSJKfiEe/KqMLRCo0tZet5uOLD3A9xzcu6Dq9K5/fGoK X-Received: by 10.180.86.98 with SMTP id o2mr666572wiz.4.1435367357168; Fri, 26 Jun 2015 18:09:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.137 with SMTP id f9ls604398lae.5.gmail; Fri, 26 Jun 2015 18:09:16 -0700 (PDT) X-Received: by 10.152.19.35 with SMTP id b3mr3994274lae.92.1435367356586; Fri, 26 Jun 2015 18:09:16 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id sc4si28802082lbb.99.2015.06.26.18.09.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 18:09:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by laar3 with SMTP id r3so11304516laa.0 for ; Fri, 26 Jun 2015 18:09:16 -0700 (PDT) X-Received: by 10.112.155.197 with SMTP id vy5mr3996846lbb.29.1435367355929; Fri, 26 Jun 2015 18:09:15 -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.108.230 with SMTP id hn6csp257448lbb; Fri, 26 Jun 2015 18:09:11 -0700 (PDT) X-Received: by 10.107.153.76 with SMTP id b73mr5433087ioe.36.1435367340515; Fri, 26 Jun 2015 18:09:00 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id k65si29130759iok.7.2015.06.26.18.08.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Jun 2015 18:09:00 -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-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z8ebw-00009g-Ju; Sat, 27 Jun 2015 01:08:48 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z8ebv-00009W-OS for edk2-devel@lists.sourceforge.net; Sat, 27 Jun 2015 01:08:47 +0000 Received-SPF: pass (sog-mx-2.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-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1Z8ebu-00071l-JA for edk2-devel@lists.sourceforge.net; Sat, 27 Jun 2015 01:08:47 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id E4B7ACA62F; Sat, 27 Jun 2015 01:08:40 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com ([10.10.116.30]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5R18Mlj024813; Fri, 26 Jun 2015 21:08:39 -0400 From: Laszlo Ersek To: edk2-devel@lists.sourceforge.net Date: Sat, 27 Jun 2015 03:08:14 +0200 Message-Id: <1435367296-28493-8-git-send-email-lersek@redhat.com> In-Reply-To: <1435367296-28493-1-git-send-email-lersek@redhat.com> References: <1435367296-28493-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1Z8ebu-00071l-JA Cc: "Yao, Jiewen" Subject: [edk2] [PATCH 7/9] IntelFrameworkModulePkg/GenericBdsLib: remove AcpiS3->S3Save() call 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.51 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 From: Ard Biesheuvel The AcpiS3->S3Save() call needs to occur before the end-of-DXE event is signalled. The end-of-DXE event needs to be signalled prior to invoking any UEFI drivers, applications, or connecting consoles. This means the call to S3Save() that occurs in BdsLibBootViaBootOption() violates the ordering constraints, and should be removed. Since it is the responsibility of the platform BDS to signal the end-of-DXE event, it should also perform the AcpiS3->S3Save() call at an appropriate time. Commit message update from Laszlo Ersek : Following the idea of Jiewen Yao , the S3 system info will now be collected directly in response to End-of-Dxe, and AcpiS3->S3Save() calls will be completely eliminated. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek Reviewed-by: Yao, Jiewen [lersek@redhat.com: updated commit message] Cc: Ard Biesheuvel Cc: Yao, Jiewen Signed-off-by: Laszlo Ersek --- IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf | 1 - IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h | 1 - IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf index 5381e33..5a138a9 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf @@ -119,7 +119,6 @@ [Protocols] gEfiLegacyBiosProtocolGuid ## SOMETIMES_CONSUMES gEfiCpuArchProtocolGuid ## CONSUMES gEfiDevicePathProtocolGuid ## CONSUMES - gEfiAcpiS3SaveProtocolGuid ## SOMETIMES_CONSUMES gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES gEfiUgaDrawProtocolGuid |gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## SOMETIMES_CONSUMES gEfiOEMBadgingProtocolGuid ## SOMETIMES_CONSUMES diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h index c32579b..7201d8a 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h @@ -33,7 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c index e02a710..4b7eca7 100644 --- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c +++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c @@ -2233,7 +2233,6 @@ BdsLibBootViaBootOption ( EFI_DEVICE_PATH_PROTOCOL *FilePath; EFI_LOADED_IMAGE_PROTOCOL *ImageInfo; EFI_DEVICE_PATH_PROTOCOL *WorkingDevicePath; - EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save; LIST_ENTRY TempBootLists; EFI_BOOT_LOGO_PROTOCOL *BootLogo; @@ -2241,15 +2240,6 @@ BdsLibBootViaBootOption ( *ExitData = NULL; // - // Notes: this code can be remove after the s3 script table - // hook on the event EVT_SIGNAL_READY_TO_BOOT or - // EVT_SIGNAL_LEGACY_BOOT - // - Status = gBS->LocateProtocol (&gEfiAcpiS3SaveProtocolGuid, NULL, (VOID **) &AcpiS3Save); - if (!EFI_ERROR (Status)) { - AcpiS3Save->S3Save (AcpiS3Save, NULL); - } - // // If it's Device Path that starts with a hard drive path, append it with the front part to compose a // full device path //