On Saturday 05 May 2012 04:25 AM, Tony Lindgren wrote: > * R Sricharan <[email protected]> [120503 00:30]: >> --- a/arch/arm/mach-omap2/omap-hotplug.c >> +++ b/arch/arm/mach-omap2/omap-hotplug.c >> @@ -17,8 +17,10 @@ >> #include <linux/kernel.h> >> #include <linux/errno.h> >> #include <linux/smp.h> >> +#include <linux/io.h> >> >> #include <asm/cacheflush.h> >> +#include <mach/omap-wakeupgen.h> >> >> #include "common.h" >> >> @@ -35,7 +37,8 @@ int platform_cpu_kill(unsigned int cpu) >> */ >> void __ref platform_cpu_die(unsigned int cpu) >> { >> - unsigned int this_cpu; >> + unsigned int boot_cpu = 0; >> + void __iomem *base = omap_get_wakeupgen_base(); >> >> flush_cache_all(); >> dsb(); >> @@ -43,16 +46,27 @@ void __ref platform_cpu_die(unsigned int cpu) >> /* >> * we're ready for shutdown now, so do it >> */ >> - if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0) >> - pr_err("Secure clear status failed\n"); >> + if (cpu_is_omap44xx()) { >> + if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0) >> + pr_err("Secure clear status failed\n"); >> + } else { >> + __raw_writel(0, base + OMAP_AUX_CORE_BOOT_0); >> + } >> + >> >> for (;;) { >> /* >> * Enter into low power state >> */ >> omap4_hotplug_cpu(cpu, PWRDM_POWER_OFF); >> - this_cpu = smp_processor_id(); >> - if (omap_read_auxcoreboot0() == this_cpu) { >> + >> + if (cpu_is_omap44xx()) >> + boot_cpu = omap_read_auxcoreboot0(); >> + else >> + boot_cpu = >> + __raw_readl(base + OMAP_AUX_CORE_BOOT_0) >> 5; >> + >> + if (boot_cpu == smp_processor_id()) { >> /* >> * OK, proper wakeup, we're done >> */ > > These should use variables set up during init instead of cpu_is_omapxxx > checks. > Sounds good. Will fit it.
Regards Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
