Commit 42d53b4f authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by Linus Torvalds

dma-debug: allow DMA_BIDIRECTIONAL mappings to be synced with DMA_FROM_DEVICE and

There is no need to perform full BIDIR sync (copying the buffers in case
of swiotlb and similar schemes) if we know that the owner (CPU or device)
hasn't altered the data.

Addresses the false-positive reported at
http://bugzilla.kernel.org/show_bug.cgi?id=14169Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Cc: David Miller <davem@davemloft.net>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e992cd9b
...@@ -913,6 +913,9 @@ static void check_sync(struct device *dev, ...@@ -913,6 +913,9 @@ static void check_sync(struct device *dev,
ref->size); ref->size);
} }
if (entry->direction == DMA_BIDIRECTIONAL)
goto out;
if (ref->direction != entry->direction) { if (ref->direction != entry->direction) {
err_printk(dev, entry, "DMA-API: device driver syncs " err_printk(dev, entry, "DMA-API: device driver syncs "
"DMA memory with different direction " "DMA memory with different direction "
...@@ -923,9 +926,6 @@ static void check_sync(struct device *dev, ...@@ -923,9 +926,6 @@ static void check_sync(struct device *dev,
dir2name[ref->direction]); dir2name[ref->direction]);
} }
if (entry->direction == DMA_BIDIRECTIONAL)
goto out;
if (to_cpu && !(entry->direction == DMA_FROM_DEVICE) && if (to_cpu && !(entry->direction == DMA_FROM_DEVICE) &&
!(ref->direction == DMA_TO_DEVICE)) !(ref->direction == DMA_TO_DEVICE))
err_printk(dev, entry, "DMA-API: device driver syncs " err_printk(dev, entry, "DMA-API: device driver syncs "
...@@ -948,7 +948,6 @@ static void check_sync(struct device *dev, ...@@ -948,7 +948,6 @@ static void check_sync(struct device *dev,
out: out:
put_hash_bucket(bucket, &flags); put_hash_bucket(bucket, &flags);
} }
void debug_dma_map_page(struct device *dev, struct page *page, size_t offset, void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment