| Message ID | 1465714475-24111-2-git-send-email-ysato@users.sourceforge.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/12/2016 9:54 AM, Yoshinori Sato wrote: > sh used P1 address space in early device tree. > So need convert P1 to physical address before reserve memory. > > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> > --- > arch/sh/boards/of-generic.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c > index 57d45dc..fe2d917 100644 > --- a/arch/sh/boards/of-generic.c > +++ b/arch/sh/boards/of-generic.c [...] > @@ -203,3 +204,14 @@ static int __init sh_of_device_init(void) > return 0; > } > arch_initcall_sync(sh_of_device_init); > + > +int __init early_init_dt_reserve_memory_arch(phys_addr_t base, > + phys_addr_t size, bool nomap) > +{ > + if (nomap) > + return memblock_remove(base, size); > + > + if (base >= P1SEG) > + base = base & ~P1SEG; base &= ~P1SEG; > + return memblock_reserve(base, size); > +} MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c index 57d45dc..fe2d917 100644 --- a/arch/sh/boards/of-generic.c +++ b/arch/sh/boards/of-generic.c @@ -15,6 +15,7 @@ #include <linux/clocksource.h> #include <linux/irqchip.h> #include <linux/clk-provider.h> +#include <linux/memblock.h> #include <asm/machvec.h> #include <asm/rtc.h> @@ -203,3 +204,14 @@ static int __init sh_of_device_init(void) return 0; } arch_initcall_sync(sh_of_device_init); + +int __init early_init_dt_reserve_memory_arch(phys_addr_t base, + phys_addr_t size, bool nomap) +{ + if (nomap) + return memblock_remove(base, size); + + if (base >= P1SEG) + base = base & ~P1SEG; + return memblock_reserve(base, size); +}
sh used P1 address space in early device tree. So need convert P1 to physical address before reserve memory. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- arch/sh/boards/of-generic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)