Skip to contentSkip to conversation

am33xx 0.950V core sleep mode

RFC Superseded Russ Dill 2 participants 6 messages May 1, 2013

Subsystems (5)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Russ Dill

author
#0 lore raw

cover am33xx 0.950V core sleep mode

This patchset adds support for setting vdd core to 0.95V during suspend. I wanted to get some comments on the DT usage and also the location of the code, in sleep33xx.S. Since the am33xx PM code is not yet merged, the patchset is based on ti-linux-3.8.y kernel located at https://git.ti.com/ti-linux-kernel/ti-linux-kernel.

am33xx processors have a special VDD core operating point that can lower power consumption, but the operating point has many restrictions. One of the restrictions is that it does not support any DDR3 clock rates, meaning that the memory controller must be disabled to enter this operating point. For DDR2 systems, the clock rate must be changed, which can only be done from internal memory.

For these reasons, the mode is most useful during suspend. The change must be done after the memory controller has been disabled. The memory controller is disabled as the last step in the suspend sequence, within sleep33xx.S.

The patchset basically adds a small I2C controller to sleep33xx.S, allowing simple I2C messages to be sent to anything on the I2C1 bus. It can support any am33xx platform so long as VDD core can be controlled via simple writes on the I2C1 bus.

Since am33xx is a device tree platform, I needed to find a way to integrate this into DT. I put the sleep and wake sequences as arrays of binary bytes in the I2C1 node. I'm not sure where else it would fit better, but I'm open to suggestions.

An example sequence is included for Beaglebone, where this patchset has been tested.

Russ Dill (2):
ARM: OMAP2+: AM33XX: I2C Sleep/wake sequence support
ARM: dts: add AM33XX vdd core opp50 suspend for Beaglebone.

 arch/arm/boot/dts/am335x-bone.dts |  25 +++++-
 arch/arm/mach-omap2/pm33xx.c      | 108 ++++++++++++++++++++++
 arch/arm/mach-omap2/pm33xx.h      |  23 +++++
 arch/arm/mach-omap2/sleep33xx.S   | 184 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 339 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

RFC 1/2 ARM: OMAP2+: AM33XX: I2C Sleep/wake sequence support

This patch adds the ability to write an I2C sleep sequence from SRAM just before WFI, and a wake sequence just after control is passed from the M3. This is useful for adjusting voltages during sleep that cannot be lowered while SDRAM is active.

Each sequence is a series of I2C transfers in the form:

u8 length | u8 chip address | u8 byte0/reg address | u8 byte 1 | u8 byte n ...

The length indicates the number of bytes to transfer, including the register address. The length of the sequence is limited by the amount of space reserved in SRAM, 127 bytes.

The sequences are taken from the i2c1 node in the device tree. The property name for the sleep sequence is "sleep_sequence" and the property name for the wake sequence is "wake_sequence". Each property should be an array of bytes.

No actions are performed if the properties are not present in the device tree.

---
 arch/arm/mach-omap2/pm33xx.c    | 108 +++++++++++++++++++++++
 arch/arm/mach-omap2/pm33xx.h    |  23 +++++
 arch/arm/mach-omap2/sleep33xx.S | 184 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 315 insertions(+)
arch/arm/mach-omap2/pm33xx.c +108 -0
index 93f970f..8aeaf6e 100644
@@ -47,10 +47,14 @@
 void (*am33xx_do_wfi_sram)(void);
 
 static void __iomem *am33xx_emif_base;
+static void __iomem *am33xx_i2c1_base;
 static struct powerdomain *cefuse_pwrdm, *gfx_pwrdm, *per_pwrdm;
 static struct clockdomain *gfx_l4ls_clkdm;
 static struct omap_hwmod *usb_oh, *cpsw_oh, *tptc0_oh, *tptc1_oh, *tptc2_oh;
+static struct omap_hwmod *i2c1_oh;
 static struct wkup_m3_context *wkup_m3;
+static char *am33xx_i2c_sleep_sequence;
+static char *am33xx_i2c_wake_sequence;
 
 static DECLARE_COMPLETION(wkup_m3_sync);
 
@@ -88,7 +92,10 @@ static int am33xx_pm_suspend(void)
 	/* Try to put GFX to sleep */
 	pwrdm_set_next_fpwrst(gfx_pwrdm, PWRDM_FUNC_PWRST_OFF);
 
+	/* We need I2C to send the sleep/wake sequences */
+	omap_hwmod_enable(i2c1_oh);
 	ret = cpu_suspend(0, am33xx_do_sram_idle);
+	omap_hwmod_idle(i2c1_oh);
 
 	status = pwrdm_read_fpwrst(gfx_pwrdm);
 	if (status != PWRDM_FUNC_PWRST_OFF)
@@ -403,6 +410,101 @@ void __iomem *am33xx_get_emif_base(void)
 	return am33xx_emif_base;
 }
 
+void am33xx_fill_i2c_sequences(char *sleep, size_t ssz, char *wake, size_t wsz)
+{
+	if (am33xx_i2c_sleep_sequence)
+		memcpy(sleep, am33xx_i2c_sleep_sequence, ssz);
+	else
+		memset(sleep, 0, ssz);
+
+	if (am33xx_i2c_wake_sequence)
+		memcpy(wake, am33xx_i2c_wake_sequence, wsz);
+	else
+		memset(wake, 0, wsz);
+}
+
+static int __init am33xx_map_i2c1(void)
+{
+	am33xx_i2c1_base = ioremap(AM33XX_I2C0_BASE, SZ_4K);
+
+	if (!am33xx_i2c1_base)
+		return -ENOMEM;
+
+	return 0;
+}
+
+void __iomem *am33xx_get_i2c1_base(void)
+{
+	return am33xx_i2c1_base;
+}
+
+static int __init am33xx_setup_sleep_sequence(void)
+{
+	int ret;
+	int sz;
+	const void *prop;
+	struct device *dev;
+	struct omap_hwmod *oh;
+
+	ret = am33xx_map_i2c1();
+	if (ret) {
+		pr_err("Could not ioremap i2c1\n");
+		return ret;
+	}
+
+	oh = omap_hwmod_lookup("i2c1");
+	if (!oh)
+		return -ENODEV;
+
+	/*
+	 * We put the device tree node in the I2C controller that will
+	 * be sending the sequence.
+	 */
+	dev = omap_device_get_by_hwmod_name("i2c1");
+	if (IS_ERR(dev))
+		return PTR_ERR(dev);
+
+	prop = of_get_property(dev->of_node, "sleep_sequence", &sz);
+	if (prop) {
+		if (sz >= i2c_sleep_sequence_sz) {
+			pr_err("Sleep sequence too long\n");
+			return -EINVAL;
+		}
+		am33xx_i2c_sleep_sequence = kzalloc(i2c_sleep_sequence_sz,
+								GFP_KERNEL);
+		if (!am33xx_i2c_sleep_sequence)
+			return -ENOMEM;
+		memcpy(am33xx_i2c_sleep_sequence, prop, sz);
+	}
+
+	prop = of_get_property(dev->of_node, "wake_sequence", &sz);
+	if (prop) {
+		if (sz >= i2c_wake_sequence_sz) {
+			pr_err("Wake sequence too long\n");
+			ret = -EINVAL;
+			goto cleanup_sleep;
+		}
+		am33xx_i2c_wake_sequence = kzalloc(i2c_wake_sequence_sz,
+								GFP_KERNEL);
+		if (!am33xx_i2c_wake_sequence) {
+			ret = -ENOMEM;
+			goto cleanup_sleep;
+		}
+		memcpy(am33xx_i2c_wake_sequence, prop, sz);
+	}
+
+	/* Only take the I2C controller out of idle if a sequence exists */
+	if (am33xx_i2c_sleep_sequence || am33xx_i2c_wake_sequence)
+		i2c1_oh = oh;
+
+	return 0;
+
+cleanup_sleep:
+	kfree(am33xx_i2c_sleep_sequence);
+	am33xx_i2c_sleep_sequence = NULL;
+	return ret;
+}
+
 int __init am33xx_pm_init(void)
 {
 	int ret;
@@ -449,6 +551,12 @@ int __init am33xx_pm_init(void)
 		goto err;
 	}
 
+	ret = am33xx_setup_sleep_sequence();
+	if (ret) {
+		pr_err("Error fetching I2C sleep/wake sequence\n");
+		goto err;
+	}
+
 	(void) clkdm_for_each(omap_pm_clkdms_setup, NULL);
 
 	/* CEFUSE domain can be turned off post bootup */
arch/arm/mach-omap2/pm33xx.h +23 -0
index 13a2c85..69616ee 100644
@@ -28,6 +28,9 @@ struct wkup_m3_context {
 	u8			state;
 };
 
+extern u32 i2c_sleep_sequence_sz;
+extern u32 i2c_wake_sequence_sz;
+
 #ifdef CONFIG_SUSPEND
 static void am33xx_m3_state_machine_reset(void);
 #else
@@ -52,5 +55,25 @@ extern void __iomem *am33xx_get_emif_base(void);
 
 #define AM33XX_OCMC_END			0x40310000
 #define AM33XX_EMIF_BASE		0x4C000000
+#define AM33XX_I2C0_BASE		0x44E0B000
+
+#define OMAP_I2C_STAT_BB		(1 << 12)
+#define OMAP_I2C_STAT_ARDY		(1 << 2)
+#define OMAP_I2C_STAT_NACK		(1 << 1)
+#define OMAP_I2C_STAT_AL		(1 << 0)
+
+#define OMAP_I2C_CON_EN			(1 << 15)
+#define OMAP_I2C_CON_MST		(1 << 10)
+#define OMAP_I2C_CON_TRX		(1 << 9)
+#define OMAP_I2C_CON_STP		(1 << 1)
+#define OMAP_I2C_CON_STT		(1 << 0)
+
+#define OMAP_I2C_STAT_RAW_REG		0x24
+#define OMAP_I2C_STAT_REG		0x28
+#define OMAP_I2C_IRQENABLE_CLR		0x30
+#define OMAP_I2C_CNT_REG		0x98
+#define OMAP_I2C_DATA_REG		0x9c
+#define OMAP_I2C_CON_REG		0xa4
+#define OMAP_I2C_SA_REG			0xac
 
 #endif
arch/arm/mach-omap2/sleep33xx.S +184 -0

220 lines not on this page · raw message

Signature · 1 line
1.8.1.2
maintainer
#2 lore raw

RFC 1/2 ARM: OMAP2+: AM33XX: I2C Sleep/wake sequence support

Quoted 13 lines · Russ Dill

This patch adds the ability to write an I2C sleep sequence from SRAM just before WFI, and a wake sequence just after control is passed from the M3. This is useful for adjusting voltages during sleep that cannot be lowered while SDRAM is active.

Each sequence is a series of I2C transfers in the form:

u8 length | u8 chip address | u8 byte0/reg address | u8 byte 1 | u8 byte n ...

The length indicates the number of bytes to transfer, including the register address. The length of the sequence is limited by the amount of space reserved in SRAM, 127 bytes.

Quoted 7 lines

The sequences are taken from the i2c1 node in the device tree. The property name for the sleep sequence is "sleep_sequence" and the property name for the wake sequence is "wake_sequence". Each property should be an array of bytes.

No actions are performed if the properties are not present in the device tree.

Looks like you should make that into just a regular device driver that lives under drivers/ somewhere?

Regards,

Tony

author
#3 lore raw

RFC 1/2 ARM: OMAP2+: AM33XX: I2C Sleep/wake sequence support

Quoted 23 lines · Tony Lindgren
Quoted 13 lines · Russ Dill

This patch adds the ability to write an I2C sleep sequence from SRAM just before WFI, and a wake sequence just after control is passed from the M3. This is useful for adjusting voltages during sleep that cannot be lowered while SDRAM is active.

Each sequence is a series of I2C transfers in the form:

u8 length | u8 chip address | u8 byte0/reg address | u8 byte 1 | u8 byte n ...

The length indicates the number of bytes to transfer, including the register address. The length of the sequence is limited by the amount of space reserved in SRAM, 127 bytes.

Quoted 7 lines

The sequences are taken from the i2c1 node in the device tree. The property name for the sleep sequence is "sleep_sequence" and the property name for the wake sequence is "wake_sequence". Each property should be an array of bytes.

No actions are performed if the properties are not present in the device tree.

Quoted 6 lines

Looks like you should make that into just a regular device driver that lives under drivers/ somewhere?

Regards,

Tony

This code has to be copied to, and run from SRAM. What would that even look like? Additionally, there is also code under drivers/ that manages this piece of hardware, i2c-omap.c. The code in this patch differs in that it accesses no system memory, no stack, only knows how to write, and it runs without interrupts.

maintainer
#4 lore raw

RFC 1/2 ARM: OMAP2+: AM33XX: I2C Sleep/wake sequence support

Quoted 10 lines · Russ Dill
Quoted 3 lines · Tony Lindgren

Looks like you should make that into just a regular device driver that lives under drivers/ somewhere?

This code has to be copied to, and run from SRAM. What would that even look like? Additionally, there is also code under drivers/ that manages this piece of hardware, i2c-omap.c. The code in this patch differs in that it accesses no system memory, no stack, only knows how to write, and it runs without interrupts.

Well we should move to using the generic drivers/misc/sram.c, so you should be able to load the code to SRAM using that. Then you can probably register some callback function based on the compatible flag with i2c-omap.c?

Regards,

Tony

author
#5 lore raw

RFC 2/2 ARM: dts: add AM33XX vdd core opp50 suspend for Beaglebone.

In reply to Russ Dill

This adds a sleep and wake sequence to set the VDD core voltage to the OPP50 level, 0.950V. This saves power during suspend. The sequences are specific to the Beaglebone layout and PMIC, the TPS65217. The sequences are written out by the am33xx PM code.

---
 arch/arm/boot/dts/am335x-bone.dts | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
arch/arm/boot/dts/am335x-bone.dts +24 -1
index 725aa63..bccada7 100644
@@ -73,10 +73,33 @@
 			status = "okay";
 			clock-frequency = <400000>;
 
+			/* Set OPP50 (0.95V) for VDD core */
+			sleep_sequence = /bits/ 8 <
+				0x02 0x24 0x0b 0x6d /* Password unlock 1 */
+				0x02 0x24 0x10 0x02 /* Set DCDC3 to 0.95V */
+				0x02 0x24 0x0b 0x6d /* Password unlock 2 */
+				0x02 0x24 0x10 0x02 /* Set DCDC3 to 0.95V */
+				0x02 0x24 0x0b 0x6c /* Password unlock 1 */
+				0x02 0x24 0x11 0x86 /* Apply DCDC changes */
+				0x02 0x24 0x0b 0x6c /* Password unlock 2 */
+				0x02 0x24 0x11 0x86 /* Apply DCDC changes */
+			>;
+
+			/* Set OPP100 (1.10V) for VDD core */
+			wake_sequence = /bits/ 8 <
+				0x02 0x24 0x0b 0x6d /* Password unlock 1 */
+				0x02 0x24 0x10 0x08 /* Set DCDC3 to 1.1V */
+				0x02 0x24 0x0b 0x6d /* Password unlock 2 */
+				0x02 0x24 0x10 0x08 /* Set DCDC3 to 1.1V */
+				0x02 0x24 0x0b 0x6c /* Password unlock 1 */
+				0x02 0x24 0x11 0x86 /* Apply DCDC changes */
+				0x02 0x24 0x0b 0x6c /* Password unlock 2 */
+				0x02 0x24 0x11 0x86 /* Apply DCDC changes */
+			>;
+
 			tps: tps@24 {
 				reg = <0x24>;
 			};
-
 		};
 
 		rtc@44e3e000 {
Signature · 1 line
1.8.1.2