lkml.org 
[lkml]   [2008]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] intel-iommu: move struct dmar_domain def out dma_remapping.h
    Date
    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    drivers/pci/intel-iommu.c | 18 ++++++++++++++++++
    include/linux/dma_remapping.h | 22 ++--------------------
    2 files changed, 20 insertions(+), 20 deletions(-)

    diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
    index 0f558c7..14066b1 100644
    --- a/drivers/pci/intel-iommu.c
    +++ b/drivers/pci/intel-iommu.c
    @@ -150,6 +150,24 @@ struct dma_pte {
    (p).val |= ((addr) & VTD_PAGE_MASK); } while (0)
    #define dma_pte_present(p) (((p).val & 3) != 0)

    +struct dmar_domain {
    + int id; /* domain id */
    + struct intel_iommu *iommu; /* back pointer to owning iommu */
    +
    + struct list_head devices; /* all devices' list */
    + struct iova_domain iovad; /* iova's that belong to this domain */
    +
    + struct dma_pte *pgd; /* virtual address */
    + spinlock_t mapping_lock; /* page table lock */
    + int gaw; /* max guest address width */
    +
    + /* adjusted guest address width, 0 is level 2 30-bit */
    + int agaw;
    +
    +#define DOMAIN_FLAG_MULTIPLE_DEVICES 1
    + int flags;
    +};
    +
    static void flush_unmaps_timeout(unsigned long data);

    DEFINE_TIMER(unmap_timer, flush_unmaps_timeout, 0, 0);
    diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
    index 9d5874e..3330144 100644
    --- a/include/linux/dma_remapping.h
    +++ b/include/linux/dma_remapping.h
    @@ -9,30 +9,12 @@
    #define VTD_PAGE_MASK (((u64)-1) << VTD_PAGE_SHIFT)
    #define VTD_PAGE_ALIGN(addr) (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)

    -struct root_entry;
    -
    #define DMA_PTE_READ (1)
    #define DMA_PTE_WRITE (2)

    struct intel_iommu;
    -
    -struct dmar_domain {
    - int id; /* domain id */
    - struct intel_iommu *iommu; /* back pointer to owning iommu */
    -
    - struct list_head devices; /* all devices' list */
    - struct iova_domain iovad; /* iova's that belong to this domain */
    -
    - struct dma_pte *pgd; /* virtual address */
    - spinlock_t mapping_lock; /* page table lock */
    - int gaw; /* max guest address width */
    -
    - /* adjusted guest address width, 0 is level 2 30-bit */
    - int agaw;
    -
    -#define DOMAIN_FLAG_MULTIPLE_DEVICES 1
    - int flags;
    -};
    +struct dmar_domain;
    +struct root_entry;

    /* PCI domain-device relationship */
    struct device_domain_info {
    --
    1.5.4.3


    \
     
     \ /
      Last update: 2008-11-20 16:55    [W:0.026 / U:0.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site