From: David Brownell Subject: Re: [PATCH 05/16] Blackfin SPI Driver: pass DMA overflow error to the higher level Date: Thu, 20 Nov 2008 12:29:10 -0800 Message-ID: <200811201229.10924.david-b@pacbell.net> References: <1226994760-4301-1-git-send-email-cooloney@kernel.org> <1226994760-4301-6-git-send-email-cooloney@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Mike Frysinger To: Bryan Wu Return-path: In-Reply-To: <1226994760-4301-6-git-send-email-cooloney-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-spi.vger.kernel.org On Monday 17 November 2008, Bryan Wu wrote: > From: Mike Frysinger > > If the SPI bus registers a receive overflow error, > pass the result back up to the higher levels. > > Signed-off-by: Mike Frysinger > Signed-off-by: Bryan Wu Acked-by: David Brownell > --- > drivers/spi/spi_bfin5xx.c | 16 +++++++++++----- > 1 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c > index cc415e8..642c402 100644 > --- a/drivers/spi/spi_bfin5xx.c > +++ b/drivers/spi/spi_bfin5xx.c > @@ -559,6 +559,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) > struct driver_data *drv_data = dev_id; > struct chip_data *chip = drv_data->cur_chip; > struct spi_message *msg = drv_data->cur_msg; > + u16 spistat = read_STAT(drv_data); > > dev_dbg(&drv_data->pdev->dev, "in dma_irq_handler\n"); > clear_dma_irqstat(drv_data->dma_channel); > @@ -582,13 +583,18 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) > while (!(read_STAT(drv_data) & SPIF)) > cpu_relax(); > > - msg->actual_length += drv_data->len_in_bytes; > + if (spistat & RBSY) { > + msg->state = ERROR_STATE; > + dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n"); > + } else { > + msg->actual_length += drv_data->len_in_bytes; > > - if (drv_data->cs_change) > - cs_deactive(drv_data, chip); > + if (drv_data->cs_change) > + cs_deactive(drv_data, chip); > > - /* Move to next transfer */ > - msg->state = next_transfer(drv_data); > + /* Move to next transfer */ > + msg->state = next_transfer(drv_data); > + } > > /* Schedule transfer tasklet */ > tasklet_schedule(&drv_data->pump_transfers); > -- > 1.5.6.3 > > ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/