• Thomas Petazzoni's avatar
    ARM: mvebu: update L2/PCIe deadlock workaround after L2CC cleanup · 01178890
    Thomas Petazzoni authored
    Commit 497a9230 ("ARM: mvebu:
    implement L2/PCIe deadlock workaround") introduced some logic in
    coherency.c to adjust the PL310 cache controller Device Tree node of
    Armada 375 and Armada 38x platform to include the 'arm,io-coherent'
    property if the system is running with hardware I/O coherency enabled.
    
    However, with the L2CC driver cleanup done by Russell King, the
    initialization of the L2CC driver has been moved earlier, and is now
    part of the init_IRQ() ARM function in
    arch/arm/kernel/irq.c. Therefore, calling coherency_init() in
    ->init_time() is now too late, as the Device Tree property gets added
    too late (after the L2CC driver has been initialized).
    
    In order to fix this, this commit removes the ->init_time() callback
    use in board-v7.c and replaces it with an ->init_irq() callback. We
    therefore no longer use the default ->init_irq() callback, but we now
    use the default ->init_time() callback.
    
    In this newly introduced ->init_irq() callback, we call irqchip_init()
    which is the default behavior when ->init_irq() isn't defined, and
    then do the initialization related to the coherency: SCU, coherency
    fabric, and mvebu-mbus (which is needed to start secondary CPUs).
    Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Link: https://lkml.kernel.org/r/1402585772-10405-4-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
    01178890
board-v7.c 5.76 KB