2019-05-27 14:55:21 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2012-12-19 01:53:14 +08:00
|
|
|
/*
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2013 ARM Limited
|
|
|
|
|
*
|
|
|
|
|
* Author: Will Deacon <will.deacon@arm.com>
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define pr_fmt(fmt) "psci: " fmt
|
|
|
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/of.h>
|
2013-10-25 03:30:14 +08:00
|
|
|
#include <linux/smp.h>
|
2014-05-07 22:18:36 +08:00
|
|
|
#include <linux/delay.h>
|
2015-07-31 22:46:16 +08:00
|
|
|
#include <linux/psci.h>
|
2017-01-11 05:35:49 +08:00
|
|
|
#include <linux/mm.h>
|
2015-07-31 22:46:16 +08:00
|
|
|
|
2014-04-18 02:38:41 +08:00
|
|
|
#include <uapi/linux/psci.h>
|
2012-12-19 01:53:14 +08:00
|
|
|
|
2013-10-25 03:30:15 +08:00
|
|
|
#include <asm/cpu_ops.h>
|
2012-12-19 01:53:14 +08:00
|
|
|
#include <asm/errno.h>
|
2013-10-25 03:30:14 +08:00
|
|
|
#include <asm/smp_plat.h>
|
2013-09-27 17:25:02 +08:00
|
|
|
|
2015-05-13 21:12:46 +08:00
|
|
|
static int __init cpu_psci_cpu_init(unsigned int cpu)
|
2013-10-25 03:30:14 +08:00
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-25 03:30:15 +08:00
|
|
|
static int __init cpu_psci_cpu_prepare(unsigned int cpu)
|
2013-10-25 03:30:14 +08:00
|
|
|
{
|
|
|
|
|
if (!psci_ops.cpu_on) {
|
|
|
|
|
pr_err("no cpu_on method, not booting CPU%d\n", cpu);
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
arm64: factor out spin-table boot method
The arm64 kernel has an internal holding pen, which is necessary for
some systems where we can't bring CPUs online individually and must hold
multiple CPUs in a safe area until the kernel is able to handle them.
The current SMP infrastructure for arm64 is closely coupled to this
holding pen, and alternative boot methods must launch CPUs into the pen,
where they sit before they are launched into the kernel proper.
With PSCI (and possibly other future boot methods), we can bring CPUs
online individually, and need not perform the secondary_holding_pen
dance. Instead, this patch factors the holding pen management code out
to the spin-table boot method code, as it is the only boot method
requiring the pen.
A new entry point for secondaries, secondary_entry is added for other
boot methods to use, which bypasses the holding pen and its associated
overhead when bringing CPUs online. The smp.pen.text section is also
removed, as the pen can live in head.text without problem.
The cpu_operations structure is extended with two new functions,
cpu_boot and cpu_postboot, for bringing a cpu into the kernel and
performing any post-boot cleanup required by a bootmethod (e.g.
resetting the secondary_holding_pen_release to INVALID_HWID).
Documentation is added for cpu_operations.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-10-25 03:30:16 +08:00
|
|
|
static int cpu_psci_cpu_boot(unsigned int cpu)
|
|
|
|
|
{
|
2017-01-11 05:35:49 +08:00
|
|
|
int err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa_symbol(secondary_entry));
|
arm64: factor out spin-table boot method
The arm64 kernel has an internal holding pen, which is necessary for
some systems where we can't bring CPUs online individually and must hold
multiple CPUs in a safe area until the kernel is able to handle them.
The current SMP infrastructure for arm64 is closely coupled to this
holding pen, and alternative boot methods must launch CPUs into the pen,
where they sit before they are launched into the kernel proper.
With PSCI (and possibly other future boot methods), we can bring CPUs
online individually, and need not perform the secondary_holding_pen
dance. Instead, this patch factors the holding pen management code out
to the spin-table boot method code, as it is the only boot method
requiring the pen.
A new entry point for secondaries, secondary_entry is added for other
boot methods to use, which bypasses the holding pen and its associated
overhead when bringing CPUs online. The smp.pen.text section is also
removed, as the pen can live in head.text without problem.
The cpu_operations structure is extended with two new functions,
cpu_boot and cpu_postboot, for bringing a cpu into the kernel and
performing any post-boot cleanup required by a bootmethod (e.g.
resetting the secondary_holding_pen_release to INVALID_HWID).
Documentation is added for cpu_operations.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-10-25 03:30:16 +08:00
|
|
|
if (err)
|
2014-02-28 17:57:47 +08:00
|
|
|
pr_err("failed to boot CPU%d (%d)\n", cpu, err);
|
arm64: factor out spin-table boot method
The arm64 kernel has an internal holding pen, which is necessary for
some systems where we can't bring CPUs online individually and must hold
multiple CPUs in a safe area until the kernel is able to handle them.
The current SMP infrastructure for arm64 is closely coupled to this
holding pen, and alternative boot methods must launch CPUs into the pen,
where they sit before they are launched into the kernel proper.
With PSCI (and possibly other future boot methods), we can bring CPUs
online individually, and need not perform the secondary_holding_pen
dance. Instead, this patch factors the holding pen management code out
to the spin-table boot method code, as it is the only boot method
requiring the pen.
A new entry point for secondaries, secondary_entry is added for other
boot methods to use, which bypasses the holding pen and its associated
overhead when bringing CPUs online. The smp.pen.text section is also
removed, as the pen can live in head.text without problem.
The cpu_operations structure is extended with two new functions,
cpu_boot and cpu_postboot, for bringing a cpu into the kernel and
performing any post-boot cleanup required by a bootmethod (e.g.
resetting the secondary_holding_pen_release to INVALID_HWID).
Documentation is added for cpu_operations.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-10-25 03:30:16 +08:00
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-25 03:30:19 +08:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2019-06-12 20:51:37 +08:00
|
|
|
static bool cpu_psci_cpu_can_disable(unsigned int cpu)
|
|
|
|
|
{
|
|
|
|
|
return !psci_tos_resident_on(cpu);
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-25 03:30:19 +08:00
|
|
|
static int cpu_psci_cpu_disable(unsigned int cpu)
|
|
|
|
|
{
|
|
|
|
|
/* Fail early if we don't have CPU_OFF support */
|
|
|
|
|
if (!psci_ops.cpu_off)
|
|
|
|
|
return -EOPNOTSUPP;
|
2015-04-23 01:10:26 +08:00
|
|
|
|
|
|
|
|
/* Trusted OS will deny CPU_OFF */
|
|
|
|
|
if (psci_tos_resident_on(cpu))
|
|
|
|
|
return -EPERM;
|
|
|
|
|
|
2013-10-25 03:30:19 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void cpu_psci_cpu_die(unsigned int cpu)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
/*
|
|
|
|
|
* There are no known implementations of PSCI actually using the
|
|
|
|
|
* power state field, pass a sensible default for now.
|
|
|
|
|
*/
|
2015-05-01 00:59:03 +08:00
|
|
|
u32 state = PSCI_POWER_STATE_TYPE_POWER_DOWN <<
|
|
|
|
|
PSCI_0_2_POWER_STATE_TYPE_SHIFT;
|
2013-10-25 03:30:19 +08:00
|
|
|
|
|
|
|
|
ret = psci_ops.cpu_off(state);
|
|
|
|
|
|
2014-02-28 17:57:47 +08:00
|
|
|
pr_crit("unable to power off CPU%u (%d)\n", cpu, ret);
|
2013-10-25 03:30:19 +08:00
|
|
|
}
|
2014-05-07 22:18:36 +08:00
|
|
|
|
|
|
|
|
static int cpu_psci_cpu_kill(unsigned int cpu)
|
|
|
|
|
{
|
arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU
cores need to be shut down. At present, the CPU hotplug operation is
serialised, and the CPU cores can only be shut down one by one. In this
process, if PSCI affinity_info() does not return LEVEL_OFF quickly,
cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores
need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So
change the wait interval from 10 ms to max 1 ms and use usleep_range()
instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages
output, so remove the "Retry ..." message, instead, track time and
output to the the sucessful message.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-10-21 19:31:21 +08:00
|
|
|
int err;
|
|
|
|
|
unsigned long start, end;
|
2014-05-07 22:18:36 +08:00
|
|
|
|
|
|
|
|
if (!psci_ops.affinity_info)
|
2015-04-21 00:55:30 +08:00
|
|
|
return 0;
|
2014-05-07 22:18:36 +08:00
|
|
|
/*
|
|
|
|
|
* cpu_kill could race with cpu_die and we can
|
|
|
|
|
* potentially end up declaring this cpu undead
|
|
|
|
|
* while it is dying. So, try again a few times.
|
|
|
|
|
*/
|
|
|
|
|
|
arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU
cores need to be shut down. At present, the CPU hotplug operation is
serialised, and the CPU cores can only be shut down one by one. In this
process, if PSCI affinity_info() does not return LEVEL_OFF quickly,
cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores
need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So
change the wait interval from 10 ms to max 1 ms and use usleep_range()
instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages
output, so remove the "Retry ..." message, instead, track time and
output to the the sucessful message.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-10-21 19:31:21 +08:00
|
|
|
start = jiffies;
|
|
|
|
|
end = start + msecs_to_jiffies(100);
|
|
|
|
|
do {
|
2014-05-07 22:18:36 +08:00
|
|
|
err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);
|
|
|
|
|
if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {
|
arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU
cores need to be shut down. At present, the CPU hotplug operation is
serialised, and the CPU cores can only be shut down one by one. In this
process, if PSCI affinity_info() does not return LEVEL_OFF quickly,
cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores
need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So
change the wait interval from 10 ms to max 1 ms and use usleep_range()
instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages
output, so remove the "Retry ..." message, instead, track time and
output to the the sucessful message.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-10-21 19:31:21 +08:00
|
|
|
pr_info("CPU%d killed (polled %d ms)\n", cpu,
|
|
|
|
|
jiffies_to_msecs(jiffies - start));
|
2015-04-21 00:55:30 +08:00
|
|
|
return 0;
|
2014-05-07 22:18:36 +08:00
|
|
|
}
|
|
|
|
|
|
arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()
In cases like suspend-to-disk and suspend-to-ram, a large number of CPU
cores need to be shut down. At present, the CPU hotplug operation is
serialised, and the CPU cores can only be shut down one by one. In this
process, if PSCI affinity_info() does not return LEVEL_OFF quickly,
cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores
need to be shut down, it will take a long time.
Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So
change the wait interval from 10 ms to max 1 ms and use usleep_range()
instead of msleep() for more accurate timer.
In addition, reducing the time interval will increase the messages
output, so remove the "Retry ..." message, instead, track time and
output to the the sucessful message.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2019-10-21 19:31:21 +08:00
|
|
|
usleep_range(100, 1000);
|
|
|
|
|
} while (time_before(jiffies, end));
|
2014-05-07 22:18:36 +08:00
|
|
|
|
|
|
|
|
pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",
|
|
|
|
|
cpu, err);
|
2015-04-21 00:55:30 +08:00
|
|
|
return -ETIMEDOUT;
|
2014-05-07 22:18:36 +08:00
|
|
|
}
|
2013-10-25 03:30:19 +08:00
|
|
|
#endif
|
|
|
|
|
|
2013-10-25 03:30:15 +08:00
|
|
|
const struct cpu_operations cpu_psci_ops = {
|
2013-10-25 03:30:14 +08:00
|
|
|
.name = "psci",
|
2013-10-25 03:30:15 +08:00
|
|
|
.cpu_init = cpu_psci_cpu_init,
|
|
|
|
|
.cpu_prepare = cpu_psci_cpu_prepare,
|
arm64: factor out spin-table boot method
The arm64 kernel has an internal holding pen, which is necessary for
some systems where we can't bring CPUs online individually and must hold
multiple CPUs in a safe area until the kernel is able to handle them.
The current SMP infrastructure for arm64 is closely coupled to this
holding pen, and alternative boot methods must launch CPUs into the pen,
where they sit before they are launched into the kernel proper.
With PSCI (and possibly other future boot methods), we can bring CPUs
online individually, and need not perform the secondary_holding_pen
dance. Instead, this patch factors the holding pen management code out
to the spin-table boot method code, as it is the only boot method
requiring the pen.
A new entry point for secondaries, secondary_entry is added for other
boot methods to use, which bypasses the holding pen and its associated
overhead when bringing CPUs online. The smp.pen.text section is also
removed, as the pen can live in head.text without problem.
The cpu_operations structure is extended with two new functions,
cpu_boot and cpu_postboot, for bringing a cpu into the kernel and
performing any post-boot cleanup required by a bootmethod (e.g.
resetting the secondary_holding_pen_release to INVALID_HWID).
Documentation is added for cpu_operations.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
2013-10-25 03:30:16 +08:00
|
|
|
.cpu_boot = cpu_psci_cpu_boot,
|
2013-10-25 03:30:19 +08:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2019-06-12 20:51:37 +08:00
|
|
|
.cpu_can_disable = cpu_psci_cpu_can_disable,
|
2013-10-25 03:30:19 +08:00
|
|
|
.cpu_disable = cpu_psci_cpu_disable,
|
|
|
|
|
.cpu_die = cpu_psci_cpu_die,
|
2014-05-07 22:18:36 +08:00
|
|
|
.cpu_kill = cpu_psci_cpu_kill,
|
2013-10-25 03:30:19 +08:00
|
|
|
#endif
|
2013-10-25 03:30:14 +08:00
|
|
|
};
|
|
|
|
|
|