Skip to content

Commit e119fc4

Browse files
James Hogangregkh
authored andcommitted
irqchip: mips-gic: SYNC after enabling GIC region
commit 2c0e8382386f618c85d20cb05e7cf7df8cdd382c upstream. A SYNC is required between enabling the GIC region and actually trying to use it, even if the first access is a read, otherwise its possible depending on the timing (and in my case depending on the precise alignment of certain kernel code) to hit CM bus errors on that first access. Add the SYNC straight after setting the GIC base. [paul.burton@imgtec.com: Changes later in this series increase our likelihood of hitting this by reducing the amount of code that runs between enabling the GIC & accessing it.] Fixes: a705727 ("irqchip: mips-gic: Add device-tree support") Signed-off-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Paul Burton <paul.burton@imgtec.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/17019/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cd99a4f commit e119fc4

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/irqchip/irq-mips-gic.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,8 +915,11 @@ static int __init gic_of_init(struct device_node *node,
915915
gic_len = resource_size(&res);
916916
}
917917

918-
if (mips_cm_present())
918+
if (mips_cm_present()) {
919919
write_gcr_gic_base(gic_base | CM_GCR_GIC_BASE_GICEN_MSK);
920+
/* Ensure GIC region is enabled before trying to access it */
921+
__sync();
922+
}
920923
gic_present = true;
921924

922925
__gic_init(gic_base, gic_len, cpu_vec, 0, node);

0 commit comments

Comments
 (0)