From c99846c8bce2fcc8d01dd800290583ae213f6545 Mon Sep 17 00:00:00 2001
From: Park Bumgyu <bumgyu.park@samsung.com>
Date: Tue, 13 Feb 2018 21:05:16 +0900
Subject: [PATCH] soc: cpupm: handle cpu hotplug

Change-Id: I0a2eb08b97bb8d4d07cec790cae13523ed0fadc8
Signed-off-by: Park Bumgyu <bumgyu.park@samsung.com>
---
 drivers/soc/samsung/exynos-cpupm.c | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/soc/samsung/exynos-cpupm.c b/drivers/soc/samsung/exynos-cpupm.c
index 3ba345acaa5f..821316c6c9a3 100644
--- a/drivers/soc/samsung/exynos-cpupm.c
+++ b/drivers/soc/samsung/exynos-cpupm.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include <linux/tick.h>
 #include <linux/psci.h>
+#include <linux/cpuhotplug.h>
 
 #include <soc/samsung/exynos-cpupm.h>
 #include <soc/samsung/cal-if.h>
@@ -355,6 +356,35 @@ void exynos_cpu_pm_exit(int cpu, int cancel)
 	spin_unlock(&cpupm_lock);
 }
 
+/******************************************************************************
+ *                               CPU HOTPLUG                                  *
+ ******************************************************************************/
+static int cpuhp_cpupm_online(unsigned int cpu)
+{
+	struct cpumask mask;
+
+	cpumask_and(&mask, cpu_coregroup_mask(cpu), cpu_online_mask);
+	if (cpumask_weight(&mask) == 0)
+		cluster_enable(cpu);
+
+	cpu_enable(cpu);
+
+	return 0;
+}
+
+static int cpuhp_cpupm_offline(unsigned int cpu)
+{
+	struct cpumask mask;
+
+	cpu_disable(cpu);
+
+	cpumask_and(&mask, cpu_coregroup_mask(cpu), cpu_online_mask);
+	if (cpumask_weight(&mask) == 0)
+		cluster_disable(cpu);
+
+	return 0;
+}
+
 /******************************************************************************
  *                                Initialization                              *
  ******************************************************************************/
@@ -424,3 +454,16 @@ static int __init exynos_cpupm_init(void)
 	return 0;
 }
 arch_initcall(exynos_cpupm_init);
+
+static int __init exynos_cpupm_early_init(void)
+{
+	cpuhp_setup_state(CPUHP_AP_EXYNOS_CPU_UP_POWER_CONTROL,
+				"AP_EXYNOS_CPU_UP_POWER_CONTROL",
+				cpuhp_cpupm_online, NULL);
+	cpuhp_setup_state(CPUHP_AP_EXYNOS_CPU_DOWN_POWER_CONTROL,
+				"AP_EXYNOS_CPU_DOWN_POWER_CONTROL",
+				NULL, cpuhp_cpupm_offline);
+
+	return 0;
+}
+early_initcall(exynos_cpupm_early_init);
-- 
2.20.1