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

Commit b4b90341 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
  [ARM] 3683/2:  ARM: Convert at91rm9200 to generic irq handling
  [ARM] 3682/2:  ARM: Convert ixp4xx to generic irq handling
  [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
  [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
  [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
  [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
  [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
  [ARM] 3697/1: ARM: Convert shark to generic irq handling
  [ARM] 3696/1: ARM: Convert clps711x to generic irq handling
  [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
  [ARM] 3693/1: ARM: Convert omap1 to generic irq handling
  [ARM] 3691/1: ARM: Convert imx to generic irq handling
  [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
  [ARM] 3687/1: ARM: Convert integrator to generic irq handling
  [ARM] 3685/1: ARM: Convert pxa to generic irq handling
  [ARM] 3684/1: ARM: Convert l7200 to generic irq handling
  [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
  [ARM] 3680/1: ARM: Convert footbridge to generic irq handling
  [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
  [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
  ...

Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
code).
parents a8c4c20d 07d265dd

arch/arm/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -47,6 +47,18 @@ config MCA 
	  <file:Documentation/mca.txt> (and especially the web page given

	  there) before attempting to build an MCA bus kernel.



config GENERIC_HARDIRQS

	bool

	default y



config HARDIRQS_SW_RESEND

	bool

	default y



config GENERIC_IRQ_PROBE

	bool

	default y



config RWSEM_GENERIC_SPINLOCK

	bool

	default y

arch/arm/common/gic.c

+16 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


static void __iomem *gic_dist_base;

static void __iomem *gic_cpu_base;

static DEFINE_SPINLOCK(irq_controller_lock);



/*

 * Routines to acknowledge, disable and enable interrupts
@@ -52,32 +53,45 @@ static void __iomem *gic_cpu_base; 
static void gic_ack_irq(unsigned int irq)

{

	u32 mask = 1 << (irq % 32);



	spin_lock(&irq_controller_lock);

	writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);

	writel(irq, gic_cpu_base + GIC_CPU_EOI);

	spin_unlock(&irq_controller_lock);

}



static void gic_mask_irq(unsigned int irq)

{

	u32 mask = 1 << (irq % 32);



	spin_lock(&irq_controller_lock);

	writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);

	spin_unlock(&irq_controller_lock);

}



static void gic_unmask_irq(unsigned int irq)

{

	u32 mask = 1 << (irq % 32);



	spin_lock(&irq_controller_lock);

	writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4);

	spin_unlock(&irq_controller_lock);

}



#ifdef CONFIG_SMP

static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu)

static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)

{

	void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3);

	unsigned int shift = (irq % 4) * 8;

	unsigned int cpu = first_cpu(mask_val);

	u32 val;



	spin_lock(&irq_controller_lock);

	irq_desc[irq].cpu = cpu;

	val = readl(reg) & ~(0xff << shift);

	val |= 1 << (cpu + shift);

	writel(val, reg);

	spin_unlock(&irq_controller_lock);

}

#endif
@@ -86,7 +100,7 @@ static struct irqchip gic_chip = { 
	.mask		= gic_mask_irq,

	.unmask		= gic_unmask_irq,

#ifdef CONFIG_SMP

	.set_cpu	= gic_set_cpu,

	.set_affinity	= gic_set_cpu,

#endif

};

arch/arm/common/sa1111.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void 
sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)

{

	unsigned int stat0, stat1, i;

	void __iomem *base = desc->data;

	void __iomem *base = get_irq_data(irq);



	stat0 = sa1111_readl(base + SA1111_INTSTATCLR0);

	stat1 = sa1111_readl(base + SA1111_INTSTATCLR1);
@@ -168,11 +168,11 @@ sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) 


	for (i = IRQ_SA1111_START; stat0; i++, stat0 >>= 1)

		if (stat0 & 1)

			do_edge_IRQ(i, irq_desc + i, regs);

			handle_edge_irq(i, irq_desc + i, regs);



	for (i = IRQ_SA1111_START + 32; stat1; i++, stat1 >>= 1)

		if (stat1 & 1)

			do_edge_IRQ(i, irq_desc + i, regs);

			handle_edge_irq(i, irq_desc + i, regs);



	/* For level-based interrupts */

	desc->chip->unmask(irq);

arch/arm/common/time-acorn.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/timex.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>



#include <asm/hardware.h>

#include <asm/io.h>

arch/arm/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg 
		ecard_t *ec = slot_to_ecard(slot);



		if (ec->claimed) {

			struct irqdesc *d = irqdesc + ec->irq;

			struct irq_desc *d = irq_desc + ec->irq;

			/*

			 * this ugly code is so that we can operate a

			 * prioritorising system: