spi: dw: make DMA working
v2 cover spi: dw: make DMA working
This patch series dedicated to make DMA working on Intel Medfield device with SPI DW and DW DMA. The previous version would be found here [1].
First two patches are bug fixes. Patch 5/9 is bugfix as well, though it's not marked as a fix to reduce a noise on stable kernels, where DMA wasn't working properly anyway. Last one is the removal of old DMA driver, since the only user of it in upstrem was SPI DW.
NOTE: the patch series depends on not applied yet [2, 3].
Vinod, since the patch 9/9 removes the driver your are author of, please give your Ack. Reliminary answer, as I remember, was okay to remove.
The driver was tested in loop back mode. It looks like there are not so many users of it right now, but I would really appreciate if anyone could test the driver on different hardware platforms (to be sure that I didn't break it).
As a side effect the patch 8/9 fixes the memore leak in probe(). Mark, we discussed tha bug earlier in last year.
[1] http://www.spinics.net/lists/linux-spi/msg01871.html
[2] http://marc.info/?l=linux-spi&m=142530114318498&w=2
[3] http://www.spinics.net/lists/linux-spi/msg02982.html
Changelog v2:
- change the approach (most of the patches were rewritten)
- rebased on top of recent linux-next
- added IRQ handler for DMA case to cover FIFO overrun/underrun issue
Andy Shevchenko (9):
spi: dw-mid: avoid potential NULL dereference
spi: dw-mid: clear BUSY flag fist and test other one
spi: dw-mid: convert value of dma_width to enum dma_slave_buswidth
spi: dw-mid: split dma_setup() from dma_transfer()
spi: dw-mid: take care of FIFO overrun/underrun when do DMA
spi: dw-mid: clear ongoing DMA transfers on timeout
spi: dw-mid: move to use core SPI DMA mappings
spi: dw-mid: convert to use dw_dmac instead of intel_mid_dma
dmaengine: intel-mid-dma: remove the driver
drivers/dma/Kconfig | 13 - drivers/dma/Makefile | 1 - drivers/dma/intel_mid_dma.c | 1447 -------------------------------------- drivers/dma/intel_mid_dma_regs.h | 299 -------- drivers/spi/Kconfig | 2 +- drivers/spi/spi-dw-mid.c | 169 +++-- drivers/spi/spi-dw.c | 74 +- drivers/spi/spi-dw.h | 22 +- include/linux/intel_mid_dma.h | 76 -- 9 files changed, 147 insertions(+), 1956 deletions(-) delete mode 100644 drivers/dma/intel_mid_dma.c delete mode 100644 drivers/dma/intel_mid_dma_regs.h delete mode 100644 include/linux/intel_mid_dma.h
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425320166-13788-1-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/[email protected]
PATCH v2 1/9 spi: dw-mid: avoid potential NULL dereference
When DMA descriptor allocation fails we should not try to assign any fields in the bad descriptor. The patch adds the necessary checks for that.
--- drivers/spi/spi-dw-mid.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/spi/spi-dw-mid.c +6 -0
@@ -139,6 +139,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx(struct dw_spi *dws)1 ,DMA_MEM_TO_DEV , DMA_PREP_INTERRUPT | DMA_CTRL_ACK); +if (!txdesc) +return NULL ; + txdesc->callback = dw_spi_dma_tx_done; txdesc->callback_param = dws;
@@ -184,6 +187,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws)1 ,DMA_DEV_TO_MEM , DMA_PREP_INTERRUPT | DMA_CTRL_ACK); +if (!rxdesc) +return NULL ; + rxdesc->callback = dw_spi_dma_rx_done; rxdesc->callback_param = dws;
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425320166-13788-2-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/[email protected]
Mark Brown
AppliedRe: [PATCH v2 1/9] spi: dw-mid: avoid potential NULL dereference
Quoted 2 lines · Andy Shevchenko
When DMA descriptor allocation fails we should not try to assign any fields in the bad descriptor. The patch adds the necessary checks for that.
Applied, thanks. The rest of the series all looks OK but it looks like we should get patch 2 into stable like I said in reply to it - apply that on fix/dw and then everything else on a merge of that and topic/dw.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 1/9] spi: dw-mid: avoid potential NULL dereference
Quoted 7 lines · Mark Brown
Quoted 2 lines · Andy Shevchenko
When DMA descriptor allocation fails we should not try to assign any fields in the bad descriptor. The patch adds the necessary checks for that.
Applied, thanks. The rest of the series all looks OK but it looks like we should get patch 2 into stable like I said in reply to it - apply that on fix/dw
Okay, I have resent it just in case.
Quoted 1 line
and then everything else on a merge of that and topic/dw.
Just to kindly remind that it has a dependency on two previous series, one of them touches SPI core.
Signature · 7 lines
Andy Shevchenko <[email protected]> Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/9 spi: dw-mid: clear BUSY flag fist and test other one
In reply to a message not in the archiveThe logic of DMA completion is broken now since test_and_clear_bit() never returns the other bit is set. It means condition are always false and we have spi_finalize_current_transfer() called per each DMA completion which is wrong.
The patch fixes logic by clearing BUSY bit first and then check for the other one.
--- drivers/spi/spi-dw-mid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/spi-dw-mid.c +4 -2
@@ -108,7 +108,8 @@ static void dw_spi_dma_tx_done(void *arg) {struct dw_spi *dws = arg; -if (test_and_clear_bit (TX_BUSY , &dws->dma_chan_busy) &BIT (RX_BUSY )) +clear_bit (TX_BUSY , &dws->dma_chan_busy); +if (test_bit (RX_BUSY , &dws->dma_chan_busy))return ;spi_finalize_current_transfer (dws->master); }
@@ -156,7 +157,8 @@ static void dw_spi_dma_rx_done(void *arg) {struct dw_spi *dws = arg; -if (test_and_clear_bit (RX_BUSY , &dws->dma_chan_busy) &BIT (TX_BUSY )) +clear_bit (RX_BUSY , &dws->dma_chan_busy); +if (test_bit (TX_BUSY , &dws->dma_chan_busy))return ;spi_finalize_current_transfer (dws->master); }
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425320166-13788-3-git-send-email-andriy.shevchenko-VuQAYsv1563Yd54FQh9/[email protected]
Re: [PATCH v2 2/9] spi: dw-mid: clear BUSY flag fist and test other one
Quoted 8 lines · Andy Shevchenko
The logic of DMA completion is broken now since
test_and_clear_bit()never returns the other bit is set. It means condition are always false and we havespi_finalize_current_transfer()called per each DMA completion which is wrong.The patch fixes logic by clearing BUSY bit first and then check for the other one.
Fixes 30c8eb52cc4a (spi: dw-mid: split rx and tx callbacks when DMA)
The commit this is fixing is in v3.19 so this should go to stable but I can't apply this against my fix/dw branch. Can you generate a version that can be applied there please? We'll need to work out the merge issues with the current code I gues...
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 2/9] spi: dw-mid: clear BUSY flag fist and test other one
Quoted 8 lines · Mark Brown
Quoted 7 lines · Andy Shevchenko
The logic of DMA completion is broken now since
test_and_clear_bit()never returns the other bit is set. It means condition are always false and we havespi_finalize_current_transfer()called per each DMA completion which is wrong.The patch fixes logic by clearing BUSY bit first and then check for the other one.
Quoted 6 lines
Quoted 1 line
Fixes 30c8eb52cc4a (spi: dw-mid: split rx and tx callbacks when DMA)The commit this is fixing is in v3.19 so this should go to stable but I can't apply this against my fix/dw branch. Can you generate a version that can be applied there please? We'll need to work out the merge issues with the current code I gues...
Hmm… Just tried apply on top on fix/dw using
git am -C1 -s 0001-spi-dw-mid-clear-BUSY-flag-fist-and-test-other-one.patch
It went fine with reduced context.
Shall I still resend you that version?
Signature · 7 lines
Andy Shevchenko <[email protected]> Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1425645629.14897.196.camel-VuQAYsv1563Yd54FQh9/[email protected]
Re: [PATCH v2 2/9] spi: dw-mid: clear BUSY flag fist and test other one
Quoted 7 lines · Andy Shevchenko
Quoted 4 lines · Mark Brown
The commit this is fixing is in v3.19 so this should go to stable but I can't apply this against my fix/dw branch. Can you generate a version that can be applied there please? We'll need to work out the merge issues with the current code I gues...
Quoted 8 lines
Hmm… Just tried apply on top on fix/dw using
git am -C1 -s 0001-spi-dw-mid-clear-BUSY-flag-fist-and-test-other-one.patch
It went fine with reduced context.
Shall I still resend you that version?
Yes, please resend.
PATCH v2 3/9 spi: dw-mid: convert value of dma_width to enum dma_slave_buswidth
In reply to a message not in the archiveDMAEngine has a specific type to be used for bus width. This patch converts the code to use the values of the specific type when configure DMA transfer.
--- drivers/spi/spi-dw-mid.c | 13 +++++++++++-- drivers/spi/spi-dw.c | 12 ++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-)
drivers/spi/spi-dw-mid.c +11 -2
@@ -100,6 +100,15 @@ static void mid_spi_dma_exit(struct dw_spi *dws)dma_release_channel (dws->rxchan); } +static enum dma_slave_buswidth convert_dma_width (u32 dma_width) { +if (dma_width ==1 ) +return DMA_SLAVE_BUSWIDTH_1_BYTE ; +else if (dma_width ==2 ) +return DMA_SLAVE_BUSWIDTH_2_BYTES ; + +return DMA_SLAVE_BUSWIDTH_UNDEFINED ; +} +/* * dws->dma_chan_busy is set before the dma transfer starts, callback for tx * channel will clear a corresponding bit.
@@ -126,7 +135,7 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx(struct dw_spi *dws) txconf.dst_addr = dws->dma_addr; txconf.dst_maxburst =LNW_DMA_MSIZE_16 ; txconf.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - txconf.dst_addr_width = dws->dma_width; + txconf.dst_addr_width =convert_dma_width (dws->dma_width); txconf.device_fc = false;dmaengine_slave_config (dws->txchan, &txconf);
@@ -175,7 +184,7 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws) rxconf.src_addr = dws->dma_addr; rxconf.src_maxburst =LNW_DMA_MSIZE_16 ; rxconf.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - rxconf.src_addr_width = dws->dma_width; + rxconf.src_addr_width =convert_dma_width (dws->dma_width); rxconf.device_fc = false;dmaengine_slave_config (dws->rxchan, &rxconf);
drivers/spi/spi-dw.c +8 -4
@@ -315,7 +315,6 @@ static int dw_spi_transfer_one(struct spi_master *master, {struct dw_spi *dws =spi_master_get_devdata (master);struct chip_data *chip =spi_get_ctldata (spi); -u8 bits =0 ;u8 imask =0 ;u8 cs_change =0 ;u16 txlevel =0 ;
@@ -357,9 +356,14 @@ static int dw_spi_transfer_one(struct spi_master *master, } }if (transfer->bits_per_word) { - bits = transfer->bits_per_word; - dws->n_bytes = dws->dma_width = bits >>3 ; - cr0 = (bits -1 ) +if (transfer->bits_per_word ==8 ) { + dws->n_bytes =1 ; + dws->dma_width =1 ; + }else if (transfer->bits_per_word ==16 ) { + dws->n_bytes =2 ; + dws->dma_width =2 ; + } + cr0 = (transfer->bits_per_word -1 ) | (chip->type <<SPI_FRF_OFFSET ) | (spi->mode <<SPI_MODE_OFFSET ) | (chip->tmode <<SPI_TMOD_OFFSET );
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 4/9 spi: dw-mid: split dma_setup() from dma_transfer()
In reply to a message not in the archiveThe patch splits DMA preparatory code to dma_setup() callback. The change also converts transfer_one() to program DMA whenever the transfer is DMA mapped. The change is a follow up of the converion to use SPI core transfer_one_message(). Since the DMA mapped transfers can be interleaved with PIO ones the DMA related configuration should respect that.
--- drivers/spi/spi-dw-mid.c | 17 ++++++----------- drivers/spi/spi-dw.c | 23 +++++++++++++---------- drivers/spi/spi-dw.h | 4 ++-- 3 files changed, 21 insertions(+), 23 deletions(-)
drivers/spi/spi-dw-mid.c +6 -11
@@ -207,12 +207,10 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws)return rxdesc; } -static void dw_spi_dma_setup (struct dw_spi *dws) +static int mid_spi_dma_setup (struct dw_spi *dws) {u16 dma_ctrl =0 ; -spi_enable_chip (dws,0 ); -dw_writew (dws,DW_SPI_DMARDLR ,0xf );dw_writew (dws,DW_SPI_DMATDLR ,0x10 );
@@ -222,21 +220,17 @@ static void dw_spi_dma_setup(struct dw_spi *dws) dma_ctrl |=SPI_DMA_RDMAE ;dw_writew (dws,DW_SPI_DMACR , dma_ctrl); -spi_enable_chip (dws,1 ); +return 0 ; } -static int mid_spi_dma_transfer (struct dw_spi *dws,int cs_change) +static int mid_spi_dma_transfer (struct dw_spi *dws) {struct dma_async_tx_descriptor *txdesc, *rxdesc; -/* 1. setup DMA related registers */ -if (cs_change) -dw_spi_dma_setup (dws); - -/* 2. Prepare the TX dma transfer */ +/* Prepare the TX dma transfer */ txdesc =dw_spi_dma_prepare_tx (dws); -/* 3. Prepare the RX dma transfer */ +/* Prepare the RX dma transfer */ rxdesc =dw_spi_dma_prepare_rx (dws);/* rx must be started before tx due to spi instinct */
@@ -258,6 +252,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)static struct dw_spi_dma_ops mid_dma_ops = { .dma_init = mid_spi_dma_init, .dma_exit = mid_spi_dma_exit, + .dma_setup = mid_spi_dma_setup, .dma_transfer = mid_spi_dma_transfer, };#endif
drivers/spi/spi-dw.c +13 -10
@@ -316,11 +316,11 @@ static int dw_spi_transfer_one(struct spi_master *master,struct dw_spi *dws =spi_master_get_devdata (master);struct chip_data *chip =spi_get_ctldata (spi);u8 imask =0 ; -u8 cs_change =0 ;u16 txlevel =0 ;u16 clk_div =0 ;u32 speed =0 ;u32 cr0 =0 ; +int ret; dws->n_bytes = chip->n_bytes; dws->dma_width = chip->dma_width;
@@ -332,8 +332,6 @@ static int dw_spi_transfer_one(struct spi_master *master, dws->rx = transfer->rx_buf; dws->rx_end = dws->rx + transfer->len; dws->len = transfer->len; -if (chip != dws->prev_chip) - cs_change =1 ;spi_enable_chip (dws,0 );
@@ -397,7 +395,13 @@ static int dw_spi_transfer_one(struct spi_master *master,* Interrupt mode * we only need set the TXEI IRQ, as TX/RX always happen syncronizely */ -if (!dws->dma_mapped && !chip->poll_mode) { +if (dws->dma_mapped) { + ret = dws->dma_ops->dma_setup (dws); +if (ret <0 ) { +spi_enable_chip (dws,1 ); +return ret; + } + }else if (!chip->poll_mode) { txlevel =min_t (u16, dws->fifo_len /2 , dws->len / dws->n_bytes);dw_writew (dws,DW_SPI_TXFLTR , txlevel);
@@ -411,11 +415,11 @@ static int dw_spi_transfer_one(struct spi_master *master,spi_enable_chip (dws,1 ); -if (cs_change) - dws->prev_chip = chip; - -if (dws->dma_mapped) - dws->dma_ops->dma_transfer (dws, cs_change); +if (dws->dma_mapped) { + ret = dws->dma_ops->dma_transfer (dws); +if (ret <0 ) +return ret; + }if (chip->poll_mode)return poll_transfer (dws);
@@ -546,7 +550,6 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) dws->master = master; dws->type =SSI_MOTO_SPI ; - dws->prev_chip =NULL ; dws->dma_inited =0 ; dws->dma_addr = (dma_addr_t)(dws->paddr +0x60 );snprintf (dws->name,sizeof (dws->name),"dw_spi%d" , dws->bus_num);
drivers/spi/spi-dw.h +2 -2
@@ -91,7 +91,8 @@ struct dw_spi;struct dw_spi_dma_ops {int (*dma_init)(struct dw_spi *dws);void (*dma_exit)(struct dw_spi *dws); -int (*dma_transfer)(struct dw_spi *dws,int cs_change); +int (*dma_setup)(struct dw_spi *dws); +int (*dma_transfer)(struct dw_spi *dws); };struct dw_spi {
@@ -109,7 +110,6 @@ struct dw_spi {u16 num_cs;/* supported slave numbers */ /* Current message transfer state info */ -struct chip_data *prev_chip;size_t len;void *tx;void *tx_end;
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 5/9 spi: dw-mid: take care of FIFO overrun/underrun when do DMA
In reply to a message not in the archiveIn according to documentation SPI in DMA mode may encounter underrun/overrun failures in rare cases. When such failure occurs, an error recovery protocol is expected to be implemented in the device driver so that the failed transaction can be restarted.
This patch enables FIFO overrun / underrun interrupts in DMA case and adds a handler for that.
--- drivers/spi/spi-dw-mid.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/spi/spi-dw-mid.c +21 -0
@@ -100,6 +100,22 @@ static void mid_spi_dma_exit(struct dw_spi *dws)dma_release_channel (dws->rxchan); } +static irqreturn_t dma_transfer (struct dw_spi *dws) +{ +u16 irq_status =dw_readw (dws,DW_SPI_ISR ); + +if (!irq_status) +return IRQ_NONE ; + +dw_readw (dws,DW_SPI_ICR ); +spi_reset_chip (dws); + +dev_err (&dws->master->dev,"%s: FIFO overrun/underrun\n" , __func__); + dws->master->cur_msg->status = -EIO ; +spi_finalize_current_transfer (dws->master); +return IRQ_HANDLED ; +} +static enum dma_slave_buswidth convert_dma_width (u32 dma_width) {if (dma_width ==1 )return DMA_SLAVE_BUSWIDTH_1_BYTE ;
@@ -220,6 +236,11 @@ static int mid_spi_dma_setup(struct dw_spi *dws) dma_ctrl |=SPI_DMA_RDMAE ;dw_writew (dws,DW_SPI_DMACR , dma_ctrl); +/* Set the interrupt mask */ +spi_umask_intr (dws,SPI_INT_TXOI |SPI_INT_RXUI |SPI_INT_RXOI ); + + dws->transfer_handler = dma_transfer; +return 0 ; }
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 6/9 spi: dw-mid: clear ongoing DMA transfers on timeout
In reply to a message not in the archiveThis patch shuts up any ongoing DMA transfer in case of error.
--- drivers/spi/spi-dw-mid.c | 13 +++++++++++++ drivers/spi/spi-dw.c | 3 +++ drivers/spi/spi-dw.h | 1 + 3 files changed, 17 insertions(+)
drivers/spi/spi-dw-mid.c +13 -0
@@ -270,11 +270,24 @@ static int mid_spi_dma_transfer(struct dw_spi *dws) return 0; } +static void mid_spi_dma_stop (struct dw_spi *dws) +{ +if (test_bit (TX_BUSY , &dws->dma_chan_busy)) { +dmaengine_terminate_all (dws->txchan); +clear_bit (TX_BUSY , &dws->dma_chan_busy); + } +if (test_bit (RX_BUSY , &dws->dma_chan_busy)) { +dmaengine_terminate_all (dws->rxchan); +clear_bit (RX_BUSY , &dws->dma_chan_busy); + } +} +static struct dw_spi_dma_ops mid_dma_ops = { .dma_init = mid_spi_dma_init, .dma_exit = mid_spi_dma_exit, .dma_setup = mid_spi_dma_setup, .dma_transfer = mid_spi_dma_transfer, + .dma_stop = mid_spi_dma_stop, };#endif
drivers/spi/spi-dw.c +3 -0
@@ -432,6 +432,9 @@ static void dw_spi_handle_err(struct spi_master *master, {struct dw_spi *dws =spi_master_get_devdata (master); +if (dws->dma_mapped) + dws->dma_ops->dma_stop (dws); +spi_reset_chip (dws); }
drivers/spi/spi-dw.h +1 -0
@@ -93,6 +93,7 @@ struct dw_spi_dma_ops {void (*dma_exit)(struct dw_spi *dws);int (*dma_setup)(struct dw_spi *dws);int (*dma_transfer)(struct dw_spi *dws); +void (*dma_stop)(struct dw_spi *dws); };struct dw_spi {
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 7/9 spi: dw-mid: move to use core SPI DMA mappings
In reply to a message not in the archiveSPI core has a comprehensive function set to map and unmap a message when it's needed. This patch converts driver to use that advantage.
--- drivers/spi/spi-dw-mid.c | 52 ++++++++++++++++++++++++++++-------------------- drivers/spi/spi-dw.c | 40 +++++++------------------------------ drivers/spi/spi-dw.h | 17 ++++++---------- 3 files changed, 43 insertions(+), 66 deletions(-)
drivers/spi/spi-dw-mid.c +30 -22
@@ -69,6 +69,7 @@ static int mid_spi_dma_init(struct dw_spi *dws) rxs->hs_mode =LNW_DMA_HW_HS ; rxs->cfg_mode =LNW_DMA_PER_TO_MEM ; dws->rxchan->private = rxs; + dws->master->dma_rx = dws->rxchan;/* 2. Init tx channel */ dws->txchan =dma_request_channel (mask, mid_spi_dma_chan_filter, dws);
@@ -78,6 +79,7 @@ static int mid_spi_dma_init(struct dw_spi *dws) txs->hs_mode =LNW_DMA_HW_HS ; txs->cfg_mode =LNW_DMA_MEM_TO_PER ; dws->txchan->private = txs; + dws->master->dma_tx = dws->txchan; dws->dma_inited =1 ;return 0 ;
@@ -116,6 +118,17 @@ static irqreturn_t dma_transfer(struct dw_spi *dws)return IRQ_HANDLED ; } +static bool mid_spi_can_dma (struct spi_master *master,struct spi_device *spi, +struct spi_transfer *xfer) +{ +struct dw_spi *dws =spi_master_get_devdata (master); + +if (!dws->dma_inited) +return false; + +return xfer->len > dws->fifo_len; +} +static enum dma_slave_buswidth convert_dma_width (u32 dma_width) {if (dma_width ==1 )return DMA_SLAVE_BUSWIDTH_1_BYTE ;
@@ -139,12 +152,13 @@ static void dw_spi_dma_tx_done(void *arg)spi_finalize_current_transfer (dws->master); } -static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx (struct dw_spi *dws) +static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx (struct dw_spi *dws, +struct spi_transfer *xfer) {struct dma_slave_config txconf;struct dma_async_tx_descriptor *txdesc; -if (!dws->tx_dma) +if (!xfer->tx_buf)return NULL ; txconf.direction =DMA_MEM_TO_DEV ;
@@ -156,13 +170,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_tx(struct dw_spi *dws)dmaengine_slave_config (dws->txchan, &txconf); -memset (&dws->tx_sgl,0 ,sizeof (dws->tx_sgl)); - dws->tx_sgl.dma_address = dws->tx_dma; - dws->tx_sgl.length = dws->len; - txdesc =dmaengine_prep_slave_sg (dws->txchan, - &dws->tx_sgl, -1 , + xfer->tx_sg.sgl, + xfer->tx_sg.nents,DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!txdesc)
@@ -188,12 +198,13 @@ static void dw_spi_dma_rx_done(void *arg)spi_finalize_current_transfer (dws->master); } -static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx (struct dw_spi *dws) +static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx (struct dw_spi *dws, +struct spi_transfer *xfer) {struct dma_slave_config rxconf;struct dma_async_tx_descriptor *rxdesc; -if (!dws->rx_dma) +if (!xfer->rx_buf)return NULL ; rxconf.direction =DMA_DEV_TO_MEM ;
@@ -205,13 +216,9 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws)dmaengine_slave_config (dws->rxchan, &rxconf); -memset (&dws->rx_sgl,0 ,sizeof (dws->rx_sgl)); - dws->rx_sgl.dma_address = dws->rx_dma; - dws->rx_sgl.length = dws->len; - rxdesc =dmaengine_prep_slave_sg (dws->rxchan, - &dws->rx_sgl, -1 , + xfer->rx_sg.sgl, + xfer->rx_sg.nents,DMA_DEV_TO_MEM ,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );if (!rxdesc)
@@ -223,16 +230,16 @@ static struct dma_async_tx_descriptor *dw_spi_dma_prepare_rx(struct dw_spi *dws)return rxdesc; } -static int mid_spi_dma_setup (struct dw_spi *dws) +static int mid_spi_dma_setup (struct dw_spi *dws,struct spi_transfer *xfer) {u16 dma_ctrl =0 ;dw_writew (dws,DW_SPI_DMARDLR ,0xf );dw_writew (dws,DW_SPI_DMATDLR ,0x10 ); -if (dws->tx_dma) +if (xfer->tx_buf) dma_ctrl |=SPI_DMA_TDMAE ; -if (dws->rx_dma) +if (xfer->rx_buf) dma_ctrl |=SPI_DMA_RDMAE ;dw_writew (dws,DW_SPI_DMACR , dma_ctrl);
@@ -244,15 +251,15 @@ static int mid_spi_dma_setup(struct dw_spi *dws)return 0 ; } -static int mid_spi_dma_transfer (struct dw_spi *dws) +static int mid_spi_dma_transfer (struct dw_spi *dws,struct spi_transfer *xfer) {struct dma_async_tx_descriptor *txdesc, *rxdesc;/* Prepare the TX dma transfer */ - txdesc =dw_spi_dma_prepare_tx (dws); + txdesc =dw_spi_dma_prepare_tx (dws, xfer);/* Prepare the RX dma transfer */ - rxdesc =dw_spi_dma_prepare_rx (dws); + rxdesc =dw_spi_dma_prepare_rx (dws, xfer);/* rx must be started before tx due to spi instinct */ if (rxdesc) {
@@ -286,6 +293,7 @@ static struct dw_spi_dma_ops mid_dma_ops = { .dma_init = mid_spi_dma_init, .dma_exit = mid_spi_dma_exit, .dma_setup = mid_spi_dma_setup, + .can_dma = mid_spi_can_dma, .dma_transfer = mid_spi_dma_transfer, .dma_stop = mid_spi_dma_stop, };
drivers/spi/spi-dw.c +7 -33
@@ -217,32 +217,6 @@ static void dw_reader(struct dw_spi *dws) } } -/* -* Note: first step is the protocol driver prepares -* a dma-capable memory, and this func just need translate -* the virt addr to physical -*/ -static int map_dma_buffers (struct spi_master *master, -struct spi_device *spi,struct spi_transfer *transfer) -{ -struct dw_spi *dws =spi_master_get_devdata (master); -struct chip_data *chip =spi_get_ctldata (spi); - -if (!master->cur_msg->is_dma_mapped - || !dws->dma_inited - || !chip->enable_dma - || !dws->dma_ops) -return 0 ; - -if (transfer->tx_dma) - dws->tx_dma = transfer->tx_dma; - -if (transfer->rx_dma) - dws->rx_dma = transfer->rx_dma; - -return 1 ; -} -static void int_error_stop (struct dw_spi *dws,const char *msg) {spi_reset_chip (dws);
@@ -322,11 +296,10 @@ static int dw_spi_transfer_one(struct spi_master *master,u32 cr0 =0 ;int ret; + dws->dma_mapped =0 ; dws->n_bytes = chip->n_bytes; dws->dma_width = chip->dma_width; - dws->rx_dma = transfer->rx_dma; - dws->tx_dma = transfer->tx_dma; dws->tx = (void *)transfer->tx_buf; dws->tx_end = dws->tx + transfer->len; dws->rx = transfer->rx_buf;
@@ -386,7 +359,8 @@ static int dw_spi_transfer_one(struct spi_master *master,dw_writew (dws,DW_SPI_CTRL0 , cr0);/* Check if current transfer is a DMA transaction */ - dws->dma_mapped =map_dma_buffers (master, spi, transfer); +if (master->can_dma && master->can_dma (master, spi, transfer)) + dws->dma_mapped = master->cur_msg_mapped;/* For poll mode just disable all interrupts */ spi_mask_intr (dws,0xff );
@@ -396,7 +370,7 @@ static int dw_spi_transfer_one(struct spi_master *master,* we only need set the TXEI IRQ, as TX/RX always happen syncronizely */ if (dws->dma_mapped) { - ret = dws->dma_ops->dma_setup (dws); + ret = dws->dma_ops->dma_setup (dws, transfer);if (ret <0 ) {spi_enable_chip (dws,1 );return ret;
@@ -416,7 +390,7 @@ static int dw_spi_transfer_one(struct spi_master *master,spi_enable_chip (dws,1 );if (dws->dma_mapped) { - ret = dws->dma_ops->dma_transfer (dws); + ret = dws->dma_ops->dma_transfer (dws, transfer);if (ret <0 )return ret; }
@@ -470,8 +444,6 @@ static int dw_spi_setup(struct spi_device *spi) chip->rx_threshold =0 ; chip->tx_threshold =0 ; - - chip->enable_dma = chip_info->enable_dma; }if (spi->bits_per_word ==8 ) {
@@ -584,6 +556,8 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws)if (ret) {dev_warn (dev,"DMA init failed\n" ); dws->dma_inited =0 ; + }else { + master->can_dma = dws->dma_ops->can_dma; } }
drivers/spi/spi-dw.h +6 -11
@@ -91,8 +91,10 @@ struct dw_spi;struct dw_spi_dma_ops {int (*dma_init)(struct dw_spi *dws);void (*dma_exit)(struct dw_spi *dws); -int (*dma_setup)(struct dw_spi *dws); -int (*dma_transfer)(struct dw_spi *dws); +int (*dma_setup)(struct dw_spi *dws,struct spi_transfer *xfer); +bool (*can_dma)(struct spi_master *master,struct spi_device *spi, +struct spi_transfer *xfer); +int (*dma_transfer)(struct dw_spi *dws,struct spi_transfer *xfer);void (*dma_stop)(struct dw_spi *dws); };
@@ -117,20 +119,14 @@ struct dw_spi {void *rx;void *rx_end;int dma_mapped; -dma_addr_t rx_dma; -dma_addr_t tx_dma; -size_t rx_map_len; -size_t tx_map_len;u8 n_bytes;/* current is a 1/2 bytes op */ u32 dma_width;irqreturn_t (*transfer_handler)(struct dw_spi *dws); -/* Dma info */ +/* DMA info */ int dma_inited;struct dma_chan *txchan; -struct scatterlist tx_sgl;struct dma_chan *rxchan; -struct scatterlist rx_sgl;unsigned long dma_chan_busy;struct device *dma_dev;dma_addr_t dma_addr;/* phy address of the Data register */
@@ -206,14 +202,13 @@ static inline void spi_reset_chip(struct dw_spi *dws)/* * Each SPI slave device to work with dw_api controller should -* has such a structure claiming its working mode (PIO/DMA etc), +* has such a structure claiming its working mode (poll or PIO/DMA), * which can be save in the "controller_data" member of the * struct spi_device. */ struct dw_spi_chip {u8 poll_mode;/* 1 for controller polling mode */ u8 type;/* SPI/SSP/MicroWire */ -u8 enable_dma;void (*cs_control)(u32 command); };
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 8/9 spi: dw-mid: convert to use dw_dmac instead of intel_mid_dma
In reply to a message not in the archiveintel_mid_dma seems to be unmaintained for a long time. Moreover, the IP block of DMA itself is the same in both dw_dmac and intel_mid_dma. This patch moves spi-dw-midpci to use dw_dmac driver.
--- drivers/spi/Kconfig | 2 +- drivers/spi/spi-dw-mid.c | 45 +++++++++++++++++++-------------------------- drivers/spi/spi-dw.h | 4 ++-- 3 files changed, 22 insertions(+), 29 deletions(-)
drivers/spi/Kconfig +1 -1
@@ -632,7 +632,7 @@ config SPI_DW_PCI config SPI_DW_MID_DMA bool "DMA support for DW SPI controller on Intel MID platform" - depends on SPI_DW_PCI && INTEL_MID_DMAC + depends on SPI_DW_PCI && DW_DMAC_PCI config SPI_DW_MMIO tristate "Memory-mapped io interface driver for DW SPI core"
drivers/spi/spi-dw-mid.c +19 -26
100 lines not on this page · raw message
drivers/spi/spi-dw.h +2 -2
@@ -128,10 +128,10 @@ struct dw_spi {struct dma_chan *txchan;struct dma_chan *rxchan;unsigned long dma_chan_busy; -struct device *dma_dev;dma_addr_t dma_addr;/* phy address of the Data register */ struct dw_spi_dma_ops *dma_ops; -void *dma_priv;/* platform relate info */ +void *dma_tx; +void *dma_rx;/* Bus interface info */ void *priv;
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 9/9 dmaengine: intel-mid-dma: remove the driver
In reply to a message not in the archiveSince the last and the only user of this driver is converted to use dw_dmac we can remove driver from the tree.
Moreover, besides the driver is unmaintained a long time, it serves for the DesignWare DMA IP, for which we have already driver in the tree.
--- drivers/dma/Kconfig | 13 - drivers/dma/Makefile | 1 - drivers/dma/intel_mid_dma.c | 1447 -------------------------------------- drivers/dma/intel_mid_dma_regs.h | 299 -------- include/linux/intel_mid_dma.h | 76 -- 5 files changed, 1836 deletions(-) delete mode 100644 drivers/dma/intel_mid_dma.c delete mode 100644 drivers/dma/intel_mid_dma_regs.h delete mode 100644 include/linux/intel_mid_dma.h
drivers/dma/Kconfig +0 -13
@@ -51,19 +51,6 @@ config INTEL_MIC_X100_DMA OS and tools for MIC to use with this driver are available from <http://software.intel.com/en-us/mic-developer>. -config INTEL_MID_DMAC - tristate "Intel MID DMA support for Peripheral DMA controllers" - depends on PCI && X86 - select DMA_ENGINE - default n - help - Enable support for the Intel(R) MID DMA engine present - in Intel MID chipsets. - - Say Y here if you have such a chipset. - - If unsure, say N. - config ASYNC_TX_ENABLE_CHANNEL_SWITCH bool
drivers/dma/Makefile +0 -1
@@ -6,7 +6,6 @@ obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o obj-$(CONFIG_DMA_ACPI) += acpi-dma.o obj-$(CONFIG_DMA_OF) += of-dma.o -obj-$(CONFIG_INTEL_MID_DMAC) += intel_mid_dma.o obj-$(CONFIG_DMATEST) += dmatest.o obj-$(CONFIG_INTEL_IOATDMA) += ioat/ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
drivers/dma/intel_mid_dma.c deleted +0 -1447
1,447 lines not on this page · raw message
drivers/dma/intel_mid_dma_regs.h deleted +0 -299
299 lines not on this page · raw message
include/linux/intel_mid_dma.h deleted +0 -76
76 lines not on this page · raw message
Signature · 6 lines
2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html