Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

dma-debug: use sg_dma_len accessor

Browse source 
debug_dma_map_sg() and debug_dma_unmap_sg() use length in struct
scatterlist while debug_dma_sync_sg_for_cpu() and
debug_dma_sync_sg_for_device() use dma_length. This causes bugs
warnings on some IOMMU implementations since these values are not
same; the length doesn't represent the dma length.

We always need to use sg_dma_len() accessor to get the dma length of a
scatterlist entry.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
FUJITA Tomonori 2009-05-27 09:43:02 +09:00 committed by Joerg Roedel
parent 15aedea439
commit 884d05970b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/dma-debug.c
View file

@ -839,7 +839,7 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
entry->type = dma_debug_sg; entry->type = dma_debug_sg;
entry->dev = dev; entry->dev = dev;
entry->paddr = sg_phys(s); entry->paddr = sg_phys(s);
entry->size = s->length; entry->size = sg_dma_len(s);
entry->dev_addr = sg_dma_address(s); entry->dev_addr = sg_dma_address(s);
entry->direction = direction; entry->direction = direction;
entry->sg_call_ents = nents; entry->sg_call_ents = nents;
@ -847,7 +847,7 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
if (!PageHighMem(sg_page(s))) { if (!PageHighMem(sg_page(s))) {
check_for_stack(dev, sg_virt(s)); check_for_stack(dev, sg_virt(s));
check_for_illegal_area(dev, sg_virt(s), s->length); check_for_illegal_area(dev, sg_virt(s), sg_dma_len(s));
} }
add_dma_entry(entry); add_dma_entry(entry);
@ -873,7 +873,7 @@ void debug_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,
.dev = dev, .dev = dev,
.paddr = sg_phys(s), .paddr = sg_phys(s),
.dev_addr = sg_dma_address(s), .dev_addr = sg_dma_address(s),
.size = s->length, .size = sg_dma_len(s),
.direction = dir, .direction = dir,
.sg_call_ents = 0, .sg_call_ents = 0,
}; };
@ -996,7 +996,7 @@ void debug_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
return; return;
for_each_sg(sg, s, nelems, i) { for_each_sg(sg, s, nelems, i) {
check_sync(dev, sg_dma_address(s), s->dma_length, 0, check_sync(dev, sg_dma_address(s), sg_dma_len(s), 0,
direction, true); direction, true);
} }
} }
@ -1012,7 +1012,7 @@ void debug_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
return; return;
for_each_sg(sg, s, nelems, i) { for_each_sg(sg, s, nelems, i) {
check_sync(dev, sg_dma_address(s), s->dma_length, 0, check_sync(dev, sg_dma_address(s), sg_dma_len(s), 0,
direction, false); direction, false);
} }
} }