From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hanjun Guo Subject: Re: [PATCH v4 09/18] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Date: Tue, 16 Sep 2014 07:34:16 +0800 Message-ID: <54177778.2050103@linaro.org> References: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> <1410530416-30200-10-git-send-email-hanjun.guo@linaro.org> <20140915063808.GC26649@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-pa0-f41.google.com ([209.85.220.41]:36786 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755820AbaIOXeT (ORCPT ); Mon, 15 Sep 2014 19:34:19 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj1so7475077pad.28 for ; Mon, 15 Sep 2014 16:34:18 -0700 (PDT) In-Reply-To: <20140915063808.GC26649@localhost> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Olof Johansson Cc: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Grant Likely , Will Deacon , Graeme Gregory , Arnd Bergmann , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org On 2014=E5=B9=B409=E6=9C=8815=E6=97=A5 14:38, Olof Johansson wrote: > On Fri, Sep 12, 2014 at 10:00:07PM +0800, Hanjun Guo wrote: >> diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/= psci.h >> index e5312ea..2454bc5 100644 >> --- a/arch/arm64/include/asm/psci.h >> +++ b/arch/arm64/include/asm/psci.h >> @@ -14,6 +14,7 @@ >> #ifndef __ASM_PSCI_H >> #define __ASM_PSCI_H >> =20 >> -int psci_init(void); >> +int psci_dt_init(void); >> +int psci_acpi_init(void); >> =20 >> #endif /* __ASM_PSCI_H */ >> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c >> index 693da7f..9e1ae37 100644 >> --- a/arch/arm64/kernel/acpi.c >> +++ b/arch/arm64/kernel/acpi.c >> @@ -13,6 +13,8 @@ >> * published by the Free Software Foundation. >> */ >> =20 >> +#define pr_fmt(fmt) "ACPI: " fmt >> + >> #include >> #include >> #include >> @@ -49,10 +51,32 @@ void __init __acpi_unmap_table(char *map, unsign= ed long size) >> early_memunmap(map, size); >> } >> =20 >> +static int __init acpi_parse_fadt(struct acpi_table_header *table) >> +{ >> + struct acpi_table_fadt *fadt =3D (struct acpi_table_fadt *)table; >> + >> + /* >> + * Revision in table header is the FADT Major revision, >> + * and there is a minor revision of FADT which was introduced >> + * by ACPI 5.1, we only deal with ACPI 5.1 or higher revision >> + * to get arm boot flags, or we will disable ACPI. >> + */ >> + if (table->revision > 5 || >> + (table->revision =3D=3D 5 && fadt->minor_revision >=3D 1)) >> + return 0; > The commend and code disagree. The code says 5.1 or newer, while the = comment say > _only_ 5.1. One or the other needs to change. I describe it in the comments "ACPI 5.1 or higher revision", maybe "newer revision" will be more explicit. > > [...] > >> diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c >> index 5539547..15ba470 100644 >> --- a/arch/arm64/kernel/psci.c >> +++ b/arch/arm64/kernel/psci.c >> @@ -15,6 +15,7 @@ >> =20 >> #define pr_fmt(fmt) "psci: " fmt >> =20 >> +#include >> #include >> #include >> #include >> @@ -23,6 +24,7 @@ >> #include >> #include >> =20 >> +#include >> #include >> #include >> #include >> @@ -231,6 +233,33 @@ static void psci_sys_poweroff(void) >> invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); >> } >> =20 >> +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] =3D PSCI_0_2_FN64_CPU_SUSPEN= D; >> + psci_ops.cpu_suspend =3D psci_cpu_suspend; >> + >> + psci_function_id[PSCI_FN_CPU_OFF] =3D PSCI_0_2_FN_CPU_OFF; >> + psci_ops.cpu_off =3D psci_cpu_off; >> + >> + psci_function_id[PSCI_FN_CPU_ON] =3D PSCI_0_2_FN64_CPU_ON; >> + psci_ops.cpu_on =3D psci_cpu_on; >> + >> + psci_function_id[PSCI_FN_MIGRATE] =3D PSCI_0_2_FN64_MIGRATE; >> + psci_ops.migrate =3D psci_migrate; >> + >> + psci_function_id[PSCI_FN_AFFINITY_INFO] =3D PSCI_0_2_FN64_AFFINITY= _INFO; >> + psci_ops.affinity_info =3D psci_affinity_info; >> + >> + psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] =3D >> + PSCI_0_2_FN_MIGRATE_INFO_TYPE; >> + psci_ops.migrate_info_type =3D psci_migrate_info_type; >> + >> + arm_pm_restart =3D psci_sys_reset; >> + >> + pm_power_off =3D psci_sys_poweroff; >> +} >> + >> /* >> * PSCI Function IDs for v0.2+ are well defined so use >> * standard values. >> @@ -264,29 +293,7 @@ static int __init psci_0_2_init(struct device_n= ode *np) >> } >> } >> =20 >> - pr_info("Using standard PSCI v0.2 function IDs\n"); >> - psci_function_id[PSCI_FN_CPU_SUSPEND] =3D PSCI_0_2_FN64_CPU_SUSPEN= D; >> - psci_ops.cpu_suspend =3D psci_cpu_suspend; >> - >> - psci_function_id[PSCI_FN_CPU_OFF] =3D PSCI_0_2_FN_CPU_OFF; >> - psci_ops.cpu_off =3D psci_cpu_off; >> - >> - psci_function_id[PSCI_FN_CPU_ON] =3D PSCI_0_2_FN64_CPU_ON; >> - psci_ops.cpu_on =3D psci_cpu_on; >> - >> - psci_function_id[PSCI_FN_MIGRATE] =3D PSCI_0_2_FN64_MIGRATE; >> - psci_ops.migrate =3D psci_migrate; >> - >> - psci_function_id[PSCI_FN_AFFINITY_INFO] =3D PSCI_0_2_FN64_AFFINITY= _INFO; >> - psci_ops.affinity_info =3D psci_affinity_info; >> - >> - psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE] =3D >> - PSCI_0_2_FN_MIGRATE_INFO_TYPE; >> - psci_ops.migrate_info_type =3D psci_migrate_info_type; >> - >> - arm_pm_restart =3D psci_sys_reset; >> - >> - pm_power_off =3D psci_sys_poweroff; >> + psci_0_2_set_functions(); >> =20 >> out_put_node: >> of_node_put(np); >> @@ -339,7 +346,7 @@ static const struct of_device_id psci_of_match[]= __initconst =3D { >> {}, >> }; >> =20 >> -int __init psci_init(void) >> +int __init psci_dt_init(void) >> { >> struct device_node *np; >> const struct of_device_id *matched_np; >> @@ -354,6 +361,29 @@ int __init psci_init(void) >> return init_fn(np); >> } >> =20 >> +/* >> + * We use PSCI 0.2+ when ACPI is deployed on ARM64 and it's >> + * explicitly clarified in SBBR >> + */ >> +int __init psci_acpi_init(void) >> +{ >> + if (!acpi_psci_present()) { >> + pr_info("is not implemented in ACPI.\n"); >> + return -EOPNOTSUPP; >> + } >> + >> + pr_info("probing for conduit method from ACPI.\n"); >> + >> + if (acpi_psci_use_hvc()) >> + invoke_psci_fn =3D __invoke_psci_fn_hvc; >> + else >> + invoke_psci_fn =3D __invoke_psci_fn_smc; >> + >> + psci_0_2_set_functions(); >> + >> + return 0; >> +} >> + >> #ifdef CONFIG_SMP >> =20 >> static int __init cpu_psci_cpu_init(struct device_node *dn, unsigne= d int cpu) >> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c >> index 5796734..7ba20d4 100644 >> --- a/arch/arm64/kernel/setup.c >> +++ b/arch/arm64/kernel/setup.c >> @@ -398,10 +398,12 @@ void __init setup_arch(char **cmdline_p) >> efi_idmap_init(); >> =20 >> cpu_logical_map(0) =3D read_cpuid_mpidr() & MPIDR_HWID_BITMASK; >> - if (acpi_disabled) >> + if (acpi_disabled) { >> unflatten_device_tree(); >> - >> - psci_init(); >> + psci_dt_init(); >> + } else { >> + psci_acpi_init(); >> + } > This is slightly nitty now, but I think it'd be slightly easier to fo= llow > boot path if the switch for acpi disabled/enabled was in psci.c. It'd= also allow > psci_dt_init() and psci_acpi_init() to be static. > > I.e. keep a psci_init() and just make it call one or the other. Do you mean something like blow in psci.c? int __init psci_init(void) { if (acpi_disabled) return psci_dt_init(); else return psci_acpi_init(); } Thanks Hanjun -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html