| Message ID | cover.1415058939.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
On Tue, Nov 11, 2014 at 7:27 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 04 November 2014 10:50:08 Simon Horman wrote: >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> >> On E2, the arch timer is hooked up to a different clock, and the CA7's arch >> timer CNTVOFF register must be initialized. >> >> Based on work by Hisashi Nakamura. >> >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > This is one of the patches that broke allmodconfig in linux-next. > > Can you apply the patch below before sending it to arm-soc? > > Thanks, > > Arnd > > --- > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > From: Arnd Bergmann <arnd@arndb.de> > Date: Tue, 11 Nov 2014 16:36:50 +0100 > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > currently be compiled correctly because it uses the isb > instruction that is not available on ARMv6. Adding the > -march=armv7-a flag lets the compiler know that it is safe > to build this file for ARMv7. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tue, Nov 11, 2014 at 08:00:26PM +0100, Geert Uytterhoeven wrote: > On Tue, Nov 11, 2014 at 7:27 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Tuesday 04 November 2014 10:50:08 Simon Horman wrote: > >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> > >> On E2, the arch timer is hooked up to a different clock, and the CA7's arch > >> timer CNTVOFF register must be initialized. > >> > >> Based on work by Hisashi Nakamura. > >> > >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > This is one of the patches that broke allmodconfig in linux-next. > > > > Can you apply the patch below before sending it to arm-soc? > > > > Thanks, > > > > Arnd > > > > --- > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > From: Arnd Bergmann <arnd@arndb.de> > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > currently be compiled correctly because it uses the isb > > instruction that is not available on ARMv6. Adding the > > -march=armv7-a flag lets the compiler know that it is safe > > to build this file for ARMv7. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Agreed. Acked-by: Simon Horman <horms+renesas@verge.net.au> Arnd, what is the best way to get this patch merged? Do you plan to take it or should I?
On Wednesday 12 November 2014 08:59:55 Simon Horman wrote: > > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > > From: Arnd Bergmann <arnd@arndb.de> > > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > > currently be compiled correctly because it uses the isb > > > instruction that is not available on ARMv6. Adding the > > > -march=armv7-a flag lets the compiler know that it is safe > > > to build this file for ARMv7. > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Agreed. > > Acked-by: Simon Horman <horms+renesas@verge.net.au> > > Arnd, what is the best way to get this patch merged? > Do you plan to take it or should I? I believe the problem only exists in your tree at the moment, not in arm-soc, so please apply it on top of the branch that introduced the build error before sending it to arm-soc. If you have already sent a pull request but we haven't taken it yet, send an updated pull request that adds this patch. Arnd
On Wed, Nov 12, 2014 at 09:53:45AM +0100, Arnd Bergmann wrote: > On Wednesday 12 November 2014 08:59:55 Simon Horman wrote: > > > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > > > currently be compiled correctly because it uses the isb > > > > instruction that is not available on ARMv6. Adding the > > > > -march=armv7-a flag lets the compiler know that it is safe > > > > to build this file for ARMv7. > > > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > > > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > > > > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > Agreed. > > > > Acked-by: Simon Horman <horms+renesas@verge.net.au> > > > > Arnd, what is the best way to get this patch merged? > > Do you plan to take it or should I? > > I believe the problem only exists in your tree at the moment, not in arm-soc, > so please apply it on top of the branch that introduced the build error > before sending it to arm-soc. If you have already sent a pull request > but we haven't taken it yet, send an updated pull request that adds > this patch. Sure, will do.
On Tuesday 04 November 2014, Simon Horman wrote: > ---------------------------------------------------------------- > Renesas ARM Based SoC Soc Updates for v3.19 > > * Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled > * Add CA7 arch_timer initialization for r8a7794 > * Handle CA7 arch timer delay > * Add shmobile_init_late() to sh7372 > - This is consistent with other shmobile SoCs Pulled into next/soc. Note that the CONFIG_ZONE_DMA change might not be the best solution, we should probably have CONFIG_ZONE_DMA32 instead as some other architectures do, so you can use the entire lowmem area for DMA allocations. Arnd
Hi Arnd, On Wednesday 19 November 2014 22:05:56 Arnd Bergmann wrote: > On Tuesday 04 November 2014, Simon Horman wrote: > > ---------------------------------------------------------------- > > Renesas ARM Based SoC Soc Updates for v3.19 > > > > * Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled > > * Add CA7 arch_timer initialization for r8a7794 > > * Handle CA7 arch timer delay > > * Add shmobile_init_late() to sh7372 > > > > - This is consistent with other shmobile SoCs > > Pulled into next/soc. > > Note that the CONFIG_ZONE_DMA change might not be the best solution, we > should probably have CONFIG_ZONE_DMA32 instead as some other architectures > do, so you can use the entire lowmem area for DMA allocations. I might be mistaken, but if the machine description doesn't set the dma_zone_size field, arm_dma_zone_size and arm_dma_limit are set to 0 and 0xffffffff respectively. This results in MAX_DMA_ADDRESS being set to 0xffffffff. Doesn't that allow using the entire lowmem area for DMA allocations ?
On Thursday 27 November 2014 22:48:12 Laurent Pinchart wrote: > Hi Arnd, > > On Wednesday 19 November 2014 22:05:56 Arnd Bergmann wrote: > > On Tuesday 04 November 2014, Simon Horman wrote: > > > ---------------------------------------------------------------- > > > Renesas ARM Based SoC Soc Updates for v3.19 > > > > > > * Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled > > > * Add CA7 arch_timer initialization for r8a7794 > > > * Handle CA7 arch timer delay > > > * Add shmobile_init_late() to sh7372 > > > > > > - This is consistent with other shmobile SoCs > > > > Pulled into next/soc. > > > > Note that the CONFIG_ZONE_DMA change might not be the best solution, we > > should probably have CONFIG_ZONE_DMA32 instead as some other architectures > > do, so you can use the entire lowmem area for DMA allocations. > > I might be mistaken, but if the machine description doesn't set the > dma_zone_size field, arm_dma_zone_size and arm_dma_limit are set to 0 and > 0xffffffff respectively. This results in MAX_DMA_ADDRESS being set to > 0xffffffff. Doesn't that allow using the entire lowmem area for DMA > allocations ? Sorry for the late reply. I hadn't actually looked at the details this far, and I would assume that you are right. Arnd
Hi Olof, Hi Kevin, Hi Arnd, Please consider these Renesas ARM based SoC soc updates for v3.19. The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1: Linux 3.18-rc1 (2014-10-19 18:08:38 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.19 for you to fetch changes up to 3794705aeb318c431c07072f04380c78cc5a84ac: ARM: shmobile: Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled (2014-10-28 08:43:03 +0900) ---------------------------------------------------------------- Renesas ARM Based SoC Soc Updates for v3.19 * Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled * Add CA7 arch_timer initialization for r8a7794 * Handle CA7 arch timer delay * Add shmobile_init_late() to sh7372 - This is consistent with other shmobile SoCs ---------------------------------------------------------------- Geert Uytterhoeven (1): ARM: shmobile: sh7372: Add shmobile_init_late() Laurent Pinchart (1): ARM: shmobile: Select CONFIG_ZONE_DMA when CONFIG_ARM_LPAE is enabled Magnus Damm (1): ARM: shmobile: Handle CA7 arch timer delay Ulrich Hecht (1): ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794 arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/setup-rcar-gen2.c | 72 ++++++++++++++++++++++---------- arch/arm/mach-shmobile/setup-sh7372.c | 1 + arch/arm/mach-shmobile/timer.c | 23 ++++++---- 4 files changed, 66 insertions(+), 31 deletions(-)