Skip to content

Commit 020a394

Browse files
Joy Chakrabortybroonie
authored andcommitted
spi: dw: Add DMA address widths capability check
Store address width capabilities of DMA controller during init and check the same per transfer to make sure the bits/word requirement can be met. Current DW DMA driver requires both tx and rx channel to be configured and functional hence a subset of both tx and rx channel address width capability is checked with the width requirement(n_bytes) for a transfer. * tested on Baikal-T1 based system with DW SPI-looped back interface transferring a chunk of data with DFS:8,12,16. Signed-off-by: Joy Chakraborty <joychakr@google.com Reviewed-by: Serge Semin <fancer.lancer@gmail.com Tested-by: Serge Semin <fancer.lancer@gmail.com Link: https://lore.kernel.org/r/20230512104746.1797865-3-joychakr@google.com Signed-off-by: Mark Brown <broonie@kernel.org
1 parent d1ca1c5 commit 020a394

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

drivers/spi/spi-dw-dma.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ static int dw_spi_dma_caps_init(struct dw_spi *dws)
9898
else
9999
dws->dma_sg_burst = 0;
100100

101+
/*
102+
* Assuming both channels belong to the same DMA controller hence the
103+
* peripheral side address width capabilities most likely would be
104+
* the same.
105+
*/
106+
dws->dma_addr_widths = tx.dst_addr_widths & rx.src_addr_widths;
107+
101108
return 0;
102109
}
103110

@@ -239,8 +246,14 @@ static bool dw_spi_can_dma(struct spi_controller *master,
239246
struct spi_device *spi, struct spi_transfer *xfer)
240247
{
241248
struct dw_spi *dws = spi_controller_get_devdata(master);
249+
enum dma_slave_buswidth dma_bus_width;
250+
251+
if (xfer->len <= dws->fifo_len)
252+
return false;
253+
254+
dma_bus_width = dw_spi_dma_convert_width(dws->n_bytes);
242255

243-
return xfer->len > dws->fifo_len;
256+
return dws->dma_addr_widths & BIT(dma_bus_width);
244257
}
245258

246259
static int dw_spi_dma_wait(struct dw_spi *dws, unsigned int len, u32 speed)

drivers/spi/spi-dw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ struct dw_spi {
190190
struct dma_chan *rxchan;
191191
u32 rxburst;
192192
u32 dma_sg_burst;
193+
u32 dma_addr_widths;
193194
unsigned long dma_chan_busy;
194195
dma_addr_t dma_addr; /* phy address of the Data register */
195196
const struct dw_spi_dma_ops *dma_ops;

0 commit comments

Comments
 (0)