diff for duplicates of <20180420080313.18796-23-hch@lst.de> diff --git a/a/content_digest b/N1/content_digest index a8b698a..bd8cda2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,6 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -359,4 +358,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +510143e4541acd30496987e817e9d38455e3a6f015f599ff1c5a2020468c89f2
diff --git a/a/content_digest b/N2/content_digest index a8b698a..7328fd1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" + "To\0unlisted-recipients:; (no To-header on input)\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -359,4 +359,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +f307157bc4acaf3cc7c43f80e29951ed3a799860e0c09d2b340a4455aa459ec4
diff --git a/a/1.txt b/N3/1.txt index e331253..251307b 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -15,7 +15,7 @@ This also now consistenly uses flush_kernel_dcache_range for cache flushing while previously some of the SG based operations used flush_kernel_vmap_range instead. -Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Christoph Hellwig <hch at lst.de> --- arch/parisc/Kconfig | 4 + arch/parisc/include/asm/dma-mapping.h | 5 - diff --git a/a/content_digest b/N3/content_digest index a8b698a..c2b630f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-snps-arc@lists.infradead.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -39,7 +22,7 @@ "flushing while previously some of the SG based operations used\n" "flush_kernel_vmap_range instead.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" + "Signed-off-by: Christoph Hellwig <hch at lst.de>\n" "---\n" " arch/parisc/Kconfig | 4 +\n" " arch/parisc/include/asm/dma-mapping.h | 5 -\n" @@ -359,4 +342,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +7f661be83f18fa9e661e227b5f75141aed47d9eec7353fd54efe50b80a602940
diff --git a/a/1.txt b/N4/1.txt index e331253..5c3248a 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -86,7 +86,7 @@ index 91bc0cac03a1..235e2e53959e 100644 + size_t size, enum dma_data_direction dir) { - void *addr = page_address(page) + offset; -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - flush_kernel_dcache_range((unsigned long) addr, size); @@ -101,13 +101,13 @@ index 91bc0cac03a1..235e2e53959e 100644 +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - if (attrs & DMA_ATTR_SKIP_CPU_SYNC) - return; - -- if (direction == DMA_TO_DEVICE) -+ if (dir == DMA_TO_DEVICE) +- if (direction = DMA_TO_DEVICE) ++ if (dir = DMA_TO_DEVICE) return; /* @@ -128,7 +128,7 @@ index 91bc0cac03a1..235e2e53959e 100644 - int i; - struct scatterlist *sg; - -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - for_each_sg(sglist, sg, nents, i) { - unsigned long vaddr = (unsigned long)sg_virt(sg); @@ -152,12 +152,12 @@ index 91bc0cac03a1..235e2e53959e 100644 - int i; - struct scatterlist *sg; - -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - if (attrs & DMA_ATTR_SKIP_CPU_SYNC) - return; - -- if (direction == DMA_TO_DEVICE) +- if (direction = DMA_TO_DEVICE) - return; - - /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */ @@ -170,7 +170,7 @@ index 91bc0cac03a1..235e2e53959e 100644 - dma_addr_t dma_handle, size_t size, - enum dma_data_direction direction) -{ -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle), - size); @@ -180,7 +180,7 @@ index 91bc0cac03a1..235e2e53959e 100644 - dma_addr_t dma_handle, size_t size, - enum dma_data_direction direction) -{ -- BUG_ON(direction == DMA_NONE); +- BUG_ON(direction = DMA_NONE); - - flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle), - size); @@ -236,7 +236,7 @@ index 91bc0cac03a1..235e2e53959e 100644 { - void *addr; - -- if ((attrs & DMA_ATTR_NON_CONSISTENT) == 0) +- if ((attrs & DMA_ATTR_NON_CONSISTENT) = 0) - return NULL; - - addr = (void *)__get_free_pages(flag, get_order(size)); @@ -244,7 +244,7 @@ index 91bc0cac03a1..235e2e53959e 100644 - *dma_handle = (dma_addr_t)virt_to_phys(addr); - - return addr; -+ if (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl) ++ if (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl) + return pa11_dma_alloc(dev, size, dma_handle, gfp, attrs); + if (attrs & DMA_ATTR_NON_CONSISTENT) + return dma_direct_alloc(dev, size, dma_handle, gfp, attrs); @@ -258,7 +258,7 @@ index 91bc0cac03a1..235e2e53959e 100644 { - free_pages((unsigned long)vaddr, get_order(size)); - return; -+ if (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl) ++ if (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl) + pa11_dma_free(dev, size, cpu_addr, dma_addr, attrs); + else + dma_direct_free(dev, size, cpu_addr, dma_addr, attrs); @@ -315,8 +315,8 @@ index cab32ee824d2..4ad91c28ecbe 100644 free_all_bootmem(); #ifdef CONFIG_PA11 -- if (hppa_dma_ops == &pcxl_dma_ops) { -+ if (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl) { +- if (hppa_dma_ops = &pcxl_dma_ops) { ++ if (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl) { pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START); parisc_vmalloc_start = SET_MAP_OFFSET(pcxl_dma_start + PCXL_DMA_MAP_SIZE); diff --git a/a/content_digest b/N4/content_digest index a8b698a..754da7f 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,8 +1,7 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" - "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" + "Date\0Fri, 20 Apr 2018 08:03:13 +0000\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -110,7 +109,7 @@ "+\t\tsize_t size, enum dma_data_direction dir)\n" " {\n" "-\tvoid *addr = page_address(page) + offset;\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tif (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))\n" "-\t\tflush_kernel_dcache_range((unsigned long) addr, size);\n" @@ -125,13 +124,13 @@ "+void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr,\n" "+\t\tsize_t size, enum dma_data_direction dir)\n" " {\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tif (attrs & DMA_ATTR_SKIP_CPU_SYNC)\n" "-\t\treturn;\n" "-\n" - "-\tif (direction == DMA_TO_DEVICE)\n" - "+\tif (dir == DMA_TO_DEVICE)\n" + "-\tif (direction = DMA_TO_DEVICE)\n" + "+\tif (dir = DMA_TO_DEVICE)\n" " \t\treturn;\n" " \n" " \t/*\n" @@ -152,7 +151,7 @@ "-\tint i;\n" "-\tstruct scatterlist *sg;\n" "-\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tfor_each_sg(sglist, sg, nents, i) {\n" "-\t\tunsigned long vaddr = (unsigned long)sg_virt(sg);\n" @@ -176,12 +175,12 @@ "-\tint i;\n" "-\tstruct scatterlist *sg;\n" "-\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tif (attrs & DMA_ATTR_SKIP_CPU_SYNC)\n" "-\t\treturn;\n" "-\n" - "-\tif (direction == DMA_TO_DEVICE)\n" + "-\tif (direction = DMA_TO_DEVICE)\n" "-\t\treturn;\n" "-\n" "-\t/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */\n" @@ -194,7 +193,7 @@ "-\t\tdma_addr_t dma_handle, size_t size,\n" "-\t\tenum dma_data_direction direction)\n" "-{\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle),\n" "-\t\t\tsize);\n" @@ -204,7 +203,7 @@ "-\t\tdma_addr_t dma_handle, size_t size,\n" "-\t\tenum dma_data_direction direction)\n" "-{\n" - "-\tBUG_ON(direction == DMA_NONE);\n" + "-\tBUG_ON(direction = DMA_NONE);\n" "-\n" "-\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle),\n" "-\t\t\tsize);\n" @@ -260,7 +259,7 @@ " {\n" "-\tvoid *addr;\n" "-\n" - "-\tif ((attrs & DMA_ATTR_NON_CONSISTENT) == 0)\n" + "-\tif ((attrs & DMA_ATTR_NON_CONSISTENT) = 0)\n" "-\t\treturn NULL;\n" "-\n" "-\taddr = (void *)__get_free_pages(flag, get_order(size));\n" @@ -268,7 +267,7 @@ "-\t\t*dma_handle = (dma_addr_t)virt_to_phys(addr);\n" "-\n" "-\treturn addr;\n" - "+\tif (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl)\n" + "+\tif (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl)\n" "+\t\treturn pa11_dma_alloc(dev, size, dma_handle, gfp, attrs);\n" "+\tif (attrs & DMA_ATTR_NON_CONSISTENT)\n" "+\t\treturn dma_direct_alloc(dev, size, dma_handle, gfp, attrs);\n" @@ -282,7 +281,7 @@ " {\n" "-\tfree_pages((unsigned long)vaddr, get_order(size));\n" "-\treturn;\n" - "+\tif (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl)\n" + "+\tif (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl)\n" "+\t\tpa11_dma_free(dev, size, cpu_addr, dma_addr, attrs);\n" "+\telse\n" "+\t\tdma_direct_free(dev, size, cpu_addr, dma_addr, attrs);\n" @@ -339,8 +338,8 @@ " \tfree_all_bootmem();\n" " \n" " #ifdef CONFIG_PA11\n" - "-\tif (hppa_dma_ops == &pcxl_dma_ops) {\n" - "+\tif (boot_cpu_data.cpu_type == pcxl2 || boot_cpu_data.cpu_type == pcxl) {\n" + "-\tif (hppa_dma_ops = &pcxl_dma_ops) {\n" + "+\tif (boot_cpu_data.cpu_type = pcxl2 || boot_cpu_data.cpu_type = pcxl) {\n" " \t\tpcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START);\n" " \t\tparisc_vmalloc_start = SET_MAP_OFFSET(pcxl_dma_start\n" " \t\t\t\t\t\t+ PCXL_DMA_MAP_SIZE);\n" @@ -359,4 +358,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +5a91e3243c6fd616412cdd2033ffe5dff6766d59c12df900480d0d0daf270f84
diff --git a/a/content_digest b/N5/content_digest index a8b698a..9a254ff 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" + "Subject\0[OpenRISC] [PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -359,4 +342,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +80398a4833941414f2ec64e625c7aee9bf5e37c0e81914e18a4ebab6c1440252
diff --git a/a/content_digest b/N6/content_digest index a8b698a..c9e41eb 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 22/22] parisc: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:13 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -359,4 +342,4 @@ "-- \n" 2.17.0 -0fc921f988a60aad65e78527bd24415bec884f5d2847326b31d549c1efdba932 +3bad45a24c7e5d9848e503fff2f3e541343345ac1d37df28a96224761f8afb5d
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.