* [PATCHv4 0/5] arm/arm64: Unify PSCI client support
@ 2015-07-02 17:12 Mark Rutland
2015-07-02 17:12 ` [PATCHv4 1/5] ARM: psci: boot_secondary: replace __pa with virt_to_idmap Mark Rutland
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw)
To: linux-arm-kernel
This series unifies the 32-bit and 64-bit PSCI client code, moving the bulk of
the FW invocation and probing out to a common location in drivers/firmware. The
bulk of the PSCI 0.2 cleanups have hit mainline now, so this is just the
unification portion.
This results in a reasonable saving in terms of lines of code, and will allow
for PSCI 1.0 support to be unified form the beginning, avoiding further
duplication.
Since v3 [1]:
* Drop the PSCI 0.2 patches as they're in mainline
* s/__pa/virt_to_idmap/ from Grygorii Strashko
* Use macros for Calxeda CPU_SUSPEND parameters
Russell, are you happy with the penultimate patch? If so, how would you prefer
that this be merged?
Rob, are you happy with the Highbank PM and Calxeda cpuidle changes?
Thanks,
Mark.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/346492.html
Grygorii Strashko (1):
ARM: psci: boot_secondary: replace __pa with virt_to_idmap
Mark Rutland (4):
arm64: psci: factor invocation code to drivers
drivers: psci: support native SMC{32,64} calls
ARM: migrate to common PSCI client code
MAINTAINERS: add PSCI entry
MAINTAINERS | 9 +
arch/arm/Kconfig | 1 +
arch/arm/include/asm/psci.h | 23 ---
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/psci.c | 299 -----------------------------
arch/arm/kernel/psci_smp.c | 31 ++-
arch/arm/kernel/setup.c | 3 +-
arch/arm/mach-highbank/highbank.c | 2 +-
arch/arm/mach-highbank/pm.c | 16 +-
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/acpi.h | 4 +-
arch/arm64/include/asm/psci.h | 28 ---
arch/arm64/kernel/psci.c | 361 +----------------------------------
arch/arm64/kernel/setup.c | 2 +-
drivers/cpuidle/cpuidle-calxeda.c | 15 +-
drivers/firmware/Kconfig | 3 +
drivers/firmware/Makefile | 1 +
drivers/firmware/psci.c | 383 ++++++++++++++++++++++++++++++++++++++
include/linux/psci.h | 52 ++++++
19 files changed, 501 insertions(+), 735 deletions(-)
delete mode 100644 arch/arm/kernel/psci.c
delete mode 100644 arch/arm64/include/asm/psci.h
create mode 100644 drivers/firmware/psci.c
create mode 100644 include/linux/psci.h
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCHv4 1/5] ARM: psci: boot_secondary: replace __pa with virt_to_idmap 2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland @ 2015-07-02 17:12 ` Mark Rutland 2015-07-02 17:12 ` [PATCHv4 2/5] arm64: psci: factor invocation code to drivers Mark Rutland ` (3 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw) To: linux-arm-kernel From: Grygorii Strashko <grygorii.strashko@ti.com> On some PAE systems (e.g. TI Keystone), memory is above the 32-bit addressable limit, and the interconnect provides an aliased view of parts of physical memory in the 32-bit addressable space. This alias is strictly for boot time usage, and is not otherwise usable because of coherency limitations. In this case, virt_to_phys(secondary_startup) would return the physical address of the secondary CPU boot entry point, but on such systems, this would be above the 4GB limit. A separate function, virt_to_idmap(), has been provided to return a usable physical address for functions in the identity mapping, and this must be used in preference to virt_to_phys() or __pa() to find the physical entry point for functions in the identity mapping range. For other systems, virt_to_idmap() and virt_to_phys() return identical physical addresses. Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Acked-by: Nicolas Pitre <nico@linaro.org> Tested-by Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> [Mark: apply rmk's suggested rewording] Signed-off-by: Mark Rutland <mark.rutland@arm.com> --- arch/arm/kernel/psci_smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index 28a1db4..244aadd 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -51,7 +51,7 @@ static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) { if (psci_ops.cpu_on) return psci_ops.cpu_on(cpu_logical_map(cpu), - __pa(secondary_startup)); + virt_to_idmap(&secondary_startup)); return -ENODEV; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 2/5] arm64: psci: factor invocation code to drivers 2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland 2015-07-02 17:12 ` [PATCHv4 1/5] ARM: psci: boot_secondary: replace __pa with virt_to_idmap Mark Rutland @ 2015-07-02 17:12 ` Mark Rutland 2015-07-02 17:12 ` [PATCHv4 3/5] drivers: psci: support native SMC{32,64} calls Mark Rutland ` (2 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw) To: linux-arm-kernel To enable sharing with arm, move the core PSCI framework code to drivers/firmware. This results in a minor gain in lines of code, but this will quickly be amortised by the removal of code currently duplicated in arch/arm. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/acpi.h | 4 +- arch/arm64/include/asm/psci.h | 28 ---- arch/arm64/kernel/psci.c | 361 +---------------------------------------- arch/arm64/kernel/setup.c | 2 +- drivers/firmware/Kconfig | 3 + drivers/firmware/Makefile | 1 + drivers/firmware/psci.c | 370 ++++++++++++++++++++++++++++++++++++++++++ include/linux/psci.h | 52 ++++++ 9 files changed, 432 insertions(+), 390 deletions(-) delete mode 100644 arch/arm64/include/asm/psci.h create mode 100644 drivers/firmware/psci.c create mode 100644 include/linux/psci.h diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0f6edb1..a77d04f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -20,6 +20,7 @@ config ARM64 select ARM_GIC_V2M if PCI_MSI select ARM_GIC_V3 select ARM_GIC_V3_ITS if PCI_MSI + select ARM_PSCI_FW select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 39248d3..ed7e212 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -12,11 +12,11 @@ #ifndef _ASM_ACPI_H #define _ASM_ACPI_H -#include <linux/mm.h> #include <linux/irqchip/arm-gic-acpi.h> +#include <linux/mm.h> +#include <linux/psci.h> #include <asm/cputype.h> -#include <asm/psci.h> #include <asm/smp_plat.h> /* Basic configuration for ACPI */ diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h deleted file mode 100644 index 49d7e1a..0000000 --- a/arch/arm64/include/asm/psci.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Copyright (C) 2013 ARM Limited - */ - -#ifndef __ASM_PSCI_H -#define __ASM_PSCI_H - -int __init psci_dt_init(void); - -#ifdef CONFIG_ACPI -int __init psci_acpi_init(void); -bool __init acpi_psci_present(void); -bool __init acpi_psci_use_hvc(void); -#else -static inline int psci_acpi_init(void) { return 0; } -static inline bool acpi_psci_present(void) { return false; } -#endif - -#endif /* __ASM_PSCI_H */ diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 869f202..51fd15a 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -18,23 +18,17 @@ #include <linux/init.h> #include <linux/of.h> #include <linux/smp.h> -#include <linux/reboot.h> -#include <linux/pm.h> #include <linux/delay.h> +#include <linux/psci.h> #include <linux/slab.h> + #include <uapi/linux/psci.h> #include <asm/compiler.h> -#include <asm/cputype.h> #include <asm/cpu_ops.h> #include <asm/errno.h> -#include <asm/psci.h> #include <asm/smp_plat.h> #include <asm/suspend.h> -#include <asm/system_misc.h> - -#define PSCI_POWER_STATE_TYPE_STANDBY 0 -#define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 static bool psci_power_state_loses_context(u32 state) { @@ -50,122 +44,8 @@ static bool psci_power_state_is_valid(u32 state) return !(state & ~valid_mask); } -/* - * The CPU any Trusted OS is resident on. The trusted OS may reject CPU_OFF - * calls to its resident CPU, so we must avoid issuing those. We never migrate - * a Trusted OS even if it claims to be capable of migration -- doing so will - * require cooperation with a Trusted OS driver. - */ -static int resident_cpu = -1; - -struct psci_operations { - int (*cpu_suspend)(u32 state, unsigned long entry_point); - int (*cpu_off)(u32 state); - int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); - int (*migrate)(unsigned long cpuid); - int (*affinity_info)(unsigned long target_affinity, - unsigned long lowest_affinity_level); - int (*migrate_info_type)(void); -}; - -static struct psci_operations psci_ops; - -typedef unsigned long (psci_fn)(unsigned long, unsigned long, - unsigned long, unsigned long); -asmlinkage psci_fn __invoke_psci_fn_hvc; -asmlinkage psci_fn __invoke_psci_fn_smc; -static psci_fn *invoke_psci_fn; - -enum psci_function { - PSCI_FN_CPU_SUSPEND, - PSCI_FN_CPU_ON, - PSCI_FN_CPU_OFF, - PSCI_FN_MIGRATE, - PSCI_FN_MAX, -}; - static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); -static u32 psci_function_id[PSCI_FN_MAX]; - -static int psci_to_linux_errno(int errno) -{ - switch (errno) { - case PSCI_RET_SUCCESS: - return 0; - case PSCI_RET_NOT_SUPPORTED: - return -EOPNOTSUPP; - case PSCI_RET_INVALID_PARAMS: - return -EINVAL; - case PSCI_RET_DENIED: - return -EPERM; - }; - - return -EINVAL; -} - -static u32 psci_get_version(void) -{ - return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); -} - -static int psci_cpu_suspend(u32 state, unsigned long entry_point) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; - err = invoke_psci_fn(fn, state, entry_point, 0); - return psci_to_linux_errno(err); -} - -static int psci_cpu_off(u32 state) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_CPU_OFF]; - err = invoke_psci_fn(fn, state, 0, 0); - return psci_to_linux_errno(err); -} - -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_CPU_ON]; - err = invoke_psci_fn(fn, cpuid, entry_point, 0); - return psci_to_linux_errno(err); -} - -static int psci_migrate(unsigned long cpuid) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_MIGRATE]; - err = invoke_psci_fn(fn, cpuid, 0, 0); - return psci_to_linux_errno(err); -} - -static int psci_affinity_info(unsigned long target_affinity, - unsigned long lowest_affinity_level) -{ - return invoke_psci_fn(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, - lowest_affinity_level, 0); -} - -static int psci_migrate_info_type(void) -{ - return invoke_psci_fn(PSCI_0_2_FN_MIGRATE_INFO_TYPE, 0, 0, 0); -} - -static unsigned long psci_migrate_info_up_cpu(void) -{ - return invoke_psci_fn(PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU, 0, 0, 0); -} - static int __maybe_unused cpu_psci_cpu_init_idle(unsigned int cpu) { int i, ret, count = 0; @@ -230,238 +110,6 @@ free_mem: return ret; } -static int get_set_conduit_method(struct device_node *np) -{ - const char *method; - - pr_info("probing for conduit method from DT.\n"); - - if (of_property_read_string(np, "method", &method)) { - pr_warn("missing \"method\" property\n"); - return -ENXIO; - } - - if (!strcmp("hvc", method)) { - invoke_psci_fn = __invoke_psci_fn_hvc; - } else if (!strcmp("smc", method)) { - invoke_psci_fn = __invoke_psci_fn_smc; - } else { - pr_warn("invalid \"method\" property: %s\n", method); - return -EINVAL; - } - return 0; -} - -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) -{ - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); -} - -static void psci_sys_poweroff(void) -{ - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); -} - -/* - * Detect the presence of a resident Trusted OS which may cause CPU_OFF to - * return DENIED (which would be fatal). - */ -static void __init psci_init_migrate(void) -{ - unsigned long cpuid; - int type, cpu; - - type = psci_ops.migrate_info_type(); - - if (type == PSCI_0_2_TOS_MP) { - pr_info("Trusted OS migration not required\n"); - return; - } - - if (type == PSCI_RET_NOT_SUPPORTED) { - pr_info("MIGRATE_INFO_TYPE not supported.\n"); - return; - } - - if (type != PSCI_0_2_TOS_UP_MIGRATE && - type != PSCI_0_2_TOS_UP_NO_MIGRATE) { - pr_err("MIGRATE_INFO_TYPE returned unknown type (%d)\n", type); - return; - } - - cpuid = psci_migrate_info_up_cpu(); - if (cpuid & ~MPIDR_HWID_BITMASK) { - pr_warn("MIGRATE_INFO_UP_CPU reported invalid physical ID (0x%lx)\n", - cpuid); - return; - } - - cpu = get_logical_index(cpuid); - resident_cpu = cpu >= 0 ? cpu : -1; - - pr_info("Trusted OS resident on physical CPU 0x%lx\n", cpuid); -} - -static void __init 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_ops.affinity_info = psci_affinity_info; - - psci_ops.migrate_info_type = psci_migrate_info_type; - - arm_pm_restart = psci_sys_reset; - - pm_power_off = psci_sys_poweroff; -} - -/* - * Probe function for PSCI firmware versions >= 0.2 - */ -static int __init psci_probe(void) -{ - u32 ver = psci_get_version(); - - pr_info("PSCIv%d.%d detected in firmware.\n", - PSCI_VERSION_MAJOR(ver), - PSCI_VERSION_MINOR(ver)); - - if (PSCI_VERSION_MAJOR(ver) == 0 && PSCI_VERSION_MINOR(ver) < 2) { - pr_err("Conflicting PSCI version detected.\n"); - return -EINVAL; - } - - psci_0_2_set_functions(); - - psci_init_migrate(); - - return 0; -} - -typedef int (*psci_initcall_t)(const struct device_node *); - -/* - * PSCI init function for PSCI versions >=0.2 - * - * Probe based on PSCI PSCI_VERSION function - */ -static int __init psci_0_2_init(struct device_node *np) -{ - int err; - - err = get_set_conduit_method(np); - - if (err) - goto out_put_node; - /* - * Starting with v0.2, the PSCI specification introduced a call - * (PSCI_VERSION) that allows probing the firmware version, so - * that PSCI function IDs and version specific initialization - * can be carried out according to the specific version reported - * by firmware - */ - err = psci_probe(); - -out_put_node: - of_node_put(np); - return err; -} - -/* - * PSCI < v0.2 get PSCI Function IDs via DT. - */ -static int __init psci_0_1_init(struct device_node *np) -{ - u32 id; - int err; - - err = get_set_conduit_method(np); - - if (err) - goto out_put_node; - - pr_info("Using PSCI v0.1 Function IDs from DT\n"); - - if (!of_property_read_u32(np, "cpu_suspend", &id)) { - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; - psci_ops.cpu_suspend = psci_cpu_suspend; - } - - if (!of_property_read_u32(np, "cpu_off", &id)) { - psci_function_id[PSCI_FN_CPU_OFF] = id; - psci_ops.cpu_off = psci_cpu_off; - } - - if (!of_property_read_u32(np, "cpu_on", &id)) { - psci_function_id[PSCI_FN_CPU_ON] = id; - psci_ops.cpu_on = psci_cpu_on; - } - - if (!of_property_read_u32(np, "migrate", &id)) { - psci_function_id[PSCI_FN_MIGRATE] = id; - psci_ops.migrate = psci_migrate; - } - -out_put_node: - of_node_put(np); - return err; -} - -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}, - {}, -}; - -int __init psci_dt_init(void) -{ - struct device_node *np; - 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 (!np) - return -ENODEV; - - init_fn = (psci_initcall_t)matched_np->data; - return init_fn(np); -} - -#ifdef CONFIG_ACPI -/* - * 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 = __invoke_psci_fn_hvc; - else - invoke_psci_fn = __invoke_psci_fn_smc; - - return psci_probe(); -} -#endif - #ifdef CONFIG_SMP static int __init cpu_psci_cpu_init(unsigned int cpu) @@ -489,11 +137,6 @@ static int cpu_psci_cpu_boot(unsigned int cpu) } #ifdef CONFIG_HOTPLUG_CPU -static bool psci_tos_resident_on(int cpu) -{ - return cpu == resident_cpu; -} - static int cpu_psci_cpu_disable(unsigned int cpu) { /* Fail early if we don't have CPU_OFF support */ diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index f3067d4..96ce264 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -46,6 +46,7 @@ #include <linux/of_platform.h> #include <linux/efi.h> #include <linux/personality.h> +#include <linux/psci.h> #include <asm/acpi.h> #include <asm/fixmap.h> @@ -61,7 +62,6 @@ #include <asm/tlbflush.h> #include <asm/traps.h> #include <asm/memblock.h> -#include <asm/psci.h> #include <asm/efi.h> #include <asm/virt.h> #include <asm/xen/hypervisor.h> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 99c69a3..d8de6a8 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -5,6 +5,9 @@ menu "Firmware Drivers" +config ARM_PSCI_FW + bool + config EDD tristate "BIOS Enhanced Disk Drive calls determine boot disk" depends on X86 diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 4a4b897..000830f 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -1,6 +1,7 @@ # # Makefile for the linux kernel. # +obj-$(CONFIG_ARM_PSCI_FW) += psci.o obj-$(CONFIG_DMI) += dmi_scan.o obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o obj-$(CONFIG_EDD) += edd.o diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c new file mode 100644 index 0000000..07b2daa --- /dev/null +++ b/drivers/firmware/psci.c @@ -0,0 +1,370 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Copyright (C) 2015 ARM Limited + */ + +#define pr_fmt(fmt) "psci: " fmt + +#include <linux/errno.h> +#include <linux/linkage.h> +#include <linux/of.h> +#include <linux/pm.h> +#include <linux/printk.h> +#include <linux/psci.h> +#include <linux/reboot.h> + +#include <uapi/linux/psci.h> + +#include <asm/cputype.h> +#include <asm/system_misc.h> +#include <asm/smp_plat.h> + +/* + * The CPU any Trusted OS is resident on. The trusted OS may reject CPU_OFF + * calls to its resident CPU, so we must avoid issuing those. We never migrate + * a Trusted OS even if it claims to be capable of migration -- doing so will + * require cooperation with a Trusted OS driver. + */ +static int resident_cpu = -1; + +bool psci_tos_resident_on(int cpu) +{ + return cpu == resident_cpu; +} + +struct psci_operations psci_ops; + +typedef unsigned long (psci_fn)(unsigned long, unsigned long, + unsigned long, unsigned long); +asmlinkage psci_fn __invoke_psci_fn_hvc; +asmlinkage psci_fn __invoke_psci_fn_smc; +static psci_fn *invoke_psci_fn; + +enum psci_function { + PSCI_FN_CPU_SUSPEND, + PSCI_FN_CPU_ON, + PSCI_FN_CPU_OFF, + PSCI_FN_MIGRATE, + PSCI_FN_MAX, +}; + +static u32 psci_function_id[PSCI_FN_MAX]; + +static int psci_to_linux_errno(int errno) +{ + switch (errno) { + case PSCI_RET_SUCCESS: + return 0; + case PSCI_RET_NOT_SUPPORTED: + return -EOPNOTSUPP; + case PSCI_RET_INVALID_PARAMS: + return -EINVAL; + case PSCI_RET_DENIED: + return -EPERM; + }; + + return -EINVAL; +} + +static u32 psci_get_version(void) +{ + return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); +} + +static int psci_cpu_suspend(u32 state, unsigned long entry_point) +{ + int err; + u32 fn; + + fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; + err = invoke_psci_fn(fn, state, entry_point, 0); + return psci_to_linux_errno(err); +} + +static int psci_cpu_off(u32 state) +{ + int err; + u32 fn; + + fn = psci_function_id[PSCI_FN_CPU_OFF]; + err = invoke_psci_fn(fn, state, 0, 0); + return psci_to_linux_errno(err); +} + +static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) +{ + int err; + u32 fn; + + fn = psci_function_id[PSCI_FN_CPU_ON]; + err = invoke_psci_fn(fn, cpuid, entry_point, 0); + return psci_to_linux_errno(err); +} + +static int psci_migrate(unsigned long cpuid) +{ + int err; + u32 fn; + + fn = psci_function_id[PSCI_FN_MIGRATE]; + err = invoke_psci_fn(fn, cpuid, 0, 0); + return psci_to_linux_errno(err); +} + +static int psci_affinity_info(unsigned long target_affinity, + unsigned long lowest_affinity_level) +{ + return invoke_psci_fn(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, + lowest_affinity_level, 0); +} + +static int psci_migrate_info_type(void) +{ + return invoke_psci_fn(PSCI_0_2_FN_MIGRATE_INFO_TYPE, 0, 0, 0); +} + +static unsigned long psci_migrate_info_up_cpu(void) +{ + return invoke_psci_fn(PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU, 0, 0, 0); +} + +static int get_set_conduit_method(struct device_node *np) +{ + const char *method; + + pr_info("probing for conduit method from DT.\n"); + + if (of_property_read_string(np, "method", &method)) { + pr_warn("missing \"method\" property\n"); + return -ENXIO; + } + + if (!strcmp("hvc", method)) { + invoke_psci_fn = __invoke_psci_fn_hvc; + } else if (!strcmp("smc", method)) { + invoke_psci_fn = __invoke_psci_fn_smc; + } else { + pr_warn("invalid \"method\" property: %s\n", method); + return -EINVAL; + } + return 0; +} + +static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) +{ + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); +} + +static void psci_sys_poweroff(void) +{ + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); +} + +/* + * Detect the presence of a resident Trusted OS which may cause CPU_OFF to + * return DENIED (which would be fatal). + */ +static void __init psci_init_migrate(void) +{ + unsigned long cpuid; + int type, cpu = -1; + + type = psci_ops.migrate_info_type(); + + if (type == PSCI_0_2_TOS_MP) { + pr_info("Trusted OS migration not required\n"); + return; + } + + if (type == PSCI_RET_NOT_SUPPORTED) { + pr_info("MIGRATE_INFO_TYPE not supported.\n"); + return; + } + + if (type != PSCI_0_2_TOS_UP_MIGRATE && + type != PSCI_0_2_TOS_UP_NO_MIGRATE) { + pr_err("MIGRATE_INFO_TYPE returned unknown type (%d)\n", type); + return; + } + + cpuid = psci_migrate_info_up_cpu(); + if (cpuid & ~MPIDR_HWID_BITMASK) { + pr_warn("MIGRATE_INFO_UP_CPU reported invalid physical ID (0x%lx)\n", + cpuid); + return; + } + + cpu = get_logical_index(cpuid); + resident_cpu = cpu >= 0 ? cpu : -1; + + pr_info("Trusted OS resident on physical CPU 0x%lx\n", cpuid); +} + +static void __init 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_ops.affinity_info = psci_affinity_info; + + psci_ops.migrate_info_type = psci_migrate_info_type; + + arm_pm_restart = psci_sys_reset; + + pm_power_off = psci_sys_poweroff; +} + +/* + * Probe function for PSCI firmware versions >= 0.2 + */ +static int __init psci_probe(void) +{ + u32 ver = psci_get_version(); + + pr_info("PSCIv%d.%d detected in firmware.\n", + PSCI_VERSION_MAJOR(ver), + PSCI_VERSION_MINOR(ver)); + + if (PSCI_VERSION_MAJOR(ver) == 0 && PSCI_VERSION_MINOR(ver) < 2) { + pr_err("Conflicting PSCI version detected.\n"); + return -EINVAL; + } + + psci_0_2_set_functions(); + + psci_init_migrate(); + + return 0; +} + +typedef int (*psci_initcall_t)(const struct device_node *); + +/* + * PSCI init function for PSCI versions >=0.2 + * + * Probe based on PSCI PSCI_VERSION function + */ +static int __init psci_0_2_init(struct device_node *np) +{ + int err; + + err = get_set_conduit_method(np); + + if (err) + goto out_put_node; + /* + * Starting with v0.2, the PSCI specification introduced a call + * (PSCI_VERSION) that allows probing the firmware version, so + * that PSCI function IDs and version specific initialization + * can be carried out according to the specific version reported + * by firmware + */ + err = psci_probe(); + +out_put_node: + of_node_put(np); + return err; +} + +/* + * PSCI < v0.2 get PSCI Function IDs via DT. + */ +static int __init psci_0_1_init(struct device_node *np) +{ + u32 id; + int err; + + err = get_set_conduit_method(np); + + if (err) + goto out_put_node; + + pr_info("Using PSCI v0.1 Function IDs from DT\n"); + + if (!of_property_read_u32(np, "cpu_suspend", &id)) { + psci_function_id[PSCI_FN_CPU_SUSPEND] = id; + psci_ops.cpu_suspend = psci_cpu_suspend; + } + + if (!of_property_read_u32(np, "cpu_off", &id)) { + psci_function_id[PSCI_FN_CPU_OFF] = id; + psci_ops.cpu_off = psci_cpu_off; + } + + if (!of_property_read_u32(np, "cpu_on", &id)) { + psci_function_id[PSCI_FN_CPU_ON] = id; + psci_ops.cpu_on = psci_cpu_on; + } + + if (!of_property_read_u32(np, "migrate", &id)) { + psci_function_id[PSCI_FN_MIGRATE] = id; + psci_ops.migrate = psci_migrate; + } + +out_put_node: + of_node_put(np); + return err; +} + +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}, + {}, +}; + +int __init psci_dt_init(void) +{ + struct device_node *np; + 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 (!np) + return -ENODEV; + + init_fn = (psci_initcall_t)matched_np->data; + return init_fn(np); +} + +#ifdef CONFIG_ACPI +/* + * 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 = __invoke_psci_fn_hvc; + else + invoke_psci_fn = __invoke_psci_fn_smc; + + return psci_probe(); +} +#endif + diff --git a/include/linux/psci.h b/include/linux/psci.h new file mode 100644 index 0000000..a682fcc --- /dev/null +++ b/include/linux/psci.h @@ -0,0 +1,52 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Copyright (C) 2015 ARM Limited + */ + +#ifndef __LINUX_PSCI_H +#define __LINUX_PSCI_H + +#include <linux/init.h> +#include <linux/types.h> + +#define PSCI_POWER_STATE_TYPE_STANDBY 0 +#define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 + +bool psci_tos_resident_on(int cpu); + +struct psci_operations { + int (*cpu_suspend)(u32 state, unsigned long entry_point); + int (*cpu_off)(u32 state); + int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); + int (*migrate)(unsigned long cpuid); + int (*affinity_info)(unsigned long target_affinity, + unsigned long lowest_affinity_level); + int (*migrate_info_type)(void); +}; + +extern struct psci_operations psci_ops; + +#if defined(CONFIG_ARM_PSCI_FW) +int __init psci_dt_init(void); +#else +static inline int psci_dt_init(void) { return 0; } +#endif + +#if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) +int __init psci_acpi_init(void); +bool __init acpi_psci_present(void); +bool __init acpi_psci_use_hvc(void); +#else +static inline int psci_acpi_init(void) { return 0; } +static inline bool acpi_psci_present(void) { return false; } +#endif + +#endif /* __LINUX_PSCI_H */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 3/5] drivers: psci: support native SMC{32,64} calls 2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland 2015-07-02 17:12 ` [PATCHv4 1/5] ARM: psci: boot_secondary: replace __pa with virt_to_idmap Mark Rutland 2015-07-02 17:12 ` [PATCHv4 2/5] arm64: psci: factor invocation code to drivers Mark Rutland @ 2015-07-02 17:12 ` Mark Rutland 2015-07-02 17:12 ` [PATCHv4 4/5] ARM: migrate to common PSCI client code Mark Rutland 2015-07-02 17:12 ` [PATCHv4 5/5] MAINTAINERS: add PSCI entry Mark Rutland 4 siblings, 0 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw) To: linux-arm-kernel A 32-bit OS cannot make calls with SMC64 IDs, while a 64-bit OS must invoke some PSCI functions with SMC64 IDs. This patch introduces and makes use of a new macro to choose the appropriate IDs based on the register width of the OS, which will allow 32-bit callers to use the PSCI client code. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> --- drivers/firmware/psci.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 07b2daa..81b70da 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -28,6 +28,18 @@ #include <asm/smp_plat.h> /* + * While a 64-bit OS can make calls with SMC32 calling conventions, for some + * calls it is necessary to use SMC64 to pass or return 64-bit values. For such + * calls PSCI_0_2_FN_NATIVE(x) will choose the appropriate (native-width) + * function ID. + */ +#ifdef CONFIG_64BIT +#define PSCI_0_2_FN_NATIVE(name) PSCI_0_2_FN64_##name +#else +#define PSCI_0_2_FN_NATIVE(name) PSCI_0_2_FN_##name +#endif + +/* * The CPU any Trusted OS is resident on. The trusted OS may reject CPU_OFF * calls to its resident CPU, so we must avoid issuing those. We never migrate * a Trusted OS even if it claims to be capable of migration -- doing so will @@ -122,8 +134,8 @@ static int psci_migrate(unsigned long cpuid) static int psci_affinity_info(unsigned long target_affinity, unsigned long lowest_affinity_level) { - return invoke_psci_fn(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, - lowest_affinity_level, 0); + return invoke_psci_fn(PSCI_0_2_FN_NATIVE(AFFINITY_INFO), + target_affinity, lowest_affinity_level, 0); } static int psci_migrate_info_type(void) @@ -133,7 +145,8 @@ static int psci_migrate_info_type(void) static unsigned long psci_migrate_info_up_cpu(void) { - return invoke_psci_fn(PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU, 0, 0, 0); + return invoke_psci_fn(PSCI_0_2_FN_NATIVE(MIGRATE_INFO_UP_CPU), + 0, 0, 0); } static int get_set_conduit_method(struct device_node *np) @@ -211,16 +224,16 @@ static void __init psci_init_migrate(void) static void __init 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_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN_NATIVE(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_function_id[PSCI_FN_CPU_ON] = PSCI_0_2_FN_NATIVE(CPU_ON); psci_ops.cpu_on = psci_cpu_on; - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN64_MIGRATE; + psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN_NATIVE(MIGRATE); psci_ops.migrate = psci_migrate; psci_ops.affinity_info = psci_affinity_info; -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 4/5] ARM: migrate to common PSCI client code 2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland ` (2 preceding siblings ...) 2015-07-02 17:12 ` [PATCHv4 3/5] drivers: psci: support native SMC{32,64} calls Mark Rutland @ 2015-07-02 17:12 ` Mark Rutland 2015-07-03 4:14 ` Rob Herring 2015-07-10 9:16 ` Mark Rutland 2015-07-02 17:12 ` [PATCHv4 5/5] MAINTAINERS: add PSCI entry Mark Rutland 4 siblings, 2 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw) To: linux-arm-kernel Now that the common PSCI client code has been factored out to drivers/firmware, and made safe for 32-bit use, move the 32-bit ARM code over to it. This results in a moderate reduction of duplicated lines, and will prevent further duplication as the PSCI client code is updated for PSCI 1.0 and beyond. The two legacy platform users of the PSCI invocation code are updated to account for interface changes. In both cases the power state parameter (which is constant) is now generated using macros, so that the pack/unpack logic can be killed in preparation for PSCI 1.0 power state changes. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Ashwin Chaugule <ashwin.chaugule@linaro.org> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Rob Herring <robh@kernel.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm/Kconfig | 1 + arch/arm/include/asm/psci.h | 23 --- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/psci.c | 299 -------------------------------------- arch/arm/kernel/psci_smp.c | 29 +++- arch/arm/kernel/setup.c | 3 +- arch/arm/mach-highbank/highbank.c | 2 +- arch/arm/mach-highbank/pm.c | 16 +- drivers/cpuidle/cpuidle-calxeda.c | 15 +- 9 files changed, 46 insertions(+), 344 deletions(-) delete mode 100644 arch/arm/kernel/psci.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a750c14..36516e4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1496,6 +1496,7 @@ config HOTPLUG_CPU config ARM_PSCI bool "Support for the ARM Power State Coordination Interface (PSCI)" depends on CPU_V7 + select ARM_PSCI_FW help Say Y here if you want Linux to communicate with system firmware implementing the PSCI specification for CPU-centric power diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index c25ef3e..68ee3ce 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -14,34 +14,11 @@ #ifndef __ASM_ARM_PSCI_H #define __ASM_ARM_PSCI_H -#define PSCI_POWER_STATE_TYPE_STANDBY 0 -#define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 - -struct psci_power_state { - u16 id; - u8 type; - u8 affinity_level; -}; - -struct psci_operations { - int (*cpu_suspend)(struct psci_power_state state, - unsigned long entry_point); - int (*cpu_off)(struct psci_power_state state); - int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); - int (*migrate)(unsigned long cpuid); - int (*affinity_info)(unsigned long target_affinity, - unsigned long lowest_affinity_level); - int (*migrate_info_type)(void); -}; - -extern struct psci_operations psci_ops; extern struct smp_operations psci_smp_ops; #ifdef CONFIG_ARM_PSCI -int psci_init(void); bool psci_smp_available(void); #else -static inline int psci_init(void) { return 0; } static inline bool psci_smp_available(void) { return false; } #endif diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index e69f7a1..3b995f5 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -89,7 +89,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o ifeq ($(CONFIG_ARM_PSCI),y) -obj-y += psci.o psci-call.o +obj-y += psci-call.o obj-$(CONFIG_SMP) += psci_smp.o endif diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c deleted file mode 100644 index f90fdf4..0000000 --- a/arch/arm/kernel/psci.c +++ /dev/null @@ -1,299 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Copyright (C) 2012 ARM Limited - * - * Author: Will Deacon <will.deacon@arm.com> - */ - -#define pr_fmt(fmt) "psci: " fmt - -#include <linux/init.h> -#include <linux/of.h> -#include <linux/reboot.h> -#include <linux/pm.h> -#include <uapi/linux/psci.h> - -#include <asm/compiler.h> -#include <asm/errno.h> -#include <asm/psci.h> -#include <asm/system_misc.h> - -struct psci_operations psci_ops; - -static int (*invoke_psci_fn)(u32, u32, u32, u32); -typedef int (*psci_initcall_t)(const struct device_node *); - -asmlinkage int __invoke_psci_fn_hvc(u32, u32, u32, u32); -asmlinkage int __invoke_psci_fn_smc(u32, u32, u32, u32); - -enum psci_function { - PSCI_FN_CPU_SUSPEND, - PSCI_FN_CPU_ON, - PSCI_FN_CPU_OFF, - PSCI_FN_MIGRATE, - PSCI_FN_AFFINITY_INFO, - PSCI_FN_MIGRATE_INFO_TYPE, - PSCI_FN_MAX, -}; - -static u32 psci_function_id[PSCI_FN_MAX]; - -static int psci_to_linux_errno(int errno) -{ - switch (errno) { - case PSCI_RET_SUCCESS: - return 0; - case PSCI_RET_NOT_SUPPORTED: - return -EOPNOTSUPP; - case PSCI_RET_INVALID_PARAMS: - return -EINVAL; - case PSCI_RET_DENIED: - return -EPERM; - }; - - return -EINVAL; -} - -static u32 psci_power_state_pack(struct psci_power_state state) -{ - return ((state.id << PSCI_0_2_POWER_STATE_ID_SHIFT) - & PSCI_0_2_POWER_STATE_ID_MASK) | - ((state.type << PSCI_0_2_POWER_STATE_TYPE_SHIFT) - & PSCI_0_2_POWER_STATE_TYPE_MASK) | - ((state.affinity_level << PSCI_0_2_POWER_STATE_AFFL_SHIFT) - & PSCI_0_2_POWER_STATE_AFFL_MASK); -} - -static int psci_get_version(void) -{ - int err; - - err = invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); - return err; -} - -static int psci_cpu_suspend(struct psci_power_state state, - unsigned long entry_point) -{ - int err; - u32 fn, power_state; - - fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; - power_state = psci_power_state_pack(state); - err = invoke_psci_fn(fn, power_state, entry_point, 0); - return psci_to_linux_errno(err); -} - -static int psci_cpu_off(struct psci_power_state state) -{ - int err; - u32 fn, power_state; - - fn = psci_function_id[PSCI_FN_CPU_OFF]; - power_state = psci_power_state_pack(state); - err = invoke_psci_fn(fn, power_state, 0, 0); - return psci_to_linux_errno(err); -} - -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_CPU_ON]; - err = invoke_psci_fn(fn, cpuid, entry_point, 0); - return psci_to_linux_errno(err); -} - -static int psci_migrate(unsigned long cpuid) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_MIGRATE]; - err = invoke_psci_fn(fn, cpuid, 0, 0); - return psci_to_linux_errno(err); -} - -static int psci_affinity_info(unsigned long target_affinity, - unsigned long lowest_affinity_level) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_AFFINITY_INFO]; - err = invoke_psci_fn(fn, target_affinity, lowest_affinity_level, 0); - return err; -} - -static int psci_migrate_info_type(void) -{ - int err; - u32 fn; - - fn = psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE]; - err = invoke_psci_fn(fn, 0, 0, 0); - return err; -} - -static int get_set_conduit_method(struct device_node *np) -{ - const char *method; - - pr_info("probing for conduit method from DT.\n"); - - if (of_property_read_string(np, "method", &method)) { - pr_warn("missing \"method\" property\n"); - return -ENXIO; - } - - if (!strcmp("hvc", method)) { - invoke_psci_fn = __invoke_psci_fn_hvc; - } else if (!strcmp("smc", method)) { - invoke_psci_fn = __invoke_psci_fn_smc; - } else { - pr_warn("invalid \"method\" property: %s\n", method); - return -EINVAL; - } - return 0; -} - -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) -{ - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); -} - -static void psci_sys_poweroff(void) -{ - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); -} - -/* - * PSCI Function IDs for v0.2+ are well defined so use - * standard values. - */ -static int psci_0_2_init(struct device_node *np) -{ - int err, ver; - - err = get_set_conduit_method(np); - - if (err) - goto out_put_node; - - ver = psci_get_version(); - - if (ver == PSCI_RET_NOT_SUPPORTED) { - /* PSCI v0.2 mandates implementation of PSCI_ID_VERSION. */ - pr_err("PSCI firmware does not comply with the v0.2 spec.\n"); - err = -EOPNOTSUPP; - goto out_put_node; - } else { - pr_info("PSCIv%d.%d detected in firmware.\n", - PSCI_VERSION_MAJOR(ver), - PSCI_VERSION_MINOR(ver)); - - if (PSCI_VERSION_MAJOR(ver) == 0 && - PSCI_VERSION_MINOR(ver) < 2) { - err = -EINVAL; - pr_err("Conflicting PSCI version detected.\n"); - goto out_put_node; - } - } - - pr_info("Using standard PSCI v0.2 function IDs\n"); - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN_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_FN_CPU_ON; - psci_ops.cpu_on = psci_cpu_on; - - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN_MIGRATE; - psci_ops.migrate = psci_migrate; - - psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN_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; - -out_put_node: - of_node_put(np); - return err; -} - -/* - * PSCI < v0.2 get PSCI Function IDs via DT. - */ -static int psci_0_1_init(struct device_node *np) -{ - u32 id; - int err; - - err = get_set_conduit_method(np); - - if (err) - goto out_put_node; - - pr_info("Using PSCI v0.1 Function IDs from DT\n"); - - if (!of_property_read_u32(np, "cpu_suspend", &id)) { - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; - psci_ops.cpu_suspend = psci_cpu_suspend; - } - - if (!of_property_read_u32(np, "cpu_off", &id)) { - psci_function_id[PSCI_FN_CPU_OFF] = id; - psci_ops.cpu_off = psci_cpu_off; - } - - if (!of_property_read_u32(np, "cpu_on", &id)) { - psci_function_id[PSCI_FN_CPU_ON] = id; - psci_ops.cpu_on = psci_cpu_on; - } - - if (!of_property_read_u32(np, "migrate", &id)) { - psci_function_id[PSCI_FN_MIGRATE] = id; - psci_ops.migrate = psci_migrate; - } - -out_put_node: - of_node_put(np); - return err; -} - -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}, - {}, -}; - -int __init psci_init(void) -{ - struct device_node *np; - 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 (!np) - return -ENODEV; - - init_fn = (psci_initcall_t)matched_np->data; - return init_fn(np); -} diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index 244aadd..61c04b0 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -17,6 +17,8 @@ #include <linux/smp.h> #include <linux/of.h> #include <linux/delay.h> +#include <linux/psci.h> + #include <uapi/linux/psci.h> #include <asm/psci.h> @@ -56,17 +58,29 @@ static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) } #ifdef CONFIG_HOTPLUG_CPU +int psci_cpu_disable(unsigned int cpu) +{ + /* Fail early if we don't have CPU_OFF support */ + if (!psci_ops.cpu_off) + return -EOPNOTSUPP; + + /* Trusted OS will deny CPU_OFF */ + if (psci_tos_resident_on(cpu)) + return -EPERM; + + return 0; +} + void __ref psci_cpu_die(unsigned int cpu) { - const struct psci_power_state ps = { - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, - }; + u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN << + PSCI_0_2_POWER_STATE_TYPE_SHIFT; - if (psci_ops.cpu_off) - psci_ops.cpu_off(ps); + if (psci_ops.cpu_off) + psci_ops.cpu_off(state); - /* We should never return */ - panic("psci: cpu %d failed to shutdown\n", cpu); + /* We should never return */ + panic("psci: cpu %d failed to shutdown\n", cpu); } int __ref psci_cpu_kill(unsigned int cpu) @@ -109,6 +123,7 @@ bool __init psci_smp_available(void) struct smp_operations __initdata psci_smp_ops = { .smp_boot_secondary = psci_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU + .cpu_disable = psci_cpu_disable, .cpu_die = psci_cpu_die, .cpu_kill = psci_cpu_kill, #endif diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 36c18b7..9c38bd4 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -31,6 +31,7 @@ #include <linux/bug.h> #include <linux/compiler.h> #include <linux/sort.h> +#include <linux/psci.h> #include <asm/unified.h> #include <asm/cp15.h> @@ -972,7 +973,7 @@ void __init setup_arch(char **cmdline_p) unflatten_device_tree(); arm_dt_init_cpu_maps(); - psci_init(); + psci_dt_init(); xen_early_init(); #ifdef CONFIG_SMP if (is_smp()) { diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 231fba0..6050a14 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -28,8 +28,8 @@ #include <linux/reboot.h> #include <linux/amba/bus.h> #include <linux/platform_device.h> +#include <linux/psci.h> -#include <asm/psci.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c index 7f2bd85..4003116 100644 --- a/arch/arm/mach-highbank/pm.c +++ b/arch/arm/mach-highbank/pm.c @@ -16,19 +16,21 @@ #include <linux/cpu_pm.h> #include <linux/init.h> +#include <linux/psci.h> #include <linux/suspend.h> #include <asm/suspend.h> -#include <asm/psci.h> + +#include <uapi/linux/psci.h> + +#define HIGHBANK_SUSPEND_PARAM \ + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ + (1 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) static int highbank_suspend_finish(unsigned long val) { - const struct psci_power_state ps = { - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, - .affinity_level = 1, - }; - - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); + return psci_ops.cpu_suspend(HIGHBANK_SUSPEND_PARAM, __pa(cpu_resume)); } static int highbank_pm_enter(suspend_state_t state) diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c index 9445e6c..1c3242c 100644 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ b/drivers/cpuidle/cpuidle-calxeda.c @@ -25,16 +25,21 @@ #include <linux/init.h> #include <linux/mm.h> #include <linux/platform_device.h> +#include <linux/psci.h> + #include <asm/cpuidle.h> #include <asm/suspend.h> -#include <asm/psci.h> + +#include <uapi/linux/psci.h> + +#define CALXEDA_IDLE_PARAM \ + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ + (0 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) static int calxeda_idle_finish(unsigned long val) { - const struct psci_power_state ps = { - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, - }; - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); + return psci_ops.cpu_suspend(CALXEDA_IDLE_PARAM, __pa(cpu_resume)); } static int calxeda_pwrdown_idle(struct cpuidle_device *dev, -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv4 4/5] ARM: migrate to common PSCI client code 2015-07-02 17:12 ` [PATCHv4 4/5] ARM: migrate to common PSCI client code Mark Rutland @ 2015-07-03 4:14 ` Rob Herring 2015-07-10 9:16 ` Mark Rutland 1 sibling, 0 replies; 8+ messages in thread From: Rob Herring @ 2015-07-03 4:14 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jul 2, 2015 at 12:12 PM, Mark Rutland <mark.rutland@arm.com> wrote: > Now that the common PSCI client code has been factored out to > drivers/firmware, and made safe for 32-bit use, move the 32-bit ARM code > over to it. This results in a moderate reduction of duplicated lines, > and will prevent further duplication as the PSCI client code is updated > for PSCI 1.0 and beyond. > > The two legacy platform users of the PSCI invocation code are updated to > account for interface changes. In both cases the power state parameter > (which is constant) is now generated using macros, so that the > pack/unpack logic can be killed in preparation for PSCI 1.0 power state > changes. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Ashwin Chaugule <ashwin.chaugule@linaro.org> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: Will Deacon <will.deacon@arm.com> I thought I had acked this already, but: Acked-by: Rob Herring <robh@kernel.org> > --- > arch/arm/Kconfig | 1 + > arch/arm/include/asm/psci.h | 23 --- > arch/arm/kernel/Makefile | 2 +- > arch/arm/kernel/psci.c | 299 -------------------------------------- > arch/arm/kernel/psci_smp.c | 29 +++- > arch/arm/kernel/setup.c | 3 +- > arch/arm/mach-highbank/highbank.c | 2 +- > arch/arm/mach-highbank/pm.c | 16 +- > drivers/cpuidle/cpuidle-calxeda.c | 15 +- > 9 files changed, 46 insertions(+), 344 deletions(-) > delete mode 100644 arch/arm/kernel/psci.c > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index a750c14..36516e4 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1496,6 +1496,7 @@ config HOTPLUG_CPU > config ARM_PSCI > bool "Support for the ARM Power State Coordination Interface (PSCI)" > depends on CPU_V7 > + select ARM_PSCI_FW > help > Say Y here if you want Linux to communicate with system firmware > implementing the PSCI specification for CPU-centric power > diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h > index c25ef3e..68ee3ce 100644 > --- a/arch/arm/include/asm/psci.h > +++ b/arch/arm/include/asm/psci.h > @@ -14,34 +14,11 @@ > #ifndef __ASM_ARM_PSCI_H > #define __ASM_ARM_PSCI_H > > -#define PSCI_POWER_STATE_TYPE_STANDBY 0 > -#define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 > - > -struct psci_power_state { > - u16 id; > - u8 type; > - u8 affinity_level; > -}; > - > -struct psci_operations { > - int (*cpu_suspend)(struct psci_power_state state, > - unsigned long entry_point); > - int (*cpu_off)(struct psci_power_state state); > - int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); > - int (*migrate)(unsigned long cpuid); > - int (*affinity_info)(unsigned long target_affinity, > - unsigned long lowest_affinity_level); > - int (*migrate_info_type)(void); > -}; > - > -extern struct psci_operations psci_ops; > extern struct smp_operations psci_smp_ops; > > #ifdef CONFIG_ARM_PSCI > -int psci_init(void); > bool psci_smp_available(void); > #else > -static inline int psci_init(void) { return 0; } > static inline bool psci_smp_available(void) { return false; } > #endif > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index e69f7a1..3b995f5 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -89,7 +89,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o > > obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o > ifeq ($(CONFIG_ARM_PSCI),y) > -obj-y += psci.o psci-call.o > +obj-y += psci-call.o > obj-$(CONFIG_SMP) += psci_smp.o > endif > > diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c > deleted file mode 100644 > index f90fdf4..0000000 > --- a/arch/arm/kernel/psci.c > +++ /dev/null > @@ -1,299 +0,0 @@ > -/* > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Copyright (C) 2012 ARM Limited > - * > - * Author: Will Deacon <will.deacon@arm.com> > - */ > - > -#define pr_fmt(fmt) "psci: " fmt > - > -#include <linux/init.h> > -#include <linux/of.h> > -#include <linux/reboot.h> > -#include <linux/pm.h> > -#include <uapi/linux/psci.h> > - > -#include <asm/compiler.h> > -#include <asm/errno.h> > -#include <asm/psci.h> > -#include <asm/system_misc.h> > - > -struct psci_operations psci_ops; > - > -static int (*invoke_psci_fn)(u32, u32, u32, u32); > -typedef int (*psci_initcall_t)(const struct device_node *); > - > -asmlinkage int __invoke_psci_fn_hvc(u32, u32, u32, u32); > -asmlinkage int __invoke_psci_fn_smc(u32, u32, u32, u32); > - > -enum psci_function { > - PSCI_FN_CPU_SUSPEND, > - PSCI_FN_CPU_ON, > - PSCI_FN_CPU_OFF, > - PSCI_FN_MIGRATE, > - PSCI_FN_AFFINITY_INFO, > - PSCI_FN_MIGRATE_INFO_TYPE, > - PSCI_FN_MAX, > -}; > - > -static u32 psci_function_id[PSCI_FN_MAX]; > - > -static int psci_to_linux_errno(int errno) > -{ > - switch (errno) { > - case PSCI_RET_SUCCESS: > - return 0; > - case PSCI_RET_NOT_SUPPORTED: > - return -EOPNOTSUPP; > - case PSCI_RET_INVALID_PARAMS: > - return -EINVAL; > - case PSCI_RET_DENIED: > - return -EPERM; > - }; > - > - return -EINVAL; > -} > - > -static u32 psci_power_state_pack(struct psci_power_state state) > -{ > - return ((state.id << PSCI_0_2_POWER_STATE_ID_SHIFT) > - & PSCI_0_2_POWER_STATE_ID_MASK) | > - ((state.type << PSCI_0_2_POWER_STATE_TYPE_SHIFT) > - & PSCI_0_2_POWER_STATE_TYPE_MASK) | > - ((state.affinity_level << PSCI_0_2_POWER_STATE_AFFL_SHIFT) > - & PSCI_0_2_POWER_STATE_AFFL_MASK); > -} > - > -static int psci_get_version(void) > -{ > - int err; > - > - err = invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); > - return err; > -} > - > -static int psci_cpu_suspend(struct psci_power_state state, > - unsigned long entry_point) > -{ > - int err; > - u32 fn, power_state; > - > - fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; > - power_state = psci_power_state_pack(state); > - err = invoke_psci_fn(fn, power_state, entry_point, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_cpu_off(struct psci_power_state state) > -{ > - int err; > - u32 fn, power_state; > - > - fn = psci_function_id[PSCI_FN_CPU_OFF]; > - power_state = psci_power_state_pack(state); > - err = invoke_psci_fn(fn, power_state, 0, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_CPU_ON]; > - err = invoke_psci_fn(fn, cpuid, entry_point, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_migrate(unsigned long cpuid) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_MIGRATE]; > - err = invoke_psci_fn(fn, cpuid, 0, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_affinity_info(unsigned long target_affinity, > - unsigned long lowest_affinity_level) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_AFFINITY_INFO]; > - err = invoke_psci_fn(fn, target_affinity, lowest_affinity_level, 0); > - return err; > -} > - > -static int psci_migrate_info_type(void) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE]; > - err = invoke_psci_fn(fn, 0, 0, 0); > - return err; > -} > - > -static int get_set_conduit_method(struct device_node *np) > -{ > - const char *method; > - > - pr_info("probing for conduit method from DT.\n"); > - > - if (of_property_read_string(np, "method", &method)) { > - pr_warn("missing \"method\" property\n"); > - return -ENXIO; > - } > - > - if (!strcmp("hvc", method)) { > - invoke_psci_fn = __invoke_psci_fn_hvc; > - } else if (!strcmp("smc", method)) { > - invoke_psci_fn = __invoke_psci_fn_smc; > - } else { > - pr_warn("invalid \"method\" property: %s\n", method); > - return -EINVAL; > - } > - return 0; > -} > - > -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) > -{ > - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); > -} > - > -static void psci_sys_poweroff(void) > -{ > - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); > -} > - > -/* > - * PSCI Function IDs for v0.2+ are well defined so use > - * standard values. > - */ > -static int psci_0_2_init(struct device_node *np) > -{ > - int err, ver; > - > - err = get_set_conduit_method(np); > - > - if (err) > - goto out_put_node; > - > - ver = psci_get_version(); > - > - if (ver == PSCI_RET_NOT_SUPPORTED) { > - /* PSCI v0.2 mandates implementation of PSCI_ID_VERSION. */ > - pr_err("PSCI firmware does not comply with the v0.2 spec.\n"); > - err = -EOPNOTSUPP; > - goto out_put_node; > - } else { > - pr_info("PSCIv%d.%d detected in firmware.\n", > - PSCI_VERSION_MAJOR(ver), > - PSCI_VERSION_MINOR(ver)); > - > - if (PSCI_VERSION_MAJOR(ver) == 0 && > - PSCI_VERSION_MINOR(ver) < 2) { > - err = -EINVAL; > - pr_err("Conflicting PSCI version detected.\n"); > - goto out_put_node; > - } > - } > - > - pr_info("Using standard PSCI v0.2 function IDs\n"); > - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN_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_FN_CPU_ON; > - psci_ops.cpu_on = psci_cpu_on; > - > - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN_MIGRATE; > - psci_ops.migrate = psci_migrate; > - > - psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN_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; > - > -out_put_node: > - of_node_put(np); > - return err; > -} > - > -/* > - * PSCI < v0.2 get PSCI Function IDs via DT. > - */ > -static int psci_0_1_init(struct device_node *np) > -{ > - u32 id; > - int err; > - > - err = get_set_conduit_method(np); > - > - if (err) > - goto out_put_node; > - > - pr_info("Using PSCI v0.1 Function IDs from DT\n"); > - > - if (!of_property_read_u32(np, "cpu_suspend", &id)) { > - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > - psci_ops.cpu_suspend = psci_cpu_suspend; > - } > - > - if (!of_property_read_u32(np, "cpu_off", &id)) { > - psci_function_id[PSCI_FN_CPU_OFF] = id; > - psci_ops.cpu_off = psci_cpu_off; > - } > - > - if (!of_property_read_u32(np, "cpu_on", &id)) { > - psci_function_id[PSCI_FN_CPU_ON] = id; > - psci_ops.cpu_on = psci_cpu_on; > - } > - > - if (!of_property_read_u32(np, "migrate", &id)) { > - psci_function_id[PSCI_FN_MIGRATE] = id; > - psci_ops.migrate = psci_migrate; > - } > - > -out_put_node: > - of_node_put(np); > - return err; > -} > - > -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}, > - {}, > -}; > - > -int __init psci_init(void) > -{ > - struct device_node *np; > - 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 (!np) > - return -ENODEV; > - > - init_fn = (psci_initcall_t)matched_np->data; > - return init_fn(np); > -} > diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c > index 244aadd..61c04b0 100644 > --- a/arch/arm/kernel/psci_smp.c > +++ b/arch/arm/kernel/psci_smp.c > @@ -17,6 +17,8 @@ > #include <linux/smp.h> > #include <linux/of.h> > #include <linux/delay.h> > +#include <linux/psci.h> > + > #include <uapi/linux/psci.h> > > #include <asm/psci.h> > @@ -56,17 +58,29 @@ static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) > } > > #ifdef CONFIG_HOTPLUG_CPU > +int psci_cpu_disable(unsigned int cpu) > +{ > + /* Fail early if we don't have CPU_OFF support */ > + if (!psci_ops.cpu_off) > + return -EOPNOTSUPP; > + > + /* Trusted OS will deny CPU_OFF */ > + if (psci_tos_resident_on(cpu)) > + return -EPERM; > + > + return 0; > +} > + > void __ref psci_cpu_die(unsigned int cpu) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - }; > + u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN << > + PSCI_0_2_POWER_STATE_TYPE_SHIFT; > > - if (psci_ops.cpu_off) > - psci_ops.cpu_off(ps); > + if (psci_ops.cpu_off) > + psci_ops.cpu_off(state); > > - /* We should never return */ > - panic("psci: cpu %d failed to shutdown\n", cpu); > + /* We should never return */ > + panic("psci: cpu %d failed to shutdown\n", cpu); > } > > int __ref psci_cpu_kill(unsigned int cpu) > @@ -109,6 +123,7 @@ bool __init psci_smp_available(void) > struct smp_operations __initdata psci_smp_ops = { > .smp_boot_secondary = psci_boot_secondary, > #ifdef CONFIG_HOTPLUG_CPU > + .cpu_disable = psci_cpu_disable, > .cpu_die = psci_cpu_die, > .cpu_kill = psci_cpu_kill, > #endif > diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c > index 36c18b7..9c38bd4 100644 > --- a/arch/arm/kernel/setup.c > +++ b/arch/arm/kernel/setup.c > @@ -31,6 +31,7 @@ > #include <linux/bug.h> > #include <linux/compiler.h> > #include <linux/sort.h> > +#include <linux/psci.h> > > #include <asm/unified.h> > #include <asm/cp15.h> > @@ -972,7 +973,7 @@ void __init setup_arch(char **cmdline_p) > unflatten_device_tree(); > > arm_dt_init_cpu_maps(); > - psci_init(); > + psci_dt_init(); > xen_early_init(); > #ifdef CONFIG_SMP > if (is_smp()) { > diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c > index 231fba0..6050a14 100644 > --- a/arch/arm/mach-highbank/highbank.c > +++ b/arch/arm/mach-highbank/highbank.c > @@ -28,8 +28,8 @@ > #include <linux/reboot.h> > #include <linux/amba/bus.h> > #include <linux/platform_device.h> > +#include <linux/psci.h> > > -#include <asm/psci.h> > #include <asm/hardware/cache-l2x0.h> > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c > index 7f2bd85..4003116 100644 > --- a/arch/arm/mach-highbank/pm.c > +++ b/arch/arm/mach-highbank/pm.c > @@ -16,19 +16,21 @@ > > #include <linux/cpu_pm.h> > #include <linux/init.h> > +#include <linux/psci.h> > #include <linux/suspend.h> > > #include <asm/suspend.h> > -#include <asm/psci.h> > + > +#include <uapi/linux/psci.h> > + > +#define HIGHBANK_SUSPEND_PARAM \ > + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ > + (1 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ > + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) > > static int highbank_suspend_finish(unsigned long val) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - .affinity_level = 1, > - }; > - > - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); > + return psci_ops.cpu_suspend(HIGHBANK_SUSPEND_PARAM, __pa(cpu_resume)); > } > > static int highbank_pm_enter(suspend_state_t state) > diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c > index 9445e6c..1c3242c 100644 > --- a/drivers/cpuidle/cpuidle-calxeda.c > +++ b/drivers/cpuidle/cpuidle-calxeda.c > @@ -25,16 +25,21 @@ > #include <linux/init.h> > #include <linux/mm.h> > #include <linux/platform_device.h> > +#include <linux/psci.h> > + > #include <asm/cpuidle.h> > #include <asm/suspend.h> > -#include <asm/psci.h> > + > +#include <uapi/linux/psci.h> > + > +#define CALXEDA_IDLE_PARAM \ > + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ > + (0 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ > + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) > > static int calxeda_idle_finish(unsigned long val) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - }; > - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); > + return psci_ops.cpu_suspend(CALXEDA_IDLE_PARAM, __pa(cpu_resume)); > } > > static int calxeda_pwrdown_idle(struct cpuidle_device *dev, > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCHv4 4/5] ARM: migrate to common PSCI client code 2015-07-02 17:12 ` [PATCHv4 4/5] ARM: migrate to common PSCI client code Mark Rutland 2015-07-03 4:14 ` Rob Herring @ 2015-07-10 9:16 ` Mark Rutland 1 sibling, 0 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-10 9:16 UTC (permalink / raw) To: linux-arm-kernel Russell, do you have any comments on this patch, or are you happy with it as it is now? Do you have any thoughts as to how this should be merged? Thanks, Mark. On Thu, Jul 02, 2015 at 06:12:36PM +0100, Mark Rutland wrote: > Now that the common PSCI client code has been factored out to > drivers/firmware, and made safe for 32-bit use, move the 32-bit ARM code > over to it. This results in a moderate reduction of duplicated lines, > and will prevent further duplication as the PSCI client code is updated > for PSCI 1.0 and beyond. > > The two legacy platform users of the PSCI invocation code are updated to > account for interface changes. In both cases the power state parameter > (which is constant) is now generated using macros, so that the > pack/unpack logic can be killed in preparation for PSCI 1.0 power state > changes. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Ashwin Chaugule <ashwin.chaugule@linaro.org> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: Will Deacon <will.deacon@arm.com> > --- > arch/arm/Kconfig | 1 + > arch/arm/include/asm/psci.h | 23 --- > arch/arm/kernel/Makefile | 2 +- > arch/arm/kernel/psci.c | 299 -------------------------------------- > arch/arm/kernel/psci_smp.c | 29 +++- > arch/arm/kernel/setup.c | 3 +- > arch/arm/mach-highbank/highbank.c | 2 +- > arch/arm/mach-highbank/pm.c | 16 +- > drivers/cpuidle/cpuidle-calxeda.c | 15 +- > 9 files changed, 46 insertions(+), 344 deletions(-) > delete mode 100644 arch/arm/kernel/psci.c > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index a750c14..36516e4 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1496,6 +1496,7 @@ config HOTPLUG_CPU > config ARM_PSCI > bool "Support for the ARM Power State Coordination Interface (PSCI)" > depends on CPU_V7 > + select ARM_PSCI_FW > help > Say Y here if you want Linux to communicate with system firmware > implementing the PSCI specification for CPU-centric power > diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h > index c25ef3e..68ee3ce 100644 > --- a/arch/arm/include/asm/psci.h > +++ b/arch/arm/include/asm/psci.h > @@ -14,34 +14,11 @@ > #ifndef __ASM_ARM_PSCI_H > #define __ASM_ARM_PSCI_H > > -#define PSCI_POWER_STATE_TYPE_STANDBY 0 > -#define PSCI_POWER_STATE_TYPE_POWER_DOWN 1 > - > -struct psci_power_state { > - u16 id; > - u8 type; > - u8 affinity_level; > -}; > - > -struct psci_operations { > - int (*cpu_suspend)(struct psci_power_state state, > - unsigned long entry_point); > - int (*cpu_off)(struct psci_power_state state); > - int (*cpu_on)(unsigned long cpuid, unsigned long entry_point); > - int (*migrate)(unsigned long cpuid); > - int (*affinity_info)(unsigned long target_affinity, > - unsigned long lowest_affinity_level); > - int (*migrate_info_type)(void); > -}; > - > -extern struct psci_operations psci_ops; > extern struct smp_operations psci_smp_ops; > > #ifdef CONFIG_ARM_PSCI > -int psci_init(void); > bool psci_smp_available(void); > #else > -static inline int psci_init(void) { return 0; } > static inline bool psci_smp_available(void) { return false; } > #endif > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index e69f7a1..3b995f5 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -89,7 +89,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o > > obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o > ifeq ($(CONFIG_ARM_PSCI),y) > -obj-y += psci.o psci-call.o > +obj-y += psci-call.o > obj-$(CONFIG_SMP) += psci_smp.o > endif > > diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c > deleted file mode 100644 > index f90fdf4..0000000 > --- a/arch/arm/kernel/psci.c > +++ /dev/null > @@ -1,299 +0,0 @@ > -/* > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * Copyright (C) 2012 ARM Limited > - * > - * Author: Will Deacon <will.deacon@arm.com> > - */ > - > -#define pr_fmt(fmt) "psci: " fmt > - > -#include <linux/init.h> > -#include <linux/of.h> > -#include <linux/reboot.h> > -#include <linux/pm.h> > -#include <uapi/linux/psci.h> > - > -#include <asm/compiler.h> > -#include <asm/errno.h> > -#include <asm/psci.h> > -#include <asm/system_misc.h> > - > -struct psci_operations psci_ops; > - > -static int (*invoke_psci_fn)(u32, u32, u32, u32); > -typedef int (*psci_initcall_t)(const struct device_node *); > - > -asmlinkage int __invoke_psci_fn_hvc(u32, u32, u32, u32); > -asmlinkage int __invoke_psci_fn_smc(u32, u32, u32, u32); > - > -enum psci_function { > - PSCI_FN_CPU_SUSPEND, > - PSCI_FN_CPU_ON, > - PSCI_FN_CPU_OFF, > - PSCI_FN_MIGRATE, > - PSCI_FN_AFFINITY_INFO, > - PSCI_FN_MIGRATE_INFO_TYPE, > - PSCI_FN_MAX, > -}; > - > -static u32 psci_function_id[PSCI_FN_MAX]; > - > -static int psci_to_linux_errno(int errno) > -{ > - switch (errno) { > - case PSCI_RET_SUCCESS: > - return 0; > - case PSCI_RET_NOT_SUPPORTED: > - return -EOPNOTSUPP; > - case PSCI_RET_INVALID_PARAMS: > - return -EINVAL; > - case PSCI_RET_DENIED: > - return -EPERM; > - }; > - > - return -EINVAL; > -} > - > -static u32 psci_power_state_pack(struct psci_power_state state) > -{ > - return ((state.id << PSCI_0_2_POWER_STATE_ID_SHIFT) > - & PSCI_0_2_POWER_STATE_ID_MASK) | > - ((state.type << PSCI_0_2_POWER_STATE_TYPE_SHIFT) > - & PSCI_0_2_POWER_STATE_TYPE_MASK) | > - ((state.affinity_level << PSCI_0_2_POWER_STATE_AFFL_SHIFT) > - & PSCI_0_2_POWER_STATE_AFFL_MASK); > -} > - > -static int psci_get_version(void) > -{ > - int err; > - > - err = invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); > - return err; > -} > - > -static int psci_cpu_suspend(struct psci_power_state state, > - unsigned long entry_point) > -{ > - int err; > - u32 fn, power_state; > - > - fn = psci_function_id[PSCI_FN_CPU_SUSPEND]; > - power_state = psci_power_state_pack(state); > - err = invoke_psci_fn(fn, power_state, entry_point, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_cpu_off(struct psci_power_state state) > -{ > - int err; > - u32 fn, power_state; > - > - fn = psci_function_id[PSCI_FN_CPU_OFF]; > - power_state = psci_power_state_pack(state); > - err = invoke_psci_fn(fn, power_state, 0, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_CPU_ON]; > - err = invoke_psci_fn(fn, cpuid, entry_point, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_migrate(unsigned long cpuid) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_MIGRATE]; > - err = invoke_psci_fn(fn, cpuid, 0, 0); > - return psci_to_linux_errno(err); > -} > - > -static int psci_affinity_info(unsigned long target_affinity, > - unsigned long lowest_affinity_level) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_AFFINITY_INFO]; > - err = invoke_psci_fn(fn, target_affinity, lowest_affinity_level, 0); > - return err; > -} > - > -static int psci_migrate_info_type(void) > -{ > - int err; > - u32 fn; > - > - fn = psci_function_id[PSCI_FN_MIGRATE_INFO_TYPE]; > - err = invoke_psci_fn(fn, 0, 0, 0); > - return err; > -} > - > -static int get_set_conduit_method(struct device_node *np) > -{ > - const char *method; > - > - pr_info("probing for conduit method from DT.\n"); > - > - if (of_property_read_string(np, "method", &method)) { > - pr_warn("missing \"method\" property\n"); > - return -ENXIO; > - } > - > - if (!strcmp("hvc", method)) { > - invoke_psci_fn = __invoke_psci_fn_hvc; > - } else if (!strcmp("smc", method)) { > - invoke_psci_fn = __invoke_psci_fn_smc; > - } else { > - pr_warn("invalid \"method\" property: %s\n", method); > - return -EINVAL; > - } > - return 0; > -} > - > -static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd) > -{ > - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); > -} > - > -static void psci_sys_poweroff(void) > -{ > - invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); > -} > - > -/* > - * PSCI Function IDs for v0.2+ are well defined so use > - * standard values. > - */ > -static int psci_0_2_init(struct device_node *np) > -{ > - int err, ver; > - > - err = get_set_conduit_method(np); > - > - if (err) > - goto out_put_node; > - > - ver = psci_get_version(); > - > - if (ver == PSCI_RET_NOT_SUPPORTED) { > - /* PSCI v0.2 mandates implementation of PSCI_ID_VERSION. */ > - pr_err("PSCI firmware does not comply with the v0.2 spec.\n"); > - err = -EOPNOTSUPP; > - goto out_put_node; > - } else { > - pr_info("PSCIv%d.%d detected in firmware.\n", > - PSCI_VERSION_MAJOR(ver), > - PSCI_VERSION_MINOR(ver)); > - > - if (PSCI_VERSION_MAJOR(ver) == 0 && > - PSCI_VERSION_MINOR(ver) < 2) { > - err = -EINVAL; > - pr_err("Conflicting PSCI version detected.\n"); > - goto out_put_node; > - } > - } > - > - pr_info("Using standard PSCI v0.2 function IDs\n"); > - psci_function_id[PSCI_FN_CPU_SUSPEND] = PSCI_0_2_FN_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_FN_CPU_ON; > - psci_ops.cpu_on = psci_cpu_on; > - > - psci_function_id[PSCI_FN_MIGRATE] = PSCI_0_2_FN_MIGRATE; > - psci_ops.migrate = psci_migrate; > - > - psci_function_id[PSCI_FN_AFFINITY_INFO] = PSCI_0_2_FN_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; > - > -out_put_node: > - of_node_put(np); > - return err; > -} > - > -/* > - * PSCI < v0.2 get PSCI Function IDs via DT. > - */ > -static int psci_0_1_init(struct device_node *np) > -{ > - u32 id; > - int err; > - > - err = get_set_conduit_method(np); > - > - if (err) > - goto out_put_node; > - > - pr_info("Using PSCI v0.1 Function IDs from DT\n"); > - > - if (!of_property_read_u32(np, "cpu_suspend", &id)) { > - psci_function_id[PSCI_FN_CPU_SUSPEND] = id; > - psci_ops.cpu_suspend = psci_cpu_suspend; > - } > - > - if (!of_property_read_u32(np, "cpu_off", &id)) { > - psci_function_id[PSCI_FN_CPU_OFF] = id; > - psci_ops.cpu_off = psci_cpu_off; > - } > - > - if (!of_property_read_u32(np, "cpu_on", &id)) { > - psci_function_id[PSCI_FN_CPU_ON] = id; > - psci_ops.cpu_on = psci_cpu_on; > - } > - > - if (!of_property_read_u32(np, "migrate", &id)) { > - psci_function_id[PSCI_FN_MIGRATE] = id; > - psci_ops.migrate = psci_migrate; > - } > - > -out_put_node: > - of_node_put(np); > - return err; > -} > - > -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}, > - {}, > -}; > - > -int __init psci_init(void) > -{ > - struct device_node *np; > - 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 (!np) > - return -ENODEV; > - > - init_fn = (psci_initcall_t)matched_np->data; > - return init_fn(np); > -} > diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c > index 244aadd..61c04b0 100644 > --- a/arch/arm/kernel/psci_smp.c > +++ b/arch/arm/kernel/psci_smp.c > @@ -17,6 +17,8 @@ > #include <linux/smp.h> > #include <linux/of.h> > #include <linux/delay.h> > +#include <linux/psci.h> > + > #include <uapi/linux/psci.h> > > #include <asm/psci.h> > @@ -56,17 +58,29 @@ static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) > } > > #ifdef CONFIG_HOTPLUG_CPU > +int psci_cpu_disable(unsigned int cpu) > +{ > + /* Fail early if we don't have CPU_OFF support */ > + if (!psci_ops.cpu_off) > + return -EOPNOTSUPP; > + > + /* Trusted OS will deny CPU_OFF */ > + if (psci_tos_resident_on(cpu)) > + return -EPERM; > + > + return 0; > +} > + > void __ref psci_cpu_die(unsigned int cpu) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - }; > + u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN << > + PSCI_0_2_POWER_STATE_TYPE_SHIFT; > > - if (psci_ops.cpu_off) > - psci_ops.cpu_off(ps); > + if (psci_ops.cpu_off) > + psci_ops.cpu_off(state); > > - /* We should never return */ > - panic("psci: cpu %d failed to shutdown\n", cpu); > + /* We should never return */ > + panic("psci: cpu %d failed to shutdown\n", cpu); > } > > int __ref psci_cpu_kill(unsigned int cpu) > @@ -109,6 +123,7 @@ bool __init psci_smp_available(void) > struct smp_operations __initdata psci_smp_ops = { > .smp_boot_secondary = psci_boot_secondary, > #ifdef CONFIG_HOTPLUG_CPU > + .cpu_disable = psci_cpu_disable, > .cpu_die = psci_cpu_die, > .cpu_kill = psci_cpu_kill, > #endif > diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c > index 36c18b7..9c38bd4 100644 > --- a/arch/arm/kernel/setup.c > +++ b/arch/arm/kernel/setup.c > @@ -31,6 +31,7 @@ > #include <linux/bug.h> > #include <linux/compiler.h> > #include <linux/sort.h> > +#include <linux/psci.h> > > #include <asm/unified.h> > #include <asm/cp15.h> > @@ -972,7 +973,7 @@ void __init setup_arch(char **cmdline_p) > unflatten_device_tree(); > > arm_dt_init_cpu_maps(); > - psci_init(); > + psci_dt_init(); > xen_early_init(); > #ifdef CONFIG_SMP > if (is_smp()) { > diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c > index 231fba0..6050a14 100644 > --- a/arch/arm/mach-highbank/highbank.c > +++ b/arch/arm/mach-highbank/highbank.c > @@ -28,8 +28,8 @@ > #include <linux/reboot.h> > #include <linux/amba/bus.h> > #include <linux/platform_device.h> > +#include <linux/psci.h> > > -#include <asm/psci.h> > #include <asm/hardware/cache-l2x0.h> > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c > index 7f2bd85..4003116 100644 > --- a/arch/arm/mach-highbank/pm.c > +++ b/arch/arm/mach-highbank/pm.c > @@ -16,19 +16,21 @@ > > #include <linux/cpu_pm.h> > #include <linux/init.h> > +#include <linux/psci.h> > #include <linux/suspend.h> > > #include <asm/suspend.h> > -#include <asm/psci.h> > + > +#include <uapi/linux/psci.h> > + > +#define HIGHBANK_SUSPEND_PARAM \ > + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ > + (1 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ > + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) > > static int highbank_suspend_finish(unsigned long val) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - .affinity_level = 1, > - }; > - > - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); > + return psci_ops.cpu_suspend(HIGHBANK_SUSPEND_PARAM, __pa(cpu_resume)); > } > > static int highbank_pm_enter(suspend_state_t state) > diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c > index 9445e6c..1c3242c 100644 > --- a/drivers/cpuidle/cpuidle-calxeda.c > +++ b/drivers/cpuidle/cpuidle-calxeda.c > @@ -25,16 +25,21 @@ > #include <linux/init.h> > #include <linux/mm.h> > #include <linux/platform_device.h> > +#include <linux/psci.h> > + > #include <asm/cpuidle.h> > #include <asm/suspend.h> > -#include <asm/psci.h> > + > +#include <uapi/linux/psci.h> > + > +#define CALXEDA_IDLE_PARAM \ > + ((0 << PSCI_0_2_POWER_STATE_ID_SHIFT) | \ > + (0 << PSCI_0_2_POWER_STATE_AFFL_SHIFT) | \ > + (PSCI_POWER_STATE_TYPE_POWER_DOWN << PSCI_0_2_POWER_STATE_TYPE_SHIFT)) > > static int calxeda_idle_finish(unsigned long val) > { > - const struct psci_power_state ps = { > - .type = PSCI_POWER_STATE_TYPE_POWER_DOWN, > - }; > - return psci_ops.cpu_suspend(ps, __pa(cpu_resume)); > + return psci_ops.cpu_suspend(CALXEDA_IDLE_PARAM, __pa(cpu_resume)); > } > > static int calxeda_pwrdown_idle(struct cpuidle_device *dev, > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCHv4 5/5] MAINTAINERS: add PSCI entry 2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland ` (3 preceding siblings ...) 2015-07-02 17:12 ` [PATCHv4 4/5] ARM: migrate to common PSCI client code Mark Rutland @ 2015-07-02 17:12 ` Mark Rutland 4 siblings, 0 replies; 8+ messages in thread From: Mark Rutland @ 2015-07-02 17:12 UTC (permalink / raw) To: linux-arm-kernel Add myself and Lorenzo as maintainers of the PSCI client code. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Will Deacon <will.deacon@arm.com> --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 993d4cf..e89c097 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8032,6 +8032,15 @@ S: Maintained F: include/linux/power_supply.h F: drivers/power/ +POWER STATE COORDINATION INTERFACE (PSCI) +M: Mark Rutland <mark.rutland@arm.com> +M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> +L: linux-arm-kernel at lists.infradead.org +S: Maintained +F: drivers/firmware/psci.c +F: include/linux/psci.h +F: include/uapi/linux/psci.h + PNP SUPPORT M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> S: Maintained -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-07-10 9:16 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-02 17:12 [PATCHv4 0/5] arm/arm64: Unify PSCI client support Mark Rutland
2015-07-02 17:12 ` [PATCHv4 1/5] ARM: psci: boot_secondary: replace __pa with virt_to_idmap Mark Rutland
2015-07-02 17:12 ` [PATCHv4 2/5] arm64: psci: factor invocation code to drivers Mark Rutland
2015-07-02 17:12 ` [PATCHv4 3/5] drivers: psci: support native SMC{32,64} calls Mark Rutland
2015-07-02 17:12 ` [PATCHv4 4/5] ARM: migrate to common PSCI client code Mark Rutland
2015-07-03 4:14 ` Rob Herring
2015-07-10 9:16 ` Mark Rutland
2015-07-02 17:12 ` [PATCHv4 5/5] MAINTAINERS: add PSCI entry Mark Rutland
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).