Skip to content

Commit 9f7fb8d

Browse files
committed
Merge tag 'spi-fix-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown: "There are quite a few fixes that have accumilated since the merge window here, all driver specific and none super urgent, plus a new device ID for the Rockchip driver" * tag 'spi-fix-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: mediatek: Avoid NULL pointer crash in interrupt spi: dt-bindings: Fix 'reg' child node schema spi: bcm-qspi: check for valid cs before applying chip select spi: uniphier: fix reference count leak in uniphier_spi_probe() spi: meson-spicc: add IRQ check in meson_spicc_probe spi: uniphier: Fix a bug that doesn't point to private data correctly spi: change clk_disable_unprepare to clk_unprepare spi: spi-rockchip: Add rk3568-spi compatible spi: stm32: make SPI_MASTER_MUST_TX flags only specific to STM32F4 spi: stm32: remove inexistant variables in struct stm32_spi_cfg comment spi: stm32-qspi: Update spi registering
2 parents 9e15510 + f83a96e commit 9f7fb8d

File tree

7 files changed

+45
-41
lines changed

7 files changed

+45
-41
lines changed

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ properties:
2323
minItems: 1
2424
maxItems: 256
2525
items:
26-
minimum: 0
27-
maximum: 256
26+
items:
27+
- minimum: 0
28+
maximum: 256
2829
description:
2930
Chip select used by the device.
3031

drivers/spi/spi-bcm-qspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ static void bcm_qspi_chip_select(struct bcm_qspi *qspi, int cs)
585585
u32 rd = 0;
586586
u32 wr = 0;
587587

588-
if (qspi->base[CHIP_SELECT]) {
588+
if (cs >= 0 && qspi->base[CHIP_SELECT]) {
589589
rd = bcm_qspi_read(qspi, CHIP_SELECT, 0);
590590
wr = (rd & ~0xff) | (1 << cs);
591591
if (rd == wr)

drivers/spi/spi-meson-spicc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,11 @@ static int meson_spicc_probe(struct platform_device *pdev)
693693
writel_relaxed(0, spicc->base + SPICC_INTREG);
694694

695695
irq = platform_get_irq(pdev, 0);
696+
if (irq < 0) {
697+
ret = irq;
698+
goto out_master;
699+
}
700+
696701
ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq,
697702
0, NULL, spicc);
698703
if (ret) {

drivers/spi/spi-mt65xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id)
624624
else
625625
mdata->state = MTK_SPI_IDLE;
626626

627-
if (!master->can_dma(master, master->cur_msg->spi, trans)) {
627+
if (!master->can_dma(master, NULL, trans)) {
628628
if (trans->rx_buf) {
629629
cnt = mdata->xfer_len / 4;
630630
ioread32_rep(mdata->base + SPI_RX_DATA_REG,

drivers/spi/spi-stm32-qspi.c

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)
688688
struct resource *res;
689689
int ret, irq;
690690

691-
ctrl = spi_alloc_master(dev, sizeof(*qspi));
691+
ctrl = devm_spi_alloc_master(dev, sizeof(*qspi));
692692
if (!ctrl)
693693
return -ENOMEM;
694694

@@ -697,58 +697,46 @@ static int stm32_qspi_probe(struct platform_device *pdev)
697697

698698
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi");
699699
qspi->io_base = devm_ioremap_resource(dev, res);
700-
if (IS_ERR(qspi->io_base)) {
701-
ret = PTR_ERR(qspi->io_base);
702-
goto err_master_put;
703-
}
700+
if (IS_ERR(qspi->io_base))
701+
return PTR_ERR(qspi->io_base);
704702

705703
qspi->phys_base = res->start;
706704

707705
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mm");
708706
qspi->mm_base = devm_ioremap_resource(dev, res);
709-
if (IS_ERR(qspi->mm_base)) {
710-
ret = PTR_ERR(qspi->mm_base);
711-
goto err_master_put;
712-
}
707+
if (IS_ERR(qspi->mm_base))
708+
return PTR_ERR(qspi->mm_base);
713709

714710
qspi->mm_size = resource_size(res);
715-
if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ) {
716-
ret = -EINVAL;
717-
goto err_master_put;
718-
}
711+
if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ)
712+
return -EINVAL;
719713

720714
irq = platform_get_irq(pdev, 0);
721-
if (irq < 0) {
722-
ret = irq;
723-
goto err_master_put;
724-
}
715+
if (irq < 0)
716+
return irq;
725717

726718
ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0,
727719
dev_name(dev), qspi);
728720
if (ret) {
729721
dev_err(dev, "failed to request irq\n");
730-
goto err_master_put;
722+
return ret;
731723
}
732724

733725
init_completion(&qspi->data_completion);
734726
init_completion(&qspi->match_completion);
735727

736728
qspi->clk = devm_clk_get(dev, NULL);
737-
if (IS_ERR(qspi->clk)) {
738-
ret = PTR_ERR(qspi->clk);
739-
goto err_master_put;
740-
}
729+
if (IS_ERR(qspi->clk))
730+
return PTR_ERR(qspi->clk);
741731

742732
qspi->clk_rate = clk_get_rate(qspi->clk);
743-
if (!qspi->clk_rate) {
744-
ret = -EINVAL;
745-
goto err_master_put;
746-
}
733+
if (!qspi->clk_rate)
734+
return -EINVAL;
747735

748736
ret = clk_prepare_enable(qspi->clk);
749737
if (ret) {
750738
dev_err(dev, "can not enable the clock\n");
751-
goto err_master_put;
739+
return ret;
752740
}
753741

754742
rstc = devm_reset_control_get_exclusive(dev, NULL);
@@ -784,7 +772,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)
784772
pm_runtime_enable(dev);
785773
pm_runtime_get_noresume(dev);
786774

787-
ret = devm_spi_register_master(dev, ctrl);
775+
ret = spi_register_master(ctrl);
788776
if (ret)
789777
goto err_pm_runtime_free;
790778

@@ -806,8 +794,6 @@ static int stm32_qspi_probe(struct platform_device *pdev)
806794
stm32_qspi_dma_free(qspi);
807795
err_clk_disable:
808796
clk_disable_unprepare(qspi->clk);
809-
err_master_put:
810-
spi_master_put(qspi->ctrl);
811797

812798
return ret;
813799
}
@@ -817,6 +803,7 @@ static int stm32_qspi_remove(struct platform_device *pdev)
817803
struct stm32_qspi *qspi = platform_get_drvdata(pdev);
818804

819805
pm_runtime_get_sync(qspi->dev);
806+
spi_unregister_master(qspi->ctrl);
820807
/* disable qspi */
821808
writel_relaxed(0, qspi->io_base + QSPI_CR);
822809
stm32_qspi_dma_free(qspi);

drivers/spi/spi-stm32.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ struct stm32_spi;
221221
* time between frames (if driver has this functionality)
222222
* @set_number_of_data: optional routine to configure registers to desired
223223
* number of data (if driver has this functionality)
224-
* @can_dma: routine to determine if the transfer is eligible for DMA use
225224
* @transfer_one_dma_start: routine to start transfer a single spi_transfer
226225
* using DMA
227226
* @dma_rx_cb: routine to call after DMA RX channel operation is complete
@@ -232,7 +231,7 @@ struct stm32_spi;
232231
* @baud_rate_div_min: minimum baud rate divisor
233232
* @baud_rate_div_max: maximum baud rate divisor
234233
* @has_fifo: boolean to know if fifo is used for driver
235-
* @has_startbit: boolean to know if start bit is used to start transfer
234+
* @flags: compatible specific SPI controller flags used at registration time
236235
*/
237236
struct stm32_spi_cfg {
238237
const struct stm32_spi_regspec *regs;
@@ -253,6 +252,7 @@ struct stm32_spi_cfg {
253252
unsigned int baud_rate_div_min;
254253
unsigned int baud_rate_div_max;
255254
bool has_fifo;
255+
u16 flags;
256256
};
257257

258258
/**
@@ -1722,6 +1722,7 @@ static const struct stm32_spi_cfg stm32f4_spi_cfg = {
17221722
.baud_rate_div_min = STM32F4_SPI_BR_DIV_MIN,
17231723
.baud_rate_div_max = STM32F4_SPI_BR_DIV_MAX,
17241724
.has_fifo = false,
1725+
.flags = SPI_MASTER_MUST_TX,
17251726
};
17261727

17271728
static const struct stm32_spi_cfg stm32h7_spi_cfg = {
@@ -1854,7 +1855,7 @@ static int stm32_spi_probe(struct platform_device *pdev)
18541855
master->prepare_message = stm32_spi_prepare_msg;
18551856
master->transfer_one = stm32_spi_transfer_one;
18561857
master->unprepare_message = stm32_spi_unprepare_msg;
1857-
master->flags = SPI_MASTER_MUST_TX;
1858+
master->flags = spi->cfg->flags;
18581859

18591860
spi->dma_tx = dma_request_chan(spi->dev, "tx");
18601861
if (IS_ERR(spi->dma_tx)) {

drivers/spi/spi-uniphier.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
726726
if (ret) {
727727
dev_err(&pdev->dev, "failed to get TX DMA capacities: %d\n",
728728
ret);
729-
goto out_disable_clk;
729+
goto out_release_dma;
730730
}
731731
dma_tx_burst = caps.max_burst;
732732
}
@@ -735,7 +735,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
735735
if (IS_ERR_OR_NULL(master->dma_rx)) {
736736
if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) {
737737
ret = -EPROBE_DEFER;
738-
goto out_disable_clk;
738+
goto out_release_dma;
739739
}
740740
master->dma_rx = NULL;
741741
dma_rx_burst = INT_MAX;
@@ -744,7 +744,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
744744
if (ret) {
745745
dev_err(&pdev->dev, "failed to get RX DMA capacities: %d\n",
746746
ret);
747-
goto out_disable_clk;
747+
goto out_release_dma;
748748
}
749749
dma_rx_burst = caps.max_burst;
750750
}
@@ -753,10 +753,20 @@ static int uniphier_spi_probe(struct platform_device *pdev)
753753

754754
ret = devm_spi_register_master(&pdev->dev, master);
755755
if (ret)
756-
goto out_disable_clk;
756+
goto out_release_dma;
757757

758758
return 0;
759759

760+
out_release_dma:
761+
if (!IS_ERR_OR_NULL(master->dma_rx)) {
762+
dma_release_channel(master->dma_rx);
763+
master->dma_rx = NULL;
764+
}
765+
if (!IS_ERR_OR_NULL(master->dma_tx)) {
766+
dma_release_channel(master->dma_tx);
767+
master->dma_tx = NULL;
768+
}
769+
760770
out_disable_clk:
761771
clk_disable_unprepare(priv->clk);
762772

0 commit comments

Comments
 (0)