| Message ID | 20210810081727.19491-1-tony@atomide.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 209ab223ad5b18e437289235e3bde12593b94ac4 |
| Headers | show |
| Series | [1/2] spi: spi-fsl-dspi: Fix issue with uninitialized dma_slave_config | expand |
On Tue, Aug 10, 2021 at 11:17:26AM +0300, Tony Lindgren wrote: > Depending on the DMA driver being used, the struct dma_slave_config may > need to be initialized to zero for the unused data. > > For example, we have three DMA drivers using src_port_window_size and > dst_port_window_size. If these are left uninitialized, it can cause DMA > failures. > > For spi-fsl-dspi, this is probably not currently an issue but is still > good to fix though. > > Fixes: 90ba37033cb9 ("spi: spi-fsl-dspi: Add DMA support for Vybrid") > Cc: Sanchayan Maity <maitysanchayan@gmail.com> > Cc: Vladimir Oltean <vladimir.oltean@nxp.com> > Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com> > Cc: Vinod Koul <vkoul@kernel.org> > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > drivers/spi/spi-fsl-dspi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c > --- a/drivers/spi/spi-fsl-dspi.c > +++ b/drivers/spi/spi-fsl-dspi.c > @@ -530,6 +530,7 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) > goto err_rx_dma_buf; > } > > + memset(&cfg, 0, sizeof(cfg)); > cfg.src_addr = phy_addr + SPI_POPR; > cfg.dst_addr = phy_addr + SPI_PUSHR; > cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; > -- > 2.32.0 Does not bother me in the very slightest. Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
On Tue, 10 Aug 2021 11:17:26 +0300, Tony Lindgren wrote: > Depending on the DMA driver being used, the struct dma_slave_config may > need to be initialized to zero for the unused data. > > For example, we have three DMA drivers using src_port_window_size and > dst_port_window_size. If these are left uninitialized, it can cause DMA > failures. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/2] spi: spi-fsl-dspi: Fix issue with uninitialized dma_slave_config commit: 209ab223ad5b18e437289235e3bde12593b94ac4 [2/2] spi: spi-pic32: Fix issue with uninitialized dma_slave_config commit: 976c1de1de147bb7f4e0d87482f375221c05aeaf 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-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -530,6 +530,7 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) goto err_rx_dma_buf; } + memset(&cfg, 0, sizeof(cfg)); cfg.src_addr = phy_addr + SPI_POPR; cfg.dst_addr = phy_addr + SPI_PUSHR; cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
Depending on the DMA driver being used, the struct dma_slave_config may need to be initialized to zero for the unused data. For example, we have three DMA drivers using src_port_window_size and dst_port_window_size. If these are left uninitialized, it can cause DMA failures. For spi-fsl-dspi, this is probably not currently an issue but is still good to fix though. Fixes: 90ba37033cb9 ("spi: spi-fsl-dspi: Add DMA support for Vybrid") Cc: Sanchayan Maity <maitysanchayan@gmail.com> Cc: Vladimir Oltean <vladimir.oltean@nxp.com> Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com> Cc: Vinod Koul <vkoul@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/spi/spi-fsl-dspi.c | 1 + 1 file changed, 1 insertion(+)