| Message ID | 780bb8c8fd752eeace2fd2fbe1d8ed8572dc0d76.1391170073.git.michal.simek@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 31, 2014 at 6:08 AM, Michal Simek <michal.simek@xilinx.com> wrote: > Reserve space from 0x0 - __pa(swapper_pg_dir), > if kernel is loaded from 0, which is not DMAable. > It is causing problem with MMC driver and others > which want to add dma buffers to this space. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > Jason: I don't think it is worth to bring 0x8000 magic > value and count minimum from it and phys_addr of swapper_pg_dir. > Full 512k of memory shouldn't be used by DMA. > > --- > arch/arm/mach-zynq/common.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) The existing DT reserved range can't be used for this purpose? Rob > > diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c > index 1db2a5ca..8c09a83 100644 > --- a/arch/arm/mach-zynq/common.c > +++ b/arch/arm/mach-zynq/common.c > @@ -25,6 +25,7 @@ > #include <linux/of_irq.h> > #include <linux/of_platform.h> > #include <linux/of.h> > +#include <linux/memblock.h> > #include <linux/irqchip.h> > #include <linux/irqchip/arm-gic.h> > > @@ -41,6 +42,18 @@ > > void __iomem *zynq_scu_base; > > +/** > + * zynq_memory_init - Initialize special memory > + * > + * We need to stop things allocating the low memory as DMA can't work in > + * the 1st 512K of memory. > + */ > +static void __init zynq_memory_init(void) > +{ > + if (!__pa(PAGE_OFFSET)) > + memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir)); > +} > + > static struct platform_device zynq_cpuidle_device = { > .name = "cpuidle-zynq", > }; > @@ -117,5 +130,6 @@ DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") > .init_machine = zynq_init_machine, > .init_time = zynq_timer_init, > .dt_compat = zynq_dt_match, > + .reserve = zynq_memory_init, > .restart = zynq_system_reset, > MACHINE_END > -- > 1.8.2.3 >
On 01/31/2014 06:38 PM, Rob Herring wrote: > On Fri, Jan 31, 2014 at 6:08 AM, Michal Simek <michal.simek@xilinx.com> wrote: >> Reserve space from 0x0 - __pa(swapper_pg_dir), >> if kernel is loaded from 0, which is not DMAable. >> It is causing problem with MMC driver and others >> which want to add dma buffers to this space. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> >> --- >> >> Jason: I don't think it is worth to bring 0x8000 magic >> value and count minimum from it and phys_addr of swapper_pg_dir. >> Full 512k of memory shouldn't be used by DMA. >> >> --- >> arch/arm/mach-zynq/common.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) > > The existing DT reserved range can't be used for this purpose? I expect you are talking about memreserve. Two cases which are valid for us which have the same DTS file with this setup. memreserve 0 - 0x4000 memory node 0x0 - 0x40000000 1. standard kernel starting addr is 0x8000 and kernel is using 1GB memory which just works 2. AMP which we are also using kernel starting for example from 0x10008000 and use just 768MB, 256MB for remoteproc. With memreserve in DTS this ends in mark_bootmem BUG because reserved memory is not in memory which Linux can handle (at least this is my theory). Case 2 require one small fix which Russell is aware of, I have to check status on it. But with this current implementation both cases just work without changing dts file because for both cases dts file is just the same and user decides where kernel is placed and how much memory user wants to use. If you know how to fix this with any better dt description please let me know. I am not aware about it. Thanks, Michal
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 1db2a5ca..8c09a83 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -25,6 +25,7 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/of.h> +#include <linux/memblock.h> #include <linux/irqchip.h> #include <linux/irqchip/arm-gic.h> @@ -41,6 +42,18 @@ void __iomem *zynq_scu_base; +/** + * zynq_memory_init - Initialize special memory + * + * We need to stop things allocating the low memory as DMA can't work in + * the 1st 512K of memory. + */ +static void __init zynq_memory_init(void) +{ + if (!__pa(PAGE_OFFSET)) + memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir)); +} + static struct platform_device zynq_cpuidle_device = { .name = "cpuidle-zynq", }; @@ -117,5 +130,6 @@ DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .init_machine = zynq_init_machine, .init_time = zynq_timer_init, .dt_compat = zynq_dt_match, + .reserve = zynq_memory_init, .restart = zynq_system_reset, MACHINE_END
Reserve space from 0x0 - __pa(swapper_pg_dir), if kernel is loaded from 0, which is not DMAable. It is causing problem with MMC driver and others which want to add dma buffers to this space. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- Jason: I don't think it is worth to bring 0x8000 magic value and count minimum from it and phys_addr of swapper_pg_dir. Full 512k of memory shouldn't be used by DMA. --- arch/arm/mach-zynq/common.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 1.8.2.3