From: Olof Johansson <olof@lixom.net> To: Hanjun Guo <hanjun.guo@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com>, Mark Brown <broonie@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Lv Zheng <lv.zheng@intel.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Robert Moore <robert.moore@intel.com>, "linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>, Grant Likely <grant.likely@linaro.org>, Charles Garcia-Tobin <Charles.Garcia-Tobin@arm.com>, Robert Richter <rric@kernel.org>, Jason Cooper <jason@lakedaemon.net>, Arnd Bergmann <arnd@arndb.de>, Marc Zyngier <marc.zyngier@arm.com>, Liviu Dudau <Liviu.Dudau@arm.com>, linaro-acpi-private@linaro.org, Bjorn Helgaas <bhelgaas@google.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, Graeme Gregory <graeme.gregory@linaro.org>, Randy Dunlap <rdunlap@infradead.org>, Rafael J. Wysock Subject: Re: [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Date: Wed, 30 Jul 2014 21:22:17 -0700 [thread overview] Message-ID: <CAOesGMjzFyd_=+ToFmjyn958F86KsDJDht+9ZmniAERz16K_VQ@mail.gmail.com> (raw) In-Reply-To: <1406206825-15590-7-git-send-email-hanjun.guo@linaro.org> Hi, On Thu, Jul 24, 2014 at 6:00 AM, Hanjun Guo <hanjun.guo@linaro.org> wrote: > There are two flags: PSCI_COMPLIANT and PSCI_USE_HVC. When set, > the former signals to the OS that the hardware is PSCI compliant. > The latter selects the appropriate conduit for PSCI calls by > toggling between Hypervisor Calls (HVC) and Secure Monitor Calls > (SMC). > > FADT table contains such information, parse FADT to get the flags > for PSCI init. Since ACPI 5.1 doesn't support self defined PSCI > function IDs, which means that only PSCI 0.2+ is supported in ACPI. > > At the same time, only ACPI 5.1 or higher verison supports PSCI, > and FADT Major.Minor version was introduced in ACPI 5.1, so we > will check the version and only parse FADT table with version >= 5.1. > > If firmware provides ACPI tables with ACPI version less than 5.1, > OS will be messed up with those information and have no way to > bring up secondery CPUs, so disable ACPI if we get an FADT table > with version less that 5.1. > > Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> > Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> > --- > arch/arm64/include/asm/acpi.h | 2 + > arch/arm64/kernel/acpi.c | 50 ++++++++++++++++++++++ > arch/arm64/kernel/psci.c | 95 +++++++++++++++++++++++++++++------------ > arch/arm64/kernel/setup.c | 2 + > 4 files changed, 121 insertions(+), 28 deletions(-) > > diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h > index 44b617f..67dac90 100644 > --- a/arch/arm64/include/asm/acpi.h > +++ b/arch/arm64/include/asm/acpi.h > @@ -18,6 +18,8 @@ extern int acpi_disabled; > extern int acpi_noirq; > extern int acpi_pci_disabled; > extern int acpi_strict; > +extern int acpi_psci_present; > +extern int acpi_psci_use_hvc; > > static inline void disable_acpi(void) > { > diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c > index f5a10b5..374926f 100644 > --- a/arch/arm64/kernel/acpi.c > +++ b/arch/arm64/kernel/acpi.c > @@ -11,6 +11,8 @@ > * published by the Free Software Foundation. > */ > > +#define pr_fmt(fmt) "ACPI: " fmt > + > #include <linux/init.h> > #include <linux/acpi.h> > #include <linux/cpumask.h> > @@ -34,6 +36,12 @@ EXPORT_SYMBOL(acpi_disabled); > int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ > EXPORT_SYMBOL(acpi_pci_disabled); > > +/* 1 to indicate PSCI is implemented */ > +int acpi_psci_present; > + > +/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */ > +int acpi_psci_use_hvc; Here's a prime example of where it would just make more sense to populate DT based on what's in the ACPI info. Have a acpi_parse_fadt() that, if needed, creates a /psci node in the system-wide DT and populates it with the few properties needed. That way, the rest of the code path in the kernel setup is identical, instead of dealing with separate functions for setup, two exported variables just to communicate the state, and so on. It's just extra complexity for no good reason. The ACPi side code isn't even adding significant complexity compared to this. We'll need to add an of_add_node() property though. > /* > * __acpi_map_table() will be called before page_init(), so early_ioremap() > * or early_memremap() should be called here to for ACPI table mapping. > @@ -54,6 +62,33 @@ void __init __acpi_unmap_table(char *map, unsigned long size) > early_iounmap(map, size); > } > > +static int __init acpi_parse_fadt(struct acpi_table_header *table) > +{ > + struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table; > + > + /* > + * Revision in table header is the FADT Major version, > + * and there is a minor version of FADT which was introduced > + * by ACPI 5.1, we only deal with ACPI 5.1 or higher version > + * to get arm boot flags, or we will disable ACPI. > + */ > + if (table->revision < 5 || fadt->minor_version < 1) { > + pr_info("FADT version is %d.%d, no PSCI support, should be 5.1 or higher\n", > + table->revision, fadt->minor_version); > + acpi_psci_present = 0; > + disable_acpi(); This does more than just check for FADT/PSCI, it disables ACPI alltogether. That kind of side effect from parse_fadt() doesn't seem appropriate. > + return -EINVAL; > + } > + > + if (acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT) > + acpi_psci_present = 1; > + > + if (acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC) > + acpi_psci_use_hvc = 1; > + > + return 0; > +} > + > /* > * acpi_boot_table_init() called from setup_arch(), always. > * 1. find RSDP and get its address, and then find XSDT > @@ -75,6 +110,21 @@ void __init acpi_boot_table_init(void) > } > } > > +int __init acpi_boot_init(void) > +{ > + int err = 0; > + > + /* If acpi_disabled, bail out */ > + if (acpi_disabled) > + return -ENODEV; > + > + err = acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt); > + if (err) > + pr_err("Can't find FADT\n"); > + > + return err; > +} > + > static int __init parse_acpi(char *arg) > { > if (!arg) > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index 9e9798f..adb25f3 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -15,6 +15,7 @@ > > #define pr_fmt(fmt) "psci: " fmt > > +#include <linux/acpi.h> > #include <linux/init.h> > #include <linux/of.h> > #include <linux/smp.h> > @@ -231,6 +232,33 @@ static void psci_sys_poweroff(void) > invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); > } > > +static void psci_0_2_set_functions(void) > +{ > + pr_info("Using standard PSCI v0.2 function IDs\n"); > + psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND; > + psci_ops.cpu_suspend = psci_cpu_suspend; > + > + psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF; > + psci_ops.cpu_off = psci_cpu_off; > + > + psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON; > + psci_ops.cpu_on = psci_cpu_on; > + > + psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE; > + psci_ops.migrate = psci_migrate; > + > + psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO; > + psci_ops.affinity_info = psci_affinity_info; > + > + psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] = > + PSCI_0_2_FN_MIGRATE_INFO_TYPE; > + psci_ops.migrate_info_type = psci_migrate_info_type; > + > + arm_pm_restart = psci_sys_reset; > + > + pm_power_off = psci_sys_poweroff; > +} > + > /* > * PSCI Function IDs for v0.2+ are well defined so use > * standard values. > @@ -264,29 +292,7 @@ static int psci_0_2_init(struct device_node *np) > } > } > > - pr_info("Using standard PSCI v0.2 function IDs\n"); > - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND; > - psci_ops.cpu_suspend = psci_cpu_suspend; > - > - psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF; > - psci_ops.cpu_off = psci_cpu_off; > - > - psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON; > - psci_ops.cpu_on = psci_cpu_on; > - > - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE; > - psci_ops.migrate = psci_migrate; > - > - psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO; > - psci_ops.affinity_info = psci_affinity_info; > - > - psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] = > - PSCI_0_2_FN_MIGRATE_INFO_TYPE; > - psci_ops.migrate_info_type = psci_migrate_info_type; > - > - arm_pm_restart = psci_sys_reset; > - > - pm_power_off = psci_sys_poweroff; > + psci_0_2_set_functions(); > > out_put_node: > of_node_put(np); > @@ -333,6 +339,33 @@ out_put_node: > return err; > } > > +#ifdef CONFIG_ACPI > +static int get_set_conduit_method_acpi(void) > +{ > + if (acpi_psci_use_hvc) > + invoke_psci_fn = __invoke_psci_fn_hvc; > + else > + invoke_psci_fn = __invoke_psci_fn_smc; > + > + return 0; > +} > + > +/* We use PSCI 0.2+ when ACPI is deployed */ > +static int psci_0_2_init_acpi(void) > +{ > + get_set_conduit_method_acpi(); > + > + psci_0_2_set_functions(); Here's a good example of the two code paths doing different things. The DT code paths does a test call into PSCI to make sure it's actually supported, while you blindly trust it. Keeping the code paths common has value w.r.t these kind of things. > + return 0; > +} > +#else > +static inline int psci_0_2_init_acpi(void) > +{ > + return -ENODEV; > +} > +#endif > + > static const struct of_device_id psci_of_match[] __initconst = { > { .compatible = "arm,psci", .data = psci_0_1_init}, > { .compatible = "arm,psci-0.2", .data = psci_0_2_init}, > @@ -345,13 +378,19 @@ int __init psci_init(void) > const struct of_device_id *matched_np; > psci_initcall_t init_fn; > > - np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np); > + if (acpi_disabled) { > + np = of_find_matching_node_and_match(NULL, > + psci_of_match, &matched_np); Ideally this code should go away by changing the rest of it, but for future cases: It'd be a lot cleaner to do this as: if (!acpi_disabled) return psci_0_2_init_acpi(); ... then fall through to the current implementation instead. But sharing the whole code path is even better, so let's do that. > > - if (!np) > - return -ENODEV; > + if (!np) > + return -ENODEV; > + > + init_fn = (psci_initcall_t)matched_np->data; > + > + return init_fn(np); > + } > > - init_fn = (psci_initcall_t)matched_np->data; > - return init_fn(np); > + return psci_0_2_init_acpi(); > } > > #ifdef CONFIG_SMP > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 9dedb0b..e00d40c 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -394,6 +394,8 @@ void __init setup_arch(char **cmdline_p) > > efi_idmap_init(); > > + acpi_boot_init(); > + > unflatten_device_tree(); The above two will need to be swapped when you move over to populating the DT instead. > > psci_init(); -Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Date: Wed, 30 Jul 2014 21:22:17 -0700 [thread overview] Message-ID: <CAOesGMjzFyd_=+ToFmjyn958F86KsDJDht+9ZmniAERz16K_VQ@mail.gmail.com> (raw) In-Reply-To: <1406206825-15590-7-git-send-email-hanjun.guo@linaro.org> Hi, On Thu, Jul 24, 2014 at 6:00 AM, Hanjun Guo <hanjun.guo@linaro.org> wrote: > There are two flags: PSCI_COMPLIANT and PSCI_USE_HVC. When set, > the former signals to the OS that the hardware is PSCI compliant. > The latter selects the appropriate conduit for PSCI calls by > toggling between Hypervisor Calls (HVC) and Secure Monitor Calls > (SMC). > > FADT table contains such information, parse FADT to get the flags > for PSCI init. Since ACPI 5.1 doesn't support self defined PSCI > function IDs, which means that only PSCI 0.2+ is supported in ACPI. > > At the same time, only ACPI 5.1 or higher verison supports PSCI, > and FADT Major.Minor version was introduced in ACPI 5.1, so we > will check the version and only parse FADT table with version >= 5.1. > > If firmware provides ACPI tables with ACPI version less than 5.1, > OS will be messed up with those information and have no way to > bring up secondery CPUs, so disable ACPI if we get an FADT table > with version less that 5.1. > > Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> > Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> > --- > arch/arm64/include/asm/acpi.h | 2 + > arch/arm64/kernel/acpi.c | 50 ++++++++++++++++++++++ > arch/arm64/kernel/psci.c | 95 +++++++++++++++++++++++++++++------------ > arch/arm64/kernel/setup.c | 2 + > 4 files changed, 121 insertions(+), 28 deletions(-) > > diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h > index 44b617f..67dac90 100644 > --- a/arch/arm64/include/asm/acpi.h > +++ b/arch/arm64/include/asm/acpi.h > @@ -18,6 +18,8 @@ extern int acpi_disabled; > extern int acpi_noirq; > extern int acpi_pci_disabled; > extern int acpi_strict; > +extern int acpi_psci_present; > +extern int acpi_psci_use_hvc; > > static inline void disable_acpi(void) > { > diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c > index f5a10b5..374926f 100644 > --- a/arch/arm64/kernel/acpi.c > +++ b/arch/arm64/kernel/acpi.c > @@ -11,6 +11,8 @@ > * published by the Free Software Foundation. > */ > > +#define pr_fmt(fmt) "ACPI: " fmt > + > #include <linux/init.h> > #include <linux/acpi.h> > #include <linux/cpumask.h> > @@ -34,6 +36,12 @@ EXPORT_SYMBOL(acpi_disabled); > int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ > EXPORT_SYMBOL(acpi_pci_disabled); > > +/* 1 to indicate PSCI is implemented */ > +int acpi_psci_present; > + > +/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */ > +int acpi_psci_use_hvc; Here's a prime example of where it would just make more sense to populate DT based on what's in the ACPI info. Have a acpi_parse_fadt() that, if needed, creates a /psci node in the system-wide DT and populates it with the few properties needed. That way, the rest of the code path in the kernel setup is identical, instead of dealing with separate functions for setup, two exported variables just to communicate the state, and so on. It's just extra complexity for no good reason. The ACPi side code isn't even adding significant complexity compared to this. We'll need to add an of_add_node() property though. > /* > * __acpi_map_table() will be called before page_init(), so early_ioremap() > * or early_memremap() should be called here to for ACPI table mapping. > @@ -54,6 +62,33 @@ void __init __acpi_unmap_table(char *map, unsigned long size) > early_iounmap(map, size); > } > > +static int __init acpi_parse_fadt(struct acpi_table_header *table) > +{ > + struct acpi_table_fadt *fadt = (struct acpi_table_fadt *)table; > + > + /* > + * Revision in table header is the FADT Major version, > + * and there is a minor version of FADT which was introduced > + * by ACPI 5.1, we only deal with ACPI 5.1 or higher version > + * to get arm boot flags, or we will disable ACPI. > + */ > + if (table->revision < 5 || fadt->minor_version < 1) { > + pr_info("FADT version is %d.%d, no PSCI support, should be 5.1 or higher\n", > + table->revision, fadt->minor_version); > + acpi_psci_present = 0; > + disable_acpi(); This does more than just check for FADT/PSCI, it disables ACPI alltogether. That kind of side effect from parse_fadt() doesn't seem appropriate. > + return -EINVAL; > + } > + > + if (acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT) > + acpi_psci_present = 1; > + > + if (acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC) > + acpi_psci_use_hvc = 1; > + > + return 0; > +} > + > /* > * acpi_boot_table_init() called from setup_arch(), always. > * 1. find RSDP and get its address, and then find XSDT > @@ -75,6 +110,21 @@ void __init acpi_boot_table_init(void) > } > } > > +int __init acpi_boot_init(void) > +{ > + int err = 0; > + > + /* If acpi_disabled, bail out */ > + if (acpi_disabled) > + return -ENODEV; > + > + err = acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt); > + if (err) > + pr_err("Can't find FADT\n"); > + > + return err; > +} > + > static int __init parse_acpi(char *arg) > { > if (!arg) > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index 9e9798f..adb25f3 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -15,6 +15,7 @@ > > #define pr_fmt(fmt) "psci: " fmt > > +#include <linux/acpi.h> > #include <linux/init.h> > #include <linux/of.h> > #include <linux/smp.h> > @@ -231,6 +232,33 @@ static void psci_sys_poweroff(void) > invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); > } > > +static void psci_0_2_set_functions(void) > +{ > + pr_info("Using standard PSCI v0.2 function IDs\n"); > + psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND; > + psci_ops.cpu_suspend = psci_cpu_suspend; > + > + psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF; > + psci_ops.cpu_off = psci_cpu_off; > + > + psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON; > + psci_ops.cpu_on = psci_cpu_on; > + > + psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE; > + psci_ops.migrate = psci_migrate; > + > + psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO; > + psci_ops.affinity_info = psci_affinity_info; > + > + psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] = > + PSCI_0_2_FN_MIGRATE_INFO_TYPE; > + psci_ops.migrate_info_type = psci_migrate_info_type; > + > + arm_pm_restart = psci_sys_reset; > + > + pm_power_off = psci_sys_poweroff; > +} > + > /* > * PSCI Function IDs for v0.2+ are well defined so use > * standard values. > @@ -264,29 +292,7 @@ static int psci_0_2_init(struct device_node *np) > } > } > > - pr_info("Using standard PSCI v0.2 function IDs\n"); > - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN64_CPU_SUSPEND; > - psci_ops.cpu_suspend = psci_cpu_suspend; > - > - psci_function_id[PSCI_FN_CPU_OFF] = PSCI_0_2_FN_CPU_OFF; > - psci_ops.cpu_off = psci_cpu_off; > - > - psci_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN64_CPU_ON; > - psci_ops.cpu_on = psci_cpu_on; > - > - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE; > - psci_ops.migrate = psci_migrate; > - > - psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN64_AFFINITY_INFO; > - psci_ops.affinity_info = psci_affinity_info; > - > - psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] = > - PSCI_0_2_FN_MIGRATE_INFO_TYPE; > - psci_ops.migrate_info_type = psci_migrate_info_type; > - > - arm_pm_restart = psci_sys_reset; > - > - pm_power_off = psci_sys_poweroff; > + psci_0_2_set_functions(); > > out_put_node: > of_node_put(np); > @@ -333,6 +339,33 @@ out_put_node: > return err; > } > > +#ifdef CONFIG_ACPI > +static int get_set_conduit_method_acpi(void) > +{ > + if (acpi_psci_use_hvc) > + invoke_psci_fn = __invoke_psci_fn_hvc; > + else > + invoke_psci_fn = __invoke_psci_fn_smc; > + > + return 0; > +} > + > +/* We use PSCI 0.2+ when ACPI is deployed */ > +static int psci_0_2_init_acpi(void) > +{ > + get_set_conduit_method_acpi(); > + > + psci_0_2_set_functions(); Here's a good example of the two code paths doing different things. The DT code paths does a test call into PSCI to make sure it's actually supported, while you blindly trust it. Keeping the code paths common has value w.r.t these kind of things. > + return 0; > +} > +#else > +static inline int psci_0_2_init_acpi(void) > +{ > + return -ENODEV; > +} > +#endif > + > static const struct of_device_id psci_of_match[] __initconst = { > { .compatible = "arm,psci", .data = psci_0_1_init}, > { .compatible = "arm,psci-0.2", .data = psci_0_2_init}, > @@ -345,13 +378,19 @@ int __init psci_init(void) > const struct of_device_id *matched_np; > psci_initcall_t init_fn; > > - np = of_find_matching_node_and_match(NULL, psci_of_match, &matched_np); > + if (acpi_disabled) { > + np = of_find_matching_node_and_match(NULL, > + psci_of_match, &matched_np); Ideally this code should go away by changing the rest of it, but for future cases: It'd be a lot cleaner to do this as: if (!acpi_disabled) return psci_0_2_init_acpi(); ... then fall through to the current implementation instead. But sharing the whole code path is even better, so let's do that. > > - if (!np) > - return -ENODEV; > + if (!np) > + return -ENODEV; > + > + init_fn = (psci_initcall_t)matched_np->data; > + > + return init_fn(np); > + } > > - init_fn = (psci_initcall_t)matched_np->data; > - return init_fn(np); > + return psci_0_2_init_acpi(); > } > > #ifdef CONFIG_SMP > diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c > index 9dedb0b..e00d40c 100644 > --- a/arch/arm64/kernel/setup.c > +++ b/arch/arm64/kernel/setup.c > @@ -394,6 +394,8 @@ void __init setup_arch(char **cmdline_p) > > efi_idmap_init(); > > + acpi_boot_init(); > + > unflatten_device_tree(); The above two will need to be swapped when you move over to populating the DT instead. > > psci_init(); -Olof
next prev parent reply other threads:[~2014-07-31 4:22 UTC|newest] Thread overview: 322+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-07-24 13:00 [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 01/19] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-28 18:29 ` Sudeep Holla 2014-07-28 18:29 ` Sudeep Holla 2014-07-28 18:29 ` Sudeep Holla 2014-07-28 22:49 ` Graeme Gregory 2014-07-28 22:49 ` Graeme Gregory 2014-07-28 22:49 ` Graeme Gregory 2014-07-29 8:49 ` Sudeep Holla 2014-07-29 8:49 ` Sudeep Holla 2014-07-29 8:49 ` Sudeep Holla 2014-07-29 13:08 ` Hanjun Guo 2014-07-29 13:08 ` Hanjun Guo 2014-07-29 13:08 ` Hanjun Guo 2014-07-29 13:50 ` Sudeep Holla 2014-07-29 13:50 ` Sudeep Holla 2014-07-29 13:50 ` Sudeep Holla 2014-07-29 14:07 ` Hanjun Guo 2014-07-29 14:07 ` Hanjun Guo 2014-07-28 18:30 ` Sudeep Holla 2014-07-28 18:30 ` Sudeep Holla 2014-07-28 18:30 ` Sudeep Holla 2014-07-24 13:00 ` [PATCH 02/19] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-28 18:35 ` Sudeep Holla 2014-07-28 18:35 ` Sudeep Holla 2014-07-28 18:35 ` Sudeep Holla 2014-07-29 13:10 ` Hanjun Guo 2014-07-29 13:10 ` Hanjun Guo 2014-07-29 13:10 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 03/19] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 15:34 ` Mark Rutland 2014-07-24 15:34 ` Mark Rutland 2014-07-25 10:42 ` Hanjun Guo 2014-07-25 10:42 ` Hanjun Guo 2014-07-28 18:28 ` Sudeep Holla 2014-07-28 18:28 ` Sudeep Holla 2014-07-28 18:28 ` Sudeep Holla 2014-07-29 13:00 ` Hanjun Guo 2014-07-29 13:00 ` Hanjun Guo 2014-07-29 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 04/19] ARM64 / ACPI: Introduce arch_fix_phys_package_id() for cpu topology Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 14:43 ` Mark Brown 2014-07-24 14:43 ` Mark Brown 2014-07-25 10:32 ` Hanjun Guo 2014-07-25 10:32 ` Hanjun Guo 2014-07-28 18:51 ` Sudeep Holla 2014-07-28 18:51 ` Sudeep Holla 2014-07-28 18:51 ` Sudeep Holla 2014-08-01 6:35 ` Hanjun Guo 2014-08-01 6:35 ` Hanjun Guo 2014-08-01 6:35 ` Hanjun Guo 2014-08-01 10:48 ` Sudeep Holla 2014-08-01 10:48 ` Sudeep Holla 2014-08-01 10:48 ` Sudeep Holla 2014-07-24 13:00 ` [PATCH 05/19] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 21:57 ` Naresh Bhat 2014-07-24 21:57 ` Naresh Bhat 2014-07-24 21:57 ` Naresh Bhat 2014-07-29 16:40 ` Sudeep Holla 2014-07-29 16:40 ` Sudeep Holla 2014-07-29 16:40 ` Sudeep Holla 2014-07-24 13:00 ` [PATCH 06/19] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-29 16:40 ` Sudeep Holla 2014-07-29 16:40 ` Sudeep Holla 2014-07-29 16:40 ` Sudeep Holla 2014-07-31 3:53 ` Hanjun Guo 2014-07-31 3:53 ` Hanjun Guo 2014-07-31 3:53 ` Hanjun Guo 2014-07-31 4:22 ` Olof Johansson [this message] 2014-07-31 4:22 ` Olof Johansson 2014-07-31 10:23 ` Hanjun Guo 2014-07-31 10:23 ` Hanjun Guo 2014-08-20 15:02 ` Grant Likely 2014-08-20 15:02 ` Grant Likely 2014-08-20 15:02 ` Grant Likely 2014-08-20 15:00 ` Grant Likely 2014-08-20 15:00 ` Grant Likely 2014-08-20 15:00 ` Grant Likely 2014-08-20 15:29 ` Catalin Marinas 2014-08-20 15:29 ` Catalin Marinas 2014-08-20 15:29 ` Catalin Marinas 2014-08-20 15:43 ` graeme.gregory 2014-08-20 15:43 ` graeme.gregory at linaro.org 2014-08-20 15:43 ` graeme.gregory 2014-07-24 13:00 ` [PATCH 07/19] ARM64 / ACPI: Parse MADT to map logical cpu to MPIDR and get cpu_possible/present_map Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 23:06 ` Naresh Bhat 2014-07-24 23:06 ` Naresh Bhat 2014-07-24 23:06 ` Naresh Bhat 2014-07-25 11:11 ` Hanjun Guo 2014-07-25 11:11 ` Hanjun Guo 2014-07-25 11:11 ` Hanjun Guo 2014-07-30 18:20 ` Sudeep Holla 2014-07-30 18:20 ` Sudeep Holla 2014-07-30 18:20 ` Sudeep Holla 2014-07-31 8:14 ` Hanjun Guo 2014-07-31 8:14 ` Hanjun Guo 2014-07-31 8:14 ` Hanjun Guo 2014-08-20 15:14 ` Grant Likely 2014-08-20 15:14 ` Grant Likely 2014-08-20 15:14 ` Grant Likely 2014-07-24 13:00 ` [PATCH 08/19] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-30 18:21 ` Sudeep Holla 2014-07-30 18:21 ` Sudeep Holla 2014-07-30 18:21 ` Sudeep Holla 2014-07-31 8:15 ` Hanjun Guo 2014-07-31 8:15 ` Hanjun Guo 2014-07-31 8:15 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 09/19] ARM64 / ACPI: Move the initialization of cpu_logical_map(0) before acpi_boot_init() Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 15:21 ` Mark Rutland 2014-07-24 15:21 ` Mark Rutland 2014-07-25 10:39 ` Hanjun Guo 2014-07-25 10:39 ` Hanjun Guo 2014-07-25 10:39 ` Hanjun Guo 2014-07-25 12:18 ` Mark Rutland 2014-07-25 12:18 ` Mark Rutland 2014-07-25 12:18 ` Mark Rutland 2014-07-24 13:00 ` [PATCH 10/19] ARM64 / ACPI: Get the enable method for SMP initialization in ACPI way Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 15:47 ` Mark Rutland 2014-07-24 15:47 ` Mark Rutland 2014-07-25 10:51 ` Hanjun Guo 2014-07-25 10:51 ` Hanjun Guo 2014-07-25 12:24 ` Mark Rutland 2014-07-25 12:24 ` Mark Rutland 2014-07-29 8:12 ` Hanjun Guo 2014-07-29 8:12 ` Hanjun Guo 2014-07-31 6:54 ` Olof Johansson 2014-07-31 6:54 ` Olof Johansson 2014-07-31 6:54 ` Olof Johansson 2014-07-31 10:57 ` Hanjun Guo 2014-07-31 10:57 ` Hanjun Guo 2014-07-31 10:57 ` Hanjun Guo 2014-08-04 9:56 ` Hanjun Guo 2014-08-04 9:56 ` Hanjun Guo 2014-08-04 9:56 ` Hanjun Guo 2014-07-31 18:52 ` Geoff Levand 2014-07-31 18:52 ` Geoff Levand 2014-07-31 18:52 ` Geoff Levand 2014-08-01 6:49 ` Hanjun Guo 2014-08-01 6:49 ` Hanjun Guo 2014-08-01 6:49 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 11/19] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 12/19] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 13/19] ACPI / table: Add new function to get table entries Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 14/19] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 15/19] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 16/19] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 18/19] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 13:00 ` [PATCH 19/19] Documentation: ACPI for ARM64 Hanjun Guo 2014-07-24 13:00 ` Hanjun Guo 2014-07-24 20:42 ` Randy Dunlap 2014-07-24 20:42 ` Randy Dunlap 2014-07-25 10:55 ` Hanjun Guo 2014-07-25 10:55 ` Hanjun Guo [not found] ` <CAFoFrHaWWxRPRYM5+bWj0tGnz05SokqwVGejUCUi+U-KChFBdQ@mail.gmail.com> 2014-07-24 21:19 ` Randy Dunlap 2014-07-24 21:19 ` Randy Dunlap 2014-07-29 10:07 ` Christoffer Dall 2014-07-29 10:07 ` Christoffer Dall 2014-07-29 10:07 ` Christoffer Dall 2014-07-27 2:34 ` Olof Johansson 2014-07-27 2:34 ` Olof Johansson 2014-07-28 8:42 ` Graeme Gregory 2014-07-28 8:42 ` Graeme Gregory 2014-07-28 8:42 ` Graeme Gregory 2014-07-28 16:23 ` Olof Johansson 2014-07-28 16:23 ` Olof Johansson 2014-07-28 16:23 ` Olof Johansson 2014-07-28 17:44 ` Mark Brown 2014-07-28 17:44 ` Mark Brown 2014-07-28 17:44 ` Mark Brown 2014-07-28 9:07 ` Arnd Bergmann 2014-07-28 9:07 ` Arnd Bergmann 2014-07-28 9:07 ` Arnd Bergmann 2014-07-28 9:23 ` Graeme Gregory 2014-07-28 9:23 ` Graeme Gregory 2014-07-28 9:23 ` Graeme Gregory 2014-07-28 10:46 ` Arnd Bergmann 2014-07-28 10:46 ` Arnd Bergmann 2014-07-28 10:46 ` Arnd Bergmann 2014-07-28 14:20 ` Andre Przywara 2014-07-28 14:20 ` Andre Przywara 2014-07-28 14:20 ` Andre Przywara 2014-07-28 15:23 ` Arnd Bergmann 2014-07-28 15:23 ` Arnd Bergmann 2014-07-28 15:23 ` Arnd Bergmann 2014-07-28 16:14 ` Andre Przywara 2014-07-28 16:14 ` Andre Przywara 2014-07-29 9:17 ` Graeme Gregory 2014-07-29 9:17 ` Graeme Gregory 2014-07-29 9:17 ` Graeme Gregory 2014-07-29 10:07 ` Arnd Bergmann 2014-07-29 10:07 ` Arnd Bergmann 2014-07-28 10:12 ` Mark Rutland 2014-07-28 10:12 ` Mark Rutland 2014-07-28 16:33 ` Olof Johansson 2014-07-28 16:33 ` Olof Johansson 2014-07-28 18:37 ` Mark Rutland 2014-07-28 18:37 ` Mark Rutland 2014-07-28 18:44 ` Olof Johansson 2014-07-28 18:44 ` Olof Johansson 2014-07-28 16:27 ` Olof Johansson 2014-07-28 16:27 ` Olof Johansson 2014-07-28 16:27 ` Olof Johansson 2014-07-28 17:00 ` Mark Rutland 2014-07-28 17:00 ` Mark Rutland 2014-07-28 18:27 ` Olof Johansson 2014-07-28 18:27 ` Olof Johansson 2014-08-12 18:23 ` Catalin Marinas 2014-08-12 18:23 ` Catalin Marinas 2014-08-13 23:41 ` Rafael J. Wysocki 2014-08-13 23:41 ` Rafael J. Wysocki 2014-08-14 3:21 ` Hanjun Guo 2014-08-14 3:21 ` Hanjun Guo 2014-08-14 3:21 ` Hanjun Guo 2014-08-14 10:27 ` Catalin Marinas 2014-08-14 10:27 ` Catalin Marinas 2014-08-14 10:27 ` Catalin Marinas 2014-08-14 20:53 ` Arnd Bergmann 2014-08-14 20:53 ` Arnd Bergmann 2014-08-14 20:53 ` Arnd Bergmann 2014-08-15 1:02 ` Olof Johansson 2014-08-15 1:02 ` Olof Johansson 2014-08-15 19:49 ` Arnd Bergmann 2014-08-15 19:49 ` Arnd Bergmann 2014-08-15 23:19 ` Mark Brown 2014-08-15 23:19 ` Mark Brown 2014-08-16 12:51 ` graeme.gregory 2014-08-16 12:51 ` graeme.gregory at linaro.org 2014-08-16 12:51 ` graeme.gregory 2014-08-15 9:09 ` Hanjun Guo 2014-08-15 9:09 ` Hanjun Guo 2014-08-15 9:09 ` Hanjun Guo 2014-08-15 10:01 ` Catalin Marinas 2014-08-15 10:01 ` Catalin Marinas 2014-08-15 10:01 ` Catalin Marinas 2014-08-18 9:29 ` Hanjun Guo 2014-08-18 9:29 ` Hanjun Guo 2014-08-18 9:29 ` Hanjun Guo 2014-08-18 12:49 ` Mark Rutland 2014-08-18 12:49 ` Mark Rutland 2014-08-18 12:49 ` Mark Rutland 2014-08-20 22:17 ` Olof Johansson 2014-08-20 22:17 ` Olof Johansson 2014-08-20 22:17 ` Olof Johansson 2014-08-21 4:00 ` Hanjun Guo 2014-08-21 4:00 ` Hanjun Guo 2014-08-21 4:00 ` Hanjun Guo 2014-07-29 9:01 ` Hanjun Guo 2014-07-29 9:01 ` Hanjun Guo 2014-07-29 9:01 ` Hanjun Guo 2014-07-28 10:06 ` Mark Rutland 2014-07-28 10:06 ` Mark Rutland 2014-07-28 16:44 ` Olof Johansson 2014-07-28 16:44 ` Olof Johansson 2014-07-28 17:36 ` Mark Rutland 2014-07-28 17:36 ` Mark Rutland 2014-07-28 18:34 ` Olof Johansson 2014-07-28 18:34 ` Olof Johansson 2014-07-29 10:29 ` Christoffer Dall 2014-07-29 10:29 ` Christoffer Dall 2014-07-29 10:41 ` Arnd Bergmann 2014-07-29 10:41 ` Arnd Bergmann 2014-07-29 10:55 ` Mark Rutland 2014-07-29 10:55 ` Mark Rutland 2014-07-29 11:28 ` Mark Rutland 2014-07-29 11:28 ` Mark Rutland 2014-07-29 12:37 ` Christoffer Dall 2014-07-29 12:37 ` Christoffer Dall 2014-07-29 12:52 ` Arnd Bergmann 2014-07-29 12:52 ` Arnd Bergmann 2014-07-29 13:08 ` Mark Rutland 2014-07-29 13:08 ` Mark Rutland 2014-07-29 13:31 ` Christoffer Dall 2014-07-29 13:31 ` Christoffer Dall 2014-07-29 14:04 ` Mark Rutland 2014-07-29 14:04 ` Mark Rutland 2014-07-29 14:41 ` Arnd Bergmann 2014-07-29 14:41 ` Arnd Bergmann 2014-07-29 15:01 ` Christoffer Dall 2014-07-29 15:01 ` Christoffer Dall 2014-07-30 6:47 ` Hanjun Guo 2014-07-30 6:47 ` Hanjun Guo 2014-07-30 7:14 ` Christoffer Dall 2014-07-30 7:14 ` Christoffer Dall 2014-07-30 9:36 ` Hanjun Guo 2014-07-30 9:36 ` Hanjun Guo 2014-07-29 13:33 ` Christoffer Dall 2014-07-29 13:33 ` Christoffer Dall 2014-07-29 7:58 ` Hanjun Guo 2014-07-29 7:58 ` Hanjun Guo 2014-07-29 7:58 ` Hanjun Guo 2014-07-29 10:30 ` Christoffer Dall 2014-07-29 10:30 ` Christoffer Dall 2014-08-15 22:43 ` Len Brown 2014-08-15 22:43 ` Len Brown 2014-08-15 22:43 ` Len Brown 2014-08-16 12:45 ` Graeme Gregory 2014-08-16 12:45 ` Graeme Gregory 2014-08-20 16:42 ` Grant Likely 2014-08-20 16:42 ` Grant Likely 2014-08-20 16:42 ` Grant Likely 2014-07-25 0:46 ` [PATCH 00/19] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo 2014-07-25 0:46 ` Hanjun Guo
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='CAOesGMjzFyd_=+ToFmjyn958F86KsDJDht+9ZmniAERz16K_VQ@mail.gmail.com' \ --to=olof@lixom.net \ --cc=Charles.Garcia-Tobin@arm.com \ --cc=Liviu.Dudau@arm.com \ --cc=Lorenzo.Pieralisi@arm.com \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=broonie@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=daniel.lezcano@linaro.org \ --cc=graeme.gregory@linaro.org \ --cc=grant.likely@linaro.org \ --cc=hanjun.guo@linaro.org \ --cc=jason@lakedaemon.net \ --cc=linaro-acpi-private@linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=lv.zheng@intel.com \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=rdunlap@infradead.org \ --cc=robert.moore@intel.com \ --cc=rric@kernel.org \ --cc=will.deacon@arm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.