Commit f7a0c786 authored by Thomas Gleixner's avatar Thomas Gleixner

x86: Cleanup irq_domain ops

We have 3 identical copies of the ioapic domain ops for acpi, mpparse,
and sfi. Have a global one in the io_apic code and be done with it.

To avoid include hell in io_apic.h, create a private irqdomain header
and include the generic irqdomain header from there.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: sfi-devel@simplefirmware.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/1428978610-28986-32-git-send-email-jiang.liu@linux.intel.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ab76085e
...@@ -96,7 +96,7 @@ struct IR_IO_APIC_route_entry { ...@@ -96,7 +96,7 @@ struct IR_IO_APIC_route_entry {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct irq_alloc_info; struct irq_alloc_info;
struct irq_data; struct ioapic_domain_cfg;
#define IOAPIC_AUTO -1 #define IOAPIC_AUTO -1
#define IOAPIC_EDGE 0 #define IOAPIC_EDGE 0
...@@ -163,23 +163,6 @@ extern int restore_ioapic_entries(void); ...@@ -163,23 +163,6 @@ extern int restore_ioapic_entries(void);
extern void setup_ioapic_ids_from_mpc(void); extern void setup_ioapic_ids_from_mpc(void);
extern void setup_ioapic_ids_from_mpc_nocheck(void); extern void setup_ioapic_ids_from_mpc_nocheck(void);
enum ioapic_domain_type {
IOAPIC_DOMAIN_INVALID,
IOAPIC_DOMAIN_LEGACY,
IOAPIC_DOMAIN_STRICT,
IOAPIC_DOMAIN_DYNAMIC,
};
struct device_node;
struct irq_domain;
struct irq_domain_ops;
struct ioapic_domain_cfg {
enum ioapic_domain_type type;
const struct irq_domain_ops *ops;
struct device_node *dev;
};
extern int mp_find_ioapic(u32 gsi); extern int mp_find_ioapic(u32 gsi);
extern int mp_find_ioapic_pin(int ioapic, u32 gsi); extern int mp_find_ioapic_pin(int ioapic, u32 gsi);
extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags, extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags,
...@@ -189,15 +172,7 @@ extern int mp_register_ioapic(int id, u32 address, u32 gsi_base, ...@@ -189,15 +172,7 @@ extern int mp_register_ioapic(int id, u32 address, u32 gsi_base,
struct ioapic_domain_cfg *cfg); struct ioapic_domain_cfg *cfg);
extern int mp_unregister_ioapic(u32 gsi_base); extern int mp_unregister_ioapic(u32 gsi_base);
extern int mp_ioapic_registered(u32 gsi_base); extern int mp_ioapic_registered(u32 gsi_base);
extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
unsigned int nr_irqs, void *arg);
extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
unsigned int nr_irqs);
extern void mp_irqdomain_activate(struct irq_domain *domain,
struct irq_data *irq_data);
extern void mp_irqdomain_deactivate(struct irq_domain *domain,
struct irq_data *irq_data);
extern int mp_irqdomain_ioapic_idx(struct irq_domain *domain);
extern void ioapic_set_alloc_attr(struct irq_alloc_info *info, extern void ioapic_set_alloc_attr(struct irq_alloc_info *info,
int node, int trigger, int polarity); int node, int trigger, int polarity);
......
#ifndef _ASM_IRQDOMAIN_H
#define _ASM_IRQDOMAIN_H
#include <linux/irqdomain.h>
enum ioapic_domain_type {
IOAPIC_DOMAIN_INVALID,
IOAPIC_DOMAIN_LEGACY,
IOAPIC_DOMAIN_STRICT,
IOAPIC_DOMAIN_DYNAMIC,
};
struct device_node;
struct irq_data;
struct ioapic_domain_cfg {
enum ioapic_domain_type type;
const struct irq_domain_ops *ops;
struct device_node *dev;
};
extern const struct irq_domain_ops mp_ioapic_irqdomain_ops;
extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
unsigned int nr_irqs, void *arg);
extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq,
unsigned int nr_irqs);
extern void mp_irqdomain_activate(struct irq_domain *domain,
struct irq_data *irq_data);
extern void mp_irqdomain_deactivate(struct irq_domain *domain,
struct irq_data *irq_data);
extern int mp_irqdomain_ioapic_idx(struct irq_domain *domain);
#endif
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqdomain.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/irqdomain.h>
#include <asm/pci_x86.h> #include <asm/pci_x86.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
...@@ -400,20 +400,13 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, ...@@ -400,20 +400,13 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
return 0; return 0;
} }
static struct irq_domain_ops acpi_irqdomain_ops = {
.alloc = mp_irqdomain_alloc,
.free = mp_irqdomain_free,
.activate = mp_irqdomain_activate,
.deactivate = mp_irqdomain_deactivate,
};
static int __init static int __init
acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
{ {
struct acpi_madt_io_apic *ioapic = NULL; struct acpi_madt_io_apic *ioapic = NULL;
struct ioapic_domain_cfg cfg = { struct ioapic_domain_cfg cfg = {
.type = IOAPIC_DOMAIN_DYNAMIC, .type = IOAPIC_DOMAIN_DYNAMIC,
.ops = &acpi_irqdomain_ops, .ops = &mp_ioapic_irqdomain_ops,
}; };
ioapic = (struct acpi_madt_io_apic *)header; ioapic = (struct acpi_madt_io_apic *)header;
...@@ -764,7 +757,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) ...@@ -764,7 +757,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
u64 addr; u64 addr;
struct ioapic_domain_cfg cfg = { struct ioapic_domain_cfg cfg = {
.type = IOAPIC_DOMAIN_DYNAMIC, .type = IOAPIC_DOMAIN_DYNAMIC,
.ops = &acpi_irqdomain_ops, .ops = &mp_ioapic_irqdomain_ops,
}; };
ioapic_id = acpi_get_ioapic_id(handle, gsi_base, &addr); ioapic_id = acpi_get_ioapic_id(handle, gsi_base, &addr);
......
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <linux/irqdomain.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/jiffies.h> /* time_after() */ #include <linux/jiffies.h> /* time_after() */
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <asm/irqdomain.h>
#include <asm/idle.h> #include <asm/idle.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
...@@ -2995,3 +2995,10 @@ int mp_irqdomain_ioapic_idx(struct irq_domain *domain) ...@@ -2995,3 +2995,10 @@ int mp_irqdomain_ioapic_idx(struct irq_domain *domain)
{ {
return (int)(long)domain->host_data; return (int)(long)domain->host_data;
} }
const struct irq_domain_ops mp_ioapic_irqdomain_ops = {
.alloc = mp_irqdomain_alloc,
.free = mp_irqdomain_free,
.activate = mp_irqdomain_activate,
.deactivate = mp_irqdomain_deactivate,
};
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqdomain.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/of.h> #include <linux/of.h>
...@@ -17,6 +16,7 @@ ...@@ -17,6 +16,7 @@
#include <linux/of_pci.h> #include <linux/of_pci.h>
#include <linux/initrd.h> #include <linux/initrd.h>
#include <asm/irqdomain.h>
#include <asm/hpet.h> #include <asm/hpet.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/pci_x86.h> #include <asm/pci_x86.h>
...@@ -216,11 +216,11 @@ static int dt_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, ...@@ -216,11 +216,11 @@ static int dt_irqdomain_alloc(struct irq_domain *domain, unsigned int virq,
return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp); return mp_irqdomain_alloc(domain, virq, nr_irqs, &tmp);
} }
const struct irq_domain_ops ioapic_irq_domain_ops = { static const struct irq_domain_ops ioapic_irq_domain_ops = {
.alloc = dt_irqdomain_alloc, .alloc = dt_irqdomain_alloc,
.free = mp_irqdomain_free, .free = mp_irqdomain_free,
.activate = mp_irqdomain_activate, .activate = mp_irqdomain_activate,
.deactivate = mp_irqdomain_deactivate, .deactivate = mp_irqdomain_deactivate,
}; };
static void __init dtb_add_ioapic(struct device_node *dn) static void __init dtb_add_ioapic(struct device_node *dn)
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/irqdomain.h>
#include <asm/irqdomain.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
...@@ -113,13 +113,6 @@ static void __init MP_bus_info(struct mpc_bus *m) ...@@ -113,13 +113,6 @@ static void __init MP_bus_info(struct mpc_bus *m)
pr_warn("Unknown bustype %s - ignoring\n", str); pr_warn("Unknown bustype %s - ignoring\n", str);
} }
static struct irq_domain_ops mp_ioapic_irqdomain_ops = {
.alloc = mp_irqdomain_alloc,
.free = mp_irqdomain_free,
.activate = mp_irqdomain_activate,
.deactivate = mp_irqdomain_deactivate,
};
static void __init MP_ioapic_info(struct mpc_ioapic *m) static void __init MP_ioapic_info(struct mpc_ioapic *m)
{ {
struct ioapic_domain_cfg cfg = { struct ioapic_domain_cfg cfg = {
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/sfi.h> #include <linux/sfi.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqdomain.h>
#include <asm/irqdomain.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -71,12 +71,6 @@ static int __init sfi_parse_cpus(struct sfi_table_header *table) ...@@ -71,12 +71,6 @@ static int __init sfi_parse_cpus(struct sfi_table_header *table)
#endif /* CONFIG_X86_LOCAL_APIC */ #endif /* CONFIG_X86_LOCAL_APIC */
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
static struct irq_domain_ops sfi_ioapic_irqdomain_ops = {
.alloc = mp_irqdomain_alloc,
.free = mp_irqdomain_free,
.activate = mp_irqdomain_activate,
.deactivate = mp_irqdomain_deactivate,
};
static int __init sfi_parse_ioapic(struct sfi_table_header *table) static int __init sfi_parse_ioapic(struct sfi_table_header *table)
{ {
...@@ -85,7 +79,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table) ...@@ -85,7 +79,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table)
int i, num; int i, num;
struct ioapic_domain_cfg cfg = { struct ioapic_domain_cfg cfg = {
.type = IOAPIC_DOMAIN_STRICT, .type = IOAPIC_DOMAIN_STRICT,
.ops = &sfi_ioapic_irqdomain_ops, .ops = &mp_ioapic_irqdomain_ops,
}; };
sb = (struct sfi_table_simple *)table; sb = (struct sfi_table_simple *)table;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment