From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [RFC PATCH 1/4] acpi: change the topo of acpi_table_upgrade() Date: Mon, 7 Jan 2019 11:55:48 +0100 Message-ID: References: <1546849485-27933-1-git-send-email-kernelfans@gmail.com> <1546849485-27933-2-git-send-email-kernelfans@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <1546849485-27933-2-git-send-email-kernelfans@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Pingfan Liu Cc: the arch/x86 maintainers , ACPI Devel Maling List , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , "Rafael J. Wysocki" , Len Brown , Linux Kernel Mailing List List-Id: linux-acpi@vger.kernel.org On Mon, Jan 7, 2019 at 9:25 AM Pingfan Liu wrote: > > The current acpi_table_upgrade() relies on initrd_start, but this var is > only valid after relocate_initrd(). There is requirement to extract the > acpi info from initrd before memblock-allocator can work(see [2/4]), hence > acpi_table_upgrade() need to accept the input param directly. > > Signed-off-by: Pingfan Liu > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: "H. Peter Anvin" > Cc: Dave Hansen > Cc: Andy Lutomirski > Cc: Peter Zijlstra > Cc: "Rafael J. Wysocki" > Cc: Len Brown > Cc: linux-kernel@vger.kernel.org Acked-by: Rafael J. Wysocki > --- > arch/arm64/kernel/setup.c | 2 +- > arch/x86/kernel/setup.c | 2 +- > drivers/acpi/tables.c | 4 +--- > include/linux/acpi.h | 4 ++-- > 4 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 4b0e123..48cb98c 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -315,7 +315,7 @@ void __init setup_arch(char **cmdline_p) > paging_init(); > efi_apply_persistent_mem_reservations(); > > - acpi_table_upgrade(); > + acpi_table_upgrade((void *)initrd_start, initrd_end - initrd_start); > > /* Parse the ACPI tables for possible boot-time configuration */ > acpi_boot_table_init(); > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 3d872a5..acbcd62 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -1175,8 +1175,8 @@ void __init setup_arch(char **cmdline_p) > > reserve_initrd(); > > - acpi_table_upgrade(); > > + acpi_table_upgrade((void *)initrd_start, initrd_end - initrd_start); > vsmp_init(); > > io_delay_init(); > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index 48eabb6..d29b05c 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -471,10 +471,8 @@ static DECLARE_BITMAP(acpi_initrd_installed, NR_ACPI_INITRD_TABLES); > > #define MAP_CHUNK_SIZE (NR_FIX_BTMAPS << PAGE_SHIFT) > > -void __init acpi_table_upgrade(void) > +void __init acpi_table_upgrade(void *data, size_t size) > { > - void *data = (void *)initrd_start; > - size_t size = initrd_end - initrd_start; > int sig, no, table_nr = 0, total_offset = 0; > long offset = 0; > struct acpi_table_header *table; > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 87715f2..44dcbba 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1272,9 +1272,9 @@ acpi_graph_get_remote_endpoint(const struct fwnode_handle *fwnode, > #endif > > #ifdef CONFIG_ACPI_TABLE_UPGRADE > -void acpi_table_upgrade(void); > +void acpi_table_upgrade(void *data, size_t size); > #else > -static inline void acpi_table_upgrade(void) { } > +static inline void acpi_table_upgrade(void *data, size_t size) { } > #endif > > #if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG) > -- > 2.7.4 >