ARM: mach-msm: hook special idle handlers to arm_pm_idle (25eb433a) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/mach-msm/idle.S→arch/arm/mach-msm/idle.c

+49 −0

Original line number	Original line	Diff line number	Diff line
	/* arch/arm/mach-msm/include/mach/idle.S		/* arch/arm/mach-msm/idle.c
	*		*
	* Idle processing for MSM7K - work around bugs with SWFI.		* Idle processing for MSM7K - work around bugs with SWFI.
	*		*
	@@ -16,21 +16,34 @@
	*		*
	*/		*/

	#include <linux/linkage.h>		#include <linux/init.h>
	#include <asm/assembler.h>		#include <asm/system.h>

	ENTRY(arch_idle)		static void msm_idle(void)
			{
	#ifdef CONFIG_MSM7X00A_IDLE		#ifdef CONFIG_MSM7X00A_IDLE
	mrc p15, 0, r1, c1, c0, 0 /* read current CR */		asm volatile (
	bic r0, r1, #(1 << 2) /* clear dcache bit */
	bic r0, r0, #(1 << 12) /* clear icache bit */
	mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */

	mov r0, #0 /* prepare wfi value */		"mrc p15, 0, r1, c1, c0, 0 /* read current CR */ \n\t"
	mcr p15, 0, r0, c7, c10, 0 /* flush the cache */		"bic r0, r1, #(1 << 2) /* clear dcache bit */ \n\t"
	mcr p15, 0, r0, c7, c10, 4 /* memory barrier */		"bic r0, r0, #(1 << 12) /* clear icache bit */ \n\t"
	mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */		"mcr p15, 0, r0, c1, c0, 0 /* disable d/i cache */ \n\t"

	mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */		"mov r0, #0 /* prepare wfi value */ \n\t"
			"mcr p15, 0, r0, c7, c10, 0 /* flush the cache */ \n\t"
			"mcr p15, 0, r0, c7, c10, 4 /* memory barrier */ \n\t"
			"mcr p15, 0, r0, c7, c0, 4 /* wait for interrupt */ \n\t"

			"mcr p15, 0, r1, c1, c0, 0 /* restore d/i cache */ \n\t"

			: : : "r0","r1" );
	#endif		#endif
	mov pc, lr		}

			static int __init msm_idle_init(void)
			{
			arm_pm_idle = msm_idle;
			return 0;
			}

			arch_initcall(msm_idle_init);

arch/arm/mach-msm/include/mach/system.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,10 @@
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	*/		*/
	void arch_idle(void);		static inline void arch_idle(void)
			{
			cpu_do_idle();
			}

	/* low level hardware reset hook -- for example, hitting the		/* low level hardware reset hook -- for example, hitting the
	* PSHOLD line on the PMIC to hard reset the system		* PSHOLD line on the PMIC to hard reset the system