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

irqchip: mips-gic: Remove gic_map_to_pin() 



Remove the gic_map_to_pin() function in favour of using the new
write_gic_map_pin() accessor function which isn't any more complex to
use & allows us to drop a level 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/17032/


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

drivers/irqchip/irq-mips-gic.c

+1 −7
Original line number Diff line number Diff line
@@ -81,12 +81,6 @@ static inline void gic_write(unsigned int reg, unsigned long val) 
		return gic_write64(reg, (u64)val);

}



static inline void gic_map_to_pin(unsigned int intr, unsigned int pin)

{

	gic_write32(GIC_REG(SHARED, GIC_SH_INTR_MAP_TO_PIN_BASE) +

		    GIC_SH_MAP_TO_PIN(intr), GIC_MAP_TO_PIN_MSK | pin);

}



static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe)

{

	gic_write(GIC_REG(SHARED, GIC_SH_INTR_MAP_TO_VPE_BASE) +
@@ -491,7 +485,7 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq, 
	int i;



	spin_lock_irqsave(&gic_lock, flags);

	gic_map_to_pin(intr, gic_cpu_pin);

	write_gic_map_pin(intr, GIC_MAP_PIN_MAP_TO_PIN | gic_cpu_pin);

	gic_map_to_vpe(intr, mips_cm_vp_id(vpe));

	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)

		clear_bit(intr, pcpu_masks[i].pcpu_mask);

include/linux/irqchip/mips-gic.h

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

#define GIC_SH_WEDGE_OFS		0x0280



/* Maps Interrupt X to a Pin */

#define GIC_SH_INTR_MAP_TO_PIN_BASE_OFS 0x0500

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



/* Maps Interrupt X to a VPE */

#define GIC_SH_INTR_MAP_TO_VPE_BASE_OFS 0x2000

#define GIC_SH_MAP_TO_VPE_REG_OFF(intr, vpe) \
@@ -84,12 +80,6 @@ 
#define GIC_SH_WEDGE_SET(intr)		((intr) | (0x1 << 31))

#define GIC_SH_WEDGE_CLR(intr)		((intr) & ~(0x1 << 31))



#define GIC_MAP_TO_PIN_SHF		31

#define GIC_MAP_TO_PIN_MSK		(MSK(1) << GIC_MAP_TO_PIN_SHF)

#define GIC_MAP_TO_NMI_SHF		30

#define GIC_MAP_TO_NMI_MSK		(MSK(1) << GIC_MAP_TO_NMI_SHF)

#define GIC_MAP_TO_YQ_SHF		29

#define GIC_MAP_TO_YQ_MSK		(MSK(1) << GIC_MAP_TO_YQ_SHF)

#define GIC_MAP_SHF			0

#define GIC_MAP_MSK			(MSK(6) << GIC_MAP_SHF)

CRA Git | Maintained and supported by SUSTech CRA and CCSE