From: Geert Uytterhoeven <geert+renesas@glider.be> To: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> Subject: [PATCH 2/2] spi: sh-msiof: Fix transmit-only DMA transfers Date: Thu, 07 Aug 2014 12:07:43 +0000 [thread overview] Message-ID: <1407413263-20177-2-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1407413263-20177-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> Fix tx/rx mixup, which broke transmit-only transfers. Introduced by commit 4240305f7cbdc7782aa8bc40cc702775d9ac0839 ("spi: sh-msiof: Fix leaking of unused DMA descriptors"). Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Feel free to fold into commit 4240305f7cbdc7782aa8bc40cc702775d9ac0839 ("spi: sh-msiof: Fix leaking of unused DMA descriptors") --- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 0d9ccd0953de..5ee13a2d93df 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -689,9 +689,9 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, reinit_completion(&p->done); /* Now start DMA */ - if (tx) - dma_async_issue_pending(p->master->dma_rx); if (rx) + dma_async_issue_pending(p->master->dma_rx); + if (tx) dma_async_issue_pending(p->master->dma_tx); ret = sh_msiof_spi_start(p, rx); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> To: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> Subject: [PATCH 2/2] spi: sh-msiof: Fix transmit-only DMA transfers Date: Thu, 7 Aug 2014 14:07:43 +0200 [thread overview] Message-ID: <1407413263-20177-2-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1407413263-20177-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> Fix tx/rx mixup, which broke transmit-only transfers. Introduced by commit 4240305f7cbdc7782aa8bc40cc702775d9ac0839 ("spi: sh-msiof: Fix leaking of unused DMA descriptors"). Reported-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> --- Feel free to fold into commit 4240305f7cbdc7782aa8bc40cc702775d9ac0839 ("spi: sh-msiof: Fix leaking of unused DMA descriptors") --- drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 0d9ccd0953de..5ee13a2d93df 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -689,9 +689,9 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, reinit_completion(&p->done); /* Now start DMA */ - if (tx) - dma_async_issue_pending(p->master->dma_rx); if (rx) + dma_async_issue_pending(p->master->dma_rx); + if (tx) dma_async_issue_pending(p->master->dma_tx); ret = sh_msiof_spi_start(p, rx); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-08-07 12:07 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-06 12:58 [PATCH 00/12] spi: rspi and sh-msiof driver updates Geert Uytterhoeven 2014-08-06 12:58 ` Geert Uytterhoeven 2014-08-06 12:58 ` [PATCH 01/12] spi: rspi: Fix leaking of unused DMA descriptors Geert Uytterhoeven 2014-08-06 12:58 ` Geert Uytterhoeven 2014-08-06 20:11 ` Mark Brown 2014-08-06 20:11 ` Mark Brown 2014-08-06 12:58 ` [PATCH 02/12] spi: rspi: Remove unneeded semicolon Geert Uytterhoeven 2014-08-06 12:58 ` Geert Uytterhoeven 2014-08-06 20:26 ` Mark Brown 2014-08-06 20:26 ` Mark Brown [not found] ` <1407329949-5695-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> 2014-08-06 12:59 ` [PATCH 03/12] spi: rspi: Use devm_kasprintf() Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven [not found] ` <1407329949-5695-4-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> 2014-08-06 20:26 ` Mark Brown 2014-08-06 20:26 ` Mark Brown 2014-08-06 12:59 ` [PATCH 04/12] spi: rspi: Configure DMA slave bus width to 8 bit Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 20:26 ` Mark Brown 2014-08-06 20:26 ` Mark Brown 2014-08-06 12:59 ` [PATCH 05/12] [v2] spi: rspi: Add DT support to DMA setup Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 20:28 ` Mark Brown 2014-08-06 20:28 ` Mark Brown 2014-08-06 12:59 ` [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-07 0:37 ` Simon Horman 2014-08-07 0:37 ` Simon Horman 2014-08-07 0:39 ` Simon Horman 2014-08-07 0:39 ` Simon Horman 2014-08-07 0:41 ` Simon Horman 2014-08-07 0:41 ` Simon Horman [not found] ` <20140807004107.GB30872-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org> 2014-08-07 8:27 ` Geert Uytterhoeven 2014-08-07 8:27 ` Geert Uytterhoeven 2014-08-08 1:38 ` Simon Horman 2014-08-08 1:38 ` Simon Horman 2014-08-06 12:59 ` [PATCH 10/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIOF Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 12:59 ` [PATCH 12/12] ARM: shmobile: r8a7790 " Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-07 0:16 ` [PATCH 00/12] spi: rspi and sh-msiof driver updates Laurent Pinchart 2014-08-07 0:16 ` Laurent Pinchart 2014-08-06 12:59 ` [PATCH 06/12] spi: sh-msiof: Fix leaking of unused DMA descriptors Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 20:35 ` Mark Brown 2014-08-06 20:35 ` Mark Brown 2014-08-07 0:07 ` Laurent Pinchart 2014-08-07 0:07 ` Laurent Pinchart 2014-08-07 8:55 ` Geert Uytterhoeven 2014-08-07 8:55 ` Geert Uytterhoeven [not found] ` <CAMuHMdUd3OKqDwhLSCMW-rEQSnWky+saN5TgC005rkmNPfEL+g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2014-08-07 12:07 ` [PATCH 1/2] spi: sh-msiof: Return early in sh_msiof_dma_once() where possible Geert Uytterhoeven 2014-08-07 12:07 ` Geert Uytterhoeven [not found] ` <1407413263-20177-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> 2014-08-07 12:07 ` Geert Uytterhoeven [this message] 2014-08-07 12:07 ` [PATCH 2/2] spi: sh-msiof: Fix transmit-only DMA transfers Geert Uytterhoeven 2014-08-07 12:51 ` Laurent Pinchart 2014-08-07 12:51 ` Laurent Pinchart 2014-08-07 12:52 ` [PATCH 1/2] spi: sh-msiof: Return early in sh_msiof_dma_once() where possible Laurent Pinchart 2014-08-07 12:52 ` Laurent Pinchart 2014-08-07 17:41 ` Mark Brown 2014-08-07 17:41 ` Mark Brown 2014-08-06 12:59 ` [PATCH 07/12] spi: sh-msiof: Configure DMA slave bus width Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven [not found] ` <1407329949-5695-8-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org> 2014-08-06 20:36 ` Mark Brown 2014-08-06 20:36 ` Mark Brown 2014-08-06 12:59 ` [PATCH 08/12] [v2] spi: sh-msiof: Add DT support to DMA setup Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 20:36 ` Mark Brown 2014-08-06 20:36 ` Mark Brown 2014-08-06 12:59 ` [PATCH 11/12] ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI Geert Uytterhoeven 2014-08-06 12:59 ` Geert Uytterhoeven 2014-08-06 20:29 ` [PATCH 00/12] spi: rspi and sh-msiof driver updates Mark Brown 2014-08-06 20:29 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1407413263-20177-2-git-send-email-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org \ --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.