Skip to content

Commit f469cde

Browse files
Magnus Dammhorms
authored andcommitted
ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds
As of commit 9a1091e ("irqchip: gic: Support hierarchy irq domain."), Marzen legacy hangs during boot with: Image Name: 'Linux-3.19.0-rc4' Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3445880 Bytes = 3.3 MiB Load Address: 60008000 Entry Point: 60008000 Verifying Checksum ... OK Loading Kernel Image ... OK OK Starting kernel ... Enabling DEBUG_LL does not seem to change the situation, however this patch by itself fixes this issue and re-enables normal boot. This issue happens because the IRQ numbers of the GIC are now virtual, and no longer match the hardcoded hardware IRQ numbers in the platform board code. To fix this, instantiate the GIC from platform board code when compiling a legacy kernel, like is done for the sh73a0, r8a7740 and r8a7778 legacy code. Follows same style as the r8a7740 legacy GIC fix by Geert Uytterhoeven, thanks to him for the initial work. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
1 parent 1fbbc3f commit f469cde

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

arch/arm/mach-shmobile/setup-r8a7779.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,10 +724,17 @@ static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
724724

725725
void __init r8a7779_init_irq_dt(void)
726726
{
727+
#ifdef CONFIG_ARCH_SHMOBILE_LEGACY
728+
void __iomem *gic_dist_base = ioremap_nocache(0xf0001000, 0x1000);
729+
void __iomem *gic_cpu_base = ioremap_nocache(0xf0000100, 0x1000);
730+
#endif
727731
gic_arch_extn.irq_set_wake = r8a7779_set_wake;
728732

733+
#ifdef CONFIG_ARCH_SHMOBILE_LEGACY
734+
gic_init(0, 29, gic_dist_base, gic_cpu_base);
735+
#else
729736
irqchip_init();
730-
737+
#endif
731738
/* route all interrupts to ARM */
732739
__raw_writel(0xffffffff, INT2NTSR0);
733740
__raw_writel(0x3fffffff, INT2NTSR1);

0 commit comments

Comments
 (0)