spi: axi-spi-engine: populate xfer->effective_speed_hz
authorDavid Lechner <dlechner@baylibre.com>
Mon, 4 Dec 2023 17:33:28 +0000 (11:33 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 6 Dec 2023 14:19:30 +0000 (14:19 +0000)
This adds a new spi_engine_precompile_message() function to the ADI AXI
SPI Engine driver to populate the xfer->effective_speed_hz field since
the SPI core doesn't/can't do this for us.

This driver is already using spi_delay_to_ns() which depends on
effective_speed_hz to get an accurate value in some cases.
Having an effective_speed_hz value can also be used in future changes
to simplify other code.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20231204-axi-spi-engine-series-2-v1-2-063672323fce@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-axi-spi-engine.c

index 982b37ac3063adf00347b265a869e95077852ee7..ee7b904ae5cf54f3cbff13fcaf9de0b612195839 100644 (file)
@@ -218,6 +218,27 @@ static void spi_engine_gen_cs(struct spi_engine_program *p, bool dry,
        spi_engine_program_add_cmd(p, dry, SPI_ENGINE_CMD_ASSERT(1, mask));
 }
 
+/*
+ * Performs precompile steps on the message.
+ *
+ * The SPI core does most of the message/transfer validation and filling in
+ * fields for us via __spi_validate(). This fixes up anything remaining not
+ * done there.
+ *
+ * NB: This is separate from spi_engine_compile_message() because the latter
+ * is called twice and would otherwise result in double-evaluation.
+ */
+static void spi_engine_precompile_message(struct spi_message *msg)
+{
+       unsigned int clk_div, max_hz = msg->spi->controller->max_speed_hz;
+       struct spi_transfer *xfer;
+
+       list_for_each_entry(xfer, &msg->transfers, transfer_list) {
+               clk_div = DIV_ROUND_UP(max_hz, xfer->speed_hz);
+               xfer->effective_speed_hz = max_hz / min(clk_div, 256U);
+       }
+}
+
 static void spi_engine_compile_message(struct spi_engine *spi_engine,
        struct spi_message *msg, bool dry, struct spi_engine_program *p)
 {
@@ -504,6 +525,8 @@ static int spi_engine_prepare_message(struct spi_controller *host,
        if (!st)
                return -ENOMEM;
 
+       spi_engine_precompile_message(msg);
+
        p_dry.length = 0;
        spi_engine_compile_message(spi_engine, msg, true, &p_dry);