Commit 458e999e authored by Nishanth Menon's avatar Nishanth Menon Committed by Kevin Hilman
Browse files

OMAP3630: PM: Erratum i608: disable RTA 



Erratum id: i608
RTA (Retention Till Access) feature is not supported and leads to device
stability issues when enabled. This impacts modules with embedded memories
on OMAP3630

Workaround is to disable RTA on boot and coming out of core off.
For disabling RTA coming out of off mode, we do this by overriding the
restore pointer for 3630 as the first point of entry before caches are
touched and is common for GP and HS devices. To disable earlier than
this could be possible by modifying the PPA for HS devices, but not for
GP devices.

Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Tony Lindgren <tony@atomide.com>

Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>

[ambresh@ti.com: co-developer]
Signed-off-by: default avatarAmbresh K <ambresh@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 8cdfd834

arch/arm/mach-omap2/control.c

+12 −1
Original line number Diff line number Diff line
@@ -241,7 +241,10 @@ void omap3_save_scratchpad_contents(void) 


	/* Populate the Scratchpad contents */

	scratchpad_contents.boot_config_ptr = 0x0;

	if (omap_rev() != OMAP3430_REV_ES3_0 &&

	if (cpu_is_omap3630())

		scratchpad_contents.public_restore_ptr =

			virt_to_phys(get_omap3630_restore_pointer());

	else if (omap_rev() != OMAP3430_REV_ES3_0 &&

					omap_rev() != OMAP3430_REV_ES3_1)

		scratchpad_contents.public_restore_ptr =

			virt_to_phys(get_restore_pointer());
@@ -474,4 +477,12 @@ void omap3_control_restore_context(void) 
	omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);

	return;

}



void omap3630_ctrl_disable_rta(void)

{

	if (!cpu_is_omap3630())

		return;

	omap_ctrl_writel(OMAP36XX_RTA_DISABLE, OMAP36XX_CONTROL_MEM_RTA_CTRL);

}



#endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */

arch/arm/mach-omap2/control.h

+6 −1
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ 
#define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014)

#define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018)



/* 36xx-only RTA - Retention till Accesss control registers and bits */

#define OMAP36XX_CONTROL_MEM_RTA_CTRL	0x40C

#define OMAP36XX_RTA_DISABLE		0x0



/* 34xx D2D idle-related pins, handled by PM core */

#define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250

#define OMAP3_PADCONF_SAD2D_IDLEACK    0x254
@@ -347,10 +351,11 @@ extern void omap3_save_scratchpad_contents(void); 
extern void omap3_clear_scratchpad_contents(void);

extern u32 *get_restore_pointer(void);

extern u32 *get_es3_restore_pointer(void);

extern u32 *get_omap3630_restore_pointer(void);

extern u32 omap3_arm_context[128];

extern void omap3_control_save_context(void);

extern void omap3_control_restore_context(void);



extern void omap3630_ctrl_disable_rta(void);

#else

#define omap_ctrl_base_get()		0

#define omap_ctrl_readb(x)		0

arch/arm/mach-omap2/pm.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ extern unsigned int save_secure_ram_context_sz; 
extern unsigned int omap24xx_cpu_suspend_sz;

extern unsigned int omap34xx_cpu_suspend_sz;



#define PM_RTA_ERRATUM_i608		(1 << 0)



#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)

extern u16 pm34xx_errata;

#define IS_PM34XX_ERRATUM(id)		(pm34xx_errata & (id))

arch/arm/mach-omap2/pm34xx.c

+10 −0
Original line number Diff line number Diff line
@@ -996,6 +996,8 @@ void omap_push_sram_idle(void) 


static void __init pm_errata_configure(void)

{

	if (cpu_is_omap3630())

		pm34xx_errata |= PM_RTA_ERRATUM_i608;

}



static int __init omap3_pm_init(void)
@@ -1056,6 +1058,14 @@ static int __init omap3_pm_init(void) 
	pm_idle = omap3_pm_idle;

	omap3_idle_init();



	/*

	 * RTA is disabled during initialization as per erratum i608

	 * it is safer to disable RTA by the bootloader, but we would like

	 * to be doubly sure here and prevent any mishaps.

	 */

	if (IS_PM34XX_ERRATUM(PM_RTA_ERRATUM_i608))

		omap3630_ctrl_disable_rta();



	clkdm_add_wkdep(neon_clkdm, mpu_clkdm);

	if (omap_type() != OMAP2_DEVICE_TYPE_GP) {

		omap3_secure_ram_storage =

arch/arm/mach-omap2/sleep34xx.S

+26 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#define CM_IDLEST_CKGEN_V	OMAP34XX_CM_REGADDR(PLL_MOD, CM_IDLEST)

#define SRAM_BASE_P		0x40200000

#define CONTROL_STAT		0x480022F0

#define CONTROL_MEM_RTA_CTRL	(OMAP343X_CTRL_BASE\

					+ OMAP36XX_CONTROL_MEM_RTA_CTRL)

#define SCRATCHPAD_MEM_OFFS	0x310 /* Move this as correct place is

				       * available */

#define SCRATCHPAD_BASE_P	(OMAP343X_CTRL_BASE + OMAP343X_CONTROL_MEM_WKUP\
@@ -99,6 +101,14 @@ ENTRY(get_restore_pointer) 
        ldmfd   sp!, {pc}     @ restore regs and return

ENTRY(get_restore_pointer_sz)

        .word   . - get_restore_pointer

	.text

/* Function call to get the restore pointer for 3630 resume from OFF */

ENTRY(get_omap3630_restore_pointer)

        stmfd   sp!, {lr}     @ save registers on stack

	adr	r0, restore_3630

        ldmfd   sp!, {pc}     @ restore regs and return

ENTRY(get_omap3630_restore_pointer_sz)

        .word   . - get_omap3630_restore_pointer



	.text

/* Function call to get the restore pointer for for ES3 to resume from OFF */
@@ -246,6 +256,20 @@ copy_to_sram: 
	bne	copy_to_sram

	ldr	r1, sram_base

	blx	r1

	b	restore



restore_3630:

	/*b restore_es3630*/		@ Enable to debug restore code

	ldr	r1, pm_prepwstst_core_p

	ldr	r2, [r1]

	and	r2, r2, #0x3

	cmp	r2, #0x0	@ Check if previous power state of CORE is OFF

	bne	restore

	/* Disable RTA before giving control */

	ldr	r1, control_mem_rta

	mov	r2, #OMAP36XX_RTA_DISABLE

	str	r2, [r1]

	/* Fall thru for the remaining logic */

restore:

	/* b restore*/  @ Enable to debug restore code

        /* Check what was the reason for mpu reset and store the reason in r9*/
@@ -651,6 +675,8 @@ cache_pred_disable_mask: 
	.word	0xFFFFE7FB

control_stat:

	.word	CONTROL_STAT

control_mem_rta:

	.word	CONTROL_MEM_RTA_CTRL

kernel_flush:

	.word v7_flush_dcache_all

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE