mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Teresa Remmet <T.Remmet@phytec.de>
To: "barebox@lists.infradead.org" <barebox@lists.infradead.org>,
	"a.fatoum@pengutronix.de" <a.fatoum@pengutronix.de>
Cc: "andrew.smirnov@gmail.com" <andrew.smirnov@gmail.com>,
	"joacim.zetterling@westermo.com" <joacim.zetterling@westermo.com>,
	"lst@pengutronix.de" <lst@pengutronix.de>
Subject: Re: [PATCH master 3/4] ddr: imx8m: workaround old spreadsheets not initializing ADDRMAP7
Date: Thu, 23 Jun 2022 11:26:58 +0000	[thread overview]
Message-ID: <12b29350135ad59a7e5fb9713a85e8f15e5b4e73.camel@phytec.de> (raw)
In-Reply-To: <6a5b1c31-5c83-b5e9-1912-669121092c62@pengutronix.de>

Am Donnerstag, dem 23.06.2022 um 13:14 +0200 schrieb Ahmad Fatoum:
> Hi Teresa,
> 
> On 23.06.22 12:59, Teresa Remmet wrote:
> > Hello Ahmad,
> > 
> > Am Donnerstag, dem 23.06.2022 um 12:30 +0200 schrieb Ahmad Fatoum:
> > > Older NXP DDR spreadsheets don't initialize ADDRMAP7, leaving it
> > > at
> > > its
> > > POR default of zero. Now that barebox looks at ADDRMAP7 to be
> > > able to
> > > correctly detect bigger memory sizes, barebox proper on out-of-
> > > tree
> > > boards with older spreadsheets may read back 4x times as much RAM
> > > as actually fitted.
> > > 
> > > Work around this by writing a trailing 0xf0f (the neutral ignore-
> > > me
> > > value for the register) if the register wasn't written through
> > > dram_timing_info::ddrc_cfg. We consider this safe to do, because
> > > the DDRC is held in reset while these values are programmed.
> > 
> > have you tried this patch without actually updating the RAM Timings
> > (
> > so patch 2/4)?
> 
> Yes. I've an out-of-tree i.MX8MM board with 1G of LPDDR4 and old RAM
> setup.
> 
> With upstream/next: 4G
> With Workaround: 1G + Warning
> With fixed ADDRMAP7: 1G, no warning
> 
> Reading back 0x3d40021c gives me 0xf0f as expected.
> 
> > I have just played around also setting ADDRMAP7 right before 
> > ddr_cfg_umctl2() without fixing the timings and the register was 0
> > again after startup and so the RAM size wrong.
> > So it seems to me that the value is overwritten/resetted at some
> > other
> > point again ... or maybe I just did something wrong.
> 
> Strange. What SoC/board is this on?

phyCORE-i.MX8MQ but with a not upstreamed 2GB RAM configuration.

I applied this patch now with the same result. Wrong RAM size. 

Regards,
Teresa

> 
> Cheers,
> Ahmad
> 
> > Regards,
> > Teresa
> > 
> > > Fixes: dad2b5636bd8 ("ARM: imx: Add imx8 support for 18 bit SDRAM
> > > row
> > > size handle")
> > > Fixes: 6cf197fa61f9 ("arm: imx: mmdc_size: Increase row_max for
> > > imx8m")
> > > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> > > ---
> > >  drivers/ddr/imx8m/ddr_init.c | 18 ++++++++++++++++++
> > >  drivers/ddr/imx8m/helper.c   |  6 ++++++
> > >  include/soc/imx8m/ddr.h      |  1 +
> > >  3 files changed, 25 insertions(+)
> > > 
> > > diff --git a/drivers/ddr/imx8m/ddr_init.c
> > > b/drivers/ddr/imx8m/ddr_init.c
> > > index ae05b136229c..9a4b4e2ca88a 100644
> > > --- a/drivers/ddr/imx8m/ddr_init.c
> > > +++ b/drivers/ddr/imx8m/ddr_init.c
> > > @@ -13,14 +13,32 @@
> > >  #include <mach/imx8m-regs.h>
> > >  #include <mach/imx8m-ccm-regs.h>
> > >  
> > > +bool imx8m_ddr_old_spreadsheet = true;
> > > +
> > >  static void ddr_cfg_umctl2(struct dram_cfg_param *ddrc_cfg, int
> > > num)
> > >  {
> > >  	int i = 0;
> > >  
> > >  	for (i = 0; i < num; i++) {
> > > +		if (ddrc_cfg->reg == DDRC_ADDRMAP7(0))
> > > +		    imx8m_ddr_old_spreadsheet = false;
> > >  		reg32_write((unsigned long)ddrc_cfg->reg, ddrc_cfg-
> > > > val);
> > >  		ddrc_cfg++;
> > >  	}
> > > +
> > > +	/*
> > > +	 * Older NXP DDR configuration spreadsheets don't initialize
> > > ADDRMAP7,
> > > +	 * which falsifies the memory size read back from the
> > > controller
> > > +	 * in barebox proper.
> > > +	 */
> > > +	if (imx8m_ddr_old_spreadsheet) {
> > > +		pr_warn("Working around old spreadsheet. Please
> > > regenerate\n");
> > > +		/*
> > > +		 * Alternatively, stick { DDRC_ADDRMAP7(0), 0xf0f }
> > > into
> > > +		 * struct dram_timing_info::ddrc_cfg of your old timing
> > > file
> > > +		 */
> > > +		reg32_write(DDRC_ADDRMAP7(0), 0xf0f);
> > > +	}
> > >  }
> > >  
> > >  /*
> > > diff --git a/drivers/ddr/imx8m/helper.c
> > > b/drivers/ddr/imx8m/helper.c
> > > index 94bbb811576d..98e40849584b 100644
> > > --- a/drivers/ddr/imx8m/helper.c
> > > +++ b/drivers/ddr/imx8m/helper.c
> > > @@ -62,6 +62,12 @@ void dram_config_save(struct dram_timing_info
> > > *timing_info,
> > >  		cfg++;
> > >  	}
> > >  
> > > +	if (imx8m_ddr_old_spreadsheet) {
> > > +		cfg->reg = DDRC_ADDRMAP7(0);
> > > +		cfg->val = 0xf0f;
> > > +		cfg++;
> > > +	}
> > > +
> > >  	/* save ddrphy config */
> > >  	saved_timing->ddrphy_cfg = cfg;
> > >  	for (i = 0; i < timing_info->ddrphy_cfg_num; i++) {
> > > diff --git a/include/soc/imx8m/ddr.h b/include/soc/imx8m/ddr.h
> > > index 9ae7cb877686..147a7d499aaf 100644
> > > --- a/include/soc/imx8m/ddr.h
> > > +++ b/include/soc/imx8m/ddr.h
> > > @@ -407,6 +407,7 @@ static inline void reg32setbit(unsigned long
> > > addr, u32 bit)
> > >  #define dwc_ddrphy_apb_rd(addr) \
> > >  	reg32_read(IOMEM(IP2APB_DDRPHY_IPS_BASE_ADDR(0)) + 4 * (addr))
> > >  
> > > +extern bool imx8m_ddr_old_spreadsheet;
> > >  extern struct dram_cfg_param ddrphy_trained_csr[];
> > >  extern uint32_t ddrphy_trained_csr_num;
> > >  
> 
> 
-- 
PHYTEC Messtechnik GmbH | Robert-Koch-Str. 39 | 55129 Mainz, Germany

Geschäftsführer: Dipl.-Ing. Michael Mitezki, Dipl.-Ing. Bodo Huber |
Handelsregister Mainz HRB 4656 | Finanzamt Mainz | St.Nr. 266500608, DE
149059855

  reply	other threads:[~2022-06-23 11:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-23 10:30 [PATCH master 0/4] ARM: i.MX8M: fix various miscalculation of DRAM size Ahmad Fatoum
2022-06-23 10:30 ` [PATCH master 1/4] ARM: i.MX8M: esdctl: ignore ADDRMAP8 for non-DDR4 Ahmad Fatoum
2022-06-23 10:30 ` [PATCH master 2/4] ARM: i.MX8MQ: initialize ADDRMAP7 Ahmad Fatoum
2022-06-23 10:30 ` [PATCH master 3/4] ddr: imx8m: workaround old spreadsheets not initializing ADDRMAP7 Ahmad Fatoum
2022-06-23 10:59   ` Teresa Remmet
2022-06-23 11:14     ` Ahmad Fatoum
2022-06-23 11:26       ` Teresa Remmet [this message]
2022-06-23 11:47         ` Teresa Remmet
2022-06-23 12:04           ` Ahmad Fatoum
2022-06-23 12:41             ` Teresa Remmet
2022-06-23 10:30 ` [PATCH master 4/4] ARM: i.MX8M: imx8mn-evk: disable DDRC memory detection Ahmad Fatoum
2022-06-23 10:37   ` [PATCH] fixup! " Ahmad Fatoum
2022-06-23 10:42 ` [PATCH master 0/4] ARM: i.MX8M: fix various miscalculation of DRAM size Ahmad Fatoum

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=12b29350135ad59a7e5fb9713a85e8f15e5b4e73.camel@phytec.de \
    --to=t.remmet@phytec.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=joacim.zetterling@westermo.com \
    --cc=lst@pengutronix.de \
    /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