| Message ID | 1547469671-1487-2-git-send-email-amittomer25@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2,1/9] arm: actions: Add common framework for Actions Semi SoCs | expand |
On 14/01/2019 12:41, Amit Singh Tomar wrote: Hi, > This adds memory regions needed to setup MMU for actions > S900 and S700 SoCs. Please change this sentence and the subject to state that this just moves code, there is nothing new here that gets added. That helps later when people browse through commit messages. With that and the w/s nit below fixed: > Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> > --- > Changes since v1: > * compile sysmap-owl.c against CONFIG_ARM64 now. > --- > arch/arm/mach-owl/Makefile | 3 ++- > arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ > arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- > 3 files changed, 34 insertions(+), 33 deletions(-) > create mode 100644 arch/arm/mach-owl/sysmap-owl.c > delete mode 100644 arch/arm/mach-owl/sysmap-s900.c > > diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile > index 0b181c6..b17fc14 100644 > --- a/arch/arm/mach-owl/Makefile > +++ b/arch/arm/mach-owl/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0+ > > obj-y += soc.o > -obj-y += sysmap-s900.o > +obj-$(CONFIG_ARM64) += sysmap-owl.o > + Please no empty line at the end of files. git should complain about it. Cheers, Andre. > diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c > new file mode 100644 > index 0000000..9d30759 > --- /dev/null > +++ b/arch/arm/mach-owl/sysmap-owl.c > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Memory map for Actions Semi S900/S700 based SoCs. > + * > + * Copyright (C) 2015 Actions Semi Co., Ltd. > + * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > + */ > + > +#include <common.h> > +#include <asm/armv8/mmu.h> > + > +static struct mm_region owl_mem_map[] = { > + { > + .virt = 0x0UL, /* DDR */ > + .phys = 0x0UL, /* DDR */ > + .size = 0x80000000UL, > + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > + PTE_BLOCK_INNER_SHARE > + }, { > + .virt = 0xE0000000UL, /* Peripheral block */ > + .phys = 0xE0000000UL, /* Peripheral block */ > + .size = 0x08000000UL, > + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > + PTE_BLOCK_NON_SHARE | > + PTE_BLOCK_PXN | PTE_BLOCK_UXN > + }, { > + /* List terminator */ > + 0, > + } > +}; > + > +struct mm_region *mem_map = owl_mem_map; > diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-s900.c > deleted file mode 100644 > index f78b639..0000000 > --- a/arch/arm/mach-owl/sysmap-s900.c > +++ /dev/null > @@ -1,32 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Actions Semi S900 Memory map > - * > - * Copyright (C) 2015 Actions Semi Co., Ltd. > - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > - */ > - > -#include <common.h> > -#include <asm/armv8/mmu.h> > - > -static struct mm_region s900_mem_map[] = { > - { > - .virt = 0x0UL, /* DDR */ > - .phys = 0x0UL, /* DDR */ > - .size = 0x80000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > - PTE_BLOCK_INNER_SHARE > - }, { > - .virt = 0xE0000000UL, /* Peripheral block */ > - .phys = 0xE0000000UL, /* Peripheral block */ > - .size = 0x08000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > - PTE_BLOCK_NON_SHARE | > - PTE_BLOCK_PXN | PTE_BLOCK_UXN > - }, { > - /* List terminator */ > - 0, > - } > -}; > - > -struct mm_region *mem_map = s900_mem_map; >
On Mon, Jan 14, 2019 at 06:11:04PM +0530, Amit Singh Tomar wrote: > This adds memory regions needed to setup MMU for actions > S900 and S700 SoCs. > > Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com> > --- > Changes since v1: > * compile sysmap-owl.c against CONFIG_ARM64 now. > --- > arch/arm/mach-owl/Makefile | 3 ++- > arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ > arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- > 3 files changed, 34 insertions(+), 33 deletions(-) > create mode 100644 arch/arm/mach-owl/sysmap-owl.c > delete mode 100644 arch/arm/mach-owl/sysmap-s900.c > > diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile > index 0b181c6..b17fc14 100644 > --- a/arch/arm/mach-owl/Makefile > +++ b/arch/arm/mach-owl/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0+ > > obj-y += soc.o > -obj-y += sysmap-s900.o > +obj-$(CONFIG_ARM64) += sysmap-owl.o > + > diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c > new file mode 100644 > index 0000000..9d30759 > --- /dev/null > +++ b/arch/arm/mach-owl/sysmap-owl.c > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Memory map for Actions Semi S900/S700 based SoCs. Actions Semi Owl series SoCs? With this, Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > + * > + * Copyright (C) 2015 Actions Semi Co., Ltd. > + * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > + */ > + > +#include <common.h> > +#include <asm/armv8/mmu.h> > + > +static struct mm_region owl_mem_map[] = { > + { > + .virt = 0x0UL, /* DDR */ > + .phys = 0x0UL, /* DDR */ > + .size = 0x80000000UL, > + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > + PTE_BLOCK_INNER_SHARE > + }, { > + .virt = 0xE0000000UL, /* Peripheral block */ > + .phys = 0xE0000000UL, /* Peripheral block */ > + .size = 0x08000000UL, > + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > + PTE_BLOCK_NON_SHARE | > + PTE_BLOCK_PXN | PTE_BLOCK_UXN > + }, { > + /* List terminator */ > + 0, > + } > +}; > + > +struct mm_region *mem_map = owl_mem_map; > diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-s900.c > deleted file mode 100644 > index f78b639..0000000 > --- a/arch/arm/mach-owl/sysmap-s900.c > +++ /dev/null > @@ -1,32 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Actions Semi S900 Memory map > - * > - * Copyright (C) 2015 Actions Semi Co., Ltd. > - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > - */ > - > -#include <common.h> > -#include <asm/armv8/mmu.h> > - > -static struct mm_region s900_mem_map[] = { > - { > - .virt = 0x0UL, /* DDR */ > - .phys = 0x0UL, /* DDR */ > - .size = 0x80000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > - PTE_BLOCK_INNER_SHARE > - }, { > - .virt = 0xE0000000UL, /* Peripheral block */ > - .phys = 0xE0000000UL, /* Peripheral block */ > - .size = 0x08000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > - PTE_BLOCK_NON_SHARE | > - PTE_BLOCK_PXN | PTE_BLOCK_UXN > - }, { > - /* List terminator */ > - 0, > - } > -}; > - > -struct mm_region *mem_map = s900_mem_map; > -- > 2.7.4 >
diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile index 0b181c6..b17fc14 100644 --- a/arch/arm/mach-owl/Makefile +++ b/arch/arm/mach-owl/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o -obj-y += sysmap-s900.o +obj-$(CONFIG_ARM64) += sysmap-owl.o + diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c new file mode 100644 index 0000000..9d30759 --- /dev/null +++ b/arch/arm/mach-owl/sysmap-owl.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Memory map for Actions Semi S900/S700 based SoCs. + * + * Copyright (C) 2015 Actions Semi Co., Ltd. + * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + */ + +#include <common.h> +#include <asm/armv8/mmu.h> + +static struct mm_region owl_mem_map[] = { + { + .virt = 0x0UL, /* DDR */ + .phys = 0x0UL, /* DDR */ + .size = 0x80000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xE0000000UL, /* Peripheral block */ + .phys = 0xE0000000UL, /* Peripheral block */ + .size = 0x08000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + +struct mm_region *mem_map = owl_mem_map; diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-s900.c deleted file mode 100644 index f78b639..0000000 --- a/arch/arm/mach-owl/sysmap-s900.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Actions Semi S900 Memory map - * - * Copyright (C) 2015 Actions Semi Co., Ltd. - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - */ - -#include <common.h> -#include <asm/armv8/mmu.h> - -static struct mm_region s900_mem_map[] = { - { - .virt = 0x0UL, /* DDR */ - .phys = 0x0UL, /* DDR */ - .size = 0x80000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_INNER_SHARE - }, { - .virt = 0xE0000000UL, /* Peripheral block */ - .phys = 0xE0000000UL, /* Peripheral block */ - .size = 0x08000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - /* List terminator */ - 0, - } -}; - -struct mm_region *mem_map = s900_mem_map;
This adds memory regions needed to setup MMU for actions S900 and S700 SoCs. Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com> --- Changes since v1: * compile sysmap-owl.c against CONFIG_ARM64 now. --- arch/arm/mach-owl/Makefile | 3 ++- arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c