diff for duplicates of <567A8226.80308@synopsys.com> diff --git a/a/1.txt b/N1/1.txt index ba3b33e..84881cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,53 +48,3 @@ It seems the dma ops rework for ARC makes kernel belly up. Patch below fixes it. -------------> ->From 96b44b39dc39542894a1081e683bd21f56cae1d1 Mon Sep 17 00:00:00 2001 -From: Vineet Gupta <vgupta@synopsys.com> -Date: Wed, 23 Dec 2015 15:41:20 +0530 -Subject: [PATCH] ARC: dma mapping fixes #2 - -Carlos Palminha reported linux-next boot broken for ARC. - -(1) dma_map_single() would recursively call itself - -| #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) -| dma_map_single_attrs -| ops->map_page -| arc_dma_map_page -| dma_map_single - -(2) arc_dma_free() to iounmap if memory is coherent - -Signed-off-by: Vineet Gupta <vgupta at synopsys.com> ---- - arch/arc/mm/dma.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c -index 695029f41a48..01eaf88bf821 100644 ---- a/arch/arc/mm/dma.c -+++ b/arch/arc/mm/dma.c -@@ -72,8 +72,8 @@ static void *arc_dma_alloc(struct device *dev, size_t size, - static void arc_dma_free(struct device *dev, size_t size, void *vaddr, - dma_addr_t dma_handle, struct dma_attrs *attrs) - { -- if (!(is_isa_arcv2() && ioc_exists) || -- dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs)) -+ if (!dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) && -+ !(is_isa_arcv2() && ioc_exists)) - iounmap((void __force __iomem *)vaddr); - - free_pages_exact((void *)dma_handle, size); -@@ -107,7 +107,8 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct -page *page, - struct dma_attrs *attrs) - { - unsigned long paddr = page_to_phys(page) + offset; -- return dma_map_single(dev, (void *)paddr, size, dir); -+ _dma_cache_sync(paddr, size, dir); -+ return (dma_addr_t)paddr; - } - - static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg, --- -1.9.1 diff --git a/a/content_digest b/N1/content_digest index 3424c69..1ec7ae6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\056784531.1000007@synopsys.com\0" - "From\0Vineet.Gupta1@synopsys.com (Vineet Gupta)\0" - "Subject\0ARC AXS101 problems with linux next-20151221\0" + "From\0Vineet Gupta <Vineet.Gupta1@synopsys.com>\0" + "Subject\0Re: ARC AXS101 problems with linux next-20151221\0" "Date\0Wed, 23 Dec 2015 16:44:46 +0530\0" - "To\0linux-snps-arc@lists.infradead.org\0" + "To\0Christoph Hellwig <hch@lst.de>\0" + "Cc\0Carlos Palminha <CARLOS.PALMINHA@synopsys.com>" + linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org> + linux-mm@kvack.org <linux-mm@kvack.org> + Alexey Brodkin <Alexey.Brodkin@synopsys.com> + lkml <linux-kernel@vger.kernel.org> + " Andrew Morton <akpm@linux-foundation.org>\0" "\00:1\0" "b\0" "Hi Christoph, Andrew\n" @@ -54,56 +60,6 @@ "\n" "Patch below fixes it.\n" "\n" - "------------->\n" - ">From 96b44b39dc39542894a1081e683bd21f56cae1d1 Mon Sep 17 00:00:00 2001\n" - "From: Vineet Gupta <vgupta@synopsys.com>\n" - "Date: Wed, 23 Dec 2015 15:41:20 +0530\n" - "Subject: [PATCH] ARC: dma mapping fixes #2\n" - "\n" - "Carlos Palminha reported linux-next boot broken for ARC.\n" - "\n" - "(1) dma_map_single() would recursively call itself\n" - "\n" - "| #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL)\n" - "| dma_map_single_attrs\n" - "| ops->map_page\n" - "| arc_dma_map_page\n" - "| dma_map_single\n" - "\n" - "(2) arc_dma_free() to iounmap if memory is coherent\n" - "\n" - "Signed-off-by: Vineet Gupta <vgupta at synopsys.com>\n" - "---\n" - " arch/arc/mm/dma.c | 7 ++++---\n" - " 1 file changed, 4 insertions(+), 3 deletions(-)\n" - "\n" - "diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c\n" - "index 695029f41a48..01eaf88bf821 100644\n" - "--- a/arch/arc/mm/dma.c\n" - "+++ b/arch/arc/mm/dma.c\n" - "@@ -72,8 +72,8 @@ static void *arc_dma_alloc(struct device *dev, size_t size,\n" - " static void arc_dma_free(struct device *dev, size_t size, void *vaddr,\n" - " \t\tdma_addr_t dma_handle, struct dma_attrs *attrs)\n" - " {\n" - "-\tif (!(is_isa_arcv2() && ioc_exists) ||\n" - "-\t dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs))\n" - "+\tif (!dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) &&\n" - "+\t !(is_isa_arcv2() && ioc_exists))\n" - " \t\tiounmap((void __force __iomem *)vaddr);\n" - "\n" - " \tfree_pages_exact((void *)dma_handle, size);\n" - "@@ -107,7 +107,8 @@ static dma_addr_t arc_dma_map_page(struct device *dev, struct\n" - "page *page,\n" - " \t\tstruct dma_attrs *attrs)\n" - " {\n" - " \tunsigned long paddr = page_to_phys(page) + offset;\n" - "-\treturn dma_map_single(dev, (void *)paddr, size, dir);\n" - "+\t_dma_cache_sync(paddr, size, dir);\n" - "+\treturn (dma_addr_t)paddr;\n" - " }\n" - "\n" - " static int arc_dma_map_sg(struct device *dev, struct scatterlist *sg,\n" - "-- \n" - 1.9.1 + -------------> -8e39149b44bd703a686e0654da7a4e89b39a60500ccf884cecf63d1401731039 +bb4d8145fcfb549cdaad7e6869cf29ed5e2dbee8e262b213cfbb34ebf3842a78
diff --git a/a/1.txt b/N2/1.txt index ba3b33e..6563530 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -65,7 +65,7 @@ Carlos Palminha reported linux-next boot broken for ARC. (2) arc_dma_free() to iounmap if memory is coherent -Signed-off-by: Vineet Gupta <vgupta at synopsys.com> +Signed-off-by: Vineet Gupta <vgupta@synopsys.com> --- arch/arc/mm/dma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 3424c69..d19c58d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,14 @@ "ref\056784531.1000007@synopsys.com\0" - "From\0Vineet.Gupta1@synopsys.com (Vineet Gupta)\0" - "Subject\0ARC AXS101 problems with linux next-20151221\0" + "From\0Vineet Gupta <Vineet.Gupta1@synopsys.com>\0" + "Subject\0Re: ARC AXS101 problems with linux next-20151221\0" "Date\0Wed, 23 Dec 2015 16:44:46 +0530\0" - "To\0linux-snps-arc@lists.infradead.org\0" + "To\0Christoph Hellwig <hch@lst.de>\0" + "Cc\0Carlos Palminha <CARLOS.PALMINHA@synopsys.com>" + linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org> + linux-mm@kvack.org <linux-mm@kvack.org> + Alexey Brodkin <Alexey.Brodkin@synopsys.com> + lkml <linux-kernel@vger.kernel.org> + " Andrew Morton <akpm@linux-foundation.org>\0" "\00:1\0" "b\0" "Hi Christoph, Andrew\n" @@ -72,7 +78,7 @@ "\n" "(2) arc_dma_free() to iounmap if memory is coherent\n" "\n" - "Signed-off-by: Vineet Gupta <vgupta at synopsys.com>\n" + "Signed-off-by: Vineet Gupta <vgupta@synopsys.com>\n" "---\n" " arch/arc/mm/dma.c | 7 ++++---\n" " 1 file changed, 4 insertions(+), 3 deletions(-)\n" @@ -106,4 +112,4 @@ "-- \n" 1.9.1 -8e39149b44bd703a686e0654da7a4e89b39a60500ccf884cecf63d1401731039 +c14d8bfc8701467624110fc9a134eb43fece1889a1a901dab6ce4585d7b213b3
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.