Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbc8d77d authored by Rob Herring's avatar Rob Herring Committed by Nicolas Pitre
Browse files

ARM: introduce common set_auxcr/get_auxcr functions 



Move the private set_auxcr/get_auxcr functions from
drivers/cpuidle/cpuidle-calxeda.c so they can be used across platforms.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
parent 62158f81

arch/arm/include/asm/cp15.h

+14 −0
Original line number Diff line number Diff line
@@ -61,6 +61,20 @@ static inline void set_cr(unsigned int val) 
	isb();

}



static inline unsigned int get_auxcr(void)

{

	unsigned int val;

	asm("mrc p15, 0, %0, c1, c0, 1	@ get AUXCR" : "=r" (val));

	return val;

}



static inline void set_auxcr(unsigned int val)

{

	asm volatile("mcr p15, 0, %0, c1, c0, 1	@ set AUXCR"

	  : : "r" (val));

	isb();

}



#ifndef CONFIG_SMP

extern void adjust_cr(unsigned long mask, unsigned long set);

#endif

drivers/cpuidle/cpuidle-calxeda.c

+0 −14
Original line number Diff line number Diff line
@@ -37,20 +37,6 @@ 
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);

extern void *scu_base_addr;



static inline unsigned int get_auxcr(void)

{

	unsigned int val;

	asm("mrc p15, 0, %0, c1, c0, 1	@ get AUXCR" : "=r" (val) : : "cc");

	return val;

}



static inline void set_auxcr(unsigned int val)

{

	asm volatile("mcr p15, 0, %0, c1, c0, 1	@ set AUXCR"

	  : : "r" (val) : "cc");

	isb();

}



static noinline void calxeda_idle_restore(void)

{

	set_cr(get_cr() | CR_C);