Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb249aad authored by Mark Brown's avatar Mark Brown
Browse files

spi/tegra114: Factor runtime PM out into transfer prepare/unprepare



Currently the tegra114 driver acquires a runtime PM reference for the
duration of each transfer. This may result in the IP being powered down
between transfers which would be at best wasteful. Instead it is better
to do this in the callbacks that are generated before and after starting
a series of transfers, keeping the IP powered throughout.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
parent 5ae90d8e
Loading
Loading
Loading
Loading
+25 −9
Original line number Diff line number Diff line
@@ -803,6 +803,20 @@ static int tegra_spi_setup(struct spi_device *spi)
	return 0;
}

static int tegra_spi_prepare_transfer(struct spi_master *spi)
{
	struct tegra_spi_data *tspi = spi_master_get_devdata(spi);
	int ret;

	ret = pm_runtime_get_sync(tspi->dev);
	if (ret < 0) {
		dev_err(tspi->dev, "runtime PM get failed: %d\n", ret);
		return ret;
	}

	return ret;
}

static int tegra_spi_transfer_one_message(struct spi_master *master,
			struct spi_message *msg)
{
@@ -816,14 +830,6 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
	msg->status = 0;
	msg->actual_length = 0;

	ret = pm_runtime_get_sync(tspi->dev);
	if (ret < 0) {
		dev_err(tspi->dev, "runtime PM get failed: %d\n", ret);
		msg->status = ret;
		spi_finalize_current_message(master);
		return ret;
	}

	single_xfer = list_is_singular(&msg->transfers);
	list_for_each_entry(xfer, &msg->transfers, transfer_list) {
		INIT_COMPLETION(tspi->xfer_completion);
@@ -859,12 +865,20 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
	ret = 0;
exit:
	tegra_spi_writel(tspi, tspi->def_command1_reg, SPI_COMMAND1);
	pm_runtime_put(tspi->dev);
	msg->status = ret;
	spi_finalize_current_message(master);
	return ret;
}

static int tegra_spi_unprepare_transfer(struct spi_master *spi)
{
	struct tegra_spi_data *tspi = spi_master_get_devdata(spi);

	pm_runtime_put(tspi->dev);

	return 0;
}

static irqreturn_t handle_cpu_based_xfer(struct tegra_spi_data *tspi)
{
	struct spi_transfer *t = tspi->curr_xfer;
@@ -1050,7 +1064,9 @@ static int tegra_spi_probe(struct platform_device *pdev)
	/* the spi->mode bits understood by this driver: */
	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
	master->setup = tegra_spi_setup;
	master->prepare_transfer_hardware = tegra_spi_prepare_transfer;
	master->transfer_one_message = tegra_spi_transfer_one_message;
	master->unprepare_transfer_hardware = tegra_spi_unprepare_transfer;
	master->num_chipselect = MAX_CHIP_SELECT;
	master->bus_num = -1;