| Message ID | 20210921072132.21831-1-villeb@bytesnap.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 75e33c55ae8fb4a177fe07c284665e1d61b02560 |
| Headers | show |
| Series | [v4] spi: atmel: Fix PDC transfer setup bug | expand |
Hi Ville, On 9/21/21 12:21 AM, Ville Baillie wrote: > Commit 5fa5e6dec762 ("spi: atmel: Switch to transfer_one transfer > method") refactored the code and changed a conditional causing > atmel_spi_dma_map_xfer to never be called in PDC mode. This causes the > driver to silently fail. > > This patch changes the conditional to match the behaviour of the > previous commit before the refactor. > > Signed-off-by: Ville Baillie <villeb@bytesnap.co.uk> Shouldn't this have a FIXES tag? > --- > drivers/spi/spi-atmel.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c > index 788dcdf25f00..f872cf196c2f 100644 > --- a/drivers/spi/spi-atmel.c > +++ b/drivers/spi/spi-atmel.c > @@ -1301,7 +1301,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, > * DMA map early, for performance (empties dcache ASAP) and > * better fault reporting. > */ > - if ((!master->cur_msg_mapped) > + if ((!master->cur_msg->is_dma_mapped) > && as->use_pdc) { > if (atmel_spi_dma_map_xfer(as, xfer) < 0) > return -ENOMEM; > @@ -1381,7 +1381,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, > } > } > > - if (!master->cur_msg_mapped > + if (!master->cur_msg->is_dma_mapped > && as->use_pdc) > atmel_spi_dma_unmap_xfer(master, xfer); > > Regards, Dan
On Tue, 21 Sep 2021 07:21:32 +0000, Ville Baillie wrote: > Commit 5fa5e6dec762 ("spi: atmel: Switch to transfer_one transfer > method") refactored the code and changed a conditional causing > atmel_spi_dma_map_xfer to never be called in PDC mode. This causes the > driver to silently fail. > > This patch changes the conditional to match the behaviour of the > previous commit before the refactor. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: atmel: Fix PDC transfer setup bug commit: 75e33c55ae8fb4a177fe07c284665e1d61b02560 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 788dcdf25f00..f872cf196c2f 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1301,7 +1301,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, * DMA map early, for performance (empties dcache ASAP) and * better fault reporting. */ - if ((!master->cur_msg_mapped) + if ((!master->cur_msg->is_dma_mapped) && as->use_pdc) { if (atmel_spi_dma_map_xfer(as, xfer) < 0) return -ENOMEM; @@ -1381,7 +1381,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, } } - if (!master->cur_msg_mapped + if (!master->cur_msg->is_dma_mapped && as->use_pdc) atmel_spi_dma_unmap_xfer(master, xfer);
Commit 5fa5e6dec762 ("spi: atmel: Switch to transfer_one transfer method") refactored the code and changed a conditional causing atmel_spi_dma_map_xfer to never be called in PDC mode. This causes the driver to silently fail. This patch changes the conditional to match the behaviour of the previous commit before the refactor. Signed-off-by: Ville Baillie <villeb@bytesnap.co.uk> --- drivers/spi/spi-atmel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)