lkml.org 
[lkml]   [2015]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] irq_remapping/vt-d: Move struct irq_2_iommu into intel_irq_remapping.c
    Commit-ID:  099c5c03487f6bca30c628e14e666788dd61fb33
    Gitweb: http://git.kernel.org/tip/099c5c03487f6bca30c628e14e666788dd61fb33
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Tue, 14 Apr 2015 10:29:51 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Fri, 24 Apr 2015 15:36:53 +0200

    irq_remapping/vt-d: Move struct irq_2_iommu into intel_irq_remapping.c

    Now only intel_irq_remapping.c access irq_2_iommu, so move it from
    hw_irq.h into intel_irq_remapping.c.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Tested-by: Joerg Roedel <jroedel@suse.de>
    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: 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: Dimitri Sivanich <sivanich@sgi.com>
    Cc: Joerg Roedel <joro@8bytes.org>
    Link: http://lkml.kernel.org/r/1428978610-28986-15-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/include/asm/hw_irq.h | 9 ---------
    drivers/iommu/intel_irq_remapping.c | 7 +++++++
    2 files changed, 7 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
    index 86e4698..1e0ee10 100644
    --- a/arch/x86/include/asm/hw_irq.h
    +++ b/arch/x86/include/asm/hw_irq.h
    @@ -95,14 +95,6 @@ extern void trace_call_function_single_interrupt(void);
    #endif /* CONFIG_TRACING */

    #ifdef CONFIG_IRQ_REMAP
    -/* Intel specific interrupt remapping information */
    -struct irq_2_iommu {
    - struct intel_iommu *iommu;
    - u16 irte_index;
    - u16 sub_handle;
    - u8 irte_mask;
    -};
    -
    /* AMD specific interrupt remapping information */
    struct irq_2_irte {
    u16 devid; /* Device ID for IRTE table */
    @@ -194,7 +186,6 @@ struct irq_cfg {
    u8 move_in_progress : 1;
    #ifdef CONFIG_IRQ_REMAP
    union {
    - struct irq_2_iommu irq_2_iommu;
    struct irq_2_irte irq_2_irte;
    };
    #endif
    diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
    index 9e19800..34642d3 100644
    --- a/drivers/iommu/intel_irq_remapping.c
    +++ b/drivers/iommu/intel_irq_remapping.c
    @@ -32,6 +32,13 @@ struct hpet_scope {
    unsigned int devfn;
    };

    +struct irq_2_iommu {
    + struct intel_iommu *iommu;
    + u16 irte_index;
    + u16 sub_handle;
    + u8 irte_mask;
    +};
    +
    struct intel_ir_data {
    struct irq_2_iommu irq_2_iommu;
    struct irte irte_entry;

    \
     
     \ /
      Last update: 2015-04-24 18:41    [W:4.244 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site