Skip to content

Commit

Permalink
spi/tegra-sflash: Factor runtime PM out into transfer prepare/unprepare
Browse files Browse the repository at this point in the history
Currently the tegra sflash 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: Mark Brown <broonie@linaro.org>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
  • Loading branch information
Mark Brown committed Jul 29, 2013
1 parent bb249aa commit 9f178c2
Showing 1 changed file with 25 additions and 7 deletions.
32 changes: 25 additions & 7 deletions drivers/spi/spi-tegra20-sflash.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,20 @@ static int tegra_sflash_setup(struct spi_device *spi)
return 0;
}

static int tegra_sflash_prepare_transfer(struct spi_master *spi)
{
struct tegra_sflash_data *tsd = spi_master_get_devdata(spi);
int ret;

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

return ret;
}

static int tegra_sflash_transfer_one_message(struct spi_master *master,
struct spi_message *msg)
{
Expand All @@ -335,12 +349,6 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master,
struct spi_device *spi = msg->spi;
int ret;

ret = pm_runtime_get_sync(tsd->dev);
if (ret < 0) {
dev_err(tsd->dev, "pm_runtime_get() failed, err = %d\n", ret);
return ret;
}

msg->status = 0;
msg->actual_length = 0;
single_xfer = list_is_singular(&msg->transfers);
Expand Down Expand Up @@ -380,10 +388,18 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master,
tegra_sflash_writel(tsd, tsd->def_command_reg, SPI_COMMAND);
msg->status = ret;
spi_finalize_current_message(master);
pm_runtime_put(tsd->dev);
return ret;
}

static int tegra_sflash_unprepare_transfer(struct spi_master *spi)
{
struct tegra_sflash_data *tsd = spi_master_get_devdata(spi);

pm_runtime_put(tsd->dev);

return 0;
}

static irqreturn_t handle_cpu_based_xfer(struct tegra_sflash_data *tsd)
{
struct spi_transfer *t = tsd->curr_xfer;
Expand Down Expand Up @@ -476,7 +492,9 @@ static int tegra_sflash_probe(struct platform_device *pdev)
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA;
master->setup = tegra_sflash_setup;
master->prepare_transfer_hardware = tegra_sflash_prepare_transfer;
master->transfer_one_message = tegra_sflash_transfer_one_message;
master->unprepare_transfer_hardware = tegra_sflash_unprepare_transfer;
master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;

Expand Down

0 comments on commit 9f178c2

Please sign in to comment.