Merge branch 'aarch64/psci/drivers' into aarch64/for-next/core

Move our PSCI implementation out into drivers/firmware/ where it can be
shared with arch/arm/.

Conflicts:
	arch/arm64/kernel/psci.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kernel/psci.c
index ec30152090ae2ebbeb9fca70312b508fc2b7c259,51fd15a16461a9aa2abd324a01484980b862c7a7..aa94a88f6279963ae7ef0c6477215894859c9aff
--- 1/arch/arm64/kernel/psci.c
--- 2/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@@ -230,238 -110,8 +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)
  {
        return 0;

diff --cc arch/arm64/kernel/setup.c
index 0c8fd975306b9dd3235c21bed7e8d5198c0570da,96ce26428f829d3d37224d2463511aa011144ac0..fddae2c15ad2a8a8c778f0a229cb58ea40609321
--- 1/arch/arm64/kernel/setup.c
--- 2/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -61,8 -62,8 +62,7 @@@
  #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>
  
  unsigned long elf_hwcap __read_mostly;