OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irq_domain: Make irq_domain structure match powerpc's irq_host 

Part of the series to unify the irq remapping mechanisms in the
kernel.  A follow up patch will copy the powerpc implementation into
kernel/irq/irqdomain.c, which will be a lot easier if the structures
are identical.

Where they differ, I've chose to use the powerpc names since there is
a lot more code using those names.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Grant Likely 2012-02-14 14:06:48 -07:00
parent e1964c50a8
commit 7bb69bade0
3 changed files with 78 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/common/gic.c
View File

@ -619,10 +619,10 @@ static void __init gic_pm_init(struct gic_chip_data *gic)
#endif #endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int gic_irq_domain_dt_translate(struct irq_domain *d, static int gic_irq_domain_xlate(struct irq_domain *d,
struct device_node *controller, struct device_node *controller,
const u32 *intspec, unsigned int intsize, const u32 *intspec, unsigned int intsize,
unsigned long *out_hwirq, unsigned int *out_type) unsigned long *out_hwirq, unsigned int *out_type)
{ {
if (d->of_node != controller) if (d->of_node != controller)
return -EINVAL; return -EINVAL;
@ -641,9 +641,9 @@ static int gic_irq_domain_dt_translate(struct irq_domain *d,
} }
#endif #endif
const struct irq_domain_ops gic_irq_domain_ops = { struct irq_domain_ops gic_irq_domain_ops = {
#ifdef CONFIG_OF #ifdef CONFIG_OF
.dt_translate = gic_irq_domain_dt_translate, .xlate = gic_irq_domain_xlate,
#endif #endif
}; };
@ -721,7 +721,7 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
irq_start); irq_start);
domain->irq_base = irq_start; domain->irq_base = irq_start;
} }
domain->priv = gic; domain->host_data = gic;
domain->ops = &gic_irq_domain_ops; domain->ops = &gic_irq_domain_ops;
irq_domain_add(domain); irq_domain_add(domain);

84
include/linux/irqdomain.h
View File

@ -9,61 +9,105 @@
* representation into a hardware irq number that can be mapped back to a * representation into a hardware irq number that can be mapped back to a
* Linux irq number without any extra platform support code. * Linux irq number without any extra platform support code.
* *
* irq_domain is expected to be embedded in an interrupt controller's private * Interrupt controller "domain" data structure. This could be defined as a
* data structure. * irq domain controller. That is, it handles the mapping between hardware
* and virtual interrupt numbers for a given interrupt domain. The domain
* structure is generally created by the PIC code for a given PIC instance
* (though a domain can cover more than one PIC if they have a flat number
* model). It's the domain callbacks that are responsible for setting the
* irq_chip on a given irq_desc after it's been mapped.
*/ */
#ifndef _LINUX_IRQDOMAIN_H #ifndef _LINUX_IRQDOMAIN_H
#define _LINUX_IRQDOMAIN_H #define _LINUX_IRQDOMAIN_H
#include <linux/irq.h> #include <linux/types.h>
#include <linux/mod_devicetable.h> #include <linux/radix-tree.h>
#ifdef CONFIG_IRQ_DOMAIN
struct device_node; struct device_node;
struct irq_domain; struct irq_domain;
struct of_device_id;
/* This type is the placeholder for a hardware interrupt number. It has to
* be big enough to enclose whatever representation is used by a given
* platform.
*/
typedef unsigned long irq_hw_number_t;
/** /**
* struct irq_domain_ops - Methods for irq_domain objects * struct irq_domain_ops - Methods for irq_domain objects
* @match: Match an interrupt controller device node to a host, returns
* 1 on a match
* @map: Create or update a mapping between a virtual irq number and a hw
* irq number. This is called only once for a given mapping.
* @unmap: Dispose of such a mapping
* @to_irq: (optional) given a local hardware irq number, return the linux * @to_irq: (optional) given a local hardware irq number, return the linux
* irq number. If to_irq is not implemented, then the irq_domain * irq number. If to_irq is not implemented, then the irq_domain
* will use this translation: irq = (domain->irq_base + hwirq) * will use this translation: irq = (domain->irq_base + hwirq)
* @dt_translate: Given a device tree node and interrupt specifier, decode * @xlate: Given a device tree node and interrupt specifier, decode
* the hardware irq number and linux irq type value. * the hardware irq number and linux irq type value.
*
* Functions below are provided by the driver and called whenever a new mapping
* is created or an old mapping is disposed. The driver can then proceed to
* whatever internal data structures management is required. It also needs
* to setup the irq_desc when returning from map().
*/ */
struct irq_domain_ops { struct irq_domain_ops {
int (*match)(struct irq_domain *d, struct device_node *node);
int (*map)(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw);
void (*unmap)(struct irq_domain *d, unsigned int virq);
unsigned int (*to_irq)(struct irq_domain *d, unsigned long hwirq); unsigned int (*to_irq)(struct irq_domain *d, unsigned long hwirq);
int (*xlate)(struct irq_domain *d, struct device_node *node,
#ifdef CONFIG_OF const u32 *intspec, unsigned int intsize,
int (*dt_translate)(struct irq_domain *d, struct device_node *node, unsigned long *out_hwirq, unsigned int *out_type);
const u32 *intspec, unsigned int intsize,
unsigned long *out_hwirq, unsigned int *out_type);
#endif /* CONFIG_OF */
}; };
/** /**
* struct irq_domain - Hardware interrupt number translation object * struct irq_domain - Hardware interrupt number translation object
* @list: Element in global irq_domain list. * @link: Element in global irq_domain list.
* @revmap_type: Method used for reverse mapping hwirq numbers to linux irq. This
* will be one of the IRQ_DOMAIN_MAP_* values.
* @revmap_data: Revmap method specific data.
* @ops: pointer to irq_domain methods
* @host_data: private data pointer for use by owner. Not touched by irq_domain
* core code.
* @irq_base: Start of irq_desc range assigned to the irq_domain. The creator * @irq_base: Start of irq_desc range assigned to the irq_domain. The creator
* of the irq_domain is responsible for allocating the array of * of the irq_domain is responsible for allocating the array of
* irq_desc structures. * irq_desc structures.
* @nr_irq: Number of irqs managed by the irq domain * @nr_irq: Number of irqs managed by the irq domain
* @hwirq_base: Starting number for hwirqs managed by the irq domain * @hwirq_base: Starting number for hwirqs managed by the irq domain
* @ops: pointer to irq_domain methods
* @priv: private data pointer for use by owner. Not touched by irq_domain
* core code.
* @of_node: (optional) Pointer to device tree nodes associated with the * @of_node: (optional) Pointer to device tree nodes associated with the
* irq_domain. Used when decoding device tree interrupt specifiers. * irq_domain. Used when decoding device tree interrupt specifiers.
*/ */
struct irq_domain { struct irq_domain {
struct list_head list; struct list_head link;
/* type of reverse mapping_technique */
unsigned int revmap_type;
#define IRQ_DOMAIN_MAP_LEGACY 0 /* legacy 8259, gets irqs 1..15 */
#define IRQ_DOMAIN_MAP_NOMAP 1 /* no fast reverse mapping */
#define IRQ_DOMAIN_MAP_LINEAR 2 /* linear map of interrupts */
#define IRQ_DOMAIN_MAP_TREE 3 /* radix tree */
union {
struct {
unsigned int size;
unsigned int *revmap;
} linear;
struct radix_tree_root tree;
} revmap_data;
struct irq_domain_ops *ops;
void *host_data;
irq_hw_number_t inval_irq;
unsigned int irq_base; unsigned int irq_base;
unsigned int nr_irq; unsigned int nr_irq;
unsigned int hwirq_base; unsigned int hwirq_base;
const struct irq_domain_ops *ops;
void *priv; /* Optional device node pointer */
struct device_node *of_node; struct device_node *of_node;
}; };
#ifdef CONFIG_IRQ_DOMAIN
/** /**
* irq_domain_to_irq() - Translate from a hardware irq to a linux irq number * irq_domain_to_irq() - Translate from a hardware irq to a linux irq number
* *

14
kernel/irq/irqdomain.c
View File

@ -43,7 +43,7 @@ void irq_domain_add(struct irq_domain *domain)
} }
mutex_lock(&irq_domain_mutex); mutex_lock(&irq_domain_mutex);
list_add(&domain->list, &irq_domain_list); list_add(&domain->link, &irq_domain_list);
mutex_unlock(&irq_domain_mutex); mutex_unlock(&irq_domain_mutex);
} }
@ -57,7 +57,7 @@ void irq_domain_del(struct irq_domain *domain)
int hwirq, irq; int hwirq, irq;
mutex_lock(&irq_domain_mutex); mutex_lock(&irq_domain_mutex);
list_del(&domain->list); list_del(&domain->link);
mutex_unlock(&irq_domain_mutex); mutex_unlock(&irq_domain_mutex);
/* Clear the irq_domain assignments */ /* Clear the irq_domain assignments */
@ -88,10 +88,10 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
/* Find a domain which can translate the irq spec */ /* Find a domain which can translate the irq spec */
mutex_lock(&irq_domain_mutex); mutex_lock(&irq_domain_mutex);
list_for_each_entry(domain, &irq_domain_list, list) { list_for_each_entry(domain, &irq_domain_list, link) {
if (!domain->ops->dt_translate) if (!domain->ops->xlate)
continue; continue;
rc = domain->ops->dt_translate(domain, controller, rc = domain->ops->xlate(domain, controller,
intspec, intsize, &hwirq, &type); intspec, intsize, &hwirq, &type);
if (rc == 0) if (rc == 0)
break; break;
@ -126,7 +126,7 @@ void irq_dispose_mapping(unsigned int irq)
} }
EXPORT_SYMBOL_GPL(irq_dispose_mapping); EXPORT_SYMBOL_GPL(irq_dispose_mapping);
int irq_domain_simple_dt_translate(struct irq_domain *d, int irq_domain_simple_xlate(struct irq_domain *d,
struct device_node *controller, struct device_node *controller,
const u32 *intspec, unsigned int intsize, const u32 *intspec, unsigned int intsize,
unsigned long *out_hwirq, unsigned int *out_type) unsigned long *out_hwirq, unsigned int *out_type)
@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(irq_domain_generate_simple);
struct irq_domain_ops irq_domain_simple_ops = { struct irq_domain_ops irq_domain_simple_ops = {
#ifdef CONFIG_OF_IRQ #ifdef CONFIG_OF_IRQ
.dt_translate = irq_domain_simple_dt_translate, .xlate = irq_domain_simple_xlate,
#endif /* CONFIG_OF_IRQ */ #endif /* CONFIG_OF_IRQ */
}; };
EXPORT_SYMBOL_GPL(irq_domain_simple_ops); EXPORT_SYMBOL_GPL(irq_domain_simple_ops);