Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87554b0e authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

irqchip: mips-gic: Drop gic_(re)set_mask() functions 



The gic_set_mask() & gic_reset_mask() functions are now no more
convenient to call than the write_gic_smask() or write_gic_rmask()
accessor functions. Remove the layer of abstraction.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17028/


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

drivers/irqchip/irq-mips-gic.c

+3 −15
Original line number Original line Diff line number Diff line
@@ -92,18 +92,6 @@ static inline void gic_update_bits(unsigned int reg, unsigned long mask, 
	gic_write(reg, regval);

	gic_write(reg, regval);

}

}





static inline void gic_reset_mask(unsigned int intr)

{

	gic_write(GIC_REG(SHARED, GIC_SH_RMASK) + GIC_INTR_OFS(intr),

		  1ul << GIC_INTR_BIT(intr));

}



static inline void gic_set_mask(unsigned int intr)

{

	gic_write(GIC_REG(SHARED, GIC_SH_SMASK) + GIC_INTR_OFS(intr),

		  1ul << GIC_INTR_BIT(intr));

}



static inline void gic_set_polarity(unsigned int intr, unsigned int pol)

static inline void gic_set_polarity(unsigned int intr, unsigned int pol)

{

{

	gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_POLARITY) +

	gic_update_bits(GIC_REG(SHARED, GIC_SH_SET_POLARITY) +
@@ -260,12 +248,12 @@ static void gic_handle_shared_int(bool chained) 




static void gic_mask_irq(struct irq_data *d)

static void gic_mask_irq(struct irq_data *d)

{

{

	gic_reset_mask(GIC_HWIRQ_TO_SHARED(d->hwirq));

	write_gic_rmask(BIT(GIC_HWIRQ_TO_SHARED(d->hwirq)));

}

}





static void gic_unmask_irq(struct irq_data *d)

static void gic_unmask_irq(struct irq_data *d)

{

{

	gic_set_mask(GIC_HWIRQ_TO_SHARED(d->hwirq));

	write_gic_smask(BIT(GIC_HWIRQ_TO_SHARED(d->hwirq)));

}

}





static void gic_ack_irq(struct irq_data *d)

static void gic_ack_irq(struct irq_data *d)
@@ -478,7 +466,7 @@ static void __init gic_basic_init(void) 
	for (i = 0; i < gic_shared_intrs; i++) {

	for (i = 0; i < gic_shared_intrs; i++) {

		gic_set_polarity(i, GIC_POL_POS);

		gic_set_polarity(i, GIC_POL_POS);

		gic_set_trigger(i, GIC_TRIG_LEVEL);

		gic_set_trigger(i, GIC_TRIG_LEVEL);

		gic_reset_mask(i);

		write_gic_rmask(BIT(i));

	}

	}





	for (i = 0; i < gic_vpes; i++) {

	for (i = 0; i < gic_vpes; i++) {

include/linux/irqchip/mips-gic.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -64,10 +64,6 @@ 
/* Set/Clear corresponding bit in Edge Detect Register */

/* Set/Clear corresponding bit in Edge Detect Register */

#define GIC_SH_WEDGE_OFS		0x0280

#define GIC_SH_WEDGE_OFS		0x0280





/* Mask manipulation */

#define GIC_SH_RMASK_OFS		0x0300

#define GIC_SH_SMASK_OFS		0x0380



/* Maps Interrupt X to a Pin */

/* Maps Interrupt X to a Pin */

#define GIC_SH_INTR_MAP_TO_PIN_BASE_OFS 0x0500

#define GIC_SH_INTR_MAP_TO_PIN_BASE_OFS 0x0500

#define GIC_SH_MAP_TO_PIN(intr)		(4 * (intr))

#define GIC_SH_MAP_TO_PIN(intr)		(4 * (intr))