Commit 464ef188 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/cpuidle' into for-next/core 

* for-next/cpuidle:
  arm64: cpuidle: remove generic cpuidle support
  cpuidle: cpuidle-arm: remove arm64 support
parents a111daf0 471f80db

arch/arm64/include/asm/cpu_ops.h

+0 −9
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 
 * @cpu_die:	Makes a cpu leave the kernel. Must not fail. Called from the

 *		cpu being killed.

 * @cpu_kill:  Ensures a cpu has left the kernel. Called from another cpu.

 * @cpu_init_idle: Reads any data necessary to initialize CPU idle states for

 *		   a proposed logical id.

 * @cpu_suspend: Suspends a cpu and saves the required context. May fail owing

 *               to wrong parameters or error conditions. Called from the

 *               CPU being suspended. Must be called with IRQs disabled.

 */

struct cpu_operations {

	const char	*name;
@@ -49,10 +44,6 @@ struct cpu_operations { 
	void		(*cpu_die)(unsigned int cpu);

	int		(*cpu_kill)(unsigned int cpu);

#endif

#ifdef CONFIG_CPU_IDLE

	int		(*cpu_init_idle)(unsigned int);

	int		(*cpu_suspend)(unsigned long);

#endif

};



int __init init_cpu_ops(int cpu);

arch/arm64/include/asm/cpuidle.h

+0 −15
Original line number Diff line number Diff line
@@ -4,21 +4,6 @@ 


#include <asm/proc-fns.h>



#ifdef CONFIG_CPU_IDLE

extern int arm_cpuidle_init(unsigned int cpu);

extern int arm_cpuidle_suspend(int index);

#else

static inline int arm_cpuidle_init(unsigned int cpu)

{

	return -EOPNOTSUPP;

}



static inline int arm_cpuidle_suspend(int index)

{

	return -EOPNOTSUPP;

}

#endif



#ifdef CONFIG_ARM64_PSEUDO_NMI

#include <asm/arch_gicv3.h>

arch/arm64/kernel/cpuidle.c

+0 −29
Original line number Diff line number Diff line
@@ -13,35 +13,6 @@ 
#include <linux/of_device.h>

#include <linux/psci.h>



#include <asm/cpuidle.h>

#include <asm/cpu_ops.h>



int arm_cpuidle_init(unsigned int cpu)

{

	const struct cpu_operations *ops = get_cpu_ops(cpu);

	int ret = -EOPNOTSUPP;



	if (ops && ops->cpu_suspend && ops->cpu_init_idle)

		ret = ops->cpu_init_idle(cpu);



	return ret;

}



/**

 * arm_cpuidle_suspend() - function to enter a low-power idle state

 * @index: argument to pass to CPU suspend operations

 *

 * Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU

 * operations back-end error code otherwise.

 */

int arm_cpuidle_suspend(int index)

{

	int cpu = smp_processor_id();

	const struct cpu_operations *ops = get_cpu_ops(cpu);



	return ops->cpu_suspend(index);

}



#ifdef CONFIG_ACPI



#include <acpi/processor.h>

drivers/cpuidle/Kconfig.arm

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
# ARM CPU Idle drivers

#

config ARM_CPUIDLE

	bool "Generic ARM/ARM64 CPU idle Driver"

	bool "Generic ARM CPU idle Driver"

	depends on ARM

	select DT_IDLE_STATES

	select CPU_IDLE_MULTIPLE_DRIVERS

	help