From patchwork Sun Jan 3 10:11:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1421871 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=TZu6PgF1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D7yj91C1Sz9s24 for ; Sun, 3 Jan 2021 23:28:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4900682483; Sun, 3 Jan 2021 13:28:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="TZu6PgF1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA63B8241C; Sun, 3 Jan 2021 10:43:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20625.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::625]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A10F780829 for ; Sun, 3 Jan 2021 10:42:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H1N2etllPLdc0CsTEulVREo7+W3zGJfVIxR9W47KpzyFWGf3nb76XSqeHwG8lCUB38h1dGMjBYYkKPkM3iT5xlyJU4ZaxhuBFI3y/JavRrCuQi44AEtJIX/IznOEwfyrfnTsLaabqCOBDOIbXydZQP8AzZ2FUbAOU4eVwmgfO9iFfTysTMkVQ2yEWV9P2/njHIZKJ+17luHIO9CTdn5SE9tC+nVHbJGzNyn/ahJBdOMlxqtRx8v/iqxomRbqN4ptDgNyTkX02ptwBNQYJTWoRGhNslLHuPc6Sdxvamg1OwPIGzqA9SSQO4BTahiqR1fDIStJO/R555cSuw9yWHl8yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SkHQ3Izyo6TyfIH5Pp6oaS5eIxxiF/zc/LHMY/S3dwk=; b=gbZeeM99vhyUCiQN6djpg8MxCxpebno+UEPLXSO/yXalXDBnkT8x3jcEYTUgXvi2J05QteAZdqMHvInLOz0CGmFEDEsLszaHBwyGe6p20oOU3ppXwRdxIfzJeRj1WIf3fVf1SVFTebL1gUjeNKOkKeh0XJq6EyzbKp1Tb1uKHQ5o+zKtQzip1WOXk8CunBbCix80xALgIOiepGGxAPPp/IAWqlueMdQB27jOt7oklMj1IinqkguRswmPvzUc71G0fhsLng9uzr7m7AEjjVOsoHXGhCQ55Tbk9YBek2w4AcriT1rz5H31pTp4ivvHyo6Op4L1RYxoZcQSD+AmLVOyuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SkHQ3Izyo6TyfIH5Pp6oaS5eIxxiF/zc/LHMY/S3dwk=; b=TZu6PgF1dZDFNEqLhxUJlVgXO5GZahqKTxhp7MskpBkOMcRvvpp+6pVZMyiZC/3cR5CGY2bhvFtV0MhTbq7s5QglbXA5igaXqKBgIrpkN9Y7jJLCqvklXOXLZuO6Amm8XKhTmRat67TVQDK8Uuyw2a0VDZ/JAptP8So3wChpWEE= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DBAPR04MB7302.eurprd04.prod.outlook.com (2603:10a6:10:1a5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.23; Sun, 3 Jan 2021 09:42:58 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3721.024; Sun, 3 Jan 2021 09:42:58 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH V2 03/12] imx: ddr: imx8m: Move selfref_en after DDR scrub Date: Sun, 3 Jan 2021 18:11:35 +0800 Message-Id: <20210103101144.4375-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210103101144.4375-1-peng.fan@oss.nxp.com> References: <20210103101144.4375-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2P153CA0034.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::21) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2P153CA0034.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.0 via Frontend Transport; Sun, 3 Jan 2021 09:42:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8654f01b-2e3a-43ad-da51-08d8afcbf463 X-MS-TrafficTypeDiagnostic: DBAPR04MB7302: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hd4B9A1VqxjxdhVr4VDQ1fQW0Orj8defqxk3nx3HfFrIAvS3YsUXQl7QhocGORhIvOr5VZofkpkge1dh062iIBVP357AogJBtD9TUsYg857CfCJvIshdYe2i/LLJOG2+ZVCdMcyLdYBaHar06ee5806hdVKyjP44JyvVgmyQxVIyuMt0p2W7UiCOcG2E4Ycq6V6t4hKA+PeU4AwNdcSa16rNrYu9/j4D0rL4d4mkdah4y6biXxqb/e92wxztcJBXOMaDc5eELmMEgO1CpfxcuTAnAUPv3JLm1JbTl0W95Ez4mfStTd0ZlHEmRtundz9JFCkRzbVe5VGBR+ZchFlJYaJkP9LEQ5AzAwYclJdRJwBjiXXqbBKWZNFZZB++4ZJc0kK4gVfDZvDV8J63u1AyV+D5wvfpMPZBJgeagOSHjrlL5NOWa3aDGnYjzU9WgN+g X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(376002)(396003)(346002)(39850400004)(66556008)(52116002)(66476007)(66946007)(6486002)(316002)(956004)(2616005)(16526019)(4326008)(8676002)(5660300002)(186003)(26005)(54906003)(86362001)(6506007)(8936002)(1076003)(83380400001)(2906002)(6512007)(6666004)(478600001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: k1cmBVJ08jX+fnMLOyVibEElXdsvEqV9X/Ii7d/+nKT099orPfAgw9/ds35F0Kg4kcsdJ4qQviIGfjjMbDqoyDsoxiOIc2kZpVSaD2lxwSltHoqrtXuTN+BCJQ3GQyr4KtBA+Zu1ejcGanzhYosUTp4Kr9TdXGfJBPisAp5dgEKwS00acVG4xGGfu/QicLz+cwvToKJSiyCozlHFAyJ/bj/6XFgMDJBHw3KZlZNFuqoX7B/uY06Hi6zkyg949Is2tK6gW1hEKKa4+fc2RPAQQJbR5O36HzjsOrGQaeAZyHyF+Sy6bgsuCDGU9C4fTJ7gTQEuHXtgxvKwGlRwVuP7EXWsSrlGhPMRw3f7Pu7XejuiH6JGqJZclPn22lwH/PYBMorNgpY2eRezKXxwGHeoHopOTUCPXWqlzk2gp69Sjw4hN2mEVRjA1ut/pqpetfeOuXTQ1IlaFFksSc7FONHvlIQZ0MyGzq79iBCI5Kx9OpAJKhygOWIEs5tRfmTpVfO/Bo7Kph+Uzy5L/pCPT0pR+tQqqeCZo/4pCtghHe5+NU9Hz6c/Y8yC5Xu8ncK/2DJeFwgvW1N+eVk3Y6XU0EqaUJDIycjPVOHdGcTaHhGA228KDeHWynFv0KwTQytkrmiMTUSaPLIIDSSZcpBjd/iM2c/Rq6C3rAfF5U0/Uf6UbqrTZhUj3ypXxl432UFPyiCIdhXQtnI3SbnzEd5XpxOK8+mIvFctD7oxF5QYWTH8K+2Aoe5/hie7J0tKYnonttcPPLVWvbS+SWuKEgaC/HpbkyFTEbsr4a+UL9T41qksdECkokUmyVsOi6PFX+dWWbge6LeWLfBtg0fIVIFQvhlGl0PqkTSxhb93yFLuADaLeKG3uuxWdS8/JwesZR684yYrL4H5Kl9iB2pzJxeEQWcFkcre8/Mo3X9BsOqLaJ4zq5UQm31Bh4adByTtvzwNL0+Qfnio4COjZ1QFprfLxbbjISsTAa1cqrHeIRiCVGr7235c990Wy/bft9Tkyodj7qCw X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2021 09:42:58.5292 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 8654f01b-2e3a-43ad-da51-08d8afcbf463 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NUh1lTA2m0dsvjoqIf+Ukli6KsGq1i8anZqnHsCZLMB0HZtYv830Mo4hhZDv4CrE8wCHkgDCbKmFxGpdQnZSGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7302 X-Mailman-Approved-At: Sun, 03 Jan 2021 13:27:56 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li When doing DDR scrub, the DDR may enter into self refresh if the selfref_en is enabled before DDR scrub. This will cause scrub can't complete that SBRSTAT.scrub_done won't be set. Since the selfref_en can be programmed during the course of normal operation, move it after DDR scrub Signed-off-by: Ye Li Acked-by: Peng Fan Signed-off-by: Peng Fan --- drivers/ddr/imx/imx8m/ddr_init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ddr/imx/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m/ddr_init.c index 99a67edfb0..b70bcc383f 100644 --- a/drivers/ddr/imx/imx8m/ddr_init.c +++ b/drivers/ddr/imx/imx8m/ddr_init.c @@ -235,8 +235,6 @@ int ddr_init(struct dram_timing_info *dram_timing) /* Step26: Set back register in Step4 to the original values if desired */ reg32_write(DDRC_RFSHCTL3(0), 0x0000000); - /* enable selfref_en by default */ - setbits_le32(DDRC_PWRCTL(0), 0x1); /* enable port 0 */ reg32_write(DDRC_PCTRL_0(0), 0x00000001); @@ -244,6 +242,9 @@ int ddr_init(struct dram_timing_info *dram_timing) board_dram_ecc_scrub(); + /* enable selfref_en by default */ + setbits_le32(DDRC_PWRCTL(0), 0x1); + /* save the dram timing config into memory */ dram_config_save(dram_timing, CONFIG_SAVED_DRAM_TIMING_BASE);