From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web12.13886.1583155540722752721 for ; Mon, 02 Mar 2020 05:25:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EVZIZQXj; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583155539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lFLmPAmSwxswbesd3+D8+d/WF1TFNu0BKdpLvf9GX60=; b=EVZIZQXjrp/oSTVojfpElz/oCyOsLfOOntaCKW0LJgUHYq5kuDv1aCty+XBZsVzjspfu/W x5scDoju00Quy7aB8trtuIcC99QH6Y5U6f58bWcSpBJFE4+VpKJgDQBQiKusKOAC7Hfyq0 G6wqAyq0OAQNvUseRnIkxxNHLktesao= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-401-b3bWn7UoNVqHHu5EV7GZYw-1; Mon, 02 Mar 2020 08:25:36 -0500 X-MC-Unique: b3bWn7UoNVqHHu5EV7GZYw-1 Received: by mail-wr1-f69.google.com with SMTP id w6so5776819wrm.16 for ; Mon, 02 Mar 2020 05:25:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zJzuyaGbzOYOZRMUjYYjFOLeKofWIy6xlCpWG4qt1mo=; b=p2qoeUNigIpVLQtzQH6t4HfeHnH2q90oAYEnL8vl6GTsL1KBmKdNOK9TIyfaaR7Huh tLJH027LL0qjuT1c2aDbQJvndxTsf5VOaknHCWB2+DIr1ngmMU/cj2jqGoehLWRj2U5w 06nwOC3Ug+78g1vZ+0BFf6S/VECzXTlRf5/LHI2TV6zLWJ8CsPvd1XNyuY71jcNc+9L8 5wzg6dq3lkQR8vxnDHaDAkI9vuwya3I5GhungG9Q+dGiU/XM/elIHt59ict35eq1IXwL I1dvefQLqSB+MAzzdVhVEhN1172s8IHGPki+PVvZdS4c91+1ulDsjE5xn1ZmD1bvT0R4 b9hQ== X-Gm-Message-State: ANhLgQ1gnJ6+RzB+H4fw8Jp93ouEcJrLCDE0aqGdaxKVT78t19Oykv9T L6hTIJlGX/Ks2ENH6cd3L3807RyZ2jiMqe3wftGXZnpTk6mZscEuFL7oBQbafKKLC05WT8jqsVP tEK8kpNjeslJmEQ== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr11213900wrw.177.1583155535570; Mon, 02 Mar 2020 05:25:35 -0800 (PST) X-Google-Smtp-Source: ADFU+vuw1shIbBxEhIFtxPw0O9i+6NXVuZdnf6cEvSFAJGd8nYYXwRSe61Ax3lldLiPRTeO8XHqczQ== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr11213876wrw.177.1583155535372; Mon, 02 Mar 2020 05:25:35 -0800 (PST) Return-Path: Received: from ?IPv6:2a01:e35:2fb0:49e0:3f7b:4b69:b9c:cdc0? ([2a01:e35:2fb0:49e0:3f7b:4b69:b9c:cdc0]) by smtp.gmail.com with ESMTPSA id i7sm18074861wma.32.2020.03.02.05.25.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Mar 2020 05:25:34 -0800 (PST) Subject: Re: [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups To: Laszlo Ersek , edk2-devel-groups-io Cc: Ard Biesheuvel , Igor Mammedov , Jiewen Yao , Jordan Justen , Michael Kinney References: <20200226221156.29589-1-lersek@redhat.com> <20200226221156.29589-16-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <9fa24dce-c604-859c-6aa2-1fbef590e97c@redhat.com> Date: Mon, 2 Mar 2020 14:25:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200226221156.29589-16-lersek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable On 2/26/20 11:11 PM, Laszlo Ersek wrote: > Sort the [Packages], [LibraryClasses], and [Pcd] sections in the INF file= . > Pad the usage notes (CONSUMES, PRODUCES) in the [Pcd] section. >=20 > Sort the Library #includes in the C file. >=20 > This patch is functionally a no-op. >=20 > 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 > --- >=20 > Notes: > v2: > =20 > - Pick up Ard's Acked-by, which is conditional on approval from Inte= l > reviewers on Cc. (I'd like to save Ard the churn of re-acking > unmodified patches.) >=20 > OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 16 ++++++++-------- > OvmfPkg/CpuS3DataDxe/CpuS3Data.c | 4 ++-- > 2 files changed, 10 insertions(+), 10 deletions(-) >=20 > diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/OvmfPkg/CpuS3DataDxe= /CpuS3DataDxe.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-E20C009F94= E9 > 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 t= he 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 ## C= ONSUMES > + gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## C= ONSUMES > + gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## P= RODUCES > =20 > [Depex] > gEfiMpServiceProtocolGuid > diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c b/OvmfPkg/CpuS3DataDxe/CpuS= 3Data.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 a= ddress > of this structure in the PcdCpuS3DataAddress PCD. This is a generic/si= mple > version of this module. It does not provide a machine check handler or= CPU > register initialization tables for ACPI S3 resume. It also only suppor= ts the > number of CPUs reported by the MP Services Protocol, so this module doe= s not > support hot plug CPUs. This module can be copied into a CPU specific p= ackage > 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 str= uctures > // > 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 Reviewed-by: Philippe Mathieu-Daude