Commit 93f29361 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ralf Baechle
Browse files

MIPS: bcm63xx: Convert to new irq_chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2176/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3fb8818b

arch/mips/bcm63xx/irq.c

+32 −45
Original line number Diff line number Diff line
@@ -76,88 +76,80 @@ asmlinkage void plat_irq_dispatch(void) 
 * internal IRQs operations: only mask/unmask on PERF irq mask

 * register.

 */

static inline void bcm63xx_internal_irq_mask(unsigned int irq)

static inline void bcm63xx_internal_irq_mask(struct irq_data *d)

{

	unsigned int irq = d->irq - IRQ_INTERNAL_BASE;

	u32 mask;



	irq -= IRQ_INTERNAL_BASE;

	mask = bcm_perf_readl(PERF_IRQMASK_REG);

	mask &= ~(1 << irq);

	bcm_perf_writel(mask, PERF_IRQMASK_REG);

}



static void bcm63xx_internal_irq_unmask(unsigned int irq)

static void bcm63xx_internal_irq_unmask(struct irq_data *d)

{

	unsigned int irq = d->irq - IRQ_INTERNAL_BASE;

	u32 mask;



	irq -= IRQ_INTERNAL_BASE;

	mask = bcm_perf_readl(PERF_IRQMASK_REG);

	mask |= (1 << irq);

	bcm_perf_writel(mask, PERF_IRQMASK_REG);

}



static unsigned int bcm63xx_internal_irq_startup(unsigned int irq)

{

	bcm63xx_internal_irq_unmask(irq);

	return 0;

}



/*

 * external IRQs operations: mask/unmask and clear on PERF external

 * irq control register.

 */

static void bcm63xx_external_irq_mask(unsigned int irq)

static void bcm63xx_external_irq_mask(struct irq_data *d)

{

	unsigned int irq = d->irq - IRQ_EXT_BASE;

	u32 reg;



	irq -= IRQ_EXT_BASE;

	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);

	reg &= ~EXTIRQ_CFG_MASK(irq);

	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);

}



static void bcm63xx_external_irq_unmask(unsigned int irq)

static void bcm63xx_external_irq_unmask(struct irq_data *d)

{

	unsigned int irq = d->irq - IRQ_EXT_BASE;

	u32 reg;



	irq -= IRQ_EXT_BASE;

	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);

	reg |= EXTIRQ_CFG_MASK(irq);

	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);

}



static void bcm63xx_external_irq_clear(unsigned int irq)

static void bcm63xx_external_irq_clear(struct irq_data *d)

{

	unsigned int irq = d->irq - IRQ_EXT_BASE;

	u32 reg;



	irq -= IRQ_EXT_BASE;

	reg = bcm_perf_readl(PERF_EXTIRQ_CFG_REG);

	reg |= EXTIRQ_CFG_CLEAR(irq);

	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);

}



static unsigned int bcm63xx_external_irq_startup(unsigned int irq)

static unsigned int bcm63xx_external_irq_startup(struct irq_data *d)

{

	set_c0_status(0x100 << (irq - IRQ_MIPS_BASE));

	set_c0_status(0x100 << (d->irq - IRQ_MIPS_BASE));

	irq_enable_hazard();

	bcm63xx_external_irq_unmask(irq);

	bcm63xx_external_irq_unmask(d);

	return 0;

}



static void bcm63xx_external_irq_shutdown(unsigned int irq)

static void bcm63xx_external_irq_shutdown(struct irq_data *d)

{

	bcm63xx_external_irq_mask(irq);

	clear_c0_status(0x100 << (irq - IRQ_MIPS_BASE));

	bcm63xx_external_irq_mask(d);

	clear_c0_status(0x100 << (d->irq - IRQ_MIPS_BASE));

	irq_disable_hazard();

}



static int bcm63xx_external_irq_set_type(unsigned int irq,

static int bcm63xx_external_irq_set_type(struct irq_data *d,

					 unsigned int flow_type)

{

	unsigned int irq = d->irq - IRQ_EXT_BASE;

	u32 reg;

	struct irq_desc *desc = irq_desc + irq;



	irq -= IRQ_EXT_BASE;



	flow_type &= IRQ_TYPE_SENSE_MASK;
@@ -199,37 +191,32 @@ static int bcm63xx_external_irq_set_type(unsigned int irq, 
	}

	bcm_perf_writel(reg, PERF_EXTIRQ_CFG_REG);



	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))  {

		desc->status |= IRQ_LEVEL;

		desc->handle_irq = handle_level_irq;

	} else {

		desc->handle_irq = handle_edge_irq;

	}

	irqd_set_trigger_type(d, flow_type);

	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))

		__irq_set_handler_locked(d->irq, handle_level_irq);

	else

		__irq_set_handler_locked(d->irq, handle_edge_irq);



	return 0;

	return IRQ_SET_MASK_OK_NOCOPY;

}



static struct irq_chip bcm63xx_internal_irq_chip = {

	.name		= "bcm63xx_ipic",

	.startup	= bcm63xx_internal_irq_startup,

	.shutdown	= bcm63xx_internal_irq_mask,



	.mask		= bcm63xx_internal_irq_mask,

	.mask_ack	= bcm63xx_internal_irq_mask,

	.unmask		= bcm63xx_internal_irq_unmask,

	.irq_mask	= bcm63xx_internal_irq_mask,

	.irq_unmask	= bcm63xx_internal_irq_unmask,

};



static struct irq_chip bcm63xx_external_irq_chip = {

	.name		= "bcm63xx_epic",

	.startup	= bcm63xx_external_irq_startup,

	.shutdown	= bcm63xx_external_irq_shutdown,

	.irq_startup	= bcm63xx_external_irq_startup,

	.irq_shutdown	= bcm63xx_external_irq_shutdown,



	.ack		= bcm63xx_external_irq_clear,

	.irq_ack	= bcm63xx_external_irq_clear,



	.mask		= bcm63xx_external_irq_mask,

	.unmask		= bcm63xx_external_irq_unmask,

	.irq_mask	= bcm63xx_external_irq_mask,

	.irq_unmask	= bcm63xx_external_irq_unmask,



	.set_type	= bcm63xx_external_irq_set_type,

	.irq_set_type	= bcm63xx_external_irq_set_type,

};



static struct irqaction cpu_ip2_cascade_action = {