Skip to content

Commit 84ecaf4

Browse files
fancerbroonie
authored andcommitted
spi: dw: Introduce max mem-ops SPI bus frequency setting
In some circumstances the current implementation of the SPI memory operations may occasionally fail even though they are executed in the atomic context. This may happen if the system bus is relatively slow in comparison to the SPI bus frequency, or there is a concurrent access to it, which makes the MMIO-operations occasionally stalling before push-pulling data from the DW APB SPI FIFOs. These two problems we've discovered on the Baikal-T1 SoC. In order to fix them we have no choice but to set an artificial limitation on the SPI bus speed. Note currently this limitation will be only applicable for the memory operations, since the standard SPI core interface is implemented with an assumption that there is no problem with the automatic CS toggling. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Link: https://lore.kernel.org/r/20201007235511.4935-19-Sergey.Semin@baikalelectronics.ru Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6423207 commit 84ecaf4

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/spi/spi-dw-core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ static int dw_spi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)
629629
* operation. Transmit-only mode is suitable for the rest of them.
630630
*/
631631
cfg.dfs = 8;
632-
cfg.freq = mem->spi->max_speed_hz;
632+
cfg.freq = clamp(mem->spi->max_speed_hz, 0U, dws->max_mem_freq);
633633
if (op->data.dir == SPI_MEM_DATA_IN) {
634634
cfg.tmode = SPI_TMOD_EPROMREAD;
635635
cfg.ndf = op->data.nbytes;
@@ -717,6 +717,8 @@ static void dw_spi_init_mem_ops(struct dw_spi *dws)
717717
dws->mem_ops.adjust_op_size = dw_spi_adjust_mem_op_size;
718718
dws->mem_ops.supports_op = dw_spi_supports_mem_op;
719719
dws->mem_ops.exec_op = dw_spi_exec_mem_op;
720+
if (!dws->max_mem_freq)
721+
dws->max_mem_freq = dws->max_freq;
720722
}
721723
}
722724

drivers/spi/spi-dw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ struct dw_spi {
148148
unsigned long paddr;
149149
int irq;
150150
u32 fifo_len; /* depth of the FIFO buffer */
151+
u32 max_mem_freq; /* max mem-ops bus freq */
151152
u32 max_freq; /* max bus freq supported */
152153

153154
u32 caps; /* DW SPI capabilities */

0 commit comments

Comments
 (0)