lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86-64: update calgary iommu to sg helpers

Browse Source 
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2007-07-24 12:38:15 +02:00
parent dbfd49fe9d
commit 8b87d9f48a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/x86/kernel/pci-calgary_64.c
View File

@@ -35,6 +35,7 @@
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/scatterlist.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/calgary.h> #include <asm/calgary.h>
#include <asm/tce.h> #include <asm/tce.h>
@@ -384,31 +385,32 @@ static void calgary_unmap_sg(struct device *dev,
struct scatterlist *sglist, int nelems, int direction) struct scatterlist *sglist, int nelems, int direction)
{ {
struct iommu_table *tbl = find_iommu_table(dev); struct iommu_table *tbl = find_iommu_table(dev);
struct scatterlist *s;
int i;
if (!translate_phb(to_pci_dev(dev))) if (!translate_phb(to_pci_dev(dev)))
return; return;
while (nelems--) { for_each_sg(sglist, s, nelems, i) {
unsigned int npages; unsigned int npages;
dma_addr_t dma = sglist->dma_address; dma_addr_t dma = s->dma_address;
unsigned int dmalen = sglist->dma_length; unsigned int dmalen = s->dma_length;
if (dmalen == 0) if (dmalen == 0)
break; break;
npages = num_dma_pages(dma, dmalen); npages = num_dma_pages(dma, dmalen);
iommu_free(tbl, dma, npages); iommu_free(tbl, dma, npages);
sglist++;
} }
} }
static int calgary_nontranslate_map_sg(struct device* dev, static int calgary_nontranslate_map_sg(struct device* dev,
struct scatterlist *sg, int nelems, int direction) struct scatterlist *sg, int nelems, int direction)
{ {
struct scatterlist *s;
int i; int i;
for (i = 0; i < nelems; i++ ) { for_each_sg(sg, s, nelems, i) {
struct scatterlist *s = &sg[i];
BUG_ON(!s->page); BUG_ON(!s->page);
s->dma_address = virt_to_bus(page_address(s->page) +s->offset); s->dma_address = virt_to_bus(page_address(s->page) +s->offset);
s->dma_length = s->length; s->dma_length = s->length;
@@ -420,6 +422,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
int nelems, int direction) int nelems, int direction)
{ {
struct iommu_table *tbl = find_iommu_table(dev); struct iommu_table *tbl = find_iommu_table(dev);
struct scatterlist *s;
unsigned long vaddr; unsigned long vaddr;
unsigned int npages; unsigned int npages;
unsigned long entry; unsigned long entry;
@@ -428,8 +431,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
if (!translate_phb(to_pci_dev(dev))) if (!translate_phb(to_pci_dev(dev)))
return calgary_nontranslate_map_sg(dev, sg, nelems, direction); return calgary_nontranslate_map_sg(dev, sg, nelems, direction);
for (i = 0; i < nelems; i++ ) { for_each_sg(sg, s, nelems, i) {
struct scatterlist *s = &sg[i];
BUG_ON(!s->page); BUG_ON(!s->page);
vaddr = (unsigned long)page_address(s->page) + s->offset; vaddr = (unsigned long)page_address(s->page) + s->offset;
@@ -454,9 +456,9 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
return nelems; return nelems;
error: error:
calgary_unmap_sg(dev, sg, nelems, direction); calgary_unmap_sg(dev, sg, nelems, direction);
for (i = 0; i < nelems; i++) { for_each_sg(sg, s, nelems, i) {
sg[i].dma_address = bad_dma_address; sg->dma_address = bad_dma_address;
sg[i].dma_length = 0; sg->dma_length = 0;
} }
return 0; return 0;
} }