diff options
author | James <> | 2015-11-04 11:49:21 +0000 |
---|---|---|
committer | James <> | 2015-11-04 11:49:21 +0000 |
commit | 716ca530e1c4515d8683c9d5be3d56b301758b66 (patch) | |
tree | 700eb5bcc1a462a5f21dcec15ce7c97ecfefa772 /target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch | |
download | trunk-47381-master.tar.gz trunk-47381-master.tar.bz2 trunk-47381-master.zip |
Diffstat (limited to 'target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch')
-rw-r--r-- | target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch | 178 |
1 files changed, 178 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch b/target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch new file mode 100644 index 0000000..8910532 --- /dev/null +++ b/target/linux/mediatek/patches/0042-ARM-mediatek-add-smp-bringup-code.patch @@ -0,0 +1,178 @@ +From daa2c1f9202f08628d4f91a1cf4dafb44c9bcafe Mon Sep 17 00:00:00 2001 +From: "Joe.C" <yingjoe.chen@mediatek.com> +Date: Fri, 1 May 2015 15:43:28 +0800 +Subject: [PATCH 42/76] ARM: mediatek: add smp bringup code + +Add support for booting secondary CPUs on mt6589, mt8127 +and mt8135. + +Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com> +--- + arch/arm/mach-mediatek/Makefile | 3 + + arch/arm/mach-mediatek/platsmp.c | 145 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 148 insertions(+) + create mode 100644 arch/arm/mach-mediatek/platsmp.c + +diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile +index 43e619f..2116460 100644 +--- a/arch/arm/mach-mediatek/Makefile ++++ b/arch/arm/mach-mediatek/Makefile +@@ -1 +1,4 @@ ++ifeq ($(CONFIG_SMP),y) ++obj-$(CONFIG_ARCH_MEDIATEK) += platsmp.o ++endif + obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o +diff --git a/arch/arm/mach-mediatek/platsmp.c b/arch/arm/mach-mediatek/platsmp.c +new file mode 100644 +index 0000000..e266b3d +--- /dev/null ++++ b/arch/arm/mach-mediatek/platsmp.c +@@ -0,0 +1,145 @@ ++/* ++ * arch/arm/mach-mediatek/platsmp.c ++ * ++ * Copyright (c) 2014 Mediatek Inc. ++ * Author: Shunli Wang <shunli.wang@mediatek.com> ++ * Yingjoe Chen <yingjoe.chen@mediatek.com> ++ * ++ * 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. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++#include <linux/io.h> ++#include <linux/memblock.h> ++#include <linux/of.h> ++#include <linux/of_address.h> ++#include <linux/string.h> ++#include <linux/threads.h> ++ ++#define MTK_MAX_CPU 8 ++#define MTK_SMP_REG_SIZE 0x1000 ++ ++struct mtk_smp_boot_info { ++ unsigned long smp_base; ++ unsigned int jump_reg; ++ unsigned int boot_reg; ++ unsigned int core_keys[MTK_MAX_CPU - 1]; ++ unsigned int core_regs[MTK_MAX_CPU - 1]; ++}; ++ ++static const struct mtk_smp_boot_info mtk_mt8135_tz_boot = { ++ 0x80002000, 1020, 1012, ++ { 0x534c4131, 0x4c415332, 0x41534c33 }, ++ { 1016, 1016, 1016}, ++}; ++ ++static const struct mtk_smp_boot_info mtk_mt6589_boot = { ++ 0x10002000, 0x34, 0x30, ++ { 0x534c4131, 0x4c415332, 0x41534c33 }, ++ { 0x38, 0x3c, 0x40 }, ++}; ++ ++static const struct of_device_id mtk_tz_smp_boot_infos[] __initconst = { ++ { .compatible = "mediatek,mt8135", .data = &mtk_mt8135_tz_boot }, ++ { .compatible = "mediatek,mt8127", .data = &mtk_mt8135_tz_boot }, ++}; ++ ++static const struct of_device_id mtk_smp_boot_infos[] __initconst = { ++ { .compatible = "mediatek,mt6589", .data = &mtk_mt6589_boot }, ++}; ++ ++static void __iomem *mtk_smp_base; ++static const struct mtk_smp_boot_info *mtk_smp_info; ++ ++static int mtk_boot_secondary(unsigned int cpu, struct task_struct *idle) ++{ ++ if (!mtk_smp_base) ++ return -EINVAL; ++ ++ if (!mtk_smp_info->core_keys[cpu-1]) ++ return -EINVAL; ++ ++ writel_relaxed(mtk_smp_info->core_keys[cpu-1], ++ mtk_smp_base + mtk_smp_info->core_regs[cpu-1]); ++ ++ arch_send_wakeup_ipi_mask(cpumask_of(cpu)); ++ ++ return 0; ++} ++ ++static void __init __mtk_smp_prepare_cpus(unsigned int max_cpus, int trustzone) ++{ ++ int i, num; ++ const struct of_device_id *infos; ++ ++ if (trustzone) { ++ num = ARRAY_SIZE(mtk_tz_smp_boot_infos); ++ infos = mtk_tz_smp_boot_infos; ++ } else { ++ num = ARRAY_SIZE(mtk_smp_boot_infos); ++ infos = mtk_smp_boot_infos; ++ } ++ ++ /* Find smp boot info for this SoC */ ++ for (i = 0; i < num; i++) { ++ if (of_machine_is_compatible(infos[i].compatible)) { ++ mtk_smp_info = infos[i].data; ++ break; ++ } ++ } ++ ++ if (!mtk_smp_info) { ++ pr_err("%s: Device is not supported\n", __func__); ++ return; ++ } ++ ++ if (trustzone) { ++ if (memblock_reserve(mtk_smp_info->smp_base, MTK_SMP_REG_SIZE)) { ++ pr_err("%s: Can't reserve smp memory\n", __func__); ++ return; ++ } ++ mtk_smp_base = phys_to_virt(mtk_smp_info->smp_base); ++ } else { ++ mtk_smp_base = ioremap(mtk_smp_info->smp_base, MTK_SMP_REG_SIZE); ++ if (!mtk_smp_base) { ++ pr_err("%s: Can't remap %lx\n", __func__, ++ mtk_smp_info->smp_base); ++ return; ++ } ++ } ++ ++ /* ++ * write the address of slave startup address into the system-wide ++ * jump register ++ */ ++ writel_relaxed(virt_to_phys(secondary_startup), ++ mtk_smp_base + mtk_smp_info->jump_reg); ++} ++ ++static void __init mtk_tz_smp_prepare_cpus(unsigned int max_cpus) ++{ ++ __mtk_smp_prepare_cpus(max_cpus, 1); ++} ++ ++static void __init mtk_smp_prepare_cpus(unsigned int max_cpus) ++{ ++ __mtk_smp_prepare_cpus(max_cpus, 0); ++} ++ ++static struct smp_operations mt81xx_tz_smp_ops __initdata = { ++ .smp_prepare_cpus = mtk_tz_smp_prepare_cpus, ++ .smp_boot_secondary = mtk_boot_secondary, ++}; ++CPU_METHOD_OF_DECLARE(mt81xx_tz_smp, "mediatek,mt81xx-tz-smp", &mt81xx_tz_smp_ops); ++ ++static struct smp_operations mt65xx_smp_ops __initdata = { ++ .smp_prepare_cpus = mtk_smp_prepare_cpus, ++ .smp_boot_secondary = mtk_boot_secondary, ++}; ++CPU_METHOD_OF_DECLARE(mt65xx_smp, "mediatek,mt65xx-smp", &mt65xx_smp_ops); +-- +1.7.10.4 + |