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 1/8] intel-iommu: move DMA_32/64BIT_PFN into intel-iommu.c
    Date
    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    drivers/pci/intel-iommu.c | 3 +++
    include/linux/dma_remapping.h | 5 -----
    2 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
    index 5721196..a9032e6 100644
    --- a/drivers/pci/intel-iommu.c
    +++ b/drivers/pci/intel-iommu.c
    @@ -53,6 +53,9 @@

    #define DOMAIN_MAX_ADDR(gaw) ((((u64)1) << gaw) - 1)

    +#define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT)
    +#define DMA_32BIT_PFN IOVA_PFN(DMA_32BIT_MASK)
    +#define DMA_64BIT_PFN IOVA_PFN(DMA_64BIT_MASK)

    static void flush_unmaps_timeout(unsigned long data);

    diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
    index cf92c49..2e5a5c0 100644
    --- a/include/linux/dma_remapping.h
    +++ b/include/linux/dma_remapping.h
    @@ -9,11 +9,6 @@
    #define VTD_PAGE_MASK (((u64)-1) << VTD_PAGE_SHIFT)
    #define VTD_PAGE_ALIGN(addr) (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)

    -#define IOVA_PFN(addr) ((addr) >> PAGE_SHIFT)
    -#define DMA_32BIT_PFN IOVA_PFN(DMA_32BIT_MASK)
    -#define DMA_64BIT_PFN IOVA_PFN(DMA_64BIT_MASK)
    -
    -
    /*
    * 0: Present
    * 1-11: Reserved
    --
    1.5.4.3


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