Commit 856c3c5b authored by Paul Walmsley's avatar Paul Walmsley Committed by Kevin Hilman
Browse files

ARM: OMAP3: PM: apply part of the erratum i582 workaround 



On OMAP34xx/35xx, and OMAP36xx chips with ES < 1.2, if the PER
powerdomain goes to OSWR or OFF while CORE stays at CSWR or ON, or if,
upon chip wakeup from OSWR or OFF, the CORE powerdomain goes ON before
PER, the UART3/4 FIFOs and McBSP2/3 SIDETONE memories will be
unusable.  This is erratum i582 in the OMAP36xx Silicon Errata
document.

This patch implements one of several parts of the workaround: the
addition of the wakeup dependency between the PER and WKUP
clockdomains, such that PER will wake up at the same time CORE_L3
does.

This is not a complete workaround.  For it to be complete:

1. the PER powerdomain's next power state must not be set to OSWR or
   OFF if the CORE powerdomain's next power state is set to CSWR or
   ON;

2. the UART3/4 FIFO and McBSP2/3 SIDETONE loopback tests should be run
   if the LASTPOWERSTATEENTERED bits for PER and CORE indicate that
   PER went OFF while CORE stayed on.  If loopback tests fail, then
   those devices will be unusable until PER and CORE can undergo a
   transition from ON to OSWR/OFF and back ON.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 6f0c0580

arch/arm/mach-omap2/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ extern void omap3_save_scratchpad_contents(void); 


#define PM_RTA_ERRATUM_i608		(1 << 0)

#define PM_SDRC_WAKEUP_ERRATUM_i583	(1 << 1)

#define PM_PER_MEMORIES_ERRATUM_i582	(1 << 2)



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

extern u16 pm34xx_errata;

arch/arm/mach-omap2/pm34xx.c

+28 −2
Original line number Diff line number Diff line
@@ -652,14 +652,17 @@ static void __init pm_errata_configure(void) 
		/* Enable the l2 cache toggling in sleep logic */

		enable_omap3630_toggle_l2_on_restore();

		if (omap_rev() < OMAP3630_REV_ES1_2)

			pm34xx_errata |= PM_SDRC_WAKEUP_ERRATUM_i583;

			pm34xx_errata |= (PM_SDRC_WAKEUP_ERRATUM_i583 |

					  PM_PER_MEMORIES_ERRATUM_i582);

	} else if (cpu_is_omap34xx()) {

		pm34xx_errata |= PM_PER_MEMORIES_ERRATUM_i582;

	}

}



int __init omap3_pm_init(void)

{

	struct power_state *pwrst, *tmp;

	struct clockdomain *neon_clkdm, *mpu_clkdm;

	struct clockdomain *neon_clkdm, *mpu_clkdm, *per_clkdm, *wkup_clkdm;

	int ret;



	if (!omap3_has_io_chain_ctrl())
@@ -711,6 +714,8 @@ int __init omap3_pm_init(void) 


	neon_clkdm = clkdm_lookup("neon_clkdm");

	mpu_clkdm = clkdm_lookup("mpu_clkdm");

	per_clkdm = clkdm_lookup("per_clkdm");

	wkup_clkdm = clkdm_lookup("wkup_clkdm");



#ifdef CONFIG_SUSPEND

	omap_pm_suspend = omap3_pm_suspend;
@@ -727,6 +732,27 @@ int __init omap3_pm_init(void) 
	if (IS_PM34XX_ERRATUM(PM_RTA_ERRATUM_i608))

		omap3630_ctrl_disable_rta();



	/*

	 * The UART3/4 FIFO and the sidetone memory in McBSP2/3 are

	 * not correctly reset when the PER powerdomain comes back

	 * from OFF or OSWR when the CORE powerdomain is kept active.

	 * See OMAP36xx Erratum i582 "PER Domain reset issue after

	 * Domain-OFF/OSWR Wakeup".  This wakeup dependency is not a

	 * complete workaround.  The kernel must also prevent the PER

	 * powerdomain from going to OSWR/OFF while the CORE

	 * powerdomain is not going to OSWR/OFF.  And if PER last

	 * power state was off while CORE last power state was ON, the

	 * UART3/4 and McBSP2/3 SIDETONE devices need to run a

	 * self-test using their loopback tests; if that fails, those

	 * devices are unusable until the PER/CORE can complete a transition

	 * from ON to OSWR/OFF and then back to ON.

	 *

	 * XXX Technically this workaround is only needed if off-mode

	 * or OSWR is enabled.

	 */

	if (IS_PM34XX_ERRATUM(PM_PER_MEMORIES_ERRATUM_i582))

		clkdm_add_wkdep(per_clkdm, wkup_clkdm);



	clkdm_add_wkdep(neon_clkdm, mpu_clkdm);

	if (omap_type() != OMAP2_DEVICE_TYPE_GP) {

		omap3_secure_ram_storage =

CRA Git | Maintained and supported by SUSTech CRA and CCSE