Commit d94e688c authored by Wenyou Yang's avatar Wenyou Yang Committed by Nicolas Ferre
Browse files

ARM: at91/pm: move the copying the sram function to the sram initialization phase 



To decrease the suspend time, move copying the sram function to the sram
initialization phase, instead of every time go to suspend.

In the meanwhile, substitute fncpy() for memcpy().

If there is no sram allocated for PM, the PM is not supported.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 0ab285c2

arch/arm/mach-at91/pm.c

+12 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/atomic.h>

#include <asm/mach/time.h>

#include <asm/mach/irq.h>

#include <asm/fncpy.h>



#include <mach/cpu.h>

#include <mach/hardware.h>
@@ -149,9 +150,6 @@ static int at91_pm_enter(suspend_state_t state) 
			 * turning off the main oscillator; reverse on wakeup.

			 */

			if (slow_clock) {

				/* copy slow_clock handler to SRAM, and call it */

				memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz);



				slow_clock(at91_pmc_base, at91_ramc_base[0],

					   at91_ramc_base[1],

					   at91_pm_data.memctrl);
@@ -295,6 +293,13 @@ static void __init at91_pm_sram_init(void) 


	sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);

	slow_clock = __arm_ioremap_exec(sram_pbase, at91_slow_clock_sz, false);

	if (!slow_clock) {

		pr_warn("SRAM: Could not map\n");

		return;

	}



	/* Copy the slow_clock handler to SRAM */

	slow_clock = fncpy(slow_clock, &at91_slow_clock, at91_slow_clock_sz);

}



static void __init at91_pm_init(void)
@@ -304,7 +309,10 @@ static void __init at91_pm_init(void) 
	if (at91_cpuidle_device.dev.platform_data)

		platform_device_register(&at91_cpuidle_device);



	if (slow_clock)

		suspend_set_ops(&at91_pm_ops);

	else

		pr_info("AT91: PM not supported, due to no SRAM allocated\n");

}



void __init at91rm9200_pm_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE