korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: topcliff-pch: Prevent usage of potentially stale DMA device

Browse Source 
DMA device is expected to be available while SPI transfer is ongoing.

Prevent usage of potentially stale DMA device by keeping reference
count till the end of the transfer.

Fixes: 4d986ffa03 ("spi: add missing pci_dev_put() before return")
Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220307173740.80996-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2022-03-07 19:37:40 +02:00 committed by Mark Brown
parent b15e3bc769
commit 80ab9012bb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi-topcliff-pch.c
View File

@ -103,6 +103,7 @@
static int use_dma = 1; static int use_dma = 1;
struct pch_spi_dma_ctrl { struct pch_spi_dma_ctrl {
struct pci_dev *dma_dev;
struct dma_async_tx_descriptor *desc_tx; struct dma_async_tx_descriptor *desc_tx;
struct dma_async_tx_descriptor *desc_rx; struct dma_async_tx_descriptor *desc_rx;
struct pch_dma_slave param_tx; struct pch_dma_slave param_tx;
@ -876,7 +877,6 @@ static void pch_spi_request_dma(struct pch_spi_data *data, int bpw)
if (!chan) { if (!chan) {
dev_err(&data->master->dev, dev_err(&data->master->dev,
"ERROR: dma_request_channel FAILS(Tx)\n"); "ERROR: dma_request_channel FAILS(Tx)\n");
data->use_dma = 0;
goto out; goto out;
} }
dma->chan_tx = chan; dma->chan_tx = chan;
@ -893,13 +893,15 @@ static void pch_spi_request_dma(struct pch_spi_data *data, int bpw)
"ERROR: dma_request_channel FAILS(Rx)\n"); "ERROR: dma_request_channel FAILS(Rx)\n");
dma_release_channel(dma->chan_tx); dma_release_channel(dma->chan_tx);
dma->chan_tx = NULL; dma->chan_tx = NULL;
data->use_dma = 0;
goto out; goto out;
} }
dma->chan_rx = chan; dma->chan_rx = chan;
dma->dma_dev = dma_dev;
return;
out: out:
pci_dev_put(dma_dev); pci_dev_put(dma_dev);
data->use_dma = 0;
} }
static void pch_spi_release_dma(struct pch_spi_data *data) static void pch_spi_release_dma(struct pch_spi_data *data)
@ -915,6 +917,8 @@ static void pch_spi_release_dma(struct pch_spi_data *data)
dma_release_channel(dma->chan_rx); dma_release_channel(dma->chan_rx);
dma->chan_rx = NULL; dma->chan_rx = NULL;
} }
pci_dev_put(dma->dma_dev);
} }
static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)