| Message ID | 1397527192-21988-6-git-send-email-cw00.choi@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 15 April 2014 07:29, Chanwoo Choi <cw00.choi@samsung.com> wrote: > This patch fix the offset of CPU boot address and don't operate smc call > of SMC_CMD_CPU1BOOT command for Exynos3250. > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > arch/arm/mach-exynos/firmware.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c > index aa01c42..6205d4f 100644 > --- a/arch/arm/mach-exynos/firmware.c > +++ b/arch/arm/mach-exynos/firmware.c > @@ -30,13 +30,16 @@ static int exynos_do_idle(void) > > static int exynos_cpu_boot(int cpu) > { > + if (soc_is_exynos3250()) { > + return 0; > /* > * 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()) > + } else if (soc_is_exynos4212()) { > cpu = 0; > + } > As you already return in case of Exynos3250, you need not change this. First commit hunk without the opening brace should be sufficient. > exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0); > return 0; > @@ -46,7 +49,7 @@ static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr) > { > void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c; > > - if (!soc_is_exynos4212()) > + if (!soc_is_exynos4212() && !soc_is_exynos3250()) > boot_reg += 4*cpu; > > __raw_writel(boot_addr, boot_reg); > -- > 1.8.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Chanwoo, On 15.04.2014 03:59, Chanwoo Choi wrote: > This patch fix the offset of CPU boot address and don't operate smc call > of SMC_CMD_CPU1BOOT command for Exynos3250. > > Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > arch/arm/mach-exynos/firmware.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c > index aa01c42..6205d4f 100644 > --- a/arch/arm/mach-exynos/firmware.c > +++ b/arch/arm/mach-exynos/firmware.c > @@ -30,13 +30,16 @@ static int exynos_do_idle(void) > > static int exynos_cpu_boot(int cpu) > { > + if (soc_is_exynos3250()) { > + return 0; This is strange. How the firmware knows when to boot the CPU then, if CPU1BOOT command is not called? Best regards, Tomasz
Hi Tomasz, On 04/16/2014 11:28 PM, Tomasz Figa wrote: > Hi Chanwoo, > > On 15.04.2014 03:59, Chanwoo Choi wrote: >> This patch fix the offset of CPU boot address and don't operate smc call >> of SMC_CMD_CPU1BOOT command for Exynos3250. >> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> arch/arm/mach-exynos/firmware.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c >> index aa01c42..6205d4f 100644 >> --- a/arch/arm/mach-exynos/firmware.c >> +++ b/arch/arm/mach-exynos/firmware.c >> @@ -30,13 +30,16 @@ static int exynos_do_idle(void) >> >> static int exynos_cpu_boot(int cpu) >> { >> + if (soc_is_exynos3250()) { >> + return 0; > > This is strange. How the firmware knows when to boot the CPU then, if CPU1BOOT command is not called? As I knew, Exynos3250 doesn't need smc for secondary boot because WFE in secure mode for Exynos3250 is removed. So, Exynos3250 doesn't need to send IPI_WAKEUP after call_firmware_op(cpu_boot, ...). Best Regards, Chanwoo Choi
Hi Tushar, On 04/15/2014 02:09 PM, Tushar Behera wrote: > On 15 April 2014 07:29, Chanwoo Choi <cw00.choi@samsung.com> wrote: >> This patch fix the offset of CPU boot address and don't operate smc call >> of SMC_CMD_CPU1BOOT command for Exynos3250. >> >> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> >> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> arch/arm/mach-exynos/firmware.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c >> index aa01c42..6205d4f 100644 >> --- a/arch/arm/mach-exynos/firmware.c >> +++ b/arch/arm/mach-exynos/firmware.c >> @@ -30,13 +30,16 @@ static int exynos_do_idle(void) >> >> static int exynos_cpu_boot(int cpu) >> { >> + if (soc_is_exynos3250()) { >> + return 0; >> /* >> * 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()) >> + } else if (soc_is_exynos4212()) { >> cpu = 0; >> + } >> > > As you already return in case of Exynos3250, you need not change this. > First commit hunk without the opening brace should be sufficient. OK, I'll remove brace. Best Regards, Chanwoo Choi
diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c index aa01c42..6205d4f 100644 --- a/arch/arm/mach-exynos/firmware.c +++ b/arch/arm/mach-exynos/firmware.c @@ -30,13 +30,16 @@ static int exynos_do_idle(void) static int exynos_cpu_boot(int cpu) { + if (soc_is_exynos3250()) { + return 0; /* * 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()) + } else if (soc_is_exynos4212()) { cpu = 0; + } exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0); return 0; @@ -46,7 +49,7 @@ static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr) { void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c; - if (!soc_is_exynos4212()) + if (!soc_is_exynos4212() && !soc_is_exynos3250()) boot_reg += 4*cpu; __raw_writel(boot_addr, boot_reg);