* [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212
@ 2014-04-29 1:37 Chanwoo Choi
2014-05-07 4:37 ` Chanwoo Choi
0 siblings, 1 reply; 4+ messages in thread
From: Chanwoo Choi @ 2014-04-29 1:37 UTC (permalink / raw)
To: kgene.kim, t.figa
Cc: linux, kyungmin.park, cw00.choi, inki.dae, sw0312.kim,
hyunhee.kim, yj44.cho, chanho61.park, linux-arm-kernel,
linux-samsung-soc, linux-kernel
From: Kyungmin Park <kyungmin.park@samsung.com>
This patch fix the offset of CPU boot address and change parameter of smc call
of SMC_CMD_CPU1BOOT command for Exynos4212.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
---
Changes from v4:
- Post only this patch separated from following patchset[1]
[1] https://lkml.org/lkml/2014/4/24/873
arch/arm/mach-exynos/firmware.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
index 932129e..aa01c42 100644
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@ -18,6 +18,8 @@
#include <mach/map.h>
+#include <plat/cpu.h>
+
#include "smc.h"
static int exynos_do_idle(void)
@@ -28,13 +30,24 @@ static int exynos_do_idle(void)
static int exynos_cpu_boot(int cpu)
{
+ /*
+ * The second parameter of SMC_CMD_CPU1BOOT command means CPU id.
+ * But, Exynos4212 has only one secondary CPU so second parameter
+ * isn't used for informing secure firmware about CPU id.
+ */
+ if (soc_is_exynos4212())
+ cpu = 0;
+
exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);
return 0;
}
static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
{
- void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;
+ void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;
+
+ if (!soc_is_exynos4212())
+ boot_reg += 4*cpu;
__raw_writel(boot_addr, boot_reg);
return 0;
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212
2014-04-29 1:37 [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212 Chanwoo Choi
@ 2014-05-07 4:37 ` Chanwoo Choi
2014-05-09 2:14 ` Kukjin Kim
0 siblings, 1 reply; 4+ messages in thread
From: Chanwoo Choi @ 2014-05-07 4:37 UTC (permalink / raw)
To: Chanwoo Choi
Cc: kgene.kim, t.figa, linux, kyungmin.park, inki.dae, sw0312.kim,
hyunhee.kim, yj44.cho, chanho61.park, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Dear Kukjin,
Could you please pick this patch?
Best Regards,
Chanwoo Choi
On 04/29/2014 10:37 AM, Chanwoo Choi wrote:
> From: Kyungmin Park <kyungmin.park@samsung.com>
>
> This patch fix the offset of CPU boot address and change parameter of smc call
> of SMC_CMD_CPU1BOOT command for Exynos4212.
>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> Reviewed-by: Tomasz Figa <t.figa@samsung.com>
> ---
> Changes from v4:
> - Post only this patch separated from following patchset[1]
> [1] https://lkml.org/lkml/2014/4/24/873
>
> arch/arm/mach-exynos/firmware.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
> index 932129e..aa01c42 100644
> --- a/arch/arm/mach-exynos/firmware.c
> +++ b/arch/arm/mach-exynos/firmware.c
> @@ -18,6 +18,8 @@
>
> #include <mach/map.h>
>
> +#include <plat/cpu.h>
> +
> #include "smc.h"
>
> static int exynos_do_idle(void)
> @@ -28,13 +30,24 @@ static int exynos_do_idle(void)
>
> static int exynos_cpu_boot(int cpu)
> {
> + /*
> + * The second parameter of SMC_CMD_CPU1BOOT command means CPU id.
> + * But, Exynos4212 has only one secondary CPU so second parameter
> + * isn't used for informing secure firmware about CPU id.
> + */
> + if (soc_is_exynos4212())
> + cpu = 0;
> +
> exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);
> return 0;
> }
>
> static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
> {
> - void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;
> + void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;
> +
> + if (!soc_is_exynos4212())
> + boot_reg += 4*cpu;
>
> __raw_writel(boot_addr, boot_reg);
> return 0;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212
2014-05-07 4:37 ` Chanwoo Choi
@ 2014-05-09 2:14 ` Kukjin Kim
2014-05-09 2:20 ` Chanwoo Choi
0 siblings, 1 reply; 4+ messages in thread
From: Kukjin Kim @ 2014-05-09 2:14 UTC (permalink / raw)
To: 'Chanwoo Choi'
Cc: t.figa, linux, kyungmin.park, inki.dae, sw0312.kim, hyunhee.kim,
yj44.cho, chanho61.park, linux-arm-kernel, linux-samsung-soc,
linux-kernel
Chanwoo Choi wrote:
>
> Dear Kukjin,
>
> Could you please pick this patch?
>
I've applied.
Thanks,
Kukjin
> Best Regards,
> Chanwoo Choi
>
> On 04/29/2014 10:37 AM, Chanwoo Choi wrote:
> > From: Kyungmin Park <kyungmin.park@samsung.com>
> >
> > This patch fix the offset of CPU boot address and change parameter of
> smc call
> > of SMC_CMD_CPU1BOOT command for Exynos4212.
> >
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> > Reviewed-by: Tomasz Figa <t.figa@samsung.com>
> > ---
> > Changes from v4:
> > - Post only this patch separated from following patchset[1]
> > [1] https://lkml.org/lkml/2014/4/24/873
> >
> > arch/arm/mach-exynos/firmware.c | 15 ++++++++++++++-
> > 1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-
> exynos/firmware.c
> > index 932129e..aa01c42 100644
> > --- a/arch/arm/mach-exynos/firmware.c
> > +++ b/arch/arm/mach-exynos/firmware.c
> > @@ -18,6 +18,8 @@
> >
> > #include <mach/map.h>
> >
> > +#include <plat/cpu.h>
> > +
> > #include "smc.h"
> >
> > static int exynos_do_idle(void)
> > @@ -28,13 +30,24 @@ static int exynos_do_idle(void)
> >
> > static int exynos_cpu_boot(int cpu)
> > {
> > + /*
> > + * The second parameter of SMC_CMD_CPU1BOOT command means CPU id.
> > + * But, Exynos4212 has only one secondary CPU so second parameter
> > + * isn't used for informing secure firmware about CPU id.
> > + */
> > + if (soc_is_exynos4212())
> > + cpu = 0;
> > +
> > exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);
> > return 0;
> > }
> >
> > static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
> > {
> > - void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;
> > + void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;
> > +
> > + if (!soc_is_exynos4212())
> > + boot_reg += 4*cpu;
> >
> > __raw_writel(boot_addr, boot_reg);
> > return 0;
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212
2014-05-09 2:14 ` Kukjin Kim
@ 2014-05-09 2:20 ` Chanwoo Choi
0 siblings, 0 replies; 4+ messages in thread
From: Chanwoo Choi @ 2014-05-09 2:20 UTC (permalink / raw)
To: Kukjin Kim
Cc: t.figa, linux, kyungmin.park, inki.dae, sw0312.kim, hyunhee.kim,
yj44.cho, chanho61.park, linux-arm-kernel, linux-samsung-soc,
linux-kernel
On 05/09/2014 11:14 AM, Kukjin Kim wrote:
> Chanwoo Choi wrote:
>>
>> Dear Kukjin,
>>
>> Could you please pick this patch?
>>
> I've applied.
Thanks for your apply.
Best regards,
Chanwoo Choi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-09 2:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-29 1:37 [PATCHv5] ARM: EXYNOS: Support secondary CPU boot of Exynos4212 Chanwoo Choi
2014-05-07 4:37 ` Chanwoo Choi
2014-05-09 2:14 ` Kukjin Kim
2014-05-09 2:20 ` Chanwoo Choi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox