From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/7] ARM: i.MX6: esdctl: Fix memsize calculation for 4GiB/cs
Date: Fri, 1 Apr 2016 14:10:38 +0200 [thread overview]
Message-ID: <1459512644-8581-1-git-send-email-s.hauer@pengutronix.de> (raw)
On i.MX6 a single chipselect can have 4GiB, which overflows a 32bit
type, so imx6_mmdc_sdram_size() must return a u64 to support this case.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/esdctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index e633b62..66ba51c 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -171,11 +171,11 @@ static inline unsigned long imx_v4_sdram_size(void __iomem *esdctlbase, int cs)
* MMDC - found on i.MX6
*/
-static inline unsigned long imx6_mmdc_sdram_size(void __iomem *mmdcbase, int cs)
+static inline u64 imx6_mmdc_sdram_size(void __iomem *mmdcbase, int cs)
{
u32 ctlval = readl(mmdcbase + MDCTL);
u32 mdmisc = readl(mmdcbase + MDMISC);
- unsigned long size;
+ u64 size;
int rows, cols, width = 2, banks = 8;
if (cs == 0 && !(ctlval & MMDCx_MDCTL_SDE0))
@@ -201,7 +201,7 @@ static inline unsigned long imx6_mmdc_sdram_size(void __iomem *mmdcbase, int cs)
if (mdmisc & MMDCx_MDMISC_DDR_4_BANKS)
banks = 4;
- size = (1 << cols) * (1 << rows) * banks * width;
+ size = (u64)(1 << cols) * (1 << rows) * banks * width;
return size;
}
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2016-04-01 12:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 12:10 Sascha Hauer [this message]
2016-04-01 12:10 ` [PATCH 2/7] ARM: i.MX6: esdctl: Fix CS0_end " Sascha Hauer
2016-04-01 12:10 ` [PATCH 3/7] ARM: i.MX: remove unused imx-flash-header.h Sascha Hauer
2016-04-01 12:10 ` [PATCH 4/7] ARM: i.MX: xload-esdhc: Add GPL header Sascha Hauer
2016-04-01 12:10 ` [PATCH 5/7] ARM: i.MX: xload-esdhc: Fix typo successul -> successful Sascha Hauer
2016-04-01 12:10 ` [PATCH 6/7] ARM: i.MX: xload-esdhc: Add debug messages Sascha Hauer
2016-04-01 12:10 ` [PATCH 7/7] ARM: i.MX: xload-esdhc: Find entry in image Sascha Hauer
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=1459512644-8581-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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