lkml.org 
[lkml]   [2015]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part2 v4 09/33] irq_remapping: Clean up unsued code to support IOAPIC
    Date
    Now we have converted to hierarchy irqdomain, so clean up unused code.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: iommu@lists.linux-foundation.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: Joerg Roedel <joro@8bytes.org>
    Link: http://lkml.kernel.org/r/1416901802-24211-19-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/include/asm/irq_remapping.h | 23 -----------------------
    arch/x86/kernel/apic/vector.c | 1 -
    drivers/iommu/irq_remapping.c | 33 ---------------------------------
    3 files changed, 57 deletions(-)

    diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
    index 0a8edb4af770..022cb635c294 100644
    --- a/arch/x86/include/asm/irq_remapping.h
    +++ b/arch/x86/include/asm/irq_remapping.h
    @@ -26,12 +26,7 @@
    #include <asm/hw_irq.h>
    #include <asm/io_apic.h>

    -struct IO_APIC_route_entry;
    -struct io_apic_irq_attr;
    -struct irq_chip;
    struct msi_msg;
    -struct pci_dev;
    -struct irq_cfg;
    struct irq_alloc_info;

    #ifdef CONFIG_IRQ_REMAP
    @@ -42,13 +37,7 @@ extern int irq_remapping_enable(void);
    extern void irq_remapping_disable(void);
    extern int irq_remapping_reenable(int);
    extern int irq_remap_enable_fault_handling(void);
    -extern void free_remapped_irq(int irq);
    extern void panic_if_irq_remap(const char *msg);
    -extern bool setup_remapped_irq(int irq,
    - struct irq_cfg *cfg,
    - struct irq_chip *chip);
    -
    -void irq_remap_modify_chip_defaults(struct irq_chip *chip);

    extern struct irq_domain *
    irq_remapping_get_ir_irq_domain( struct irq_alloc_info *info);
    @@ -72,23 +61,11 @@ static inline int irq_remapping_enable(void) { return -ENODEV; }
    static inline void irq_remapping_disable(void) { }
    static inline int irq_remapping_reenable(int eim) { return -ENODEV; }
    static inline int irq_remap_enable_fault_handling(void) { return -ENODEV; }
    -static inline void free_remapped_irq(int irq) { }

    static inline void panic_if_irq_remap(const char *msg)
    {
    }

    -static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)
    -{
    -}
    -
    -static inline bool setup_remapped_irq(int irq,
    - struct irq_cfg *cfg,
    - struct irq_chip *chip)
    -{
    - return false;
    -}
    -
    static inline struct irq_domain *
    irq_remapping_get_ir_irq_domain(struct irq_alloc_info *info)
    {
    diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
    index 31dc4a871673..ca30365507a0 100644
    --- a/arch/x86/kernel/apic/vector.c
    +++ b/arch/x86/kernel/apic/vector.c
    @@ -283,7 +283,6 @@ static void x86_vector_free_irqs(struct irq_domain *domain,
    for (i = 0; i < nr_irqs; i++) {
    irq_data = irq_domain_get_irq_data(x86_vector_domain, virq + i);
    if (irq_data && irq_data->chip_data) {
    - free_remapped_irq(virq);
    clear_irq_vector(virq + i, irq_data->chip_data);
    free_irq_cfg(irq_data->chip_data);
    #ifdef CONFIG_X86_IO_APIC
    diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
    index bca42550b1ad..fc78b0d41f71 100644
    --- a/drivers/iommu/irq_remapping.c
    +++ b/drivers/iommu/irq_remapping.c
    @@ -25,11 +25,6 @@ int no_x2apic_optout;
    static int disable_irq_remap;
    static struct irq_remap_ops *remap_ops;

    -static bool irq_remapped(struct irq_cfg *cfg)
    -{
    - return (cfg->remapped == 1);
    -}
    -
    static void irq_remapping_disable_io_apic(void)
    {
    /*
    @@ -140,14 +135,6 @@ int __init irq_remap_enable_fault_handling(void)
    return remap_ops->enable_faulting();
    }

    -void free_remapped_irq(int irq)
    -{
    - struct irq_cfg *cfg = irq_cfg(irq);
    -
    - if (irq_remapped(cfg) && remap_ops->free_irq)
    - remap_ops->free_irq(irq);
    -}
    -
    void panic_if_irq_remap(const char *msg)
    {
    if (irq_remapping_enabled)
    @@ -159,26 +146,6 @@ void ir_ack_apic_edge(struct irq_data *data)
    ack_APIC_irq();
    }

    -static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
    -{
    - seq_printf(p, " IR-%s", data->chip->name);
    -}
    -
    -void irq_remap_modify_chip_defaults(struct irq_chip *chip)
    -{
    - chip->irq_print_chip = ir_print_prefix;
    - chip->irq_ack = ir_ack_apic_edge;
    -}
    -
    -bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
    -{
    - if (!irq_remapped(cfg))
    - return false;
    - irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
    - irq_remap_modify_chip_defaults(chip);
    - return true;
    -}
    -
    /**
    * irq_remapping_get_ir_irq_domain - Get the irqdomain associated with the IOMMU
    * device serving request @info
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2015-01-20 07:01    [W:4.274 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site