From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: u-boot@lists.denx.de
Subject: [PATCH v3 16/29] x86: Move acpi_s3.h to include/acpi/
Date: Fri, 3 Apr 2020 15:53:55 +0300 [thread overview]
Message-ID: <20200403125355.GC3676135@smile.fi.intel.com> (raw)
In-Reply-To: <20200330171226.v3.16.Ie511d0d0f8ddd84e9c49768b0b68f7bedd402428@changeid>
On Mon, Mar 30, 2020 at 05:12:52PM -0600, Simon Glass wrote:
> This header relates to ACPI and we are about to add some more ACPI
> headers. Move this one into a new directory so they are together.
>
FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
One nit below.
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3:
> - Add new patch to move acpi_s3.h to include/acpi/
>
> Changes in v2: None
>
> arch/x86/cpu/apollolake/cpu_spl.c | 2 +-
> arch/x86/cpu/apollolake/fsp_s.c | 2 +-
> arch/x86/cpu/apollolake/pmc.c | 2 +-
> arch/x86/cpu/baytrail/acpi.c | 4 ++--
> arch/x86/cpu/cpu.c | 2 +-
> arch/x86/cpu/wakeup.S | 2 +-
> arch/x86/lib/acpi_s3.c | 2 +-
> arch/x86/lib/coreboot_table.c | 2 +-
> arch/x86/lib/fsp/fsp_common.c | 2 +-
> arch/x86/lib/fsp1/fsp_common.c | 2 +-
> arch/x86/lib/fsp2/fsp_dram.c | 2 +-
> drivers/pci/pci_rom.c | 4 +---
> drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 +-
> drivers/sysreset/sysreset_x86.c | 2 +-
> include/{ => acpi}/acpi_s3.h | 0
> 15 files changed, 15 insertions(+), 17 deletions(-)
> rename include/{ => acpi}/acpi_s3.h (100%)
>
> diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
> index 8a39c3128e0..e2509e391fa 100644
> --- a/arch/x86/cpu/apollolake/cpu_spl.c
> +++ b/arch/x86/cpu/apollolake/cpu_spl.c
> @@ -6,13 +6,13 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <dm.h>
> #include <ec_commands.h>
> #include <log.h>
> #include <spi_flash.h>
> #include <spl.h>
> #include <syscon.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/cpu.h>
> #include <asm/cpu_common.h>
> #include <asm/cpu_x86.h>
> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
> index 1f22c1ea3c6..17cf1682ad0 100644
> --- a/arch/x86/cpu/apollolake/fsp_s.c
> +++ b/arch/x86/cpu/apollolake/fsp_s.c
> @@ -5,11 +5,11 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <binman.h>
> #include <dm.h>
> #include <irq.h>
> #include <malloc.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/intel_pinctrl.h>
> #include <asm/io.h>
> #include <asm/intel_regs.h>
> diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
> index aec0c8394c2..4ea7c7447bc 100644
> --- a/arch/x86/cpu/apollolake/pmc.c
> +++ b/arch/x86/cpu/apollolake/pmc.c
> @@ -9,10 +9,10 @@
> #define LOG_CATEGORY UCLASS_ACPI_PMC
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <dt-structs.h>
> #include <dm.h>
> #include <spl.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/io.h>
> #include <asm/pci.h>
> #include <power/acpi_pmc.h>
> diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c
> index f44228e6939..3c27391873c 100644
> --- a/arch/x86/cpu/baytrail/acpi.c
> +++ b/arch/x86/cpu/baytrail/acpi.c
> @@ -4,15 +4,15 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <cpu.h>
> #include <dm.h>
> -#include <dm/uclass-internal.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/acpi_table.h>
> #include <asm/io.h>
> #include <asm/tables.h>
> #include <asm/arch/global_nvs.h>
> #include <asm/arch/iomap.h>
> +#include <dm/uclass-internal.h>
>
> void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
> void *dsdt)
> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
> index dae06949cc6..246ee50948c 100644
> --- a/arch/x86/cpu/cpu.c
> +++ b/arch/x86/cpu/cpu.c
> @@ -19,7 +19,6 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <command.h>
> #include <cpu_func.h>
> #include <dm.h>
> @@ -27,6 +26,7 @@
> #include <init.h>
> #include <malloc.h>
> #include <syscon.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/acpi.h>
> #include <asm/acpi_table.h>
> #include <asm/control_regs.h>
> diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S
> index 244ca1276af..093bf3bcc5c 100644
> --- a/arch/x86/cpu/wakeup.S
> +++ b/arch/x86/cpu/wakeup.S
> @@ -5,7 +5,7 @@
> * From coreboot src/arch/x86/wakeup.S
> */
>
> -#include <acpi_s3.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/processor.h>
> #include <asm/processor-flags.h>
>
> diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c
> index 197636c4b50..c3759ec8492 100644
> --- a/arch/x86/lib/acpi_s3.c
> +++ b/arch/x86/lib/acpi_s3.c
> @@ -4,7 +4,7 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/acpi.h>
> #include <asm/acpi_table.h>
> #include <asm/post.h>
> diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
> index 2943e11d2a4..c996fc588df 100644
> --- a/arch/x86/lib/coreboot_table.c
> +++ b/arch/x86/lib/coreboot_table.c
> @@ -4,9 +4,9 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <malloc.h>
> #include <vbe.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/coreboot_tables.h>
> #include <asm/e820.h>
>
> diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
> index 5eff0f99aad..267527eb344 100644
> --- a/arch/x86/lib/fsp/fsp_common.c
> +++ b/arch/x86/lib/fsp/fsp_common.c
> @@ -4,11 +4,11 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <cpu_func.h>
> #include <dm.h>
> #include <errno.h>
> #include <rtc.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/cmos_layout.h>
> #include <asm/early_cmos.h>
> #include <asm/io.h>
> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
> index aee2a05044f..0a726807c2b 100644
> --- a/arch/x86/lib/fsp1/fsp_common.c
> +++ b/arch/x86/lib/fsp1/fsp_common.c
> @@ -4,11 +4,11 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <dm.h>
> #include <errno.h>
> #include <malloc.h>
> #include <rtc.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/cmos_layout.h>
> #include <asm/early_cmos.h>
> #include <asm/io.h>
> diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
> index 90a238a2245..c8f2c09b6a7 100644
> --- a/arch/x86/lib/fsp2/fsp_dram.c
> +++ b/arch/x86/lib/fsp2/fsp_dram.c
> @@ -5,9 +5,9 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <handoff.h>
> #include <spl.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/arch/cpu.h>
> #include <asm/fsp/fsp_support.h>
> #include <asm/fsp2/fsp_api.h>
> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
> index 90f224b0452..6b17f18bc07 100644
> --- a/drivers/pci/pci_rom.c
> +++ b/drivers/pci/pci_rom.c
> @@ -33,12 +33,10 @@
> #include <vbe.h>
> #include <video.h>
> #include <video_fb.h>
> +#include <acpi/acpi_s3.h>
> #include <linux/screen_info.h>
>
> -#ifdef CONFIG_X86
There is nothing in commit message about this change. Is it safe? Don't you get
new compiler warnings (like defined-but-not-used)?
> -#include <acpi_s3.h>
> DECLARE_GLOBAL_DATA_PTR;
> -#endif
>
> __weak bool board_should_run_oprom(struct udevice *dev)
> {
> diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
> index d43de87126c..1c79f835c66 100644
> --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c
> +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c
> @@ -6,9 +6,9 @@
> #define LOG_CATEGORY UCLASS_ACPI_PMC
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <dm.h>
> #include <log.h>
> +#include <acpi/acpi_s3.h>
> #ifdef CONFIG_X86
> #include <asm/intel_pinctrl.h>
> #endif
> diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
> index 8e2d1eaa7a1..bc911435602 100644
> --- a/drivers/sysreset/sysreset_x86.c
> +++ b/drivers/sysreset/sysreset_x86.c
> @@ -6,11 +6,11 @@
> */
>
> #include <common.h>
> -#include <acpi_s3.h>
> #include <dm.h>
> #include <efi_loader.h>
> #include <pch.h>
> #include <sysreset.h>
> +#include <acpi/acpi_s3.h>
> #include <asm/io.h>
> #include <asm/processor.h>
>
> diff --git a/include/acpi_s3.h b/include/acpi/acpi_s3.h
> similarity index 100%
> rename from include/acpi_s3.h
> rename to include/acpi/acpi_s3.h
> --
> 2.26.0.rc2.310.g2932bb562d-goog
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-04-03 12:53 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 23:12 [PATCH v3 00/29] dm: Add programmatic generation of ACPI tables (part A) Simon Glass
2020-03-30 23:12 ` [PATCH v3 01/29] cpu: Support querying the address width Simon Glass
2020-03-30 23:12 ` [PATCH v3 02/29] spi: Add SPI mode enums Simon Glass
2020-03-30 23:12 ` [PATCH v3 03/29] tpm: cr50: Release locality on exit Simon Glass
2020-03-30 23:12 ` [PATCH v3 04/29] tpm: cr50: Add a comment for cr50_priv Simon Glass
2020-03-30 23:12 ` [PATCH v3 05/29] tpm: cr50: Use the correct GPIO binding Simon Glass
2020-03-30 23:12 ` [PATCH v3 06/29] tpm: Don't cleanup unless an error happens Simon Glass
2020-03-30 23:12 ` [PATCH v3 07/29] dm: pci: Allow disabling auto-config for a device Simon Glass
2020-03-30 23:12 ` [PATCH v3 08/29] x86: Correct wording of coreboot source code Simon Glass
2020-03-30 23:12 ` [PATCH v3 09/29] x86: apl: Move p2sb ofdata reading to the correct method Simon Glass
2020-03-30 23:12 ` [PATCH v3 10/29] pci: Adjust dm_pci_read_bar32() to return errors correctly Simon Glass
2020-04-03 11:22 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-04-08 16:58 ` Andy Shevchenko
2020-04-08 22:15 ` Simon Glass
2020-03-30 23:12 ` [PATCH v3 11/29] x86: apl: Add Global NVS table header Simon Glass
2020-03-31 8:07 ` Antwort: " Wolfgang Wallner
2020-04-03 11:25 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 12/29] dm: core: Add basic ACPI support Simon Glass
2020-03-31 8:16 ` Antwort: " Wolfgang Wallner
2020-04-03 11:35 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-04-08 17:01 ` Andy Shevchenko
2020-04-08 22:15 ` Simon Glass
2020-03-30 23:12 ` [PATCH v3 13/29] dts: Add a binding for hid-over-i2c Simon Glass
2020-03-31 19:25 ` Antwort: " Wolfgang Wallner
2020-04-01 7:39 ` Wolfgang Wallner
2020-04-08 2:57 ` Simon Glass
2020-04-08 2:58 ` Simon Glass
2020-04-08 17:08 ` Andy Shevchenko
2020-04-08 19:39 ` Antwort: " Wolfgang Wallner
2020-04-08 20:40 ` Andy Shevchenko
2020-04-08 20:49 ` Andy Shevchenko
2020-04-15 14:00 ` Antwort: Re: " Wolfgang Wallner
2020-04-15 14:25 ` Andy Shevchenko
2020-04-15 14:57 ` Antwort: Re: Re: " Wolfgang Wallner
2020-04-15 15:15 ` Andy Shevchenko
2020-04-15 15:17 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 14/29] acpi: Add a binding for ACPI settings in the device tree Simon Glass
2020-04-03 12:42 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 15/29] acpi: Add a simple sandbox test Simon Glass
2020-04-03 12:51 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-04-08 16:57 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 16/29] x86: Move acpi_s3.h to include/acpi/ Simon Glass
2020-04-03 12:53 ` Andy Shevchenko [this message]
2020-04-08 2:57 ` Simon Glass
2020-04-08 17:03 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 17/29] x86: Move acpi_table header to main include/ directory Simon Glass
2020-04-03 12:58 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-04-08 17:04 ` Andy Shevchenko
2020-04-08 22:15 ` Simon Glass
2020-03-30 23:12 ` [PATCH v3 18/29] acpi: Add an __ACPI__ preprocessor symbol Simon Glass
2020-03-30 23:12 ` [PATCH v3 19/29] acpi: Add a central location for table version numbers Simon Glass
2020-03-31 19:30 ` Antwort: " Wolfgang Wallner
2020-04-08 2:58 ` Simon Glass
2020-04-03 13:04 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-03-30 23:12 ` [PATCH v3 20/29] acpi: Add support for DMAR Simon Glass
2020-03-31 19:34 ` Antwort: " Wolfgang Wallner
2020-04-03 13:15 ` Andy Shevchenko
2020-03-30 23:12 ` [PATCH v3 21/29] test: Add hexdump.h to the unit test header Simon Glass
2020-04-06 11:53 ` Antwort: " Wolfgang Wallner
2020-03-30 23:12 ` [PATCH v3 22/29] acpi: Add a method to write tables for a device Simon Glass
2020-04-03 13:20 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-03-30 23:12 ` [PATCH v3 23/29] acpi: Convert part of acpi_table to use acpi_ctx Simon Glass
2020-04-03 13:24 ` Andy Shevchenko
2020-04-03 13:25 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-03-30 23:13 ` [PATCH v3 24/29] x86: Allow devices to write ACPI tables Simon Glass
2020-03-30 23:13 ` [PATCH v3 25/29] acpi: Drop code for missing XSDT from acpi_write_rsdp() Simon Glass
2020-03-30 23:13 ` [PATCH v3 26/29] acpi: Move acpi_add_table() to generic code Simon Glass
2020-03-30 23:13 ` [PATCH v3 27/29] acpi: Put table-setup code in its own function Simon Glass
2020-04-03 13:32 ` Andy Shevchenko
2020-04-08 2:57 ` Simon Glass
2020-04-08 17:11 ` Andy Shevchenko
2020-04-08 19:35 ` Simon Glass
2020-03-30 23:13 ` [PATCH v3 28/29] acpi: Move the xsdt pointer to acpi_ctx Simon Glass
2020-03-30 23:13 ` [PATCH v3 29/29] acpi: Add an acpi command Simon Glass
2020-03-31 18:14 ` Leif Lindholm
2020-04-03 13:41 ` Andy Shevchenko
2020-04-03 13:39 ` Andy Shevchenko
2020-03-31 6:31 ` [PATCH v3 00/29] dm: Add programmatic generation of ACPI tables (part A) Heinrich Schuchardt
2020-04-02 2:34 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200403125355.GC3676135@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox