| Message ID | 20200528102311.79948-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/2] spi: dw: Make DMA request line assignments explicit for Intel Medfield | expand |
On Thu, May 28, 2020 at 01:23:10PM +0300, Andy Shevchenko wrote: > The 2afccbd283ae ("spi: dw: Discard static DW DMA slave structures") > did a clean up of global variables, which is fine, but messed up with > the carefully provided information in the custom DMA slave structures. > There reader can find an assignment of the DMA request lines in use. This doesn't apply against current code, please rebase and resend.
On Thu, 28 May 2020 13:23:10 +0300, Andy Shevchenko wrote: > The 2afccbd283ae ("spi: dw: Discard static DW DMA slave structures") > did a clean up of global variables, which is fine, but messed up with > the carefully provided information in the custom DMA slave structures. > There reader can find an assignment of the DMA request lines in use. > > Partially revert the above mentioned commit to restore readability > and maintainability of the code. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/2] spi: dw: Make DMA request line assignments explicit for Intel Medfield commit: b3f82dc26c0d4e1348ef81e0189cb8838b8b0d22 [2/2] spi: dw: Refactor mid_spi_dma_setup() to separate DMA and IRQ config commit: 3d7db0f11c7ad19979a1a01cac1d379ff040e886 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-dw-mid.c b/drivers/spi/spi-dw-mid.c index b1710132b7b2..0fd7543dc91a 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c @@ -33,10 +33,8 @@ static bool mid_spi_dma_chan_filter(struct dma_chan *chan, void *param) static int mid_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) { - struct dw_dma_slave slave = { - .src_id = 0, - .dst_id = 0 - }; + struct dw_dma_slave tx = { .dst_id = 1 }; + struct dw_dma_slave rx = { .src_id = 0 }; struct pci_dev *dma_dev; dma_cap_mask_t mask; @@ -52,14 +50,14 @@ static int mid_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) dma_cap_set(DMA_SLAVE, mask); /* 1. Init rx channel */ - slave.dma_dev = &dma_dev->dev; - dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, &slave); + rx->dma_dev = &dma_dev->dev; + dws->rxchan = dma_request_channel(mask, mid_spi_dma_chan_filter, rx); if (!dws->rxchan) goto err_exit; /* 2. Init tx channel */ - slave.dst_id = 1; - dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, &slave); + tx->dma_dev = &dma_dev->dev; + dws->txchan = dma_request_channel(mask, mid_spi_dma_chan_filter, tx); if (!dws->txchan) goto free_rxchan;
The 2afccbd283ae ("spi: dw: Discard static DW DMA slave structures") did a clean up of global variables, which is fine, but messed up with the carefully provided information in the custom DMA slave structures. There reader can find an assignment of the DMA request lines in use. Partially revert the above mentioned commit to restore readability and maintainability of the code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/spi/spi-dw-mid.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)