| Message ID | 20211214110152.48316-1-tudor.ambarus@microchip.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Revert "spi: spi-zynqmp-gqspi: add mutex locking for exec_op" | expand |
On 12/14/21 7:01 PM, Tudor Ambarus wrote: > This reverts commit a0f65be6e880a14d3445b75e7dc03d7d015fc922. > > SPIMEM uses ctlr->bus_lock_mutex to prevent concurrency on > ctlr->mem_ops->exec_op(). > > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Reviewed-by: Quanyang Wang <quanyang.wang@windriver.com> > --- > drivers/spi/spi-zynqmp-gqspi.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c > index 328b6559bb19..189fe4eb59ad 100644 > --- a/drivers/spi/spi-zynqmp-gqspi.c > +++ b/drivers/spi/spi-zynqmp-gqspi.c > @@ -174,7 +174,6 @@ struct zynqmp_qspi { > u32 genfifoentry; > enum mode_type mode; > struct completion data_completion; > - struct mutex op_lock; > }; > > /** > @@ -946,7 +945,6 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, > op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth, > op->dummy.buswidth, op->data.buswidth); > > - mutex_lock(&xqspi->op_lock); > zynqmp_qspi_config_op(xqspi, mem->spi); > zynqmp_qspi_chipselect(mem->spi, false); > genfifoentry |= xqspi->genfifocs; > @@ -1069,7 +1067,6 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, > return_err: > > zynqmp_qspi_chipselect(mem->spi, true); > - mutex_unlock(&xqspi->op_lock); > > return err; > } > @@ -1143,8 +1140,6 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) > > init_completion(&xqspi->data_completion); > > - mutex_init(&xqspi->op_lock); > - > pm_runtime_use_autosuspend(&pdev->dev); > pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); > pm_runtime_set_active(&pdev->dev); >
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 328b6559bb19..189fe4eb59ad 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -174,7 +174,6 @@ struct zynqmp_qspi { u32 genfifoentry; enum mode_type mode; struct completion data_completion; - struct mutex op_lock; }; /** @@ -946,7 +945,6 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth, op->dummy.buswidth, op->data.buswidth); - mutex_lock(&xqspi->op_lock); zynqmp_qspi_config_op(xqspi, mem->spi); zynqmp_qspi_chipselect(mem->spi, false); genfifoentry |= xqspi->genfifocs; @@ -1069,7 +1067,6 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, return_err: zynqmp_qspi_chipselect(mem->spi, true); - mutex_unlock(&xqspi->op_lock); return err; } @@ -1143,8 +1140,6 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) init_completion(&xqspi->data_completion); - mutex_init(&xqspi->op_lock); - pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); pm_runtime_set_active(&pdev->dev);
This reverts commit a0f65be6e880a14d3445b75e7dc03d7d015fc922. SPIMEM uses ctlr->bus_lock_mutex to prevent concurrency on ctlr->mem_ops->exec_op(). Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> --- drivers/spi/spi-zynqmp-gqspi.c | 5 ----- 1 file changed, 5 deletions(-)