From patchwork Mon Jan 6 20:55:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 3436731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67586C02DC for ; Mon, 6 Jan 2014 08:59:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EA692016D for ; Mon, 6 Jan 2014 08:59:50 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A61342016A for ; Mon, 6 Jan 2014 08:59:48 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W061F-00051d-KI; Mon, 06 Jan 2014 08:58:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W0612-00047s-SN; Mon, 06 Jan 2014 08:58:32 +0000 Received: from mail-db9lp0252.outbound.messaging.microsoft.com ([213.199.154.252] helo=db9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W060o-00045U-5J for linux-arm-kernel@lists.infradead.org; Mon, 06 Jan 2014 08:58:20 +0000 Received: from mail63-db9-R.bigfish.com (10.174.16.225) by DB9EHSOBE037.bigfish.com (10.174.14.100) with Microsoft SMTP Server id 14.1.225.22; Mon, 6 Jan 2014 08:57:56 +0000 Received: from mail63-db9 (localhost [127.0.0.1]) by mail63-db9-R.bigfish.com (Postfix) with ESMTP id 676DD5E01CC; Mon, 6 Jan 2014 08:57:56 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6h1082kzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h2327h2336h1155h) Received: from mail63-db9 (localhost.localdomain [127.0.0.1]) by mail63-db9 (MessageSwitch) id 1388998674288985_25892; Mon, 6 Jan 2014 08:57:54 +0000 (UTC) Received: from DB9EHSMHS027.bigfish.com (unknown [10.174.16.243]) by mail63-db9.bigfish.com (Postfix) with ESMTP id 414CC480047; Mon, 6 Jan 2014 08:57:54 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB9EHSMHS027.bigfish.com (10.174.14.37) with Microsoft SMTP Server (TLS) id 14.16.227.3; Mon, 6 Jan 2014 08:57:53 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.3.158.2; Mon, 6 Jan 2014 08:57:52 +0000 Received: from ubuntu.ap.freescale.net (ubuntu-010192242118.ap.freescale.net [10.192.242.118]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s068vkr7016209; Mon, 6 Jan 2014 01:57:51 -0700 From: Anson Huang To: , Subject: [PATCH 3/3] ARM: imx: add suspend in ocram support on i.mx6sl Date: Mon, 6 Jan 2014 15:55:39 -0500 Message-ID: <1389041739-18389-3-git-send-email-b20788@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389041739-18389-1-git-send-email-b20788@freescale.com> References: <1389041739-18389-1-git-send-email-b20788@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140106_035818_568252_4A7C3117 X-CRM114-Status: GOOD ( 13.90 ) X-Spam-Score: 0.0 (/) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP i.MX6SL's suspend in ocram function is derived from i.MX6Q, the only difference is the offset of DDR IO pins, so we need to check cpu type in runtime to set DDR IO to high-Z mode correctly. This patch can lower the DDR IO power from ~10mA@1.2V to ~1mA@1.2V, measured on i.MX6SL EVK board, SH5. Signed-off-by: Anson Huang --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/mach-imx6sl.c | 8 +- arch/arm/mach-imx/suspend-imx6.S | 160 +++++++++++++++++++++++++++++++++++++- 3 files changed, 164 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 61770b9..d8205fb 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -104,7 +104,7 @@ ifeq ($(CONFIG_PM),y) AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o suspend-imx6.o # i.MX6SL reuses i.MX6Q code -obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o +obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o suspend-imx6.o endif # i.MX5 based machines diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index cca183a..7fdd4e8 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c @@ -52,6 +52,12 @@ static void __init imx6sl_init_machine(void) imx6q_pm_init(); } +static void __init imx6sl_map_io(void) +{ + debug_ll_io_init(); + imx6_pm_map_io(); +} + static void __init imx6sl_init_irq(void) { imx_init_revision_from_anatop(); @@ -67,7 +73,7 @@ static const char *imx6sl_dt_compat[] __initconst = { }; DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)") - .map_io = debug_ll_io_init, + .map_io = imx6sl_map_io, .init_irq = imx6sl_init_irq, .init_machine = imx6sl_init_machine, .dt_compat = imx6sl_dt_compat, diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S index 415dfa0..edf5599 100644 --- a/arch/arm/mach-imx/suspend-imx6.S +++ b/arch/arm/mach-imx/suspend-imx6.S @@ -16,6 +16,7 @@ #define MX6Q_SRC_GPR1 0x20 #define MX6Q_SRC_GPR2 0x24 #define MX6Q_MMDC_MAPSR 0x404 +#define MX6Q_MMDC_MPDGCTRL0 0x83c #define MX6Q_GPC_IMR1 0x08 #define MX6Q_GPC_IMR2 0x0c #define MX6Q_GPC_IMR3 0x10 @@ -24,6 +25,103 @@ .align 3 + .macro imx6sl_ddr_io_save + + ldr r4, [r8, #0x30c] /* DRAM_DQM0 */ + ldr r5, [r8, #0x310] /* DRAM_DQM1 */ + ldr r6, [r8, #0x314] /* DRAM_DQM2 */ + ldr r7, [r8, #0x318] /* DRAM_DQM3 */ + stmfd r10!, {r4-r7} + + ldr r4, [r8, #0x5c4] /* GPR_B0DS */ + ldr r5, [r8, #0x5cc] /* GPR_B1DS */ + ldr r6, [r8, #0x5d4] /* GPR_B2DS */ + ldr r7, [r8, #0x5d8] /* GPR_B3DS */ + stmfd r10!, {r4-r7} + + ldr r4, [r8, #0x300] /* DRAM_CAS */ + ldr r5, [r8, #0x31c] /* DRAM_RAS */ + ldr r6, [r8, #0x338] /* DRAM_SDCLK_0 */ + ldr r7, [r8, #0x5ac] /* GPR_ADDS*/ + stmfd r10!, {r4-r7} + + ldr r4, [r8, #0x5b0] /* DDRMODE_CTL */ + ldr r5, [r8, #0x5c0] /* DDRMODE */ + ldr r6, [r8, #0x33c] /* DRAM_SODT0*/ + ldr r7, [r8, #0x340] /* DRAM_SODT1*/ + stmfd r10!, {r4-r7} + + ldr r4, [r8, #0x330] /* DRAM_SDCKE0 */ + ldr r5, [r8, #0x334] /* DRAM_SDCKE1 */ + ldr r6, [r8, #0x320] /* DRAM_RESET */ + stmfd r10!, {r4-r6} + + .endm + + .macro imx6sl_ddr_io_restore + + ldmea r10!, {r4-r7} + str r4, [r8, #0x30c] /* DRAM_DQM0 */ + str r5, [r8, #0x310] /* DRAM_DQM1 */ + str r6, [r8, #0x314] /* DRAM_DQM2 */ + str r7, [r8, #0x318] /* DRAM_DQM3 */ + + ldmea r10!, {r4-r7} + str r4, [r8, #0x5c4] /* GPR_B0DS */ + str r5, [r8, #0x5cc] /* GPR_B1DS */ + str r6, [r8, #0x5d4] /* GPR_B2DS */ + str r7, [r8, #0x5d8] /* GPR_B3DS */ + + ldmea r10!, {r4-r7} + str r4, [r8, #0x300] /* DRAM_CAS */ + str r5, [r8, #0x31c] /* DRAM_RAS */ + str r6, [r8, #0x338] /* DRAM_SDCLK_0 */ + str r7, [r8, #0x5ac] /* GPR_ADDS*/ + + ldmea r10!, {r4-r7} + str r4, [r8, #0x5b0] /* DDRMODE_CTL */ + str r5, [r8, #0x5c0] /* DDRMODE */ + str r6, [r8, #0x33c] /* DRAM_SODT0*/ + str r7, [r8, #0x340] /* DRAM_SODT1*/ + + ldmea r10!, {r4-r6} + str r4, [r8, #0x330] /* DRAM_SDCKE0 */ + str r5, [r8, #0x334] /* DRAM_SDCKE1 */ + str r6, [r8, #0x320] /* DRAM_RESET */ + + .endm + + .macro imx6sl_ddr_io_set_lpm + + mov r10, #0 + str r10, [r8, #0x30c] /* DRAM_DQM0 */ + str r10, [r8, #0x310] /* DRAM_DQM1 */ + str r10, [r8, #0x314] /* DRAM_DQM2 */ + str r10, [r8, #0x318] /* DRAM_DQM3 */ + + str r10, [r8, #0x5c4] /* GPR_B0DS */ + str r10, [r8, #0x5cc] /* GPR_B1DS */ + str r10, [r8, #0x5d4] /* GPR_B2DS */ + str r10, [r8, #0x5d8] /* GPR_B3DS */ + + str r10, [r8, #0x300] /* DRAM_CAS */ + str r10, [r8, #0x31c] /* DRAM_RAS */ + str r10, [r8, #0x338] /* DRAM_SDCLK_0 */ + str r10, [r8, #0x5ac] /* GPR_ADDS*/ + + str r10, [r8, #0x5b0] /* DDRMODE_CTL */ + str r10, [r8, #0x5c0] /* DDRMODE */ + str r10, [r8, #0x33c] /* DRAM_SODT0*/ + str r10, [r8, #0x340] /* DRAM_SODT1*/ + + mov r10, #0x80000 + str r10, [r8, #0x320] /* DRAM_RESET */ + mov r10, #0x1000 + str r10, [r8, #0x330] /* DRAM_SDCKE0 */ + str r10, [r8, #0x334] /* DRAM_SDCKE1 */ + + .endm + .macro imx6dl_ddr_io_save ldr r4, [r8, #0x470] /* DRAM_DQM0 */ @@ -401,8 +499,11 @@ ENTRY(imx6_suspend) b ddr_io_save_dsm_done dl_io_dsm_save: cmp r2, #MXC_CPU_IMX6DL - bne ddr_io_save_dsm_done + bne sl_io_save imx6dl_ddr_io_save + b ddr_io_save_dsm_done +sl_io_save: + imx6sl_ddr_io_save ddr_io_save_dsm_done: /* need to sync L2 cache before DSM. */ @@ -435,8 +536,11 @@ poll_dvfs_set_1: b ddr_io_set_lpm_dsm_done dl_io_dsm_set_lpm: cmp r2, #MXC_CPU_IMX6DL - bne ddr_io_set_lpm_dsm_done + bne sl_io_dsm_set_lpm imx6dl_ddr_io_set_lpm + b ddr_io_set_lpm_dsm_done +sl_io_dsm_set_lpm: + imx6sl_ddr_io_set_lpm ddr_io_set_lpm_dsm_done: /* @@ -526,8 +630,32 @@ rbc_loop: b ddr_io_restore_done dl_io_restore: cmp r2, #MXC_CPU_IMX6DL - bne ddr_io_restore_done + bne sl_io_restore imx6dl_ddr_io_restore + b ddr_io_restore_done +sl_io_restore: + imx6sl_ddr_io_restore + ldr r8, =IMX_IO_P2V(MX6Q_MMDC_P0_BASE_ADDR) + /* reset read FIFO, RST_RD_FIFO */ + ldr r7, =MX6Q_MMDC_MPDGCTRL0 + ldr r6, [r8, r7] + orr r6, r6, #(1 << 31) + str r6, [r8, r7] +fifo_reset1_wait: + ldr r6, [r8, r7] + and r6, r6, #(1 << 31) + cmp r6, #0 + bne fifo_reset1_wait + + /* reset FIFO a second time */ + ldr r6, [r8, r7] + orr r6, r6, #(1 << 31) + str r6, [r8, r7] +fifo_reset2_wait: + ldr r6, [r8, r7] + and r6, r6, #(1 << 31) + cmp r6, #0 + bne fifo_reset2_wait ddr_io_restore_done: ldr r8, =IMX_IO_P2V(MX6Q_MMDC_P0_BASE_ADDR) @@ -579,8 +707,32 @@ resume: b ddr_io_restore_dsm_done dl_io_dsm_restore: cmp r2, #MXC_CPU_IMX6DL - bne ddr_io_restore_dsm_done + bne sl_io_dsm_restore imx6dl_ddr_io_restore + b ddr_io_restore_dsm_done +sl_io_dsm_restore: + imx6sl_ddr_io_restore + ldr r8, =MX6Q_MMDC_P0_BASE_ADDR + /* reset read FIFO, RST_RD_FIFO */ + ldr r7, =MX6Q_MMDC_MPDGCTRL0 + ldr r6, [r8, r7] + orr r6, r6, #(1 << 31) + str r6, [r8, r7] +dsm_fifo_reset1_wait: + ldr r6, [r8, r7] + and r6, r6, #(1 << 31) + cmp r6, #0 + bne dsm_fifo_reset1_wait + + /* reset FIFO a second time */ + ldr r6, [r8, r7] + orr r6, r6, #(1 << 31) + str r6, [r8, r7] +dsm_fifo_reset2_wait: + ldr r6, [r8, r7] + and r6, r6, #(1 << 31) + cmp r6, #0 + bne dsm_fifo_reset2_wait ddr_io_restore_dsm_done: ldr r8, =MX6Q_MMDC_P0_BASE_ADDR