lkml.org 
[lkml]   [2014]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part3 v3 15/38] x86, irq: Kill x86_io_apic_ops.eoi_ioapic_pin and related interfaces
    Date
    Now there is no user of x86_io_apic_ops.eoi_ioapic_pin anymore, so kill
    it.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    arch/x86/include/asm/io_apic.h | 7 -------
    arch/x86/include/asm/x86_init.h | 1 -
    arch/x86/kernel/apic/io_apic.c | 20 ++++----------------
    arch/x86/kernel/x86_init.c | 1 -
    drivers/iommu/irq_remapping.c | 19 -------------------
    5 files changed, 4 insertions(+), 44 deletions(-)

    diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
    index 5fba350fec1f..3b54f0f9cbb7 100644
    --- a/arch/x86/include/asm/io_apic.h
    +++ b/arch/x86/include/asm/io_apic.h
    @@ -150,10 +150,6 @@ struct irq_cfg;
    extern void ioapic_insert_resources(void);
    extern int arch_early_ioapic_init(void);

    -extern void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg);
    -
    -extern void native_eoi_ioapic_pin(int apic, int pin, int vector);
    -
    extern int save_ioapic_entries(void);
    extern void mask_ioapic_entries(void);
    extern int restore_ioapic_entries(void);
    @@ -237,8 +233,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned
    x86_io_apic_ops.modify(apic, reg, value);
    }

    -extern void io_apic_eoi(unsigned int apic, unsigned int vector);
    -
    extern void setup_IO_APIC(void);
    extern void enable_IO_APIC(void);
    extern void disable_IO_APIC(void);
    @@ -282,7 +276,6 @@ static inline void disable_ioapic_support(void) { }
    #define native_io_apic_write NULL
    #define native_io_apic_modify NULL
    #define native_disable_io_apic NULL
    -#define native_eoi_ioapic_pin NULL
    #endif

    #endif /* _ASM_X86_IO_APIC_H */
    diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
    index 2637e8fb978d..fa6b1b5128ee 100644
    --- a/arch/x86/include/asm/x86_init.h
    +++ b/arch/x86/include/asm/x86_init.h
    @@ -194,7 +194,6 @@ struct x86_io_apic_ops {
    void (*write) (unsigned int apic, unsigned int reg, unsigned int value);
    void (*modify) (unsigned int apic, unsigned int reg, unsigned int value);
    void (*disable)(void);
    - void (*eoi_ioapic_pin)(int apic, int pin, int vector);
    };

    extern struct x86_init_ops x86_init;
    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 26fa504b57f6..2a10cb9f03bf 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -268,7 +268,7 @@ static __attribute_const__ struct io_apic __iomem *io_apic_base(int idx)
    + (mpc_ioapic_addr(idx) & ~PAGE_MASK);
    }

    -void io_apic_eoi(unsigned int apic, unsigned int vector)
    +static inline void io_apic_eoi(unsigned int apic, unsigned int vector)
    {
    struct io_apic __iomem *io_apic = io_apic_base(apic);
    writel(vector, &io_apic->eoi);
    @@ -524,7 +524,7 @@ static void unmask_ioapic_irq(struct irq_data *data)
    * Otherwise, we simulate the EOI message manually by changing the trigger
    * mode to edge and then back to level, with RTE being masked during this.
    */
    -void native_eoi_ioapic_pin(int apic, int pin, int vector)
    +static void __eoi_ioapic_pin(int apic, int pin, int vector)
    {
    if (mpc_ioapic_ver(apic) >= 0x20) {
    io_apic_eoi(apic, vector);
    @@ -555,19 +555,7 @@ void eoi_ioapic_pin(int vector, struct irq_cfg *cfg)

    raw_spin_lock_irqsave(&ioapic_lock, flags);
    for_each_irq_pin(entry, cfg->irq_2_pin)
    - native_eoi_ioapic_pin(entry->apic, entry->pin, vector);
    - raw_spin_unlock_irqrestore(&ioapic_lock, flags);
    -}
    -
    -void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
    -{
    - struct irq_pin_list *entry;
    - unsigned long flags;
    -
    - raw_spin_lock_irqsave(&ioapic_lock, flags);
    - for_each_irq_pin(entry, cfg->irq_2_pin)
    - x86_io_apic_ops.eoi_ioapic_pin(entry->apic, entry->pin,
    - cfg->vector);
    + __eoi_ioapic_pin(entry->apic, entry->pin, vector);
    raw_spin_unlock_irqrestore(&ioapic_lock, flags);
    }

    @@ -603,7 +591,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)
    ioapic_write_entry(apic, pin, entry);
    }
    raw_spin_lock_irqsave(&ioapic_lock, flags);
    - native_eoi_ioapic_pin(apic, pin, entry.vector);
    + __eoi_ioapic_pin(apic, pin, entry.vector);
    raw_spin_unlock_irqrestore(&ioapic_lock, flags);
    }

    diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
    index 377b22008280..ac2b604c00ec 100644
    --- a/arch/x86/kernel/x86_init.c
    +++ b/arch/x86/kernel/x86_init.c
    @@ -154,5 +154,4 @@ struct x86_io_apic_ops x86_io_apic_ops = {
    .write = native_io_apic_write,
    .modify = native_io_apic_modify,
    .disable = native_disable_io_apic,
    - .eoi_ioapic_pin = native_eoi_ioapic_pin,
    };
    diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
    index 0e2a80491170..058755b9b530 100644
    --- a/drivers/iommu/irq_remapping.c
    +++ b/drivers/iommu/irq_remapping.c
    @@ -44,21 +44,9 @@ static void irq_remapping_disable_io_apic(void)
    disconnect_bsp_APIC(0);
    }

    -static void eoi_ioapic_pin_remapped(int apic, int pin, int vector)
    -{
    - /*
    - * Intr-remapping uses pin number as the virtual vector
    - * in the RTE. Actual vector is programmed in
    - * intr-remapping table entry. Hence for the io-apic
    - * EOI we use the pin number.
    - */
    - io_apic_eoi(apic, pin);
    -}
    -
    static void __init irq_remapping_modify_x86_ops(void)
    {
    x86_io_apic_ops.disable = irq_remapping_disable_io_apic;
    - x86_io_apic_ops.eoi_ioapic_pin = eoi_ioapic_pin_remapped;
    }

    static __init int setup_nointremap(char *str)
    @@ -194,12 +182,6 @@ void ir_ack_apic_edge(struct irq_data *data)
    ack_APIC_irq();
    }

    -static void ir_ack_apic_level(struct irq_data *data)
    -{
    - ack_APIC_irq();
    - eoi_ioapic_irq(data->irq, irqd_cfg(data));
    -}
    -
    void irq_remapping_print_chip(struct irq_data *data, struct seq_file *p)
    {
    /*
    @@ -222,7 +204,6 @@ void irq_remap_modify_chip_defaults(struct irq_chip *chip)
    {
    chip->irq_print_chip = ir_print_prefix;
    chip->irq_ack = ir_ack_apic_edge;
    - chip->irq_eoi = ir_ack_apic_level;
    }

    bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-11-08 19:41    [W:2.135 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site