Merge "ARM: qcom: Add MSM Legacy hotplug low power mode APIs" (14cc2678) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-qcom/Makefile

+1 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_USE_OF) += board-dt.o
		obj-$(CONFIG_SMP) += platsmp.o
		obj-$(CONFIG_MSM_PM_LEGACY) +=hotplug.o
		obj-$(CONFIG_ARCH_SDXPOORWILLS) += board-poorwills.o
		obj-$(CONFIG_ARCH_MSM8953) += board-msm8953.o
		obj-$(CONFIG_ARCH_MSM8937) += board-msm8937.o

arch/arm/mach-qcom/hotplug.c

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2002 ARM Ltd.
		* All Rights Reserved
		* Copyright (c) 2011-2014, 2016, 2018, The Linux Foundation.
		* All rights reserved.
		*
		* 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.
		*/
		#include <linux/kernel.h>
		#include <linux/errno.h>
		#include <linux/smp.h>
		#include <linux/cpu.h>
		#include <soc/qcom/spm.h>
		#include <soc/qcom/pm-legacy.h>
		#include <asm/smp_plat.h>
		#include "platsmp.h"
		#include <soc/qcom/jtag.h>

		static cpumask_t cpu_dying_mask;
		static DEFINE_PER_CPU(unsigned int, warm_boot_flag);

		static inline void cpu_enter_lowpower(void)
		{
		}

		static inline void cpu_leave_lowpower(void)
		{
		}

		static inline void platform_do_lowpower(unsigned int cpu)
		{
		lpm_cpu_hotplug_enter(cpu);
		/*
		* getting here, means that we have come out of low power mode
		* without having been woken up - this shouldn't happen
		*
		*/
		pr_err("%s: CPU%u has failed to Hotplug\n", __func__, cpu);
		}

		int qcom_cpu_kill_legacy(unsigned int cpu)
		{
		int ret = 0;

		if (cpumask_test_and_clear_cpu(cpu, &cpu_dying_mask))
		ret = msm_pm_wait_cpu_shutdown(cpu);

		return ret ? 0 : 1;
		}

		/*
		* platform-specific code to shutdown a CPU
		*
		* Called with IRQs disabled
		*/
		void __ref qcom_cpu_die_legacy(unsigned int cpu)
		{
		if (unlikely(cpu != smp_processor_id())) {
		pr_crit("%s: running on %u, should be %u\n",
		__func__, smp_processor_id(), cpu);
		WARN_ON(cpu);
		}
		/*
		* we're ready for shutdown now, so do it
		*/
		cpu_enter_lowpower();
		platform_do_lowpower(cpu);

		pr_debug("CPU%u: %s: normal wakeup\n", cpu, __func__);
		cpu_leave_lowpower();
		}

		int msm_platform_secondary_init(unsigned int cpu)
		{
		int ret;
		unsigned int *warm_boot = this_cpu_ptr(&warm_boot_flag);

		if (!(*warm_boot)) {
		*warm_boot = 1;
		/*
		* All CPU0 boots are considered warm boots (restore needed)
		* since CPU0 is the system boot CPU and never cold-booted
		* by the kernel.
		*/
		if (cpu)
		return 0;
		}
		msm_jtag_restore_state();
		ret = msm_spm_set_low_power_mode(MSM_SPM_MODE_CLOCK_GATING, false);

		return ret;
		}

		static int hotplug_dying_cpu(unsigned int cpu)
		{
		cpumask_set_cpu(cpu, &cpu_dying_mask);
		return 0;
		}

		static int __init init_hotplug_dying(void)
		{
		cpuhp_setup_state(CPUHP_AP_QCOM_SLEEP_STARTING,
		"AP_QCOM_HOTPLUG_STARTING", NULL, hotplug_dying_cpu);

		return 0;
		}
		early_initcall(init_hotplug_dying);

arch/arm/mach-qcom/platsmp.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@
		#include <asm/smp_plat.h>
		#include <asm/fixmap.h>
		#include "platsmp.h"
		#ifdef CONFIG_MSM_PM_LEGACY
		#include <soc/qcom/pm-legacy.h>
		#endif

		#define MSM_APCS_IDR 0x0B011030

		@@ -62,10 +65,18 @@ static void qcom_cpu_die(unsigned int cpu)
		{
		wfi();
		}

		static bool qcom_cpu_can_disable(unsigned int cpu)
		{
		return true; /Hotplug of any CPU is supported /
		}
		#endif

		static void qcom_secondary_init(unsigned int cpu)
		{
		#ifdef CONFIG_MSM_PM_LEGACY
		WARN_ON(msm_platform_secondary_init(cpu));
		#endif
		/*
		* Synchronise with the boot thread.
		*/
		@@ -472,7 +483,13 @@ struct smp_operations msm8909_smp_ops __initdata = {
		.smp_secondary_init = qcom_secondary_init,
		.smp_boot_secondary = msm8909_boot_secondary,
		#ifdef CONFIG_HOTPLUG_CPU
		#ifdef CONFIG_MSM_PM_LEGACY
		.cpu_die = qcom_cpu_die_legacy,
		.cpu_kill = qcom_cpu_kill_legacy,
		#else
		.cpu_die = qcom_cpu_die,
		#endif
		.cpu_can_disable = qcom_cpu_can_disable,
		#endif
		};

include/soc/qcom/pm-legacy.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -179,9 +179,13 @@ static inline int lpm_get_latency(struct latency_level *level,
		#endif

		#ifdef CONFIG_HOTPLUG_CPU
		void qcom_cpu_die_legacy(unsigned int cpu);
		int qcom_cpu_kill_legacy(unsigned int cpu);
		int msm_platform_secondary_init(unsigned int cpu);
		#else
		static inline int msm_platform_secondary_init(unsigned int cpu) { return 0; }
		static inline void qcom_cpu_die_legacy(unsigned int cpu) {}
		static inline int qcom_cpu_kill_legacy(unsigned int cpu) { return 0; }
		#endif

		enum msm_pm_time_stats_id {