The cpu booting of exynos5422 has been still broken since we discussed it in last year[1]. This patch is inspired from odroid xu3 code(Actually, it was from samsung exynos vendor kernel)[2]. This weird reset code was founded exynos5420 octa cores series SoCs and only required for the first boot core is the little core(kingfisher core). Some of the exynos5420 boards and all of the exynos5422 boards will be required this code. There is two ways to check the little core is the first cpu. One is checking GPG2CON[1] gpio value and the other is checking the cluster number of the first cpu. I selected the latter because it's more easier than the former.
Changes since RFC[3]: - drop checking soc_is_exynos5800 to extend this codes to exynos5420/5422 boards. - kfc cores will be reset only if the cpu0 is kfc core. - Rebase top of the kukjin's for-next branch [1]:http://lists.infradead.org/pipermail/linux-arm-kernel/2015-June/350632.html [2]:https://patchwork.kernel.org/patch/6782891/ [3]:http://lists.infradead.org/pipermail/linux-arm-kernel/2015-July/356610.html Cc: Joonyoung Shim <[email protected]> Cc: Chanwoo Choi <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Heesub Shin <[email protected]> Cc: Mauro Ribeiro <[email protected]> Cc: Abhilash Kesavan <[email protected]> Cc: Przemyslaw Marczak <[email protected]> Cc: Marek Szyprowski <[email protected]> Cc: Krzysztof Kozlowski <[email protected]> Signed-off-by: Chanho Park <[email protected]> --- arch/arm/mach-exynos/mcpm-exynos.c | 18 +++++++++++++++++- arch/arm/mach-exynos/regs-pmu.h | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c index 9bdf547..5b69ed2 100644 --- a/arch/arm/mach-exynos/mcpm-exynos.c +++ b/arch/arm/mach-exynos/mcpm-exynos.c @@ -20,6 +20,7 @@ #include <asm/cputype.h> #include <asm/cp15.h> #include <asm/mcpm.h> +#include <asm/smp_plat.h> #include "regs-pmu.h" #include "common.h" @@ -70,7 +71,22 @@ static int exynos_cpu_powerup(unsigned int cpu, unsigned int cluster) cluster >= EXYNOS5420_NR_CLUSTERS) return -EINVAL; - exynos_cpu_power_up(cpunr); + if (!exynos_cpu_power_state(cpunr)) { + exynos_cpu_power_up(cpunr); + + /* This assumes the cluster number of the eagle is 0 and the + * kfc is 1. When the system was booted from the kfc core, + * they should be reset */ + if (cluster && + cluster == MPIDR_AFFINITY_LEVEL(cpu_logical_map(0), 1)) { + while (!pmu_raw_readl(S5P_PMU_SPARE2)) + udelay(10); + + pmu_raw_writel(EXYNOS5420_KFC_CORE_RESET(cpu), + EXYNOS_SWRESET); + } + } + return 0; } diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index b761433..fba9068 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -513,6 +513,12 @@ static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr) #define SPREAD_ENABLE 0xF #define SPREAD_USE_STANDWFI 0xF +#define EXYNOS5420_KFC_CORE_RESET0 BIT(8) +#define EXYNOS5420_KFC_ETM_RESET0 BIT(20) + +#define EXYNOS5420_KFC_CORE_RESET(_nr) \ + ((EXYNOS5420_KFC_CORE_RESET0 | EXYNOS5420_KFC_ETM_RESET0) << (_nr)) + #define EXYNOS5420_BB_CON1 0x0784 #define EXYNOS5420_BB_SEL_EN BIT(31) #define EXYNOS5420_BB_PMOS_EN BIT(7) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
