Commit ea229296 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A few small fixes for v5.16, one in the core for an issue with
  handling of controller unregistration that was introduced with the
  fixes for registering nested SPI controllers and a few more minor
  device specific ones"

* tag 'spi-fix-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: fix use-after-free of the add_lock mutex
  spi: spi-geni-qcom: fix error handling in spi_geni_grab_gpi_chan()
  spi: lpspi: Silence error message upon deferred probe
  spi: cadence-quadspi: fix write completion support
parents 8d0112ac 6c53b45c

drivers/spi/spi-cadence-quadspi.c

+21 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define CQSPI_NEEDS_WR_DELAY		BIT(0)

#define CQSPI_DISABLE_DAC_MODE		BIT(1)

#define CQSPI_SUPPORT_EXTERNAL_DMA	BIT(2)

#define CQSPI_NO_SUPPORT_WR_COMPLETION	BIT(3)



/* Capabilities */

#define CQSPI_SUPPORTS_OCTAL		BIT(0)
@@ -86,6 +87,7 @@ struct cqspi_st { 
	struct cqspi_flash_pdata f_pdata[CQSPI_MAX_CHIPSELECT];

	bool			use_dma_read;

	u32			pd_dev_id;

	bool			wr_completion;

};



struct cqspi_driver_platdata {
@@ -996,9 +998,11 @@ static int cqspi_write_setup(struct cqspi_flash_pdata *f_pdata, 
	 * polling on the controller's side. spinand and spi-nor will take

	 * care of polling the status register.

	 */

	if (cqspi->wr_completion) {

		reg = readl(reg_base + CQSPI_REG_WR_COMPLETION_CTRL);

		reg |= CQSPI_REG_WR_DISABLE_AUTO_POLL;

		writel(reg, reg_base + CQSPI_REG_WR_COMPLETION_CTRL);

	}



	reg = readl(reg_base + CQSPI_REG_SIZE);

	reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;
@@ -1736,6 +1740,10 @@ static int cqspi_probe(struct platform_device *pdev) 


	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);

	master->max_speed_hz = cqspi->master_ref_clk_hz;



	/* write completion is supported by default */

	cqspi->wr_completion = true;



	ddata  = of_device_get_match_data(dev);

	if (ddata) {

		if (ddata->quirks & CQSPI_NEEDS_WR_DELAY)
@@ -1747,6 +1755,8 @@ static int cqspi_probe(struct platform_device *pdev) 
			cqspi->use_direct_mode = true;

		if (ddata->quirks & CQSPI_SUPPORT_EXTERNAL_DMA)

			cqspi->use_dma_read = true;

		if (ddata->quirks & CQSPI_NO_SUPPORT_WR_COMPLETION)

			cqspi->wr_completion = false;



		if (of_device_is_compatible(pdev->dev.of_node,

					    "xlnx,versal-ospi-1.0"))
@@ -1859,6 +1869,10 @@ static const struct cqspi_driver_platdata intel_lgm_qspi = { 
	.quirks = CQSPI_DISABLE_DAC_MODE,

};



static const struct cqspi_driver_platdata socfpga_qspi = {

	.quirks = CQSPI_NO_SUPPORT_WR_COMPLETION,

};



static const struct cqspi_driver_platdata versal_ospi = {

	.hwcaps_mask = CQSPI_SUPPORTS_OCTAL,

	.quirks = CQSPI_DISABLE_DAC_MODE | CQSPI_SUPPORT_EXTERNAL_DMA,
@@ -1887,6 +1901,10 @@ static const struct of_device_id cqspi_dt_ids[] = { 
		.compatible = "xlnx,versal-ospi-1.0",

		.data = (void *)&versal_ospi,

	},

	{

		.compatible = "intel,socfpga-qspi",

		.data = (void *)&socfpga_qspi,

	},

	{ /* end of table */ }

};

drivers/spi/spi-fsl-lpspi.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) 


	ret = devm_spi_register_controller(&pdev->dev, controller);

	if (ret < 0) {

		dev_err(&pdev->dev, "spi_register_controller error.\n");

		dev_err_probe(&pdev->dev, ret, "spi_register_controller error: %i\n", ret);

		goto out_pm_get;

	}

drivers/spi/spi-geni-qcom.c

+10 −6
Original line number Diff line number Diff line
@@ -491,22 +491,26 @@ static int spi_geni_grab_gpi_chan(struct spi_geni_master *mas) 
	int ret;



	mas->tx = dma_request_chan(mas->dev, "tx");

	ret = dev_err_probe(mas->dev, IS_ERR(mas->tx), "Failed to get tx DMA ch\n");

	if (ret < 0)

	if (IS_ERR(mas->tx)) {

		ret = dev_err_probe(mas->dev, PTR_ERR(mas->tx),

				    "Failed to get tx DMA ch\n");

		goto err_tx;

	}



	mas->rx = dma_request_chan(mas->dev, "rx");

	ret = dev_err_probe(mas->dev, IS_ERR(mas->rx), "Failed to get rx DMA ch\n");

	if (ret < 0)

	if (IS_ERR(mas->rx)) {

		ret = dev_err_probe(mas->dev, PTR_ERR(mas->rx),

				    "Failed to get rx DMA ch\n");

		goto err_rx;

	}



	return 0;



err_rx:

	mas->rx = NULL;

	dma_release_channel(mas->tx);

	mas->tx = NULL;

err_tx:

	mas->rx = NULL;

	mas->tx = NULL;

	return ret;

}

drivers/spi/spi.c

+6 −6
Original line number Diff line number Diff line
@@ -3099,12 +3099,6 @@ void spi_unregister_controller(struct spi_controller *ctlr) 


	device_del(&ctlr->dev);



	/* Release the last reference on the controller if its driver

	 * has not yet been converted to devm_spi_alloc_master/slave().

	 */

	if (!ctlr->devm_allocated)

		put_device(&ctlr->dev);



	/* free bus id */

	mutex_lock(&board_lock);

	if (found == ctlr)
@@ -3113,6 +3107,12 @@ void spi_unregister_controller(struct spi_controller *ctlr) 


	if (IS_ENABLED(CONFIG_SPI_DYNAMIC))

		mutex_unlock(&ctlr->add_lock);



	/* Release the last reference on the controller if its driver

	 * has not yet been converted to devm_spi_alloc_master/slave().

	 */

	if (!ctlr->devm_allocated)

		put_device(&ctlr->dev);

}

EXPORT_SYMBOL_GPL(spi_unregister_controller);