lkml.org 
[lkml]   [2014]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] iommu/amd: Move struct irq_2_irte into amd_iommu.c
    Commit-ID:  a266cd087cb237c796927ad4399ad29a9250f94a
    Gitweb: http://git.kernel.org/tip/a266cd087cb237c796927ad4399ad29a9250f94a
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Tue, 25 Nov 2014 15:49:48 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 26 Nov 2014 23:52:48 +0100

    iommu/amd: Move struct irq_2_irte into amd_iommu.c

    Now only amd_iommu.c access irq_2_irte, so move it from hw_irq.h into
    amd_iommu.c.

    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-25-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/hw_irq.h | 13 -------------
    drivers/iommu/amd_iommu.c | 5 +++++
    2 files changed, 5 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
    index 3520f71..494d541 100644
    --- a/arch/x86/include/asm/hw_irq.h
    +++ b/arch/x86/include/asm/hw_irq.h
    @@ -94,14 +94,6 @@ extern void trace_call_function_single_interrupt(void);
    #define trace_kvm_posted_intr_ipi kvm_posted_intr_ipi
    #endif /* CONFIG_TRACING */

    -#ifdef CONFIG_IRQ_REMAP
    -/* AMD specific interrupt remapping information */
    -struct irq_2_irte {
    - u16 devid; /* Device ID for IRTE table */
    - u16 index; /* Index into IRTE table*/
    -};
    -#endif /* CONFIG_IRQ_REMAP */
    -
    struct irq_domain;

    #ifdef CONFIG_X86_LOCAL_APIC
    @@ -184,11 +176,6 @@ struct irq_cfg {
    unsigned int dest_apicid;
    u8 vector;
    u8 move_in_progress : 1;
    -#ifdef CONFIG_IRQ_REMAP
    - union {
    - struct irq_2_irte irq_2_irte;
    - };
    -#endif
    union {
    #ifdef CONFIG_X86_IO_APIC
    struct {
    diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
    index cc4ac40..2e8bbe5 100644
    --- a/drivers/iommu/amd_iommu.c
    +++ b/drivers/iommu/amd_iommu.c
    @@ -3855,6 +3855,11 @@ union irte {
    } fields;
    };

    +struct irq_2_irte {
    + u16 devid; /* Device ID for IRTE table */
    + u16 index; /* Index into IRTE table*/
    +};
    +
    struct amd_ir_data {
    struct irq_2_irte irq_2_irte;
    union irte irte_entry;

    \
     
     \ /
      Last update: 2014-11-27 01:01    [W:6.677 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site