From nobody Sat Feb 7 06:49:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+54956+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54956+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582755160; cv=none; d=zohomail.com; s=zohoarc; b=NVwqEuPXmUQvdCh9sJwU1n04UKhwSqFyElMdEUQffWocVpOjyDS1xiaCTT2hS9FPzes56PDKtt3U3HZcIFUNzZ8e3t9IKuXReaMPfosrOyhsekWlCmDkaltHda8gh+9VdlZmQGxygfqXJ5AiJuQcawtMbopAZfsYVBN7de7syNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582755160; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=jnTmgmc7aq2ckNXiQuSkK19YO0vB4li+VUUkYr5Vnp4=; b=aOl5UZIxYLkSvnClZcqAJSOY8kIWtzKrNct65Ib+dSaPSOUdrOU7aPQbHFk6whCJtFHrrZjOujl9qnrSKYObrghAXGI1hm4yiUwUSqfDOn4k/NMKZleRx7QH9jhwtyqzHE3gh06tq9qTfEIPr+2pDZLLqMO5jDETYWWfqvdE1aw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54956+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 1582755160809276.18108726359094; Wed, 26 Feb 2020 14:12:40 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QZWNYY1788612xnkA2Uz02Hh; Wed, 26 Feb 2020 14:12:39 -0800 X-Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web10.245.1582755159300307466 for ; Wed, 26 Feb 2020 14:12:39 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-gBFR-VDMNHqDtIPFPlvJVA-1; Wed, 26 Feb 2020 17:12:36 -0500 X-MC-Unique: gBFR-VDMNHqDtIPFPlvJVA-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C12CF800D50; Wed, 26 Feb 2020 22:12:35 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-185.ams2.redhat.com [10.36.116.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1673C60BEF; Wed, 26 Feb 2020 22:12:33 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Igor Mammedov , Jiewen Yao , Jordan Justen , Michael Kinney , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups Date: Wed, 26 Feb 2020 23:11:55 +0100 Message-Id: <20200226221156.29589-16-lersek@redhat.com> In-Reply-To: <20200226221156.29589-1-lersek@redhat.com> References: <20200226221156.29589-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.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,lersek@redhat.com X-Gm-Message-State: bLIJZycaa8mNFUR6jymjNXMtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1582755159; bh=jnTmgmc7aq2ckNXiQuSkK19YO0vB4li+VUUkYr5Vnp4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=awEu4E226nmR//J2xCHzF7sAdB0h/gPMVPukoEN8aNJaaPHbDgfgId2hwQCuDtyfSEQ m5C6bUfC7QX4USbU50oLHSn8teDWDxm4+BaAUMsjwN1IM/MWvXHofJ1zhKdo5pY7Ofcek HqodrTZNd8GtsJoJJLbgRqgI8afg6SOlBFQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Sort the [Packages], [LibraryClasses], and [Pcd] sections in the INF file. Pad the usage notes (CONSUMES, PRODUCES) in the [Pcd] section. Sort the Library #includes in the C file. This patch is functionally a no-op. Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Jiewen Yao Cc: Jordan Justen Cc: Michael Kinney Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1512 Signed-off-by: Laszlo Ersek Acked-by: Ard Biesheuvel Reviewed-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daude --- Notes: v2: =20 - Pick up Ard's Acked-by, which is conditional on approval from Intel reviewers on Cc. (I'd like to save Ard the churn of re-acking unmodified patches.) OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 16 ++++++++-------- OvmfPkg/CpuS3DataDxe/CpuS3Data.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/OvmfPkg/CpuS3DataDxe/C= puS3DataDxe.inf index 0ad8a0b35d25..f9679e0c33b3 100644 --- a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf +++ b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -14,48 +14,48 @@ # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 [Defines] INF_VERSION =3D 1.29 BASE_NAME =3D CpuS3DataDxe FILE_GUID =3D 229B7EFD-DA02-46B9-93F4-E20C009F94E9 MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 ENTRY_POINT =3D CpuS3DataInitialize =20 # The following information is for reference only and not required by the = build # tools. # # VALID_ARCHITECTURES =3D IA32 X64 =20 [Sources] CpuS3Data.c =20 [Packages] - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec UefiCpuPkg/UefiCpuPkg.dec =20 [LibraryClasses] - UefiDriverEntryPoint - UefiBootServicesTableLib + BaseLib BaseMemoryLib DebugLib - BaseLib - MtrrLib MemoryAllocationLib + MtrrLib + UefiBootServicesTableLib + UefiDriverEntryPoint =20 [Guids] gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event =20 [Protocols] gEfiMpServiceProtocolGuid ## CONSUMES =20 [Pcd] - gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## CONSUMES - gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## PRODUCES - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CON= SUMES + gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## CON= SUMES + gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## PRO= DUCES =20 [Depex] gEfiMpServiceProtocolGuid diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c b/OvmfPkg/CpuS3DataDxe/CpuS3D= ata.c index 2bb60d591b1e..8bb9807cd501 100644 --- a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c +++ b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c @@ -3,48 +3,48 @@ ACPI CPU Data initialization module =20 This module initializes the ACPI_CPU_DATA structure and registers the addr= ess of this structure in the PcdCpuS3DataAddress PCD. This is a generic/simple version of this module. It does not provide a machine check handler or CPU register initialization tables for ACPI S3 resume. It also only supports = the number of CPUs reported by the MP Services Protocol, so this module does n= ot support hot plug CPUs. This module can be copied into a CPU specific pack= age and customized if these additional features are required. =20 Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
Copyright (c) 2015 - 2020, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include =20 #include =20 #include #include -#include #include -#include #include +#include +#include =20 #include #include =20 // // Data structure used to allocate ACPI_CPU_DATA and its supporting struct= ures // typedef struct { ACPI_CPU_DATA AcpiCpuData; MTRR_SETTINGS MtrrTable; IA32_DESCRIPTOR GdtrProfile; IA32_DESCRIPTOR IdtrProfile; } ACPI_CPU_DATA_EX; =20 /** Allocate EfiACPIMemoryNVS memory. =20 @param[in] Size Size of memory to allocate. =20 @return Allocated address for output. =20 **/ --=20 2.19.1.3.g30247aa5d201 -=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 (#54956): https://edk2.groups.io/g/devel/message/54956 Mute This Topic: https://groups.io/mt/71575190/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-