Commit d1e1c31c authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

ARM: i.MX: Fix FIQ interrupt handling for TZIC 



IRQ number should be translated from VIRQ to HWIRQ for TZIC.
As a solution for this issue, move existing translation code
from AVIC to common place.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4dbc39e9

arch/arm/mach-imx/avic.c

+8 −11
Original line number Diff line number Diff line
@@ -55,23 +55,20 @@ static void __iomem *avic_base; 
static struct irq_domain *domain;



#ifdef CONFIG_FIQ

static int avic_set_irq_fiq(unsigned int irq, unsigned int type)

static int avic_set_irq_fiq(unsigned int hwirq, unsigned int type)

{

	struct irq_data *d = irq_get_irq_data(irq);

	unsigned int irqt;



	irq = d->hwirq;



	if (irq >= AVIC_NUM_IRQS)

	if (hwirq >= AVIC_NUM_IRQS)

		return -EINVAL;



	if (irq < AVIC_NUM_IRQS / 2) {

		irqt = imx_readl(avic_base + AVIC_INTTYPEL) & ~(1 << irq);

		imx_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEL);

	if (hwirq < AVIC_NUM_IRQS / 2) {

		irqt = imx_readl(avic_base + AVIC_INTTYPEL) & ~(1 << hwirq);

		imx_writel(irqt | (!!type << hwirq), avic_base + AVIC_INTTYPEL);

	} else {

		irq -= AVIC_NUM_IRQS / 2;

		irqt = imx_readl(avic_base + AVIC_INTTYPEH) & ~(1 << irq);

		imx_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEH);

		hwirq -= AVIC_NUM_IRQS / 2;

		irqt = imx_readl(avic_base + AVIC_INTTYPEH) & ~(1 << hwirq);

		imx_writel(irqt | (!!type << hwirq), avic_base + AVIC_INTTYPEH);

	}



	return 0;

arch/arm/mach-imx/irq-common.c

+4 −2
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ int mxc_set_irq_fiq(unsigned int irq, unsigned int type) 
	gc = irq_get_chip_data(irq);

	if (gc && gc->private) {

		exirq = gc->private;

		if (exirq->set_irq_fiq)

			ret = exirq->set_irq_fiq(irq, type);

		if (exirq->set_irq_fiq) {

			struct irq_data *d = irq_get_irq_data(irq);

			ret = exirq->set_irq_fiq(irqd_to_hwirq(d), type);

		}

	}



	return ret;

arch/arm/mach-imx/tzic.c

+3 −3
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ static struct irq_domain *domain; 
#define TZIC_NUM_IRQS 128



#ifdef CONFIG_FIQ

static int tzic_set_irq_fiq(unsigned int irq, unsigned int type)

static int tzic_set_irq_fiq(unsigned int hwirq, unsigned int type)

{

	unsigned int index, mask, value;



	index = irq >> 5;

	index = hwirq >> 5;

	if (unlikely(index >= 4))

		return -EINVAL;

	mask = 1U << (irq & 0x1F);

	mask = 1U << (hwirq & 0x1F);



	value = imx_readl(tzic_base + TZIC_INTSEC0(index)) | mask;

	if (type)

CRA Git | Maintained and supported by SUSTech CRA and CCSE