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

Commit e3873444 authored by Grant Likely's avatar Grant Likely
Browse files

of/irq: Move irq_of_parse_and_map() to common code 



Merge common code between PowerPC and Microblaze.  SPARC implements
irq_of_parse_and_map(), but the implementation is different, so it
does not use this code.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Kerr <jeremy.kerr@canonical.com>
parent b505ff5e

arch/microblaze/include/asm/irq.h

+0 −24
Original line number Diff line number Diff line
@@ -27,17 +27,6 @@ extern unsigned int nr_irq; 
struct pt_regs;

extern void do_IRQ(struct pt_regs *regs);



/**

 * irq_of_parse_and_map - Parse and Map an interrupt into linux virq space

 * @device: Device node of the device whose interrupt is to be mapped

 * @index: Index of the interrupt to map

 *

 * This function is a wrapper that chains of_irq_map_one() and

 * irq_create_of_mapping() to make things easier to callers

 */

struct device_node;

extern unsigned int irq_of_parse_and_map(struct device_node *dev, int index);



/** FIXME - not implement

 * irq_dispose_mapping - Unmap an interrupt

 * @virq: linux virq number of the interrupt to unmap
@@ -62,17 +51,4 @@ struct irq_host; 
extern unsigned int irq_create_mapping(struct irq_host *host,

					irq_hw_number_t hwirq);



/**

 * irq_create_of_mapping - Map a hardware interrupt into linux virq space

 * @controller: Device node of the interrupt controller

 * @inspec: Interrupt specifier from the device-tree

 * @intsize: Size of the interrupt specifier from the device-tree

 *

 * This function is identical to irq_create_mapping except that it takes

 * as input informations straight from the device-tree (typically the results

 * of the of_irq_map_*() functions.

 */

extern unsigned int irq_create_of_mapping(struct device_node *controller,

					u32 *intspec, unsigned int intsize);



#endif /* _ASM_MICROBLAZE_IRQ_H */

arch/microblaze/include/asm/prom.h

+1 −25
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <linux/of_irq.h>

#include <linux/of_fdt.h>

#include <linux/proc_fs.h>

#include <linux/platform_device.h>
@@ -92,18 +93,6 @@ extern const void *of_get_mac_address(struct device_node *np); 
 * OF interrupt mapping

 */



/* This structure is returned when an interrupt is mapped. The controller

 * field needs to be put() after use

 */



#define OF_MAX_IRQ_SPEC		4 /* We handle specifiers of at most 4 cells */



struct of_irq {

	struct device_node *controller; /* Interrupt controller node */

	u32 size; /* Specifier size */

	u32 specifier[OF_MAX_IRQ_SPEC]; /* Specifier copy */

};



/**

 * of_irq_map_init - Initialize the irq remapper

 * @flags:	flags defining workarounds to enable
@@ -138,19 +127,6 @@ extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec, 
			u32 ointsize, const u32 *addr,

			struct of_irq *out_irq);



/**

 * of_irq_map_one - Resolve an interrupt for a device

 * @device:	the device whose interrupt is to be resolved

 * @index:	index of the interrupt to resolve

 * @out_irq:	structure of_irq filled by this function

 *

 * This function resolves an interrupt, walking the tree, for a given

 * device-tree node. It's the high level pendant to of_irq_map_raw().

 * It also implements the workarounds for OldWolrd Macs.

 */

extern int of_irq_map_one(struct device_node *device, int index,

			struct of_irq *out_irq);



/**

 * of_irq_map_pci - Resolve the interrupt for a PCI device

 * @pdev:	the device whose interrupt is to be resolved

arch/microblaze/kernel/irq.c

+2 −12
Original line number Diff line number Diff line
@@ -17,20 +17,10 @@ 
#include <linux/seq_file.h>

#include <linux/kernel_stat.h>

#include <linux/irq.h>

#include <linux/of_irq.h>



#include <asm/prom.h>



unsigned int irq_of_parse_and_map(struct device_node *dev, int index)

{

	struct of_irq oirq;



	if (of_irq_map_one(dev, index, &oirq))

		return NO_IRQ;



	return oirq.specifier[0];

}

EXPORT_SYMBOL_GPL(irq_of_parse_and_map);



static u32 concurrent_irq;



void __irq_entry do_IRQ(struct pt_regs *regs)
@@ -104,7 +94,7 @@ unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq) 
EXPORT_SYMBOL_GPL(irq_create_mapping);



unsigned int irq_create_of_mapping(struct device_node *controller,

					u32 *intspec, unsigned int intsize)

				   const u32 *intspec, unsigned int intsize)

{

	return intspec[0];

}

arch/powerpc/include/asm/irq.h

+0 −28
Original line number Diff line number Diff line
@@ -300,34 +300,6 @@ extern unsigned int irq_alloc_virt(struct irq_host *host, 
 */

extern void irq_free_virt(unsigned int virq, unsigned int count);





/* -- OF helpers -- */



/**

 * irq_create_of_mapping - Map a hardware interrupt into linux virq space

 * @controller: Device node of the interrupt controller

 * @inspec: Interrupt specifier from the device-tree

 * @intsize: Size of the interrupt specifier from the device-tree

 *

 * This function is identical to irq_create_mapping except that it takes

 * as input informations straight from the device-tree (typically the results

 * of the of_irq_map_*() functions.

 */

extern unsigned int irq_create_of_mapping(struct device_node *controller,

					  const u32 *intspec, unsigned int intsize);



/**

 * irq_of_parse_and_map - Parse and Map an interrupt into linux virq space

 * @device: Device node of the device whose interrupt is to be mapped

 * @index: Index of the interrupt to map

 *

 * This function is a wrapper that chains of_irq_map_one() and

 * irq_create_of_mapping() to make things easier to callers

 */

extern unsigned int irq_of_parse_and_map(struct device_node *dev, int index);



/* -- End OF helpers -- */



/**

 * irq_early_init - Init irq remapping subsystem

 */

arch/powerpc/include/asm/prom.h

+1 −26
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */

#include <linux/types.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/proc_fs.h>

#include <linux/platform_device.h>

#include <asm/irq.h>
@@ -108,18 +109,6 @@ extern const void *of_get_mac_address(struct device_node *np); 
 * OF interrupt mapping

 */



/* This structure is returned when an interrupt is mapped. The controller

 * field needs to be put() after use

 */



#define OF_MAX_IRQ_SPEC		 4 /* We handle specifiers of at most 4 cells */



struct of_irq {

	struct device_node *controller;	/* Interrupt controller node */

	u32 size;			/* Specifier size */

	u32 specifier[OF_MAX_IRQ_SPEC];	/* Specifier copy */

};



/**

 * of_irq_map_init - Initialize the irq remapper

 * @flags:	flags defining workarounds to enable
@@ -154,20 +143,6 @@ extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec, 
			  u32 ointsize, const u32 *addr,

			  struct of_irq *out_irq);





/**

 * of_irq_map_one - Resolve an interrupt for a device

 * @device:	the device whose interrupt is to be resolved

 * @index:     	index of the interrupt to resolve

 * @out_irq:	structure of_irq filled by this function

 *

 * This function resolves an interrupt, walking the tree, for a given

 * device-tree node. It's the high level pendant to of_irq_map_raw().

 * It also implements the workarounds for OldWolrd Macs.

 */

extern int of_irq_map_one(struct device_node *device, int index,

			  struct of_irq *out_irq);



/**

 * of_irq_map_pci - Resolve the interrupt for a PCI device

 * @pdev:	the device whose interrupt is to be resolved