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

Commit 9d88f22a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq updates from Thomas Gleixner:
 "Two patches from the irq departement:

   - a simple fix to make dummy_irq_chip usable for wakeup scenarios

   - removal of the gic arch_extn hackery.  Now that all users are
     converted we really want to get rid of the interface so people wont
     come up with new use cases"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: gic: Drop support for gic_arch_extn
  genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip
parents 95f3b1f4 1dcc73d7

drivers/irqchip/irq-gic.c

+1 −70
Original line number Diff line number Diff line
@@ -82,19 +82,6 @@ static DEFINE_RAW_SPINLOCK(irq_controller_lock); 
#define NR_GIC_CPU_IF 8

static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;



/*

 * Supported arch specific GIC irq extension.

 * Default make them NULL.

 */

struct irq_chip gic_arch_extn = {

	.irq_eoi	= NULL,

	.irq_mask	= NULL,

	.irq_unmask	= NULL,

	.irq_retrigger	= NULL,

	.irq_set_type	= NULL,

	.irq_set_wake	= NULL,

};



#ifndef MAX_GIC_NR

#define MAX_GIC_NR	1

#endif
@@ -167,34 +154,16 @@ static int gic_peek_irq(struct irq_data *d, u32 offset) 


static void gic_mask_irq(struct irq_data *d)

{

	unsigned long flags;



	raw_spin_lock_irqsave(&irq_controller_lock, flags);

	gic_poke_irq(d, GIC_DIST_ENABLE_CLEAR);

	if (gic_arch_extn.irq_mask)

		gic_arch_extn.irq_mask(d);

	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);

}



static void gic_unmask_irq(struct irq_data *d)

{

	unsigned long flags;



	raw_spin_lock_irqsave(&irq_controller_lock, flags);

	if (gic_arch_extn.irq_unmask)

		gic_arch_extn.irq_unmask(d);

	gic_poke_irq(d, GIC_DIST_ENABLE_SET);

	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);

}



static void gic_eoi_irq(struct irq_data *d)

{

	if (gic_arch_extn.irq_eoi) {

		raw_spin_lock(&irq_controller_lock);

		gic_arch_extn.irq_eoi(d);

		raw_spin_unlock(&irq_controller_lock);

	}



	writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);

}
@@ -251,8 +220,6 @@ static int gic_set_type(struct irq_data *d, unsigned int type) 
{

	void __iomem *base = gic_dist_base(d);

	unsigned int gicirq = gic_irq(d);

	unsigned long flags;

	int ret;



	/* Interrupt configuration for SGIs can't be changed */

	if (gicirq < 16)
@@ -263,25 +230,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type) 
			    type != IRQ_TYPE_EDGE_RISING)

		return -EINVAL;



	raw_spin_lock_irqsave(&irq_controller_lock, flags);



	if (gic_arch_extn.irq_set_type)

		gic_arch_extn.irq_set_type(d, type);



	ret = gic_configure_irq(gicirq, type, base, NULL);



	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);



	return ret;

}



static int gic_retrigger(struct irq_data *d)

{

	if (gic_arch_extn.irq_retrigger)

		return gic_arch_extn.irq_retrigger(d);



	/* the genirq layer expects 0 if we can't retrigger in hardware */

	return 0;

	return gic_configure_irq(gicirq, type, base, NULL);

}



#ifdef CONFIG_SMP
@@ -312,21 +261,6 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
}

#endif



#ifdef CONFIG_PM

static int gic_set_wake(struct irq_data *d, unsigned int on)

{

	int ret = -ENXIO;



	if (gic_arch_extn.irq_set_wake)

		ret = gic_arch_extn.irq_set_wake(d, on);



	return ret;

}



#else

#define gic_set_wake	NULL

#endif



static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;
@@ -385,11 +319,9 @@ static struct irq_chip gic_chip = { 
	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoi_irq,

	.irq_set_type		= gic_set_type,

	.irq_retrigger		= gic_retrigger,

#ifdef CONFIG_SMP

	.irq_set_affinity	= gic_set_affinity,

#endif

	.irq_set_wake		= gic_set_wake,

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

};
@@ -1055,7 +987,6 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start, 
		set_handle_irq(gic_handle_irq);

	}



	gic_chip.flags |= gic_arch_extn.flags;

	gic_dist_init(gic);

	gic_cpu_init(gic);

	gic_pm_init(gic);

include/linux/irqchip/arm-gic.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ 


struct device_node;



extern struct irq_chip gic_arch_extn;



void gic_set_irqchip_flags(unsigned long flags);

void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,

		    u32 offset, struct device_node *);

kernel/irq/dummychip.c

+1 −0
Original line number Diff line number Diff line
@@ -57,5 +57,6 @@ struct irq_chip dummy_irq_chip = { 
	.irq_ack	= noop,

	.irq_mask	= noop,

	.irq_unmask	= noop,

	.flags		= IRQCHIP_SKIP_SET_WAKE,

};

EXPORT_SYMBOL_GPL(dummy_irq_chip);