[PATCH 2/9] davinci: sram: ioremap the davinci_soc_info specified sram regions - Jean-Christophe PLAGNIOL-VILLARD

From: plagnioj@jcrosoft.com (Jean-Christophe PLAGNIOL-VILLARD)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/9] davinci: sram: ioremap the davinci_soc_info specified sram regions
Date: Thu, 26 May 2011 01:16:44 +0200	[thread overview]
Message-ID: <20110525231644.GN863@game.jcrosoft.org> (raw)
In-Reply-To: <20110518155858.GK15292@game.jcrosoft.org>

On 17:58 Wed 18 May     , Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 13:14 Wed 18 May     , Russell King - ARM Linux wrote:
> > On Wed, May 18, 2011 at 05:41:56PM +0530, Nori, Sekhar wrote:
> > > Hi Russell,
> > > 
> > > On Wed, May 18, 2011 at 10:21:40, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > 
> > > > On 17:41 Tue 17 May     , Ben Gardiner wrote:
> > > 
> > > > > diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
> > > > > index 219d4c5..96026df 100644
> > > > > --- a/arch/arm/mach-davinci/sram.c
> > > > > +++ b/arch/arm/mach-davinci/sram.c
> > > > > @@ -8,6 +8,7 @@
> > > > >   * the Free Software Foundation; either version 2 of the License, or
> > > > >   * (at your option) any later version.
> > > > >   */
> > > > > +#include <linux/io.h>
> > > > >  #include <linux/module.h>
> > > > >  #include <linux/init.h>
> > > > >  #include <asm/pv-pool.h>
> > > > > @@ -26,16 +27,23 @@ EXPORT_SYMBOL_GPL(davinci_pv_pool);
> > > > >   */
> > > > >  static int __init sram_init(void)
> > > > >  {
> > > > > +	void *addr;
> > > > >  	unsigned len = davinci_soc_info.sram_len;
> > > > >  	int status = 0;
> > > > >  
> > > > >  	if (len) {
> > > > >  		len = min_t(unsigned, len, SRAM_SIZE);
> > > > > -		davinci_pv_pool = pv_pool_create((void *)SRAM_VIRT,
> > > > > +		addr = ioremap(davinci_soc_info.sram_phys, len);
> > > > > +		if (!addr)
> > > > > +			return -EIO;
> > > > > +
> > > > > +		davinci_pv_pool = pv_pool_create(addr,
> > > > >  					davinci_soc_info.sram_phys, len,
> > > > >  					ilog2(SRAM_GRANULARITY));
> > > > please use the gennalloc directly as discuss with Andrew and Russell my patch
> > > > will present in the .40
> > > 
> > > With Jean-Christophe's patch getting merged, would you be dropping
> > > your PV pool patch?
> > 
> > I'll make that decision once JC's patch has actually been merged.  JC's
> > patch doesn't do any of the consolidation work, so that needs addressing
> > still.
> Agreed this patch just add the support to have physicall address link to the
> pool, the consolidation need to be done on the top of it
> 
> Hope see the merge soon
patch in linus tree
commit 3c8f370ded3483 and 6aae6e0304d

Best Regards,
J.