Blackfin SPI Driver: Fix bug when SPI full-duplex
PATCH 1/1 Blackfin SPI Driver: Fix bug when SPI full-duplex
From: Vitja Makarov <[email protected]>
Check if full-duplex and DMA are used together, fall-back to PIO mode.
Signed-off-by Vitja Makarov <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- drivers/spi/spi_bfin5xx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/spi/spi_bfin5xx.c +4 -2
@@ -608,6 +608,7 @@ static void pump_transfers(unsigned long data)u8 width;u16 cr, dma_width, dma_config;u32 tranf_success =1 ; +u8 full_duplex =0 ;/* Get current state information */ message = drv_data->cur_msg;
@@ -658,6 +659,7 @@ static void pump_transfers(unsigned long data) }if (transfer->rx_buf !=NULL ) { + full_duplex = transfer->tx_buf !=NULL ; drv_data->rx = transfer->rx_buf; drv_data->rx_end = drv_data->rx + transfer->len; dev_dbg(&drv_data->pdev->dev, "rx_buf is %p, rx_end is %p\n",
@@ -740,7 +742,7 @@ static void pump_transfers(unsigned long data)* successful use different way to r/w according to * drv_data->cur_chip->enable_dma */ -if (drv_data->cur_chip->enable_dma && drv_data->len >6 ) { +if (!full_duplex && drv_data->cur_chip->enable_dma && drv_data->len >6 ) {disable_dma (drv_data->dma_channel);clear_dma_irqstat (drv_data->dma_channel);
@@ -828,7 +830,7 @@ static void pump_transfers(unsigned long data)/* IO mode write then read */ dev_dbg (&drv_data->pdev->dev,"doing IO transfer\n" ); -if (drv_data->tx !=NULL && drv_data->rx !=NULL ) { +if (full_duplex) {/* full duplex mode */ BUG_ON ((drv_data->tx_end - drv_data->tx) != (drv_data->rx_end - drv_data->rx));
Signature · 7 lines
1.5.5 ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone