From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web12.14467.1583158015709531537 for ; Mon, 02 Mar 2020 06:06:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=eu7ymjFh; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f67.google.com with SMTP id a25so2633516wmm.0 for ; Mon, 02 Mar 2020 06:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=cnLus00MS8KpzufaUoBsDhgRUFSuAkM24lWuNC7P2z4=; b=eu7ymjFh5WKKe7oPm/MQ/0bwno6ztd8pxVlK5GG/rtWtCrl4pnE+hzMqyNJunczXp4 IW5EfctfX0Y+vO4dC3bCWjeGWTbpgZ8oaS4UGVT+xwyZQua3vsL/QEFbJPeC0qcwUhZq ieThQjYkkwgNgaD/CEYrXjhtnZmEP4HtvnRmZ3+i7Kpk8vzZ99mxbxycLl2TyS9i4qGG VCbsOPwFamF/nws9LEQrSZCPefBXJOMh2YTV009j/dFQp9Cyxdzze9or8mRHLD49s1hr M+r8znY4fx6XeP1Ga4d97+IK7cskva0pmPSyjbjBrosNlhO+bv+cAHX+p0LoZfPwZPzW Gycw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=cnLus00MS8KpzufaUoBsDhgRUFSuAkM24lWuNC7P2z4=; b=tiWPyxyWb/D/mBiRKFvg853FewPdLxCvBhiJzCMoO+7NFyXW+eMU7hnkkFRKFK5HnF VOxkmLFOFLkjHBFxfRF7HDWwLwsjs9FCjQaQXdE9fVl0GNBCp6UdRsQ5jTKXll/lR2sw xQtM2/KgEAe933idnVUUZkFGADAh8x4qaoBoFzAUkGWuYL/VYo0n7YPcTXpPRdMlNWZG NNK2ty2vzhCwQV6GKB+quYKy1vm25I0145VmrOgJTKRXNSusThniovwTC+nGnz/hcLmi xmaAwy2hUNajiCVDo27pIv+Q8Zv2yTWxjB7LnsC7a/CMNZP8UrzpAz41lKtX3Z6x+FBS 5dzw== X-Gm-Message-State: APjAAAXtBf6CzRyvk0UD947Mv2LusYJQqxwJwlVnxfTLzW5Vopk3lv9V l+moVJzW5U43OcLY10UaEDr9gDkPhnwMOcAC3d6lBg== X-Google-Smtp-Source: APXvYqwXIky5JRgyWHCTEeK7ggbk2FXoyMgn2v5UiuUnR7svefK/w8swEgvb3LftdikgdWeITKLpNS4Xh+6H+NiYZMg= X-Received: by 2002:a1c:bc46:: with SMTP id m67mr19332880wmf.40.1583158013369; Mon, 02 Mar 2020 06:06:53 -0800 (PST) MIME-Version: 1.0 References: <20200226221156.29589-1-lersek@redhat.com> <20200226221156.29589-16-lersek@redhat.com> In-Reply-To: <20200226221156.29589-16-lersek@redhat.com> From: "Ard Biesheuvel" Date: Mon, 2 Mar 2020 15:06:42 +0100 Message-ID: Subject: Re: [PATCH v2 15/16] OvmfPkg/CpuS3DataDxe: superficial cleanups To: Laszlo Ersek Cc: edk2-devel-groups-io , Igor Mammedov , Jiewen Yao , Jordan Justen , Michael Kinney , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 26 Feb 2020 at 23:12, Laszlo Ersek wrote: > > 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 > --- > > Notes: > v2: > > - 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= /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 > # > ## > > [Defines] > INF_VERSION =3D 1.29 > BASE_NAME =3D CpuS3DataDxe > FILE_GUID =3D 229B7EFD-DA02-46B9-93F4-E20C009F94E= 9 > MODULE_TYPE =3D DXE_DRIVER > VERSION_STRING =3D 1.0 > ENTRY_POINT =3D CpuS3DataInitialize > > # The following information is for reference only and not required by th= e build > # tools. > # > # VALID_ARCHITECTURES =3D IA32 X64 > > [Sources] > CpuS3Data.c > > [Packages] > - MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > + MdePkg/MdePkg.dec > UefiCpuPkg/UefiCpuPkg.dec > > [LibraryClasses] > - UefiDriverEntryPoint > - UefiBootServicesTableLib > + BaseLib > BaseMemoryLib > DebugLib > - BaseLib > - MtrrLib > MemoryAllocationLib > + MtrrLib > + UefiBootServicesTableLib > + UefiDriverEntryPoint > > [Guids] > gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event > > [Protocols] > gEfiMpServiceProtocolGuid ## CONSUMES > > [Pcd] > - gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## CONSUMES > - gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## PRODUCES > - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES > + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## C= ONSUMES > + gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize ## C= ONSUMES > + gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress ## P= RODUCES > > [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 > > This module initializes the ACPI_CPU_DATA structure and registers the ad= dress > of this structure in the PcdCpuS3DataAddress PCD. This is a generic/sim= ple > version of this module. It does not provide a machine check handler or = CPU > register initialization tables for ACPI S3 resume. It also only support= s the > number of CPUs reported by the MP Services Protocol, so this module does= not > support hot plug CPUs. This module can be copied into a CPU specific pa= ckage > and customized if these additional features are required. > > Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
> Copyright (c) 2015 - 2020, Red Hat, Inc. > > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > > #include > > #include > > #include > #include > -#include > #include > -#include > #include > +#include > +#include > > #include > #include > > // > // Data structure used to allocate ACPI_CPU_DATA and its supporting stru= ctures > // > typedef struct { > ACPI_CPU_DATA AcpiCpuData; > MTRR_SETTINGS MtrrTable; > IA32_DESCRIPTOR GdtrProfile; > IA32_DESCRIPTOR IdtrProfile; > } ACPI_CPU_DATA_EX; > > /** > Allocate EfiACPIMemoryNVS memory. > > @param[in] Size Size of memory to allocate. > > @return Allocated address for output. > > **/ > -- > 2.19.1.3.g30247aa5d201 > >