spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation
Subsystems (2)
PATCH v2 1/1 spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation
The spi_imx->spi_bus_clk may be uninitialized and thus also zero in mx51_ecspi_prepare_message(), which would lead to division by zero in kernel. Since bitbang .setup_transfer callback which initializes the spi_imx->spi_bus_clk is called after bitbang prepare_message callback, iterate over all the transfers in spi_message, find the one with lowest bus frequency, and use that bus frequency for the delay calculation.
Note that it is not possible to move this CONFIGREG delay back into the .setup_transfer callback, because that is invoked too late, after the GPIO chipselects were already configured.
---
V2: Add comment regarding all zero-frequency transfers
--- drivers/spi/spi-imx.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/spi/spi-imx.c +15 -1
@@ -505,7 +505,9 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx, struct spi_message *msg) {struct spi_device *spi = msg->spi; +struct spi_transfer *xfer;u32 ctrl =MX51_ECSPI_CTRL_ENABLE ; +u32 min_speed_hz = ~0U ;u32 testreg, delay;u32 cfg =readl (spi_imx->base +MX51_ECSPI_CONFIG );
@@ -577,8 +579,20 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx,* be asserted before the SCLK polarity changes, which would disrupt * the SPI communication as the device on the other end would consider * the change of SCLK polarity as a clock tick already. +* +* Because spi_imx->spi_bus_clk is only set in bitbang prepare_message +* callback, iterate over all the transfers in spi_message, find the +* one with lowest bus frequency, and use that bus frequency for the +* delay calculation. In case all transfers have speed_hz == 0, then +* min_speed_hz is ~0 and the resulting delay is zero. */ - delay = (2 *1000000 ) / spi_imx->spi_bus_clk; +list_for_each_entry (xfer, &msg->transfers, transfer_list) { +if (!xfer->speed_hz) +continue ; + min_speed_hz =min (xfer->speed_hz, min_speed_hz); + } + + delay = (2 *1000000 ) / min_speed_hz;if (likely (delay <10 ))/* SCLK is faster than 100 kHz */ udelay (delay);else /* SCLK is _very_ slow */
Signature · 1 line
2.30.2
Mark Brown
maintainerQuoted 9 lines · Marek Vasut
The
spi_imx->spi_bus_clkmay be uninitialized and thus also zero inmx51_ecspi_prepare_message(), which would lead to division by zero in kernel. Since bitbang .setup_transfer callback which initializes thespi_imx->spi_bus_clkis called after bitbangprepare_messagecallback, iterate over all the transfers inspi_message, find the one with lowest bus frequency, and use that bus frequency for the delay calculation.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation
commit: 53ca18acbe645656132fb5a329833db711067e54
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Hello,
Quoted 26 lines · Marek Vasut
drivers/spi/spi-imx.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)drivers/spi/spi-imx.c +7
-0@@ -505,7 +505,9 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx, struct spi_message *msg) {struct spi_device *spi = msg->spi; +struct spi_transfer *xfer;u32 ctrl =MX51_ECSPI_CTRL_ENABLE ; +u32 min_speed_hz = ~0U ;u32 testreg, delay;u32 cfg =readl (spi_imx->base +MX51_ECSPI_CONFIG );@@ -577,8 +579,20 @@ static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx,* be asserted before the SCLK polarity changes, which would disrupt * the SPI communication as the device on the other end would consider * the change of SCLK polarity as a clock tick already. +* +* Because spi_imx->spi_bus_clk is only set in bitbang prepare_message +* callback, iterate over all the transfers in spi_message, find the +* one with lowest bus frequency, and use that bus frequency for the +* delay calculation. In case all transfers have speed_hz == 0, then
drivers/spi/spi-imx.c static int mx51_ecspi_prepare_message(struct spi_imx_data *spi_imx, · line 595
Quoted 10 lines
drivers/spi/spi-imx.c +8
-1+* min_speed_hz is ~0 and the resulting delay is zero. */ - delay = (2 *1000000 ) / spi_imx->spi_bus_clk; +list_for_each_entry (xfer, &msg->transfers, transfer_list) { +if (!xfer->speed_hz) +continue ; + min_speed_hz =min (xfer->speed_hz, min_speed_hz); + } + + delay = (2 *1000000 ) / min_speed_hz;
It might already be too late as Mark already send out his applied mail, but still:
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |