spi: tegra114: avoid reset call in atomic context
authorSowjanya Komatineni <skomatineni@nvidia.com>
Fri, 5 Apr 2019 00:14:03 +0000 (17:14 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 5 Apr 2019 02:59:21 +0000 (09:59 +0700)
This patch moves SPI controller reset out of spin lock.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-tegra114.c

index 8de002f..b57f101 100644 (file)
@@ -967,11 +967,12 @@ static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi)
                dev_err(tspi->dev, "CpuXfer 0x%08x:0x%08x\n",
                        tspi->command1_reg, tspi->dma_control_reg);
                tegra_spi_flush_fifos(tspi);
+               complete(&tspi->xfer_completion);
+               spin_unlock_irqrestore(&tspi->lock, flags);
                reset_control_assert(tspi->rst);
                udelay(2);
                reset_control_deassert(tspi->rst);
-               complete(&tspi->xfer_completion);
-               goto exit;
+               return IRQ_HANDLED;
        }
 
        if (tspi->cur_direction & DATA_DIR_RX)
@@ -1040,11 +1041,11 @@ static irqreturn_t handle_dma_based_xfer(struct tegra_spi_data *tspi)
                dev_err(tspi->dev, "DmaXfer 0x%08x:0x%08x\n",
                        tspi->command1_reg, tspi->dma_control_reg);
                tegra_spi_flush_fifos(tspi);
+               complete(&tspi->xfer_completion);
+               spin_unlock_irqrestore(&tspi->lock, flags);
                reset_control_assert(tspi->rst);
                udelay(2);
                reset_control_deassert(tspi->rst);
-               complete(&tspi->xfer_completion);
-               spin_unlock_irqrestore(&tspi->lock, flags);
                return IRQ_HANDLED;
        }