All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wenyou Yang <wenyou.yang@atmel.com>
To: <linux-arm-kernel@lists.infradead.org>
Cc: <grant.likely@secretlab.ca>,
	<broonie@opensource.wolfsonmicro.com>, <richard.genoud@gmail.com>,
	<plagnioj@jcrosoft.com>, <nicolas.ferre@atmel.com>,
	<JM.Lin@atmel.com>, <wenyou.yang@atmel.com>,
	<spi-devel-general@lists.sourceforge.net>,
	<linux-kernel@vger.kernel.org>
Subject: [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data
Date: Tue, 19 Mar 2013 15:45:01 +0800	[thread overview]
Message-ID: <1363679101-3834-1-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1363678866-3567-1-git-send-email-wenyou.yang@atmel.com>

From: Nicolas Ferre <nicolas.ferre@atmel.com>

The status of transfer is stored in controller data structure
so that it can be used not only by atmel_spi_msg_done() function.
This will be useful for upcoming dmaengine enabled driver.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: spi-devel-general@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org
[wenyou.yang@atmel.com: submit the patch]
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
 drivers/spi/spi-atmel.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index e3af244..4692f1f 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -209,6 +209,7 @@ struct atmel_spi {
 	unsigned long		current_remaining_bytes;
 	struct spi_transfer	*next_transfer;
 	unsigned long		next_remaining_bytes;
+	int			done_status;
 
 	void			*buffer;
 	dma_addr_t		buffer_dma;
@@ -554,15 +555,15 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master,
 
 static void
 atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,
-		struct spi_message *msg, int status, int stay)
+		struct spi_message *msg, int stay)
 {
-	if (!stay || status < 0)
+	if (!stay || as->done_status < 0)
 		cs_deactivate(as, msg->spi);
 	else
 		as->stay = msg->spi;
 
 	list_del(&msg->queue);
-	msg->status = status;
+	msg->status = as->done_status;
 
 	dev_dbg(master->dev.parent,
 		"xfer complete: %u bytes transferred\n",
@@ -574,6 +575,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,
 
 	as->current_transfer = NULL;
 	as->next_transfer = NULL;
+	as->done_status = 0;
 
 	/* continue if needed */
 	if (list_empty(&as->queue) || as->stopping)
@@ -651,7 +653,8 @@ atmel_spi_interrupt(int irq, void *dev_id)
 		/* Clear any overrun happening while cleaning up */
 		spi_readl(as, SR);
 
-		atmel_spi_msg_done(master, as, msg, -EIO, 0);
+		as->done_status = -EIO;
+		atmel_spi_msg_done(master, as, msg, 0);
 	} else if (pending & (SPI_BIT(RXBUFF) | SPI_BIT(ENDRX))) {
 		ret = IRQ_HANDLED;
 
@@ -669,7 +672,7 @@ atmel_spi_interrupt(int irq, void *dev_id)
 
 			if (atmel_spi_xfer_is_last(msg, xfer)) {
 				/* report completed message */
-				atmel_spi_msg_done(master, as, msg, 0,
+				atmel_spi_msg_done(master, as, msg,
 						xfer->cs_change);
 			} else {
 				if (xfer->cs_change) {
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: wenyou.yang@atmel.com (Wenyou Yang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data
Date: Tue, 19 Mar 2013 15:45:01 +0800	[thread overview]
Message-ID: <1363679101-3834-1-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1363678866-3567-1-git-send-email-wenyou.yang@atmel.com>

From: Nicolas Ferre <nicolas.ferre@atmel.com>

The status of transfer is stored in controller data structure
so that it can be used not only by atmel_spi_msg_done() function.
This will be useful for upcoming dmaengine enabled driver.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: spi-devel-general at lists.sourceforge.net
Cc: linux-kernel at vger.kernel.org
[wenyou.yang at atmel.com: submit the patch]
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
 drivers/spi/spi-atmel.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index e3af244..4692f1f 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -209,6 +209,7 @@ struct atmel_spi {
 	unsigned long		current_remaining_bytes;
 	struct spi_transfer	*next_transfer;
 	unsigned long		next_remaining_bytes;
+	int			done_status;
 
 	void			*buffer;
 	dma_addr_t		buffer_dma;
@@ -554,15 +555,15 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master,
 
 static void
 atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,
-		struct spi_message *msg, int status, int stay)
+		struct spi_message *msg, int stay)
 {
-	if (!stay || status < 0)
+	if (!stay || as->done_status < 0)
 		cs_deactivate(as, msg->spi);
 	else
 		as->stay = msg->spi;
 
 	list_del(&msg->queue);
-	msg->status = status;
+	msg->status = as->done_status;
 
 	dev_dbg(master->dev.parent,
 		"xfer complete: %u bytes transferred\n",
@@ -574,6 +575,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,
 
 	as->current_transfer = NULL;
 	as->next_transfer = NULL;
+	as->done_status = 0;
 
 	/* continue if needed */
 	if (list_empty(&as->queue) || as->stopping)
@@ -651,7 +653,8 @@ atmel_spi_interrupt(int irq, void *dev_id)
 		/* Clear any overrun happening while cleaning up */
 		spi_readl(as, SR);
 
-		atmel_spi_msg_done(master, as, msg, -EIO, 0);
+		as->done_status = -EIO;
+		atmel_spi_msg_done(master, as, msg, 0);
 	} else if (pending & (SPI_BIT(RXBUFF) | SPI_BIT(ENDRX))) {
 		ret = IRQ_HANDLED;
 
@@ -669,7 +672,7 @@ atmel_spi_interrupt(int irq, void *dev_id)
 
 			if (atmel_spi_xfer_is_last(msg, xfer)) {
 				/* report completed message */
-				atmel_spi_msg_done(master, as, msg, 0,
+				atmel_spi_msg_done(master, as, msg,
 						xfer->cs_change);
 			} else {
 				if (xfer->cs_change) {
-- 
1.7.9.5

  parent reply	other threads:[~2013-03-19  7:48 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19  7:41 [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Wenyou Yang
2013-03-19  7:41 ` Wenyou Yang
2013-03-19  7:42 ` [PATCH v7 01/14] spi/spi-atmel: detect the capabilities of SPI core by reading the VERSION register Wenyou Yang
2013-03-19  7:42   ` Wenyou Yang
2013-04-01 13:38   ` Mark Brown
2013-04-01 13:38     ` Mark Brown
2013-03-19  7:43 ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1,2,3, not only on CS0 Wenyou Yang
2013-03-19  7:43   ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1, 2, 3, " Wenyou Yang
2013-03-19  7:43   ` Wenyou Yang
2013-04-01 13:41   ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1,2,3, " Mark Brown
2013-04-01 13:41     ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1, 2, 3, " Mark Brown
2013-03-19  7:43 ` [PATCH v7 03/14] spi/spi-atmel: add physical base address Wenyou Yang
2013-03-19  7:43   ` Wenyou Yang
2013-03-19  7:43   ` Wenyou Yang
2013-04-01 13:41   ` Mark Brown
2013-04-01 13:41     ` Mark Brown
2013-04-02  5:49     ` Yang, Wenyou
2013-04-02  5:49       ` Yang, Wenyou
2013-04-02  5:49       ` Yang, Wenyou
2013-04-02  6:17     ` Yang, Wenyou
2013-04-02  6:17       ` Yang, Wenyou
2013-04-02  6:17       ` Yang, Wenyou
2013-03-19  7:44 ` [PATCH v7 04/14] spi/spi-atmel: call unmapping on transfers buffers Wenyou Yang
2013-03-19  7:44   ` Wenyou Yang
2013-04-01 13:43   ` Mark Brown
2013-04-01 13:43     ` Mark Brown
2013-03-19  7:45 ` Wenyou Yang [this message]
2013-03-19  7:45   ` [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data Wenyou Yang
2013-04-01 13:43   ` Mark Brown
2013-04-01 13:43     ` Mark Brown
2013-03-19  7:46 ` [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations Wenyou Yang
2013-03-19  7:46   ` Wenyou Yang
2013-03-19  7:46   ` Wenyou Yang
2013-04-01 13:46   ` Mark Brown
2013-04-01 13:46     ` Mark Brown
2013-04-03  5:09     ` Yang, Wenyou
2013-04-03  5:09       ` Yang, Wenyou
2013-04-03  5:09       ` Yang, Wenyou
2013-03-19  7:46 ` [PATCH v7 07/14] spi/spi-atmel: add dmaengine support Wenyou Yang
2013-03-19  7:46   ` Wenyou Yang
2013-03-19  7:47 ` [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes Wenyou Yang
2013-03-19  7:47   ` Wenyou Yang
2013-04-01 13:51   ` Mark Brown
2013-04-01 13:51     ` Mark Brown
2013-04-02  5:45     ` Yang, Wenyou
2013-04-02  5:45       ` Yang, Wenyou
2013-04-02  5:45       ` Yang, Wenyou
2013-03-19  7:47 ` [PATCH v7 09/14] spi/spi-atmel: correct 16 bits transfers using PIO Wenyou Yang
2013-03-19  7:47   ` Wenyou Yang
2013-04-01 13:53   ` Mark Brown
2013-04-01 13:53     ` Mark Brown
2013-03-19  7:49 ` [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA Wenyou Yang
2013-03-19  7:49   ` Wenyou Yang
2013-03-19  7:49   ` Wenyou Yang
2013-04-01 13:53   ` Mark Brown
2013-04-01 13:53     ` Mark Brown
2013-04-02  5:46     ` Yang, Wenyou
2013-04-02  5:46       ` Yang, Wenyou
2013-04-02  5:46       ` Yang, Wenyou
2013-03-19  7:49 ` [PATCH v7 11/14] ARM: at91: add clocks for spi dt entries Wenyou Yang
2013-03-19  7:49   ` Wenyou Yang
2013-03-19  7:50 ` [PATCH v7 12/14] ARM: dts: add spi nodes for atmel SoC Wenyou Yang
2013-03-19  7:50   ` Wenyou Yang
2013-03-19  7:50   ` Wenyou Yang
2013-03-19  7:51 ` [PATCH v7 13/14] ARM: dts: add spi nodes for the atmel boards Wenyou Yang
2013-03-19  7:51   ` Wenyou Yang
2013-03-19  7:51   ` Wenyou Yang
2013-03-19  7:52 ` [PATCH v7 14/14] ARM: dts: add pinctrl property for spi node for atmel SoC Wenyou Yang
2013-03-19  7:52   ` Wenyou Yang
     [not found] ` <1363678866-3567-1-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2013-03-21  9:32   ` [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Nicolas Ferre
2013-03-21  9:32     ` Nicolas Ferre
     [not found]     ` <514AD3A2.50203-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2013-03-22  9:26       ` Nicolas Ferre
2013-03-22  9:26         ` Nicolas Ferre

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=1363679101-3834-1-git-send-email-wenyou.yang@atmel.com \
    --to=wenyou.yang@atmel.com \
    --cc=JM.Lin@atmel.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=richard.genoud@gmail.com \
    --cc=spi-devel-general@lists.sourceforge.net \
    /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: link
Be 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.