lkml.org 
[lkml]   [2008]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/11] VT-d: adapt domain iova_to_phys function for IOMMU API
    Date
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    drivers/pci/intel-iommu.c | 7 ++++---
    include/linux/intel-iommu.h | 2 --
    2 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
    index 8af6c96..7128105 100644
    --- a/drivers/pci/intel-iommu.c
    +++ b/drivers/pci/intel-iommu.c
    @@ -3106,15 +3106,16 @@ int intel_iommu_found(void)
    }
    EXPORT_SYMBOL_GPL(intel_iommu_found);

    -u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova)
    +static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
    + unsigned long iova)
    {
    + struct dmar_domain *dmar_domain = domain->priv;
    struct dma_pte *pte;
    u64 phys = 0;

    - pte = addr_to_dma_pte(domain, iova);
    + pte = addr_to_dma_pte(dmar_domain, iova);
    if (pte)
    phys = dma_pte_addr(pte);

    return phys;
    }
    -EXPORT_SYMBOL_GPL(intel_iommu_iova_to_phys);
    diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
    index 6bc26e0..26ccc02 100644
    --- a/include/linux/intel-iommu.h
    +++ b/include/linux/intel-iommu.h
    @@ -330,8 +330,6 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,

    extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);

    -u64 intel_iommu_iova_to_phys(struct dmar_domain *domain, u64 iova);
    -
    #ifdef CONFIG_DMAR
    int intel_iommu_found(void);
    #else /* CONFIG_DMAR */
    --
    1.5.6.4



    \
     
     \ /
      Last update: 2008-12-09 15:21    [W:0.042 / U:0.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site