diff for duplicates of <09282005175049.10344@bilbo.tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index 8c7fe20..c6e639e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,20 +43,20 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c - * bounce... copy the data back into/from the original buffer - * XXX How do you handle DMA_BIDIRECTIONAL here ? - */ -- if (dir = DMA_FROM_DEVICE) +- if (dir == DMA_FROM_DEVICE) - memcpy(buffer, dma_addr, size); -- else if (dir = DMA_TO_DEVICE) +- else if (dir == DMA_TO_DEVICE) - memcpy(dma_addr, buffer, size); - else + switch (target) { + case SYNC_FOR_CPU: -+ if (likely(dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL)) ++ if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)) + memcpy(buffer, dma_addr, size); + else if (dir != DMA_TO_DEVICE) + BUG(); + break; + case SYNC_FOR_DEVICE: -+ if (likely(dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL)) ++ if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)) + memcpy(dma_addr, buffer, size); + else if (dir != DMA_FROM_DEVICE) + BUG(); @@ -76,12 +76,12 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c { char *dma_addr = phys_to_virt(dev_addr); - if (dir = DMA_NONE) + if (dir == DMA_NONE) BUG(); if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) - sync_single(hwdev, dma_addr, size, dir); + sync_single(hwdev, dma_addr, size, dir, target); - else if (dir = DMA_FROM_DEVICE) + else if (dir == DMA_FROM_DEVICE) mark_clean(dma_addr, size); } @@ -510,14 +525,14 @@ void @@ -111,12 +111,12 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c { char *dma_addr = phys_to_virt(dev_addr) + offset; - if (dir = DMA_NONE) + if (dir == DMA_NONE) BUG(); if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) - sync_single(hwdev, dma_addr, size, dir); + sync_single(hwdev, dma_addr, size, dir, target); - else if (dir = DMA_FROM_DEVICE) + else if (dir == DMA_FROM_DEVICE) mark_clean(dma_addr, size); } @@ -541,14 +557,16 @@ void diff --git a/a/content_digest b/N1/content_digest index e19c67a..ea4a14b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\009282005175049.10281@bilbo.tuxdriver.com\0" "From\0John W. Linville <linville@tuxdriver.com>\0" "Subject\0[patch 2.6.14-rc2 4/6] swiotlb: support syncing DMA_BIDIRECTIONAL mappings\0" - "Date\0Wed, 28 Sep 2005 21:50:49 +0000\0" + "Date\0Wed, 28 Sep 2005 17:50:49 -0400\0" "To\0linux-kernel@vger.kernel.org" discuss@x86-64.org linux-ia64@vger.kernel.org @@ -57,20 +57,20 @@ "-\t * bounce... copy the data back into/from the original buffer\n" "-\t * XXX How do you handle DMA_BIDIRECTIONAL here ?\n" "-\t */\n" - "-\tif (dir = DMA_FROM_DEVICE)\n" + "-\tif (dir == DMA_FROM_DEVICE)\n" "-\t\tmemcpy(buffer, dma_addr, size);\n" - "-\telse if (dir = DMA_TO_DEVICE)\n" + "-\telse if (dir == DMA_TO_DEVICE)\n" "-\t\tmemcpy(dma_addr, buffer, size);\n" "-\telse\n" "+\tswitch (target) {\n" "+\tcase SYNC_FOR_CPU:\n" - "+\t\tif (likely(dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL))\n" + "+\t\tif (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))\n" "+\t\t\tmemcpy(buffer, dma_addr, size);\n" "+\t\telse if (dir != DMA_TO_DEVICE)\n" "+\t\t\tBUG();\n" "+\t\tbreak;\n" "+\tcase SYNC_FOR_DEVICE:\n" - "+\t\tif (likely(dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL))\n" + "+\t\tif (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))\n" "+\t\t\tmemcpy(dma_addr, buffer, size);\n" "+\t\telse if (dir != DMA_FROM_DEVICE)\n" "+\t\t\tBUG();\n" @@ -90,12 +90,12 @@ " {\n" " \tchar *dma_addr = phys_to_virt(dev_addr);\n" " \n" - " \tif (dir = DMA_NONE)\n" + " \tif (dir == DMA_NONE)\n" " \t\tBUG();\n" " \tif (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)\n" "-\t\tsync_single(hwdev, dma_addr, size, dir);\n" "+\t\tsync_single(hwdev, dma_addr, size, dir, target);\n" - " \telse if (dir = DMA_FROM_DEVICE)\n" + " \telse if (dir == DMA_FROM_DEVICE)\n" " \t\tmark_clean(dma_addr, size);\n" " }\n" "@@ -510,14 +525,14 @@ void\n" @@ -125,12 +125,12 @@ " {\n" " \tchar *dma_addr = phys_to_virt(dev_addr) + offset;\n" " \n" - " \tif (dir = DMA_NONE)\n" + " \tif (dir == DMA_NONE)\n" " \t\tBUG();\n" " \tif (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)\n" "-\t\tsync_single(hwdev, dma_addr, size, dir);\n" "+\t\tsync_single(hwdev, dma_addr, size, dir, target);\n" - " \telse if (dir = DMA_FROM_DEVICE)\n" + " \telse if (dir == DMA_FROM_DEVICE)\n" " \t\tmark_clean(dma_addr, size);\n" " }\n" "@@ -541,14 +557,16 @@ void\n" @@ -187,4 +187,4 @@ " \n" int -507c645edf8d005cdab052a85adf6a11a1d3fca8a50b1f62730aa27f1ddd233c +9edafb435f12979e967e638c75b3715641f2a69edbad30e292e9971221c6bf4c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.