From: Wang Long <long.wanglong@huawei.com>
To: <xuwei5@hisilicon.com>, <arnd@arndb.de>, <yanhaifeng@gmail.com>,
<zhangfei.gao@linaro.org>, <haojian.zhuang@linaro.org>,
<galak@codeaurora.org>, <ijc+devicetree@hellion.org.uk>,
<jason@lakedaemon.net>, <jh80.chung@samsung.com>,
<khilman@linaro.org>, <lee.jones@linaro.org>,
<linux@arm.linux.org.uk>, <long.wanglong@huawei.com>,
<mark.rutland@arm.com>, <maxime.ripard@free-electrons.com>,
<obh+dt@kernel.org>, <olof@lixom.net>, <pawel.moll@arm.com>,
<swarren@nvidia.com>, <thomas.petazzoni@free-electrons.com>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <peifeiyue@huawei.com>,
<huxinwei@huawei.com>
Subject: [PATCH 6/7] ARM: hisi: rename secondary_startup function
Date: Fri, 28 Nov 2014 02:15:49 +0000 [thread overview]
Message-ID: <1417140950-67103-7-git-send-email-long.wanglong@huawei.com> (raw)
In-Reply-To: <1417140950-67103-1-git-send-email-long.wanglong@huawei.com>
As hix5hd2 and hip01 has the same secondary_startup
so rename hix5hd2_secondary_startup to
to hisi_secondary_startup.
the hip01 will use hisi_secondary_startup for the
secondary core boot.
Signed-off-by: Wang Long <long.wanglong@huawei.com>
---
arch/arm/mach-hisi/core.h | 2 +-
arch/arm/mach-hisi/headsmp.S | 2 +-
arch/arm/mach-hisi/platsmp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h
index 88b1f48..75520b0 100644
--- a/arch/arm/mach-hisi/core.h
+++ b/arch/arm/mach-hisi/core.h
@@ -12,7 +12,7 @@ extern void hi3xxx_cpu_die(unsigned int cpu);
extern int hi3xxx_cpu_kill(unsigned int cpu);
extern void hi3xxx_set_cpu(int cpu, bool enable);
-extern void hix5hd2_secondary_startup(void);
+extern void hisi_secondary_startup(void);
extern struct smp_operations hix5hd2_smp_ops;
extern void hix5hd2_set_cpu(int cpu, bool enable);
extern void hix5hd2_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-hisi/headsmp.S b/arch/arm/mach-hisi/headsmp.S
index 278889c..81e35b1 100644
--- a/arch/arm/mach-hisi/headsmp.S
+++ b/arch/arm/mach-hisi/headsmp.S
@@ -11,6 +11,6 @@
__CPUINIT
-ENTRY(hix5hd2_secondary_startup)
+ENTRY(hisi_secondary_startup)
bl v7_invalidate_l1
b secondary_startup
diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c
index b3c3a58..4a70f56 100644
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -116,7 +116,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
phys_addr_t jumpaddr;
- jumpaddr = virt_to_phys(hix5hd2_secondary_startup);
+ jumpaddr = virt_to_phys(hisi_secondary_startup);
hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);
hix5hd2_set_cpu(cpu, true);
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
--
1.8.3.4
next prev parent reply other threads:[~2014-11-28 2:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-28 2:15 [PATCH 0/7] ARM: hisi: enable HiP01 SoC Wang Long
2014-11-28 2:15 ` [PATCH 1/7] ARM: debug: add HiP01 debug uart Wang Long
2014-11-28 2:15 ` [PATCH 2/7] ARM: hisi: enable HiP01 SoC Wang Long
2014-11-28 2:15 ` [PATCH 3/7] ARM: dts: Add hip01-ca9x2 dts file Wang Long
2014-11-28 2:15 ` [PATCH 4/7] ARM: config: enable ARCH_HIP01 Wang Long
2014-11-28 2:15 ` [PATCH 5/7] ARM: hisi: add a common smp_prepares_cpus function Wang Long
2014-11-28 2:15 ` Wang Long [this message]
2014-11-28 2:15 ` [PATCH 7/7] ARM: hisi: enable smp for HiP01 Wang Long
2014-12-04 12:58 ` [PATCH 0/7] ARM: hisi: enable HiP01 SoC Arnd Bergmann
2014-12-05 0:34 ` Wei Xu
2014-12-24 3:09 Wang Long
2014-12-24 3:10 ` [PATCH 6/7] ARM: hisi: rename secondary_startup function Wang Long
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417140950-67103-7-git-send-email-long.wanglong@huawei.com \
--to=long.wanglong@huawei.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=haojian.zhuang@linaro.org \
--cc=huxinwei@huawei.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=jh80.chung@samsung.com \
--cc=khilman@linaro.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=obh+dt@kernel.org \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=peifeiyue@huawei.com \
--cc=swarren@nvidia.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=xuwei5@hisilicon.com \
--cc=yanhaifeng@gmail.com \
--cc=zhangfei.gao@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®