From: Wenyou Yang <wenyou.yang@atmel.com>
To: <nicolas.ferre@atmel.com>, <linux@arm.linux.org.uk>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<alexandre.belloni@free-electrons.com>,
<sylvain.rochet@finsecur.com>, <peda@axentia.se>,
<wenyou.yang@atmel.com>, <Patrice.VILCHEZ@atmel.com>
Subject: [PATCH 7/7] pm: at91: add disable/enable the mpddrc's clock and DDR clock support
Date: Mon, 26 Jan 2015 18:08:58 +0800 [thread overview]
Message-ID: <1422266938-24700-1-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1422266617-24381-1-git-send-email-wenyou.yang@atmel.com>
In order to decrease the power consumption, when go to suspend,
disable the mpddr controller peripheral clock and the DDR clock
after the DDR enters the self-refresh mode.
Due the mpddr controller's issue, postpone the disable clocks operation,
instead of the DDR enters self-fresh mode immediately.
Enable the clocks after resume and before the DDR exits the self-refresh mode.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
arch/arm/mach-at91/pm.c | 4 +++
arch/arm/mach-at91/pm.h | 8 +++++
arch/arm/mach-at91/pm_suspend.S | 64 +++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 50cde92..6bd2a6b 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -145,6 +145,10 @@ static void at91_pm_suspend(suspend_state_t state)
pm_data |= (state == PM_SUSPEND_MEM) ?
AT91_PM_MODE(AT91_PM_SLOW_CLOCK) : 0;
+ pm_data |= AT91_PM_DDRCK(at91_pm_data.ddrck_id);
+
+ pm_data |= AT91_PM_DDRC_ID(at91_pm_data.mpddrc_id[0]);
+
/* Disable L1 D-cache and L2 cache */
at91_disable_l1_l2_cache();
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 158575e..fd4c5fc 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -19,6 +19,14 @@
#define AT91_PM_MODE_MASK 0x0f
#define AT91_PM_MODE(x) (((x) & AT91_PM_MODE_MASK) << AT91_PM_MODE_OFFSET)
+#define AT91_PM_DDRCK_OFFSET 8
+#define AT91_PM_DDRCK_MASK 0xff
+#define AT91_PM_DDRCK(x) (((x) & AT91_PM_DDRCK_MASK) << AT91_PM_DDRCK_OFFSET)
+
+#define AT91_PM_DDRC_ID_OFFSET 16
+#define AT91_PM_DDRC_ID_MASK 0xff
+#define AT91_PM_DDRC_ID(x) (((x) & AT91_PM_DDRC_ID_MASK) << AT91_PM_DDRC_ID_OFFSET)
+
#define AT91_PM_SLOW_CLOCK 0x01
#endif
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index e6e7f7a..8fb276c 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -26,6 +26,8 @@ memctrl .req r3
tmp1 .req r4
tmp2 .req r5
mode .req r6
+ddrc_id .req r7
+ddrck .req r8
/*
* Wait until master clock is ready (after switching master clock source)
@@ -130,6 +132,16 @@ ENTRY(at91_pm_suspend_in_sram)
and mode, tmp2, #AT91_PM_MODE_MASK
mov tmp1, memctrl
+ mov tmp2, tmp1, lsr#AT91_PM_DDRCK_OFFSET
+ mov tmp1, #0x01
+ and tmp2, tmp2, #AT91_PM_DDRCK_MASK
+ mov ddrck, tmp1, lsl tmp2
+
+ mov tmp1, memctrl
+ mov tmp2, tmp1, lsr#AT91_PM_DDRC_ID_OFFSET
+ and ddrc_id, tmp2, #AT91_PM_DDRC_ID_MASK
+
+ mov tmp1, memctrl
and memctrl, tmp1, #AT91_PM_MEMCTRL_MASK
cmp memctrl, #AT91_MEMCTRL_MC
@@ -234,6 +246,32 @@ sdr_sr_done:
str tmp1, [pmc, #AT91_CKGR_MOR]
skip_disable_main_clock:
+
+ /*
+ * Disable the SDRAM controller clock
+ */
+ cmp ddrc_id, #0
+ beq skip_disable_ddrc_clock
+ bic tmp2, ddrc_id, #0xe0 /* fetch least 5 bits */
+ mov tmp1, #0x01
+ mov tmp1, tmp1, lsl tmp2
+
+ tst ddrc_id, #0xe0 /* > 32 ? */
+ beq set_pmc_pcdr
+ str tmp1, [pmc, #AT91_PMC_PCDR1]
+ b skip_disable_ddrc_clock
+set_pmc_pcdr:
+ str tmp1, [pmc, #AT91_PMC_PCDR]
+skip_disable_ddrc_clock:
+
+ /*
+ * Disable SDRAM system clock
+ */
+ cmp ddrck, #0
+ beq skip_disable_ddrck
+ str ddrck, [pmc, #AT91_PMC_SCDR]
+skip_disable_ddrck:
+
/* Wait for interrupt */
_do_wfi
@@ -269,6 +307,32 @@ skip_disable_main_clock:
wait_mckrdy
skip_enable_main_clock:
+
+ /*
+ * Enable the SDRAM controller clock
+ */
+ cmp ddrc_id, #0
+ beq skip_enable_ddrc_clock
+ bic tmp2, ddrc_id, #0xe0 /* fetch lowest 5 bits */
+ mov tmp1, #0x01
+ mov tmp1, tmp1, lsl tmp2
+
+ tst ddrc_id, #0xe0 /* > 32 ? */
+ beq set_pmc_pcer
+ str tmp1, [pmc, #AT91_PMC_PCER1]
+ b skip_enable_ddrc_clock
+set_pmc_pcer:
+ str tmp1, [pmc, #AT91_PMC_PCER]
+skip_enable_ddrc_clock:
+
+ /*
+ * Enable SDRAM system clock
+ */
+ cmp ddrck, #0
+ beq skip_enable_ddrck
+ str ddrck, [pmc, #AT91_PMC_SCER]
+skip_enable_ddrck:
+
/*
* at91rm9200 Memory controller
* Do nothing - self-refresh is automatically disabled.
--
1.7.9.5
prev parent reply other threads:[~2015-01-26 10:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 10:03 [PATCH 0/7] AT91 pm improvements for 3.20 Wenyou Yang
2015-01-26 10:04 ` [PATCH 1/7] pm: at91: achieve the memory controller's type from the dts file Wenyou Yang
2015-01-26 10:06 ` [PATCH 2/7] pm: at91: pm_suspend: add the WFI support for ARMv7 Wenyou Yang
2015-01-26 13:05 ` Sergei Shtylyov
2015-01-27 4:44 ` Yang, Wenyou
2015-01-28 11:25 ` Lorenzo Pieralisi
2015-01-29 2:36 ` Yang, Wenyou
2015-01-29 12:22 ` Lorenzo Pieralisi
2015-01-30 7:23 ` Yang, Wenyou
2015-01-30 10:17 ` Lorenzo Pieralisi
2015-01-30 10:44 ` Lorenzo Pieralisi
2015-01-26 10:06 ` [PATCH 3/7] pm: at91: pm_suspend: MOR register KEY was missing Wenyou Yang
2015-01-26 10:07 ` [PATCH 4/7] ARM: at91: enable the L2 Cache controller Wenyou Yang
2015-01-26 11:46 ` Mark Rutland
2015-01-26 12:45 ` Russell King - ARM Linux
2015-01-26 22:36 ` Alexandre Belloni
2015-01-27 5:11 ` Yang, Wenyou
2015-01-26 10:07 ` [PATCH 5/7] pm: at91: add disable/enable the L1/L2 cache while suspend/resume Wenyou Yang
2015-01-26 10:08 ` [PATCH 6/7] pm: at91: add achieve the mpddrc peripheral ID and the DDR clock ID support Wenyou Yang
2015-01-26 11:49 ` Mark Rutland
2015-01-27 5:24 ` Yang, Wenyou
2015-01-26 10:08 ` Wenyou Yang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422266938-24700-1-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=Patrice.VILCHEZ@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.ferre@atmel.com \
--cc=peda@axentia.se \
--cc=sylvain.rochet@finsecur.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).