From: u.kleine-koenig@pengutronix.de (Uwe =?iso-8859-1?Q?Kleine-K=F6nig?=) Date: Mon, 11 Oct 2010 10:35:08 +0200 Subject: [PATCH] ARM: allow, but warn, when issuing ioremap() on RAM In-Reply-To: References: <20101007192245.GC26435@n2100.arm.linux.org.uk> <20101008175308.GA10975@n2100.arm.linux.org.uk> <20101008230451.GB10975@n2100.arm.linux.org.uk> <20101008232539.GA28697@kroah.com> <20101008234448.GD10975@n2100.arm.linux.org.uk> <20101009092127.GB20975@n2100.arm.linux.org.uk> Message-ID: <20101011083508.GW29673@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello, On Sun, Oct 10, 2010 at 04:52:36AM +0300, Felipe Contreras wrote: > On Sat, Oct 9, 2010 at 12:21 PM, Russell King - ARM Linux > wrote: > > static unsigned long reserve_mem(struct meminfo *mi, unsigned long size) > > { > > ? ? ? ?unsigned long addr = ~0; > > ? ? ? ?int i; > > > > ? ? ? ?for (i = mi->nr_banks - 1; i >= 0; i--) > > ? ? ? ? ? ? ? ?if (mi->bank[i].size >= size) { > > ? ? ? ? ? ? ? ? ? ? ? ?mi->bank[i].size -= size; > > ? ? ? ? ? ? ? ? ? ? ? ?addr = mi->bank[i].start + mi->bank[i].size; > > ? ? ? ? ? ? ? ? ? ? ? ?break; > > ? ? ? ? ? ? ? ?} > > > > ? ? ? ?return addr; > > } > > > > static void __init my_fixup(struct machine_desc *desc, struct tag *tags, > > ? ? ? ? ? ? ? ? ? ? ? ? ? ?char **cmdline, struct meminfo *mi) > > { > > ? ? ? ?omapfb_buffer_phys = reserve_mem(mi, 32*1048576); > > ? ? ? ?if (omapfb_buffer_phys == ~0) > > ? ? ? ? ? ? ? ?pr_warn("Unable to allocate omapfb buffer\n"); > > } > > > > Then later: > > > > ? ? ? ?omapfb_buffer = ioremap(omapfb_buffer_phys, 32*1048576); > > > > That's a damned simple and direct implementation of exactly what I > > described, and results in something which is much more architecturally > > correct than what's going on today. > > I tried this, it doesn't work. Ack, didn't work. I tried it for arch/arm/mach-mx3/mach-pcm037.c. > > At the time 'fixup' is called, 'meminfo' is empty; the tags haven't > been parsed. So my solution is to move the memblock_add() after > 'reserve', and pass 'meminfo' as an argument: > > --- a/arch/arm/mm/init.c > +++ b/arch/arm/mm/init.c > @@ -272,8 +272,6 @@ void __init arm_memblock_init(struct meminfo *mi, > struct machine_desc *mdesc) > int i; > > memblock_init(); > - for (i = 0; i < mi->nr_banks; i++) > - memblock_add(mi->bank[i].start, mi->bank[i].size); > > /* Register the kernel text, kernel data and initrd with memblock. */ > #ifdef CONFIG_XIP_KERNEL > @@ -295,7 +293,10 @@ void __init arm_memblock_init(struct meminfo *mi, > struct machine_desc *mdesc) > > /* reserve any platform specific memblock areas */ > if (mdesc->reserve) > - mdesc->reserve(); > + mdesc->reserve(mi); > + > + for (i = 0; i < mi->nr_banks; i++) > + memblock_add(mi->bank[i].start, mi->bank[i].size); > > memblock_analyze(); > memblock_dump_all(); Alternatively when calling fixup only after parse_tags in setup_arch() it worked. But I guess this change is not for discussion. OTOH I wonder why fixup gets passed meminfo. It's not very useful if it's not yet filled. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |