Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b66d16 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar
Browse files

x86/acpi, x86/boot: Take RSDP address for boot params if available 



In case the RSDP address in struct boot_params is specified don't try
to find the table by searching, but take the address directly as set
by the boot loader.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jia Zhang <qianyue.zj@alibaba-inc.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: boris.ostrovsky@oracle.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20181010061456.22238-4-jgross@suse.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ae7e1238

arch/x86/include/asm/acpi.h

+7 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static inline u64 acpi_arch_get_root_pointer(void) 


void acpi_generic_reduced_hw_init(void);



u64 x86_default_get_root_pointer(void);



#else /* !CONFIG_ACPI */



#define acpi_lapic 0
@@ -153,6 +155,11 @@ static inline void disable_acpi(void) { } 


static inline void acpi_generic_reduced_hw_init(void) { }



static inline u64 x86_default_get_root_pointer(void)

{

	return 0;

}



#endif /* !CONFIG_ACPI */



#define ARCH_HAS_POWER_INIT	1

arch/x86/kernel/acpi/boot.c

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <asm/mpspec.h>

#include <asm/smp.h>

#include <asm/i8259.h>

#include <asm/setup.h>



#include "sleep.h" /* To include x86_acpi_suspend_lowlevel */

static int __initdata acpi_force = 0;
@@ -1771,3 +1772,8 @@ void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size) 
	e820__range_add(addr, size, E820_TYPE_ACPI);

	e820__update_table_print();

}



u64 x86_default_get_root_pointer(void)

{

	return boot_params.hdr.acpi_rsdp_addr;

}

arch/x86/kernel/x86_init.c

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ static int __init iommu_init_noop(void) { return 0; } 
static void iommu_shutdown_noop(void) { }

static bool __init bool_x86_init_noop(void) { return false; }

static void x86_op_int_noop(int cpu) { }

static u64 u64_x86_init_noop(void) { return 0; }



/*

 * The platform setup functions are preset with the default functions
@@ -96,7 +95,7 @@ struct x86_init_ops x86_init __initdata = { 
	},



	.acpi = {

		.get_root_pointer	= u64_x86_init_noop,

		.get_root_pointer	= x86_default_get_root_pointer,

		.reduced_hw_early_init	= acpi_generic_reduced_hw_init,

	},

};