Unverified Commit cb588254 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

spi: rspi: Fill in spi_transfer.effective_speed_hz 



Fill in the effective bit rate used for transfers, so the SPI core can
calculate instead of estimate delays.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200819125904.20938-7-geert+renesas@glider.be


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6a195f24

drivers/spi/spi-rspi.c

+6 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static void rspi_set_rate(struct rspi_data *rspi) 


	rspi_write8(rspi, clamp(spbr, 0, 255), RSPI_SPBR);

	rspi->spcmd |= SPCMD_BRDV(brdv);

	rspi->speed_hz = DIV_ROUND_UP(clksrc, (2U << brdv) * (spbr + 1));

}



/*
@@ -344,6 +345,7 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size) 
	clksrc = clk_get_rate(rspi->clk);

	if (rspi->speed_hz >= clksrc) {

		spbr = 0;

		rspi->speed_hz = clksrc;

	} else {

		spbr = DIV_ROUND_UP(clksrc, 2 * rspi->speed_hz);

		while (spbr > 255 && brdv < 3) {
@@ -351,6 +353,7 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size) 
			spbr = DIV_ROUND_UP(spbr, 2);

		}

		spbr = clamp(spbr, 0, 255);

		rspi->speed_hz = DIV_ROUND_UP(clksrc, (2U << brdv) * spbr);

	}

	rspi_write8(rspi, spbr, RSPI_SPBR);

	rspi->spcmd |= SPCMD_BRDV(brdv);
@@ -698,6 +701,8 @@ static int rspi_common_transfer(struct rspi_data *rspi, 
{

	int ret;



	xfer->effective_speed_hz = rspi->speed_hz;



	ret = rspi_dma_check_then_transfer(rspi, xfer);

	if (ret != -EAGAIN)

		return ret;
@@ -853,6 +858,7 @@ static int qspi_transfer_one(struct spi_controller *ctlr, 
{

	struct rspi_data *rspi = spi_controller_get_devdata(ctlr);



	xfer->effective_speed_hz = rspi->speed_hz;

	if (spi->mode & SPI_LOOP) {

		return qspi_transfer_out_in(rspi, xfer);

	} else if (xfer->tx_nbits > SPI_NBITS_SINGLE) {