lkml.org 
[lkml]   [2008]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] x86: convert GART driver to generic iommu_num_pages function
    Date
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/pci-gart_64.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
    index cdf1c00..fa313d4 100644
    --- a/arch/x86/kernel/pci-gart_64.c
    +++ b/arch/x86/kernel/pci-gart_64.c
    @@ -238,7 +238,7 @@ nonforced_iommu(struct device *dev, unsigned long addr, size_t size)
    static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem,
    size_t size, int dir)
    {
    - unsigned long npages = iommu_nr_pages(phys_mem, size);
    + unsigned long npages = iommu_num_pages(phys_mem, size, PAGE_SIZE);
    unsigned long iommu_page = alloc_iommu(dev, npages);
    int i;

    @@ -301,7 +301,7 @@ static void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,
    return;

    iommu_page = (dma_addr - iommu_bus_base)>>PAGE_SHIFT;
    - npages = iommu_nr_pages(dma_addr, size);
    + npages = iommu_num_pages(dma_addr, size, PAGE_SIZE);
    for (i = 0; i < npages; i++) {
    iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;
    CLEAR_LEAK(iommu_page + i);
    @@ -384,7 +384,7 @@ static int __dma_map_cont(struct device *dev, struct scatterlist *start,
    }

    addr = phys_addr;
    - pages = iommu_nr_pages(s->offset, s->length);
    + pages = iommu_num_pages(s->offset, s->length, PAGE_SIZE);
    while (pages--) {
    iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr);
    SET_LEAK(iommu_page);
    @@ -467,7 +467,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)

    seg_size += s->length;
    need = nextneed;
    - pages += iommu_nr_pages(s->offset, s->length);
    + pages += iommu_num_pages(s->offset, s->length, PAGE_SIZE);
    ps = s;
    }
    if (dma_map_cont(dev, start_sg, i - start, sgmap, pages, need) < 0)
    --
    1.5.3.7



    \
     
     \ /
      Last update: 2008-08-04 18:09    [W:6.704 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site