#define pr_fmt(fmt) "psci: " fmt
#include <linux/init.h>
+#include <linux/irqchip/arm-gic.h>
#include <linux/of.h>
#include <asm/compiler.h>
#include <asm/opcodes-sec.h>
#include <asm/opcodes-virt.h>
#include <asm/psci.h>
+#include <asm/smp_plat.h>
-struct psci_operations psci_ops;
+extern void secondary_startup(void);
static int (*invoke_psci_fn)(u32, u32, u32, u32);
PSCI_FN_MAX,
};
-static u32 psci_function_id[PSCI_FN_MAX];
+struct psci_function_desc {
+ enum psci_function func;
+ bool valid;
+};
+static struct psci_function_desc psci_function_id[PSCI_FN_MAX];
#define PSCI_RET_SUCCESS 0
#define PSCI_RET_EOPNOTSUPP -1
int err;
u32 fn, power_state;
- fn = psci_function_id[PSCI_FN_CPU_SUSPEND];
+ if (!psci_function_id[PSCI_FN_CPU_SUSPEND].valid)
+ return -ENOSYS;
+
+ fn = psci_function_id[PSCI_FN_CPU_SUSPEND].func;
power_state = psci_power_state_pack(state);
err = invoke_psci_fn(fn, power_state, entry_point, 0);
return psci_to_linux_errno(err);
int err;
u32 fn, power_state;
- fn = psci_function_id[PSCI_FN_CPU_OFF];
+ if (!psci_function_id[PSCI_FN_CPU_OFF].valid)
+ return -ENOSYS;
+
+ fn = psci_function_id[PSCI_FN_CPU_OFF].func;
power_state = psci_power_state_pack(state);
err = invoke_psci_fn(fn, power_state, 0, 0);
return psci_to_linux_errno(err);
int err;
u32 fn;
- fn = psci_function_id[PSCI_FN_CPU_ON];
+ if (!psci_function_id[PSCI_FN_CPU_ON].valid)
+ return -ENOSYS;
+
+ fn = psci_function_id[PSCI_FN_CPU_ON].func;
err = invoke_psci_fn(fn, cpuid, entry_point, 0);
return psci_to_linux_errno(err);
}
int err;
u32 fn;
- fn = psci_function_id[PSCI_FN_MIGRATE];
+ if (!psci_function_id[PSCI_FN_MIGRATE].valid)
+ return -ENOSYS;
+
+ fn = psci_function_id[PSCI_FN_MIGRATE].func;
err = invoke_psci_fn(fn, cpuid, 0, 0);
return psci_to_linux_errno(err);
}
+struct psci_operations psci_ops = {
+ .cpu_suspend = psci_cpu_suspend,
+ .cpu_off = psci_cpu_off,
+ .cpu_on = psci_cpu_on,
+ .migrate = psci_migrate,
+};
+
+#ifdef CONFIG_SMP
+static void __init psci_smp_init_cpus(void)
+{
+}
+
+static void __init psci_smp_prepare_cpus(unsigned int max_cpus)
+{
+}
+
+static int __cpuinit psci_boot_secondary(unsigned int cpu,
+ struct task_struct *idle)
+{
+ return psci_cpu_on(cpu_logical_map(cpu), __pa(secondary_startup));
+}
+
+static void __cpuinit psci_secondary_init(unsigned int cpu)
+{
+ gic_secondary_init(0);
+}
+
+struct smp_operations __initdata psci_smp_ops = {
+ .smp_init_cpus = psci_smp_init_cpus,
+ .smp_prepare_cpus = psci_smp_prepare_cpus,
+ .smp_secondary_init = psci_secondary_init,
+ .smp_boot_secondary = psci_boot_secondary,
+};
+#endif
+
static const struct of_device_id psci_of_match[] __initconst = {
{ .compatible = "arm,psci", },
{},
};
-static int __init psci_init(void)
+int __init psci_init(void)
{
struct device_node *np;
const char *method;
u32 id;
+ int rc = -EINVAL;
np = of_find_matching_node(NULL, psci_of_match);
if (!np)
- return 0;
+ return -ENODEV;
pr_info("probing function IDs from device-tree\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;
+ psci_function_id[PSCI_FN_CPU_SUSPEND].func = id;
+ psci_function_id[PSCI_FN_CPU_SUSPEND].valid = true;
}
if (!of_property_read_u32(np, "cpu_off", &id)) {
- psci_function_id[PSCI_FN_CPU_OFF] = id;
- psci_ops.cpu_off = psci_cpu_off;
+ psci_function_id[PSCI_FN_CPU_OFF].func = id;
+ psci_function_id[PSCI_FN_CPU_OFF].valid = true;
}
if (!of_property_read_u32(np, "cpu_on", &id)) {
- psci_function_id[PSCI_FN_CPU_ON] = id;
- psci_ops.cpu_on = psci_cpu_on;
+ psci_function_id[PSCI_FN_CPU_ON].func = id;
+ psci_function_id[PSCI_FN_CPU_ON].valid = true;
}
if (!of_property_read_u32(np, "migrate", &id)) {
- psci_function_id[PSCI_FN_MIGRATE] = id;
- psci_ops.migrate = psci_migrate;
+ psci_function_id[PSCI_FN_MIGRATE].func = id;
+ psci_function_id[PSCI_FN_MIGRATE].valid = true;
}
+ rc = 0;
+
out_put_node:
of_node_put(np);
- return 0;
+ return rc;
+}
+
+bool __init psci_smp_available(void)
+{
+ /* is cpu_on available at least? */
+ return psci_function_id[PSCI_FN_CPU_ON].valid;
}
-early_initcall(psci_init);
+++ /dev/null
-/*
- * Dummy Virtual Machine - does what it says on the tin.
- *
- * Copyright (C) 2012 ARM Ltd
- * Author: Will Deacon <will.deacon@arm.com>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/of.h>
-
-#include <linux/irqchip/arm-gic.h>
-
-#include <asm/psci.h>
-#include <asm/smp_plat.h>
-
-extern void secondary_startup(void);
-
-static void __init virt_smp_init_cpus(void)
-{
-}
-
-static void __init virt_smp_prepare_cpus(unsigned int max_cpus)
-{
-}
-
-static int __cpuinit virt_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));
- return -ENODEV;
-}
-
-static void __cpuinit virt_secondary_init(unsigned int cpu)
-{
- gic_secondary_init(0);
-}
-
-struct smp_operations __initdata virt_smp_ops = {
- .smp_init_cpus = virt_smp_init_cpus,
- .smp_prepare_cpus = virt_smp_prepare_cpus,
- .smp_secondary_init = virt_secondary_init,
- .smp_boot_secondary = virt_boot_secondary,
-};
projects / people / sstabellini / linux-pvhvm-deprecated.git / commitdiff