Get rid of PowerPC users of NR

linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed

* Get rid of PowerPC users of NR_IRQS
@ 2012-04-23 22:30 Grant Likely
  2012-04-23 22:30 ` [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller Grant Likely
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Grant Likely @ 2012-04-23 22:30 UTC (permalink / raw)
  To: linux-kernel, linuxppc-dev, Benjamin Herrenschmidt,
	Joakim Tjernlund

Hi Ben,

Here's the 2nd version of the NR_IRQS cleanup patches for PowerPC.  I've
addressed your comments and compile tested them, but I've not tried to
boot.  If they check out for you then they should probably go into v3.4.

g.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
  2012-04-23 22:30 Get rid of PowerPC users of NR_IRQS Grant Likely
@ 2012-04-23 22:30 ` Grant Likely
  2012-04-24  3:13   ` Benjamin Herrenschmidt
  2012-04-23 22:30 ` [PATCH v2 2/2] irqdomain/powerpc: Fix broken NR_IRQ references Grant Likely
  2012-04-23 22:36 ` [PATCH v2 0/2] Get rid of PowerPC users of NR_IRQS Grant Likely
  2 siblings, 1 reply; 8+ messages in thread
From: Grant Likely @ 2012-04-23 22:30 UTC (permalink / raw)
  To: linux-kernel, linuxppc-dev, Benjamin Herrenschmidt,
	Joakim Tjernlund

The mpc8xx driver uses a reference to NR_IRQS that is buggy.  It uses
NR_IRQs for the array size of the ppc_cached_irq_mask bitmap, but
NR_IRQs could be smaller than the number of hardware irqs that
ppc_cached_irq_mask tracks.

Also, while fixing that problem, it became apparent that the interrupt
controller only supports 32 interrupt numbers, but it is written as if
it supports multiple register banks which is more complicated.

This patch pulls out the buggy reference to NR_IRQs and fixes the size
of the ppc_cached_irq_mask to match the number of HW irqs.  It also
drops the now-unnecessary code since ppc_cached_irq_mask is no longer
an array.

v2: - Rename ppc_cached_irq_mask to mpc8xx_cached_irq_mask
    - Drop duplicate forward declaration

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/sysdev/mpc8xx_pic.c |   61 +++++++++++++-------------------------
 1 file changed, 20 insertions(+), 41 deletions(-)

diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index d5f5416..b724622 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -18,69 +18,45 @@
 extern int cpm_get_irq(struct pt_regs *regs);
 
 static struct irq_domain *mpc8xx_pic_host;
-#define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
-static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
+static unsigned long mpc8xx_cached_irq_mask;
 static sysconf8xx_t __iomem *siu_reg;
 
-int cpm_get_irq(struct pt_regs *regs);
+static inline unsigned long mpc8xx_irqd_to_bit(struct irq_data *d)
+{
+	return 0x80000000 >> irqd_to_hwirq(d);
+}
 
 static void mpc8xx_unmask_irq(struct irq_data *d)
 {
-	int	bit, word;
-	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
-
-	bit = irq_nr & 0x1f;
-	word = irq_nr >> 5;
-
-	ppc_cached_irq_mask[word] |= (1 << (31-bit));
-	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
+	mpc8xx_cached_irq_mask |= mpc8xx_irqd_to_bit(d);
+	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
 }
 
 static void mpc8xx_mask_irq(struct irq_data *d)
 {
-	int	bit, word;
-	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
-
-	bit = irq_nr & 0x1f;
-	word = irq_nr >> 5;
-
-	ppc_cached_irq_mask[word] &= ~(1 << (31-bit));
-	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
+	mpc8xx_cached_irq_mask &= ~mpc8xx_irqd_to_bit(d);
+	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
 }
 
 static void mpc8xx_ack(struct irq_data *d)
 {
-	int	bit;
-	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
-
-	bit = irq_nr & 0x1f;
-	out_be32(&siu_reg->sc_sipend, 1 << (31-bit));
+	out_be32(&siu_reg->sc_sipend, mpc8xx_irqd_to_bit(d));
 }
 
 static void mpc8xx_end_irq(struct irq_data *d)
 {
-	int bit, word;
-	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
-
-	bit = irq_nr & 0x1f;
-	word = irq_nr >> 5;
-
-	ppc_cached_irq_mask[word] |= (1 << (31-bit));
-	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
+	mpc8xx_cached_irq_mask |= mpc8xx_irqd_to_bit(d);
+	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
 }
 
 static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
-	if (flow_type & IRQ_TYPE_EDGE_FALLING) {
-		irq_hw_number_t hw = (unsigned int)irqd_to_hwirq(d);
+	/* only external IRQ senses are programmable */
+	if ((flow_type & IRQ_TYPE_EDGE_FALLING) && !(irqd_to_hwirq(d) & 1)) {
 		unsigned int siel = in_be32(&siu_reg->sc_siel);
-
-		/* only external IRQ senses are programmable */
-		if ((hw & 1) == 0) {
-			siel |= (0x80000000 >> hw);
-			out_be32(&siu_reg->sc_siel, siel);
-			__irq_set_handler_locked(d->irq, handle_edge_irq);
-		}
+		siel |= mpc8xx_irqd_to_bit(d);
+		out_be32(&siu_reg->sc_siel, siel);
+		__irq_set_handler_locked(d->irq, handle_edge_irq);
 	}
 	return 0;
 }
@@ -132,6 +108,9 @@ static int mpc8xx_pic_host_xlate(struct irq_domain *h, struct device_node *ct,
 		IRQ_TYPE_EDGE_FALLING,
 	};
 
+	if (intspec[0] > 0x1f)
+		return 0;
+
 	*out_hwirq = intspec[0];
 	if (intsize > 1 && intspec[1] < 4)
 		*out_flags = map_pic_senses[intspec[1]];
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
  2012-04-23 22:30 ` [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller Grant Likely
@ 2012-04-24  3:13   ` Benjamin Herrenschmidt
  2012-04-24  7:41     ` Joakim Tjernlund
  0 siblings, 1 reply; 8+ messages in thread
From: Benjamin Herrenschmidt @ 2012-04-24  3:13 UTC (permalink / raw)
  To: Grant Likely; +Cc: linuxppc-dev, linux-kernel

On Mon, 2012-04-23 at 16:30 -0600, Grant Likely wrote:
> The mpc8xx driver uses a reference to NR_IRQS that is buggy.  It uses
> NR_IRQs for the array size of the ppc_cached_irq_mask bitmap, but
> NR_IRQs could be smaller than the number of hardware irqs that
> ppc_cached_irq_mask tracks.

Joakim, any chance you can test this ASAP ? :-)

Thanks !

Cheers,
Ben.

> Also, while fixing that problem, it became apparent that the interrupt
> controller only supports 32 interrupt numbers, but it is written as if
> it supports multiple register banks which is more complicated.
> 
> This patch pulls out the buggy reference to NR_IRQs and fixes the size
> of the ppc_cached_irq_mask to match the number of HW irqs.  It also
> drops the now-unnecessary code since ppc_cached_irq_mask is no longer
> an array.
> 
> v2: - Rename ppc_cached_irq_mask to mpc8xx_cached_irq_mask
>     - Drop duplicate forward declaration
> 
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>  arch/powerpc/sysdev/mpc8xx_pic.c |   61 +++++++++++++-------------------------
>  1 file changed, 20 insertions(+), 41 deletions(-)
> 
> diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
> index d5f5416..b724622 100644
> --- a/arch/powerpc/sysdev/mpc8xx_pic.c
> +++ b/arch/powerpc/sysdev/mpc8xx_pic.c
> @@ -18,69 +18,45 @@
>  extern int cpm_get_irq(struct pt_regs *regs);
>  
>  static struct irq_domain *mpc8xx_pic_host;
> -#define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
> -static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
> +static unsigned long mpc8xx_cached_irq_mask;
>  static sysconf8xx_t __iomem *siu_reg;
>  
> -int cpm_get_irq(struct pt_regs *regs);
> +static inline unsigned long mpc8xx_irqd_to_bit(struct irq_data *d)
> +{
> +	return 0x80000000 >> irqd_to_hwirq(d);
> +}
>  
>  static void mpc8xx_unmask_irq(struct irq_data *d)
>  {
> -	int	bit, word;
> -	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
> -
> -	bit = irq_nr & 0x1f;
> -	word = irq_nr >> 5;
> -
> -	ppc_cached_irq_mask[word] |= (1 << (31-bit));
> -	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
> +	mpc8xx_cached_irq_mask |= mpc8xx_irqd_to_bit(d);
> +	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
>  }
>  
>  static void mpc8xx_mask_irq(struct irq_data *d)
>  {
> -	int	bit, word;
> -	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
> -
> -	bit = irq_nr & 0x1f;
> -	word = irq_nr >> 5;
> -
> -	ppc_cached_irq_mask[word] &= ~(1 << (31-bit));
> -	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
> +	mpc8xx_cached_irq_mask &= ~mpc8xx_irqd_to_bit(d);
> +	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
>  }
>  
>  static void mpc8xx_ack(struct irq_data *d)
>  {
> -	int	bit;
> -	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
> -
> -	bit = irq_nr & 0x1f;
> -	out_be32(&siu_reg->sc_sipend, 1 << (31-bit));
> +	out_be32(&siu_reg->sc_sipend, mpc8xx_irqd_to_bit(d));
>  }
>  
>  static void mpc8xx_end_irq(struct irq_data *d)
>  {
> -	int bit, word;
> -	unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
> -
> -	bit = irq_nr & 0x1f;
> -	word = irq_nr >> 5;
> -
> -	ppc_cached_irq_mask[word] |= (1 << (31-bit));
> -	out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
> +	mpc8xx_cached_irq_mask |= mpc8xx_irqd_to_bit(d);
> +	out_be32(&siu_reg->sc_simask, mpc8xx_cached_irq_mask);
>  }
>  
>  static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
>  {
> -	if (flow_type & IRQ_TYPE_EDGE_FALLING) {
> -		irq_hw_number_t hw = (unsigned int)irqd_to_hwirq(d);
> +	/* only external IRQ senses are programmable */
> +	if ((flow_type & IRQ_TYPE_EDGE_FALLING) && !(irqd_to_hwirq(d) & 1)) {
>  		unsigned int siel = in_be32(&siu_reg->sc_siel);
> -
> -		/* only external IRQ senses are programmable */
> -		if ((hw & 1) == 0) {
> -			siel |= (0x80000000 >> hw);
> -			out_be32(&siu_reg->sc_siel, siel);
> -			__irq_set_handler_locked(d->irq, handle_edge_irq);
> -		}
> +		siel |= mpc8xx_irqd_to_bit(d);
> +		out_be32(&siu_reg->sc_siel, siel);
> +		__irq_set_handler_locked(d->irq, handle_edge_irq);
>  	}
>  	return 0;
>  }
> @@ -132,6 +108,9 @@ static int mpc8xx_pic_host_xlate(struct irq_domain *h, struct device_node *ct,
>  		IRQ_TYPE_EDGE_FALLING,
>  	};
>  
> +	if (intspec[0] > 0x1f)
> +		return 0;
> +
>  	*out_hwirq = intspec[0];
>  	if (intsize > 1 && intspec[1] < 4)
>  		*out_flags = map_pic_senses[intspec[1]];

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
  2012-04-24  3:13   ` Benjamin Herrenschmidt
@ 2012-04-24  7:41     ` Joakim Tjernlund
  2012-04-24 11:22       ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 8+ messages in thread
From: Joakim Tjernlund @ 2012-04-24  7:41 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, linux-kernel

Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote on 2012/04/24 05:13:15:
>
> On Mon, 2012-04-23 at 16:30 -0600, Grant Likely wrote:
> > The mpc8xx driver uses a reference to NR_IRQS that is buggy.  It uses
> > NR_IRQs for the array size of the ppc_cached_irq_mask bitmap, but
> > NR_IRQs could be smaller than the number of hardware irqs that
> > ppc_cached_irq_mask tracks.
>
> Joakim, any chance you can test this ASAP ? :-)

Sorry, but no.  We have not moved our 8xx boards to 3.x as it in maintenance
and takes too much space.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
  2012-04-24  7:41     ` Joakim Tjernlund
@ 2012-04-24 11:22       ` Benjamin Herrenschmidt
  2012-04-24 22:04         ` Scott Wood
  0 siblings, 1 reply; 8+ messages in thread
From: Benjamin Herrenschmidt @ 2012-04-24 11:22 UTC (permalink / raw)
  To: Joakim Tjernlund; +Cc: linuxppc-dev, linux-kernel

On Tue, 2012-04-24 at 09:41 +0200, Joakim Tjernlund wrote:
> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote on 2012/04/24 05:13:15:
> >
> > On Mon, 2012-04-23 at 16:30 -0600, Grant Likely wrote:
> > > The mpc8xx driver uses a reference to NR_IRQS that is buggy.  It uses
> > > NR_IRQs for the array size of the ppc_cached_irq_mask bitmap, but
> > > NR_IRQs could be smaller than the number of hardware irqs that
> > > ppc_cached_irq_mask tracks.
> >
> > Joakim, any chance you can test this ASAP ? :-)
> 
> Sorry, but no.  We have not moved our 8xx boards to 3.x as it in maintenance
> and takes too much space.

Ah ok... Anybody else on the list who still has some 8xx gear ?

Cheers,
Ben.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller
  2012-04-24 11:22       ` Benjamin Herrenschmidt
@ 2012-04-24 22:04         ` Scott Wood
  0 siblings, 0 replies; 8+ messages in thread
From: Scott Wood @ 2012-04-24 22:04 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, linux-kernel

On 04/24/2012 06:22 AM, Benjamin Herrenschmidt wrote:
> On Tue, 2012-04-24 at 09:41 +0200, Joakim Tjernlund wrote:
>> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote on 2012/04/24 05:13:15:
>>>
>>> On Mon, 2012-04-23 at 16:30 -0600, Grant Likely wrote:
>>>> The mpc8xx driver uses a reference to NR_IRQS that is buggy.  It uses
>>>> NR_IRQs for the array size of the ppc_cached_irq_mask bitmap, but
>>>> NR_IRQs could be smaller than the number of hardware irqs that
>>>> ppc_cached_irq_mask tracks.
>>>
>>> Joakim, any chance you can test this ASAP ? :-)
>>
>> Sorry, but no.  We have not moved our 8xx boards to 3.x as it in maintenance
>> and takes too much space.
> 
> Ah ok... Anybody else on the list who still has some 8xx gear ?

Boots OK on ep88xc.

-Scott

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2 2/2] irqdomain/powerpc: Fix broken NR_IRQ references
  2012-04-23 22:30 Get rid of PowerPC users of NR_IRQS Grant Likely
  2012-04-23 22:30 ` [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller Grant Likely
@ 2012-04-23 22:30 ` Grant Likely
  2012-04-23 22:36 ` [PATCH v2 0/2] Get rid of PowerPC users of NR_IRQS Grant Likely
  2 siblings, 0 replies; 8+ messages in thread
From: Grant Likely @ 2012-04-23 22:30 UTC (permalink / raw)
  To: linux-kernel, linuxppc-dev, Benjamin Herrenschmidt,
	Joakim Tjernlund

The switch from using irq_map to irq_alloc_desc*() for managing irq
number allocations introduced new bugs in some of the powerpc
interrupt code.  Several functions rely on the value of NR_IRQS to
determine the maximum irq number that could get allocated.  However,
with sparse_irq and using irq_alloc_desc*() the maximum possible irq
number is now specified with 'nr_irqs' which may be a number larger
than NR_IRQS.  This has caused breakage on powermac when
CONFIG_NR_IRQS is set to 32.

This patch removes most of the direct references to NR_IRQS in the
powerpc code and replaces them with either a nr_irqs reference or by
using the common for_each_irq_desc() macro.  The powerpc-specific
for_each_irq() macro is removed at the same time.

Also, the Cell axon_msi driver is refactored to remove the global
build assumption on the size of NR_IRQS and instead add a limit to the
maximum irq number when calling irq_domain_add_nomap().

v2: Reinstate comment on 65536 irq limit deleted in v1.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 arch/powerpc/include/asm/irq.h               |    4 ----
 arch/powerpc/kernel/irq.c                    |    6 +-----
 arch/powerpc/kernel/machine_kexec.c          |    7 ++-----
 arch/powerpc/platforms/cell/axon_msi.c       |    8 +++-----
 arch/powerpc/platforms/cell/beat_interrupt.c |    2 +-
 arch/powerpc/platforms/powermac/pic.c        |    6 +++---
 arch/powerpc/sysdev/cpm2_pic.c               |    3 +--
 arch/powerpc/sysdev/xics/xics-common.c       |    7 +++----
 8 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index e648af9..0e40843 100644
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -18,10 +18,6 @@
 #include <linux/atomic.h>
 
 
-/* Define a way to iterate across irqs. */
-#define for_each_irq(i) \
-	for ((i) = 0; (i) < NR_IRQS; ++(i))
-
 extern atomic_t ppc_n_lost_interrupts;
 
 /* This number is used when no interrupt has been assigned */
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 5ec1b23..43eb74f 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -330,14 +330,10 @@ void migrate_irqs(void)
 
 	alloc_cpumask_var(&mask, GFP_KERNEL);
 
-	for_each_irq(irq) {
+	for_each_irq_desc(irq, desc) {
 		struct irq_data *data;
 		struct irq_chip *chip;
 
-		desc = irq_to_desc(irq);
-		if (!desc)
-			continue;
-
 		data = irq_desc_get_irq_data(desc);
 		if (irqd_is_per_cpu(data))
 			continue;
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index c957b12..5df7777 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -23,14 +23,11 @@
 
 void machine_kexec_mask_interrupts(void) {
 	unsigned int i;
+	struct irq_desc *desc;
 
-	for_each_irq(i) {
-		struct irq_desc *desc = irq_to_desc(i);
+	for_each_irq_desc(i, desc) {
 		struct irq_chip *chip;
 
-		if (!desc)
-			continue;
-
 		chip = irq_desc_get_chip(desc);
 		if (!chip)
 			continue;
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index d09f3e8..85825b5 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -114,7 +114,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
 		pr_devel("axon_msi: woff %x roff %x msi %x\n",
 			  write_offset, msic->read_offset, msi);
 
-		if (msi < NR_IRQS && irq_get_chip_data(msi) == msic) {
+		if (msi < nr_irqs && irq_get_chip_data(msi) == msic) {
 			generic_handle_irq(msi);
 			msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
 		} else {
@@ -276,9 +276,6 @@ static int axon_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 	if (rc)
 		return rc;
 
-	/* We rely on being able to stash a virq in a u16 */
-	BUILD_BUG_ON(NR_IRQS > 65536);
-
 	list_for_each_entry(entry, &dev->msi_list, list) {
 		virq = irq_create_direct_mapping(msic->irq_domain);
 		if (virq == NO_IRQ) {
@@ -392,7 +389,8 @@ static int axon_msi_probe(struct platform_device *device)
 	}
 	memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES);
 
-	msic->irq_domain = irq_domain_add_nomap(dn, 0, &msic_host_ops, msic);
+	/* We rely on being able to stash a virq in a u16, so limit irqs to < 65536 */
+	msic->irq_domain = irq_domain_add_nomap(dn, 65536, &msic_host_ops, msic);
 	if (!msic->irq_domain) {
 		printk(KERN_ERR "axon_msi: couldn't allocate irq_domain for %s\n",
 		       dn->full_name);
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index f9a48af..8c6dc42 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -248,6 +248,6 @@ void beatic_deinit_IRQ(void)
 {
 	int	i;
 
-	for (i = 1; i < NR_IRQS; i++)
+	for (i = 1; i < nr_irqs; i++)
 		beat_destruct_irq_plug(i);
 }
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 66ad93d..c4e6305 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -57,9 +57,9 @@ static int max_real_irqs;
 
 static DEFINE_RAW_SPINLOCK(pmac_pic_lock);
 
-#define NR_MASK_WORDS	((NR_IRQS + 31) / 32)
-static unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
-static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
+/* The max irq number this driver deals with is 128; see max_irqs */
+static DECLARE_BITMAP(ppc_lost_interrupts, 128);
+static DECLARE_BITMAP(ppc_cached_irq_mask, 128);
 static int pmac_irq_cascade = -1;
 static struct irq_domain *pmac_pic_host;
 
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index d3be961..10386b6 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -51,8 +51,7 @@
 static intctl_cpm2_t __iomem *cpm2_intctl;
 
 static struct irq_domain *cpm2_pic_host;
-#define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
-static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
+static unsigned long ppc_cached_irq_mask[2]; /* 2 32-bit registers */
 
 static const u_char irq_to_siureg[] = {
 	1, 1, 1, 1, 1, 1, 1, 1,
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index ea5e204..cd1d18d 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -188,6 +188,7 @@ void xics_migrate_irqs_away(void)
 {
 	int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
 	unsigned int irq, virq;
+	struct irq_desc *desc;
 
 	/* If we used to be the default server, move to the new "boot_cpuid" */
 	if (hw_cpu == xics_default_server)
@@ -202,8 +203,7 @@ void xics_migrate_irqs_away(void)
 	/* Allow IPIs again... */
 	icp_ops->set_priority(DEFAULT_PRIORITY);
 
-	for_each_irq(virq) {
-		struct irq_desc *desc;
+	for_each_irq_desc(virq, desc) {
 		struct irq_chip *chip;
 		long server;
 		unsigned long flags;
@@ -212,9 +212,8 @@ void xics_migrate_irqs_away(void)
 		/* We can't set affinity on ISA interrupts */
 		if (virq < NUM_ISA_INTERRUPTS)
 			continue;
-		desc = irq_to_desc(virq);
 		/* We only need to migrate enabled IRQS */
-		if (!desc || !desc->action)
+		if (!desc->action)
 			continue;
 		if (desc->irq_data.domain != xics_host)
 			continue;
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v2 0/2] Get rid of PowerPC users of NR_IRQS
  2012-04-23 22:30 Get rid of PowerPC users of NR_IRQS Grant Likely
  2012-04-23 22:30 ` [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller Grant Likely
  2012-04-23 22:30 ` [PATCH v2 2/2] irqdomain/powerpc: Fix broken NR_IRQ references Grant Likely
@ 2012-04-23 22:36 ` Grant Likely
  2 siblings, 0 replies; 8+ messages in thread
From: Grant Likely @ 2012-04-23 22:36 UTC (permalink / raw)
  To: linux-kernel, linuxppc-dev, Benjamin Herrenschmidt,
	Joakim Tjernlund

Oops. Flubbed the subject on the below email.  This is the cover
letter for the NR_IRQS patches, so the subject should have included
"[PATCH v2 0/2]"

On Mon, Apr 23, 2012 at 4:30 PM, Grant Likely <grant.likely@secretlab.ca> w=
rote:
> Hi Ben,
>
> Here's the 2nd version of the NR_IRQS cleanup patches for PowerPC. =A0I'v=
e
> addressed your comments and compile tested them, but I've not tried to
> boot. =A0If they check out for you then they should probably go into v3.4=
.
>
> g.
>



--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-04-24 22:05 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-23 22:30 Get rid of PowerPC users of NR_IRQS Grant Likely
2012-04-23 22:30 ` [PATCH v2 1/2] powerpc/8xx: Fix NR_IRQ bugs and refactor 8xx interrupt controller Grant Likely
2012-04-24  3:13   ` Benjamin Herrenschmidt
2012-04-24  7:41     ` Joakim Tjernlund
2012-04-24 11:22       ` Benjamin Herrenschmidt
2012-04-24 22:04         ` Scott Wood
2012-04-23 22:30 ` [PATCH v2 2/2] irqdomain/powerpc: Fix broken NR_IRQ references Grant Likely
2012-04-23 22:36 ` [PATCH v2 0/2] Get rid of PowerPC users of NR_IRQS Grant Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).