Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f534d10 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos

parents 036c37c5 fc2cac41

arch/arm/mach-exynos/exynos.c

+3 −1
Original line number Diff line number Diff line
@@ -335,7 +335,9 @@ static void __init exynos_dt_machine_init(void) 
	if (!IS_ENABLED(CONFIG_SMP))

		exynos_sysram_init();



	if (!of_machine_is_compatible("samsung,exynos5420"))

		exynos_cpuidle_init();



	exynos_cpufreq_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

arch/arm/mach-exynos/mcpm-exynos.c

+36 −0
Original line number Diff line number Diff line
@@ -257,10 +257,46 @@ static int exynos_wait_for_powerdown(unsigned int cpu, unsigned int cluster) 
	return -ETIMEDOUT; /* timeout */

}



static void exynos_powered_up(void)

{

	unsigned int mpidr, cpu, cluster;



	mpidr = read_cpuid_mpidr();

	cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);

	cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);



	arch_spin_lock(&exynos_mcpm_lock);

	if (cpu_use_count[cpu][cluster] == 0)

		cpu_use_count[cpu][cluster] = 1;

	arch_spin_unlock(&exynos_mcpm_lock);

}



static void exynos_suspend(u64 residency)

{

	unsigned int mpidr, cpunr;



	exynos_power_down();



	/*

	 * Execution reaches here only if cpu did not power down.

	 * Hence roll back the changes done in exynos_power_down function.

	 *

	 * CAUTION: "This function requires the stack data to be visible through

	 * power down and can only be executed on processors like A15 and A7

	 * that hit the cache with the C bit clear in the SCTLR register."

	*/

	mpidr = read_cpuid_mpidr();

	cpunr = exynos_pmu_cpunr(mpidr);



	exynos_cpu_power_up(cpunr);

}



static const struct mcpm_platform_ops exynos_power_ops = {

	.power_up		= exynos_power_up,

	.power_down		= exynos_power_down,

	.wait_for_powerdown	= exynos_wait_for_powerdown,

	.suspend		= exynos_suspend,

	.powered_up		= exynos_powered_up,

};



static void __init exynos_mcpm_usage_count_init(void)

arch/arm/mach-exynos/regs-pmu.h

+9 −0
Original line number Diff line number Diff line
@@ -319,4 +319,13 @@ 


#define EXYNOS5420_SWRESET_KFC_SEL				0x3



#include <asm/cputype.h>

#define MAX_CPUS_IN_CLUSTER	4



static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr)

{

	return ((MPIDR_AFFINITY_LEVEL(mpidr, 1) * MAX_CPUS_IN_CLUSTER)

		 + MPIDR_AFFINITY_LEVEL(mpidr, 0));

}



#endif /* __ASM_ARCH_REGS_PMU_H */

drivers/cpuidle/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config ARM_ARMADA_370_XP_CPUIDLE 


config ARM_BIG_LITTLE_CPUIDLE

	bool "Support for ARM big.LITTLE processors"

	depends on ARCH_VEXPRESS_TC2_PM

	depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS

	select ARM_CPU_SUSPEND

	select CPU_IDLE_MULTIPLE_DRIVERS

	help

drivers/cpuidle/cpuidle-big_little.c

+11 −1
Original line number Diff line number Diff line
@@ -163,14 +163,24 @@ static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int cpu_id) 
	return 0;

}



static const struct of_device_id compatible_machine_match[] = {

	{ .compatible = "arm,vexpress,v2p-ca15_a7" },

	{ .compatible = "samsung,exynos5420" },

	{},

};



static int __init bl_idle_init(void)

{

	int ret;

	struct device_node *root = of_find_node_by_path("/");



	if (!root)

		return -ENODEV;



	/*

	 * Initialize the driver just for a compliant set of machines

	 */

	if (!of_machine_is_compatible("arm,vexpress,v2p-ca15_a7"))

	if (!of_match_node(compatible_machine_match, root))

		return -ENODEV;

	/*

	 * For now the differentiation between little and big cores