diff for duplicates of <1532343252.3163.99.camel@pengutronix.de> diff --git a/a/1.txt b/N1/1.txt index 8164b01..60dac5b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,17 +17,17 @@ Lucas > Signed-off-by: Robin Gong <yibin.gong@nxp.com> > --- -> drivers/dma/imx-sdma.c | 17 ++++++++++++++++- -> 1 file changed, 16 insertions(+), 1 deletion(-) +> ?drivers/dma/imx-sdma.c | 17 ++++++++++++++++- +> ?1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index b4ec2d2..5973489 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -298,6 +298,15 @@ struct sdma_context_data { -> > u32 scratch7; -> } __attribute__ ((packed)); -> +> > ? u32??scratch7; +> ?} __attribute__ ((packed)); +> ? > +/* > + * All bds in one transfer should be consitent on SDMA. To easily follow it,just > + * set the dma pool size as the enough bds. For example, in dmatest case, the @@ -37,32 +37,28 @@ Lucas > + * appear if the bd numbers is over than 20. > + */ > +#define NUM_BD 20 -> -> struct sdma_engine; -> +> ? +> ?struct sdma_engine; +> ? > @@ -1273,7 +1282,7 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) -> > goto disable_clk_ahb; -> -> > sdmac->bd_pool = dma_pool_create("bd_pool", chan->device->dev, +> > ? goto disable_clk_ahb; +> ? +> > ? sdmac->bd_pool = dma_pool_create("bd_pool", chan->device->dev, > > - sizeof(struct sdma_buffer_descriptor), > > + NUM_BD * sizeof(struct sdma_buffer_descriptor), -> > 32, 0); -> -> > return 0; +> > ? 32, 0); +> ? +> > ? return 0; > @@ -1314,6 +1323,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, -> { -> > struct sdma_desc *desc; -> +> ?{ +> > ? struct sdma_desc *desc; +> ? > > + if (bds > NUM_BD) { > > + dev_err(sdmac->sdma->dev, "%d bds exceed the max %d\n", > > + bds, NUM_BD); > > + goto err_out; > > + } > + -> > desc = kzalloc((sizeof(*desc)), GFP_NOWAIT); -> > if (!desc) -> > goto err_out; ---- -To unsubscribe from this list: send the line "unsubscribe dmaengine" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +> > ? desc = kzalloc((sizeof(*desc)), GFP_NOWAIT); +> > ? if (!desc) +> > ? goto err_out; diff --git a/a/content_digest b/N1/content_digest index f0151bb..0dddeb0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ - "From\0Lucas Stach <l.stach@pengutronix.de>\0" - "Subject\0[v3,3/3] dmaengine: imx-sdma: allocate max 20 bds for one transfer\0" + "ref\01532367972-29707-1-git-send-email-yibin.gong@nxp.com\0" + "ref\01532367972-29707-4-git-send-email-yibin.gong@nxp.com\0" + "From\0l.stach@pengutronix.de (Lucas Stach)\0" + "Subject\0[PATCH v3 3/3] dmaengine: imx-sdma: allocate max 20 bds for one transfer\0" "Date\0Mon, 23 Jul 2018 12:54:12 +0200\0" - "To\0Robin Gong <yibin.gong@nxp.com>" - vkoul@kernel.org - dan.j.williams@intel.com - s.hauer@pengutronix.de - " linux@armlinux.org.uk\0" - "Cc\0dmaengine@vger.kernel.org" - linux-imx@nxp.com - kernel@pengutronix.de - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Am Dienstag, den 24.07.2018, 01:46 +0800 schrieb Robin Gong:\n" @@ -32,17 +25,17 @@ "\n" "> Signed-off-by: Robin Gong <yibin.gong@nxp.com>\n" "> ---\n" - "> \302\240drivers/dma/imx-sdma.c | 17 ++++++++++++++++-\n" - "> \302\2401 file changed, 16 insertions(+), 1 deletion(-)\n" + "> ?drivers/dma/imx-sdma.c | 17 ++++++++++++++++-\n" + "> ?1 file changed, 16 insertions(+), 1 deletion(-)\n" "> \n" "> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c\n" "> index b4ec2d2..5973489 100644\n" "> --- a/drivers/dma/imx-sdma.c\n" "> +++ b/drivers/dma/imx-sdma.c\n" "> @@ -298,6 +298,15 @@ struct sdma_context_data {\n" - "> > \302\240\tu32\302\240\302\240scratch7;\n" - "> \302\240} __attribute__ ((packed));\n" - "> \302\240\n" + "> > ?\tu32??scratch7;\n" + "> ?} __attribute__ ((packed));\n" + "> ?\n" "> +/*\n" "> + * All bds in one transfer should be consitent on SDMA. To easily follow it,just\n" "> + * set the dma pool size as the enough bds. For example, in dmatest case, the\n" @@ -52,34 +45,30 @@ "> + * appear if the bd numbers is over than 20.\n" "> + */\n" "> +#define NUM_BD 20\n" - "> \302\240\n" - "> \302\240struct sdma_engine;\n" - "> \302\240\n" + "> ?\n" + "> ?struct sdma_engine;\n" + "> ?\n" "> @@ -1273,7 +1282,7 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)\n" - "> > \302\240\t\tgoto disable_clk_ahb;\n" - "> \302\240\n" - "> > \302\240\tsdmac->bd_pool = dma_pool_create(\"bd_pool\", chan->device->dev,\n" + "> > ?\t\tgoto disable_clk_ahb;\n" + "> ?\n" + "> > ?\tsdmac->bd_pool = dma_pool_create(\"bd_pool\", chan->device->dev,\n" "> > -\t\t\t\tsizeof(struct sdma_buffer_descriptor),\n" "> > +\t\t\t\tNUM_BD * sizeof(struct sdma_buffer_descriptor),\n" - "> > \302\240\t\t\t\t32, 0);\n" - "> \302\240\n" - "> > \302\240\treturn 0;\n" + "> > ?\t\t\t\t32, 0);\n" + "> ?\n" + "> > ?\treturn 0;\n" "> @@ -1314,6 +1323,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,\n" - "> \302\240{\n" - "> > \302\240\tstruct sdma_desc *desc;\n" - "> \302\240\n" + "> ?{\n" + "> > ?\tstruct sdma_desc *desc;\n" + "> ?\n" "> > +\tif (bds > NUM_BD) {\n" "> > +\t\tdev_err(sdmac->sdma->dev, \"%d bds exceed the max %d\\n\",\n" "> > +\t\t\tbds, NUM_BD);\n" "> > +\t\tgoto err_out;\n" "> > +\t}\n" "> +\n" - "> > \302\240\tdesc = kzalloc((sizeof(*desc)), GFP_NOWAIT);\n" - "> > \302\240\tif (!desc)\n" - "> > \302\240\t\tgoto err_out;\n" - "---\n" - "To unsubscribe from this list: send the line \"unsubscribe dmaengine\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "> > ?\tdesc = kzalloc((sizeof(*desc)), GFP_NOWAIT);\n" + "> > ?\tif (!desc)\n" + "> > ?\t\tgoto err_out;" -cbdaba62fcee3424a75acb80a077a26e9dcb09c58d95b202b291fbb43e7d9574 +95bd62d7b936af57386b0c14878e2e01b00e1b8efe724471be5cb8b2c7a1ab3a
diff --git a/a/1.txt b/N2/1.txt index 8164b01..02e8633 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -62,7 +62,3 @@ Lucas > > desc = kzalloc((sizeof(*desc)), GFP_NOWAIT); > > if (!desc) > > goto err_out; ---- -To unsubscribe from this list: send the line "unsubscribe dmaengine" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index f0151bb..c391197 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,5 +1,7 @@ + "ref\01532367972-29707-1-git-send-email-yibin.gong@nxp.com\0" + "ref\01532367972-29707-4-git-send-email-yibin.gong@nxp.com\0" "From\0Lucas Stach <l.stach@pengutronix.de>\0" - "Subject\0[v3,3/3] dmaengine: imx-sdma: allocate max 20 bds for one transfer\0" + "Subject\0Re: [PATCH v3 3/3] dmaengine: imx-sdma: allocate max 20 bds for one transfer\0" "Date\0Mon, 23 Jul 2018 12:54:12 +0200\0" "To\0Robin Gong <yibin.gong@nxp.com>" vkoul@kernel.org @@ -76,10 +78,6 @@ "> +\n" "> > \302\240\tdesc = kzalloc((sizeof(*desc)), GFP_NOWAIT);\n" "> > \302\240\tif (!desc)\n" - "> > \302\240\t\tgoto err_out;\n" - "---\n" - "To unsubscribe from this list: send the line \"unsubscribe dmaengine\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "> > \302\240\t\tgoto err_out;" -cbdaba62fcee3424a75acb80a077a26e9dcb09c58d95b202b291fbb43e7d9574 +54c070c1f55a31215a67f239b218d7cd405e03c737214c67761722e4fad3ef68
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.