From patchwork Thu Jul 18 18:04:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1133800 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SBSKtoQ/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qMVF5glhz9s3l for ; Fri, 19 Jul 2019 04:04:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 721C1C21FE1; Thu, 18 Jul 2019 18:04:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4A032C21F75; Thu, 18 Jul 2019 18:04:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C25B6C21F3F; Thu, 18 Jul 2019 18:04:39 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by lists.denx.de (Postfix) with ESMTPS id 362FCC21F01 for ; Thu, 18 Jul 2019 18:04:39 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id x22so23264111qtp.12 for ; Thu, 18 Jul 2019 11:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JMimpcOEsyRWnDqjVpcr9oXmtTyZdhfCpYyeP7dvKos=; b=SBSKtoQ/1MFOfkQhN4NjZ6l6913s2/BJ/96Ux5aaV6CAWAdEqLD+NaEu3xQegGcJiM MfjYwlyJxO4Db1jqvdYO+aIPTsclhvIfHU0aCNDh4kb3vBYYF8HnDjNCg/VoNN9ZHGtu OfyiGv9T7WNlW6lKvqcnYoIorjDRnU/n9XWjFppOVtL73pSlWH2GM1GUs7+V6IinZ3tE LvM1xFRk0Zq8U5Y6Nr4SvsuRSdp3gEkVqIE5NL4Mm49qVTvSi7zPyRi2JFT8FcCQO4pc dGRk4fYvo74XotbNy5v4Svecu6kXbYfRb1zuNtqco4qR1d1OZZRf3a/pTDlsux2qfniT 0MOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JMimpcOEsyRWnDqjVpcr9oXmtTyZdhfCpYyeP7dvKos=; b=Q1KBTwYF8smV6IJe5aM9ldGZulLwANrm2GR6gFjhNDnIm6GNo8blMAKezwlrjQ8WT+ g2UoGhz+tQ18Y6KcOUcx2gDnnI9g2MH/+yyNOFP9WA6X++IYtr7mi7KSeFVhkwJlJdBN cy4mMHd7J6zX+yA/bd/jxYrK7ZD4ObvKGvOt9amPg/A6XsfDZA05cM1Na4kkYz9sGwDD WuWBbVL8pYqC6r6OPYCs2aDlleeB/ob1TXNLMhcHOgTntjQ7Lg2fvd+K9ilB+7E1vNrd ojUkLw/xHfckVw4gFQZMWJneuonqpwdcsw/rZd9gZOxyf5beGUsmknmF+NMqgSvCjy3r COxg== X-Gm-Message-State: APjAAAUkek9ITASdL02cWj8TjExKfnOEdlHhhsEYnh/DFSmPYopDZnB9 xPpuXhY69OkeB/chi++W5Qs= X-Google-Smtp-Source: APXvYqxKDmfyJtnh1X5haZPL/YWekIpLCoH0LZpzK+6/VGIKfp0D8GSDgK/ChA7J25th4vbtgqwrxw== X-Received: by 2002:ad4:4a92:: with SMTP id h18mr33885838qvx.235.1563473077726; Thu, 18 Jul 2019 11:04:37 -0700 (PDT) Received: from fabio-Latitude-E5450.am.freescale.net ([2804:14c:482:3c8:56cb:1049:60d2:137b]) by smtp.gmail.com with ESMTPSA id y194sm13876737qkb.111.2019.07.18.11.04.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 11:04:37 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Date: Thu, 18 Jul 2019 15:04:22 -0300 Message-Id: <20190718180425.29472-1-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: u-boot@lists.denx.de, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 1/4] imx: Place imx_ddr_size() into a separate file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Place imx_ddr_size() into a separate file. The motivation for doing this is to be able to easily reuse imx_ddr_size() on i.MX7ULP. Currently imx_ddr_size() is inside arch/arm/mach-imx/cpu.c, which is not built for i.MX7ULP. Changing the logic to allow building cpu.c for i.MX7UP would require adding several ifdef's, leading to a not a very elegant solution. To allow better reuse, just place imx_ddr_size() into a common mmdc_size.c file. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cpu.c | 53 --------------------------------- arch/arm/mach-imx/mmdc_size.c | 55 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 54 deletions(-) create mode 100644 arch/arm/mach-imx/mmdc_size.c diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 898478fc4a..0c8519be94 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -20,7 +20,7 @@ obj-y += cpu.o endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) -obj-y += cpu.o speed.o +obj-y += cpu.o speed.o mmdc_size.o obj-$(CONFIG_GPT_TIMER) += timer.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 3a8cf30c06..0b30ff40cd 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -87,59 +87,6 @@ static char *get_reset_cause(void) } #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) -#if defined(CONFIG_MX53) -#define MEMCTL_BASE ESDCTL_BASE_ADDR -#else -#define MEMCTL_BASE MMDC_P0_BASE_ADDR -#endif -static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9}; -static const unsigned char bank_lookup[] = {3, 2}; - -/* these MMDC registers are common to the IMX53 and IMX6 */ -struct esd_mmdc_regs { - uint32_t ctl; - uint32_t pdc; - uint32_t otc; - uint32_t cfg0; - uint32_t cfg1; - uint32_t cfg2; - uint32_t misc; -}; - -#define ESD_MMDC_CTL_GET_ROW(mdctl) ((ctl >> 24) & 7) -#define ESD_MMDC_CTL_GET_COLUMN(mdctl) ((ctl >> 20) & 7) -#define ESD_MMDC_CTL_GET_WIDTH(mdctl) ((ctl >> 16) & 3) -#define ESD_MMDC_CTL_GET_CS1(mdctl) ((ctl >> 30) & 1) -#define ESD_MMDC_MISC_GET_BANK(mdmisc) ((misc >> 5) & 1) - -/* - * imx_ddr_size - return size in bytes of DRAM according MMDC config - * The MMDC MDCTL register holds the number of bits for row, col, and data - * width and the MMDC MDMISC register holds the number of banks. Combine - * all these bits to determine the meme size the MMDC has been configured for - */ -unsigned imx_ddr_size(void) -{ - struct esd_mmdc_regs *mem = (struct esd_mmdc_regs *)MEMCTL_BASE; - unsigned ctl = readl(&mem->ctl); - unsigned misc = readl(&mem->misc); - int bits = 11 + 0 + 0 + 1; /* row + col + bank + width */ - - bits += ESD_MMDC_CTL_GET_ROW(ctl); - bits += col_lookup[ESD_MMDC_CTL_GET_COLUMN(ctl)]; - bits += bank_lookup[ESD_MMDC_MISC_GET_BANK(misc)]; - bits += ESD_MMDC_CTL_GET_WIDTH(ctl); - bits += ESD_MMDC_CTL_GET_CS1(ctl); - - /* The MX6 can do only 3840 MiB of DRAM */ - if (bits == 32) - return 0xf0000000; - - return 1 << bits; -} -#endif - #if defined(CONFIG_DISPLAY_CPUINFO) && !defined(CONFIG_SPL_BUILD) const char *get_imx_type(u32 imxtype) diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c new file mode 100644 index 0000000000..8a3c6bdea6 --- /dev/null +++ b/arch/arm/mach-imx/mmdc_size.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include + +#if defined(CONFIG_MX53) +#define MEMCTL_BASE ESDCTL_BASE_ADDR +#else +#define MEMCTL_BASE MMDC_P0_BASE_ADDR +#endif +static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9}; +static const unsigned char bank_lookup[] = {3, 2}; + +/* these MMDC registers are common to the IMX53 and IMX6 */ +struct esd_mmdc_regs { + uint32_t ctl; + uint32_t pdc; + uint32_t otc; + uint32_t cfg0; + uint32_t cfg1; + uint32_t cfg2; + uint32_t misc; +}; + +#define ESD_MMDC_CTL_GET_ROW(mdctl) ((ctl >> 24) & 7) +#define ESD_MMDC_CTL_GET_COLUMN(mdctl) ((ctl >> 20) & 7) +#define ESD_MMDC_CTL_GET_WIDTH(mdctl) ((ctl >> 16) & 3) +#define ESD_MMDC_CTL_GET_CS1(mdctl) ((ctl >> 30) & 1) +#define ESD_MMDC_MISC_GET_BANK(mdmisc) ((misc >> 5) & 1) + +/* + * imx_ddr_size - return size in bytes of DRAM according MMDC config + * The MMDC MDCTL register holds the number of bits for row, col, and data + * width and the MMDC MDMISC register holds the number of banks. Combine + * all these bits to determine the meme size the MMDC has been configured for + */ +unsigned imx_ddr_size(void) +{ + struct esd_mmdc_regs *mem = (struct esd_mmdc_regs *)MEMCTL_BASE; + unsigned ctl = readl(&mem->ctl); + unsigned misc = readl(&mem->misc); + int bits = 11 + 0 + 0 + 1; /* row + col + bank + width */ + + bits += ESD_MMDC_CTL_GET_ROW(ctl); + bits += col_lookup[ESD_MMDC_CTL_GET_COLUMN(ctl)]; + bits += bank_lookup[ESD_MMDC_MISC_GET_BANK(misc)]; + bits += ESD_MMDC_CTL_GET_WIDTH(ctl); + bits += ESD_MMDC_CTL_GET_CS1(ctl); + + /* The MX6 can do only 3840 MiB of DRAM */ + if (bits == 32) + return 0xf0000000; + + return 1 << bits; +} From patchwork Thu Jul 18 18:04:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1133801 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VENGN9G+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qMVM4BTPz9s3l for ; Fri, 19 Jul 2019 04:04:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4E087C21F93; Thu, 18 Jul 2019 18:04:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B07B3C2202D; Thu, 18 Jul 2019 18:04:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4149BC22004; Thu, 18 Jul 2019 18:04:44 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by lists.denx.de (Postfix) with ESMTPS id 2C94BC21F3F for ; Thu, 18 Jul 2019 18:04:41 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id h18so28155982qtm.9 for ; Thu, 18 Jul 2019 11:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Nkk29tLYfDMYqxQaper/FL/DLCt7BsxpDOMRCRw8Eo=; b=VENGN9G+/CGfmilCkKVBkZr0tryqC7NNeUz8mGSACNDQc8GalwkJm02OO7x+xpwkRA WN4hyFr56hY/FTDJBFtbjgl+yWq2P5qxGEOD/TPgcDtcsGfIQl+j1UtER6X8G1NUjvsk gXUYrBEs/A66OMozMz+7Gl/3WrWDHeuh6AYgrFCt1VgUeLwjW12cqSSyQQ76WZSUGYzq Bi+wvbc+pJuu1H/brcXYn93CNYt+DyFu8cGz2fHVZS8OQaRbHnHwZEM+zCHjLabz5psl JcNqumr+qBbfNUfp9Px8Mq/S38/CUyO/Hx94SbZmvm6+OX+1UhE6aVoOdTd9eoBesVih aJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8Nkk29tLYfDMYqxQaper/FL/DLCt7BsxpDOMRCRw8Eo=; b=oizAT+W6tZriN+8gGvW803nxdp9Fp7+nmcCBOYA8l/0capkO5vhTHdQUwNAdJfy8Ml kdZDzSaP0AH87hh280uR09YQmz+0IJoHd+Y0L8tyIfE2rSq6P2m9dGoZH/MGVimv7IKR RAfSgjdtSKl1I0SzFfsp+GHNbYWcrp1KgOYKJVTXtsjYahXtcr3V+/xKFu/2armQOhT+ 7NIpq23IxcEIyyKRjz7X2LRwnMjp4XSUVqb42A96WeyyIjfgRjrYFZ6DU79XOGgx5fLn sehHDVCA+yDYQiLz2xedBhfuHTDukR1FV05JL8inkruw8o64WmTLBua1lAaAIrA6YCGd 3Aeg== X-Gm-Message-State: APjAAAVuT0xwXX4HSs1DTjNMeWZ8rfvLxzabODZtVieKDkq/mhgLT5AW NGTgLl/P7RoW5fzUK49Haw8= X-Google-Smtp-Source: APXvYqw5aSnnZs/3x/spN8yHOpbKbHR9GDMffOzP9a6tZ5EUs2NKhhRSJYwJjrkLEmwwYNTXP5sDMA== X-Received: by 2002:ac8:394b:: with SMTP id t11mr32871271qtb.286.1563473080120; Thu, 18 Jul 2019 11:04:40 -0700 (PDT) Received: from fabio-Latitude-E5450.am.freescale.net ([2804:14c:482:3c8:56cb:1049:60d2:137b]) by smtp.gmail.com with ESMTPSA id y194sm13876737qkb.111.2019.07.18.11.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 11:04:39 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Date: Thu, 18 Jul 2019 15:04:23 -0300 Message-Id: <20190718180425.29472-2-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718180425.29472-1-festevam@gmail.com> References: <20190718180425.29472-1-festevam@gmail.com> Cc: u-boot@lists.denx.de, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 2/4] imx: mmdc_size: Fix checkpatch warnings X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The original imx_ddr_size() implementation had some issues reported by checkpatch like this: CHECK: Prefer kernel type 'u32' over 'uint32_t' #127: FILE: arch/arm/mach-imx/mmdc_size.c:16: + uint32_t ctl; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #151: FILE: arch/arm/mach-imx/mmdc_size.c:40: + unsigned ctl = readl(&mem->ctl); Fix all of them. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mmdc_size.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c index 8a3c6bdea6..13f587c38a 100644 --- a/arch/arm/mach-imx/mmdc_size.c +++ b/arch/arm/mach-imx/mmdc_size.c @@ -13,13 +13,13 @@ static const unsigned char bank_lookup[] = {3, 2}; /* these MMDC registers are common to the IMX53 and IMX6 */ struct esd_mmdc_regs { - uint32_t ctl; - uint32_t pdc; - uint32_t otc; - uint32_t cfg0; - uint32_t cfg1; - uint32_t cfg2; - uint32_t misc; + u32 ctl; + u32 pdc; + u32 otc; + u32 cfg0; + u32 cfg1; + u32 cfg2; + u32 misc; }; #define ESD_MMDC_CTL_GET_ROW(mdctl) ((ctl >> 24) & 7) @@ -34,11 +34,11 @@ struct esd_mmdc_regs { * width and the MMDC MDMISC register holds the number of banks. Combine * all these bits to determine the meme size the MMDC has been configured for */ -unsigned imx_ddr_size(void) +unsigned int imx_ddr_size(void) { struct esd_mmdc_regs *mem = (struct esd_mmdc_regs *)MEMCTL_BASE; - unsigned ctl = readl(&mem->ctl); - unsigned misc = readl(&mem->misc); + unsigned int ctl = readl(&mem->ctl); + unsigned int misc = readl(&mem->misc); int bits = 11 + 0 + 0 + 1; /* row + col + bank + width */ bits += ESD_MMDC_CTL_GET_ROW(ctl); From patchwork Thu Jul 18 18:04:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1133802 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jN5bdQ5T"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qMWV74jjz9s3l for ; Fri, 19 Jul 2019 04:05:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7A451C22044; Thu, 18 Jul 2019 18:05:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 34A7EC2203D; Thu, 18 Jul 2019 18:04:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E1929C21FFE; Thu, 18 Jul 2019 18:04:47 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by lists.denx.de (Postfix) with ESMTPS id A943AC22037 for ; Thu, 18 Jul 2019 18:04:43 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id 44so584492qtg.11 for ; Thu, 18 Jul 2019 11:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rdekLSwLiJb0PtT0RITHVbuu/rkkLhx5BvQyaMCNIDk=; b=jN5bdQ5TqsuQGdzWwKm+wE5mDlPeUnA3tOqd8z8xd1jnvQILSY/9Uj6dwuGC2daksG YicMxkMRJGw4CG9H0pYojgTUJ1wnghkTV3Bzo+MHj/lNjCp+us4hMfd5m2uVUM8EWMt3 znbHbqUI8qi0mKGe1NmF8x8rwFTeUiYrKSLu6htAXR0//MCvFuDlbhFMYjIVH2Q+b5D2 I34XrNH8FessE57uBi8g59gYzZh0vTcHszHTlSqtPDIuTfV0ufwUXvRJ9Up155Z0Fel8 ft5oyozsxX0WifTReyHmOAEdUVnJnJQNT33wsdJevNCwJQpYPhghUwXBU6aC+RTA47/N iW9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rdekLSwLiJb0PtT0RITHVbuu/rkkLhx5BvQyaMCNIDk=; b=nVmkjsWRdCHUJgbN/K/2hgY0QldmI6W7i+f5d0/VE69VSh9hNSTXa174A1tfrz5591 sJXzsMj7cdcw2JhdoPMzLRZcDXy0amWtTShE9HWSQNV6SIX2uZFAcQgwuwpqYXbyunzA VKWsGkH1aHA5ItuBlLbHCpiS2Gj1zK/8cmKAbPQHlk3G3sP9Z1dZqLv7tmdLrGzkeJ4B 1grbPAo6idLVcDSA+0mY4BIsvlQQRd5Q+AZOIJkEYdPalqDni/hLCvHuaBYXOHyactzZ oABgRKIqn+t1/9W5GER+b1hP6/B+WEEOSU2PijhZlxSVYIGXeoOhXvcPbgh318rKuCLL Bchg== X-Gm-Message-State: APjAAAWd9GNn8l60V5ualUsdGjK8Dpud+DXNu9Q85YR867yX8EcuG+NA x+xl4yxPDR4BDmYnFlNf3RA= X-Google-Smtp-Source: APXvYqwD+wunWdCcgr+qTmJ75Rb0EEBpglqO5R+OUAvCVLZ8kRgtIHlYXv4N8W4TbOxIPtg29E/EZw== X-Received: by 2002:ac8:6b4f:: with SMTP id x15mr32277786qts.14.1563473082624; Thu, 18 Jul 2019 11:04:42 -0700 (PDT) Received: from fabio-Latitude-E5450.am.freescale.net ([2804:14c:482:3c8:56cb:1049:60d2:137b]) by smtp.gmail.com with ESMTPSA id y194sm13876737qkb.111.2019.07.18.11.04.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 11:04:41 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Date: Thu, 18 Jul 2019 15:04:24 -0300 Message-Id: <20190718180425.29472-3-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718180425.29472-1-festevam@gmail.com> References: <20190718180425.29472-1-festevam@gmail.com> Cc: u-boot@lists.denx.de, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 3/4] imx: mmdc_size: Allow building it for i.MX7ULP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" i.MX7ULP uses the same MMDC controller IP as found on i.MX53 and i.MX6, so build mmdc_size.c for i.MX7ULP as well. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/mmdc_size.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 0c8519be94..b29f90b024 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -48,7 +48,7 @@ obj-$(CONFIG_SECURE_BOOT) += hab.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif ifeq ($(SOC),$(filter $(SOC),mx7ulp)) -obj-y += cache.o +obj-y += cache.o mmdc_size.o obj-$(CONFIG_SECURE_BOOT) += hab.o endif ifeq ($(SOC),$(filter $(SOC),vf610)) diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c index 13f587c38a..1a094726aa 100644 --- a/arch/arm/mach-imx/mmdc_size.c +++ b/arch/arm/mach-imx/mmdc_size.c @@ -5,8 +5,10 @@ #if defined(CONFIG_MX53) #define MEMCTL_BASE ESDCTL_BASE_ADDR -#else +#elif defined(CONFIG_MX6) #define MEMCTL_BASE MMDC_P0_BASE_ADDR +#elif defined(CONFIG_MX7ULP) +#define MEMCTL_BASE MMDC0_RBASE #endif static const unsigned char col_lookup[] = {9, 10, 11, 8, 12, 9, 9, 9}; static const unsigned char bank_lookup[] = {3, 2}; From patchwork Thu Jul 18 18:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1133803 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O8ZK2Y14"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qMWk0qNkz9s3l for ; Fri, 19 Jul 2019 04:06:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C2065C21F01; Thu, 18 Jul 2019 18:05:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B626DC22010; Thu, 18 Jul 2019 18:05:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B99DDC22009; Thu, 18 Jul 2019 18:04:49 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by lists.denx.de (Postfix) with ESMTPS id 285EDC21FFE for ; Thu, 18 Jul 2019 18:04:46 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id r21so21230941qke.2 for ; Thu, 18 Jul 2019 11:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=alixEVfS5UVjZwJNnAW2560tIQmEdJGuZ4+R3c8zX7U=; b=O8ZK2Y14AohMSu8vG8r8MSZ7v384GLMZZY+qnCXDL0TJXIJa27mYo5KEan6ql+HL6a KMT/gBzUkLxrK1ske1jHYbO/4EejmYSO3KNDGkSNYMr+ttXPzTF8xE2ufVP+5VpyOf1U OAl4ykXHSbfbijrIdUUuXOW5FtcgQ2bHNuweFqtSzfV+Afa0KcKKDOGJTab+/yg5Db7z Pv/iTUNk5z2FNckmt62Xz0+1y/ENsSSLfxt4GChDPg4MiqGF1AL47L2B12nEgVCmZSAj 1NlXH3zvnKVLCDptLaNsZgJsOYa2cMQblXtCTTa1HtnQz+jBrdEzqKVHjB1/sNgkTCnm GmrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=alixEVfS5UVjZwJNnAW2560tIQmEdJGuZ4+R3c8zX7U=; b=gij6eikrozo6rCEMtuWzAWMQRcxFZ89sY4kW5Hfsp0CX2g2p5YvE6oU/lsHU4lhDXC CiEl163uZuVq/OgF8I//Wekwgdc/YlcZH5E3FaL9H4JpAK6nTf/c+GclzJINaTpYDs79 yjh3tELeGuO7KJkHiI0u9qDeo97BdCC4+XVOwPZ5sn37qjLa3b/p4p9vVJU1Zun/YM5Q Gr90JVPF8wjY860ti3C1lHPKCWBkxN1MzOQWUfFsqDDU5UoVMf5ZY/gli8G/lLr4Zo/w Game/obwoAv2C68T25tTtC2wPYL+ZkoaJLRtN6ZUxH8jpg84KKcCFDxxM1QptJnE5U4+ xaLQ== X-Gm-Message-State: APjAAAXGqkmhbjGqpPXqjeXKRJNhToHlXxhNP3GVs0As3P1ei1AV4eYy 6YmRffZNxJvdsucLY0DchTM= X-Google-Smtp-Source: APXvYqw2YST0J10i6q+u/XAFGzGCCUFKNX7+hoPGvZ9wVtwd5OwnMOQ/aloU58Wgw+Q4v5X9tCMpIg== X-Received: by 2002:a05:620a:1270:: with SMTP id b16mr31122306qkl.333.1563473084922; Thu, 18 Jul 2019 11:04:44 -0700 (PDT) Received: from fabio-Latitude-E5450.am.freescale.net ([2804:14c:482:3c8:56cb:1049:60d2:137b]) by smtp.gmail.com with ESMTPSA id y194sm13876737qkb.111.2019.07.18.11.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 11:04:44 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Date: Thu, 18 Jul 2019 15:04:25 -0300 Message-Id: <20190718180425.29472-4-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718180425.29472-1-festevam@gmail.com> References: <20190718180425.29472-1-festevam@gmail.com> Cc: u-boot@lists.denx.de, uboot-imx@nxp.com Subject: [U-Boot] [PATCH 4/4] mx7ulp_evk: Use imx_ddr_size() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use imx_ddr_size() to retrieve the total DDR size instead of passing a hardcoded memory size. imx_ddr_size() calculates the memory size based on the actual MMDC registers values and is useful to detect misconfigurations, so switch to this more robust approach. Signed-off-by: Fabio Estevam --- board/freescale/mx7ulp_evk/mx7ulp_evk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c index 7527263577..c939514a5f 100644 --- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c +++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c @@ -17,7 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; int dram_init(void) { - gd->ram_size = PHYS_SDRAM_SIZE; + gd->ram_size = imx_ddr_size(); return 0; }