* [PATCH v2] spi: Fix regression when the SPI controller does not pass max_speed_hz
@ 2020-12-29 4:04 Fabio Estevam
2020-12-29 8:05 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2020-12-29 4:04 UTC (permalink / raw)
To: broonie; +Cc: tudor.ambarus, linux-spi, Fabio Estevam
Since commit 9326e4f1e5dd ("spi: Limit the spi device max speed to
controller's max speed") the following regression is observed on an
imx6q-sabresd:
[ 3.918284] spi_imx 2008000.spi: cannot set clock freq: 0 (base freq: 60000000)
[ 3.925953] Division by zero in kernel.
[ 3.929831] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 5.10.0-next-20201223 #276
[ 3.938565] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
[ 3.945124] [<c0111a68>] (unwind_backtrace) from [<c010c068>] (show_stack+0x10/0x14)
[ 3.952925] [<c010c068>] (show_stack) from [<c0e11540>] (dump_stack+0xe0/0x10c)
[ 3.960279] [<c0e11540>] (dump_stack) from [<c05d471c>] (Ldiv0+0x8/0x10)
[ 3.967026] [<c05d471c>] (Ldiv0) from [<c089b044>] (mx51_ecspi_prepare_transfer+0xfc/0x17c)
The spi-imx driver does not fill the max_speed_hz field, so we get:
spi->max_speed_hz = 20MHz
spi->controller->max_speed_hz = 0MHz
which will result in spi->max_speed_hz being 0, causing the division by
zero in the spi-imx driver.
Fix this problem, by checking if spi->controller->max_speed_hz is not
zero prior to assign it to spi->max_speed_hz.
Fixes: 9326e4f1e5dd ("spi: Limit the spi device max speed to controller's max speed")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v1:
- Do not add unneeded parenthesis.
drivers/spi/spi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 51d7c004fbab..e786a94960d5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -3380,7 +3380,8 @@ int spi_setup(struct spi_device *spi)
if (!spi->max_speed_hz ||
spi->max_speed_hz > spi->controller->max_speed_hz)
- spi->max_speed_hz = spi->controller->max_speed_hz;
+ if (spi->controller->max_speed_hz)
+ spi->max_speed_hz = spi->controller->max_speed_hz;
mutex_lock(&spi->controller->io_mutex);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] spi: Fix regression when the SPI controller does not pass max_speed_hz
2020-12-29 4:04 [PATCH v2] spi: Fix regression when the SPI controller does not pass max_speed_hz Fabio Estevam
@ 2020-12-29 8:05 ` Geert Uytterhoeven
2020-12-30 13:46 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2020-12-29 8:05 UTC (permalink / raw)
To: Fabio Estevam; +Cc: Mark Brown, Tudor Ambarus, linux-spi
Hi Fabio,
On Tue, Dec 29, 2020 at 5:06 AM Fabio Estevam <festevam@gmail.com> wrote:
> Since commit 9326e4f1e5dd ("spi: Limit the spi device max speed to
> controller's max speed") the following regression is observed on an
> imx6q-sabresd:
>
> [ 3.918284] spi_imx 2008000.spi: cannot set clock freq: 0 (base freq: 60000000)
> [ 3.925953] Division by zero in kernel.
> [ 3.929831] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 5.10.0-next-20201223 #276
> [ 3.938565] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
> [ 3.945124] [<c0111a68>] (unwind_backtrace) from [<c010c068>] (show_stack+0x10/0x14)
> [ 3.952925] [<c010c068>] (show_stack) from [<c0e11540>] (dump_stack+0xe0/0x10c)
> [ 3.960279] [<c0e11540>] (dump_stack) from [<c05d471c>] (Ldiv0+0x8/0x10)
> [ 3.967026] [<c05d471c>] (Ldiv0) from [<c089b044>] (mx51_ecspi_prepare_transfer+0xfc/0x17c)
>
> The spi-imx driver does not fill the max_speed_hz field, so we get:
>
> spi->max_speed_hz = 20MHz
> spi->controller->max_speed_hz = 0MHz
>
> which will result in spi->max_speed_hz being 0, causing the division by
> zero in the spi-imx driver.
>
> Fix this problem, by checking if spi->controller->max_speed_hz is not
> zero prior to assign it to spi->max_speed_hz.
>
> Fixes: 9326e4f1e5dd ("spi: Limit the spi device max speed to controller's max speed")
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
See also
https://lore.kernel.org/linux-spi/20201216092321.413262-1-tudor.ambarus@microchip.com/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] spi: Fix regression when the SPI controller does not pass max_speed_hz
2020-12-29 8:05 ` Geert Uytterhoeven
@ 2020-12-30 13:46 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2020-12-30 13:46 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Fabio Estevam, Tudor Ambarus, linux-spi
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
On Tue, Dec 29, 2020 at 09:05:45AM +0100, Geert Uytterhoeven wrote:
> See also
> https://lore.kernel.org/linux-spi/20201216092321.413262-1-tudor.ambarus@microchip.com/
Right, I already queued that version.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-30 13:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-29 4:04 [PATCH v2] spi: Fix regression when the SPI controller does not pass max_speed_hz Fabio Estevam
2020-12-29 8:05 ` Geert Uytterhoeven
2020-12-30 13:46 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).