20499ed3c0
commit 9d67412f24cc3a2c05f35f7c856addb07a2960ce upstream.
iop32x is one of the last platforms to use IRQ 0, and this has apparently
stopped working in a 2014 cleanup without anyone noticing. This interrupt
is used for the DMA engine, so most likely this has not actually worked
in the past 7 years, but it's also not essential for using this board.
I'm splitting out this change from my GENERIC_IRQ_MULTI_HANDLER
conversion so it can be backported if anyone cares.
Fixes: a71b092a9c ("ARM: Convert handle_IRQ to use __handle_domain_irq")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[ardb: take +1 offset into account in mask/unmask and init as well]
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Marc Zyngier <maz@kernel.org>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com> # ARMv7M
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
73 lines
1.4 KiB
C
73 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* arch/arm/mach-iop32x/irq.c
|
|
*
|
|
* Generic IOP32X IRQ handling functionality
|
|
*
|
|
* Author: Rory Bolt <rorybolt@pacbell.net>
|
|
* Copyright (C) 2002 Rory Bolt
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/list.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include "hardware.h"
|
|
|
|
static u32 iop32x_mask;
|
|
|
|
static void intctl_write(u32 val)
|
|
{
|
|
asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val));
|
|
}
|
|
|
|
static void intstr_write(u32 val)
|
|
{
|
|
asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val));
|
|
}
|
|
|
|
static void
|
|
iop32x_irq_mask(struct irq_data *d)
|
|
{
|
|
iop32x_mask &= ~(1 << (d->irq - 1));
|
|
intctl_write(iop32x_mask);
|
|
}
|
|
|
|
static void
|
|
iop32x_irq_unmask(struct irq_data *d)
|
|
{
|
|
iop32x_mask |= 1 << (d->irq - 1);
|
|
intctl_write(iop32x_mask);
|
|
}
|
|
|
|
struct irq_chip ext_chip = {
|
|
.name = "IOP32x",
|
|
.irq_ack = iop32x_irq_mask,
|
|
.irq_mask = iop32x_irq_mask,
|
|
.irq_unmask = iop32x_irq_unmask,
|
|
};
|
|
|
|
void __init iop32x_init_irq(void)
|
|
{
|
|
int i;
|
|
|
|
iop_init_cp6_handler();
|
|
|
|
intctl_write(0);
|
|
intstr_write(0);
|
|
if (machine_is_glantank() ||
|
|
machine_is_iq80321() ||
|
|
machine_is_iq31244() ||
|
|
machine_is_n2100() ||
|
|
machine_is_em7210())
|
|
*IOP3XX_PCIIRSR = 0x0f;
|
|
|
|
for (i = 1; i < NR_IRQS; i++) {
|
|
irq_set_chip_and_handler(i, &ext_chip, handle_level_irq);
|
|
irq_clear_status_flags(i, IRQ_NOREQUEST | IRQ_NOPROBE);
|
|
}
|
|
}
|