spi: Update speed/mode on change
PATCH 1/1 spi: Update speed/mode on change
The spi_get_bus_and_cs() may be called on the same bus and chipselect with different frequency or mode. This is valid usecase, but the code fails to notify the controller of such a configuration change. Call spi_set_speed_mode() in case bus frequency or bus mode changed to let the controller update the configuration.
The problem can easily be triggered using the sspi command:
=> sspi 0:0 at 1000
=> sspi 0:0 at 2000
Without this patch, both transfers happen at 1000 Hz. With this patch, the later transfer happens correctly at 2000 Hz.
--- drivers/spi/spi-uclass.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/spi/spi-uclass.c +10 -0
@@ -405,12 +405,22 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, goto err; } +/* In case bus frequency or mode changed, update it. */ +if ((speed && slave->speed && slave->speed != speed) || + (plat->mode != mode)) { + ret =spi_set_speed_mode (bus, speed, mode); +if (ret) + goto err_speed_mode; + } + *busp = bus; *devp = slave;log_debug ("%s: bus=%p, slave=%p\n" , __func__, bus, *devp);return 0 ; +err_speed_mode: +spi_claim_bus (slave); err:log_debug ("%s: Error path, created=%d, device '%s'\n" , __func__, created, dev->name);
Signature · 1 line
2.30.0
PATCH 1/1 spi: Update speed/mode on change
Hi Marek,
Quoted 25 lines · Marek Vasut
The
spi_get_bus_and_cs()may be called on the same bus and chipselect with different frequency or mode. This is valid usecase, but the code fails to notify the controller of such a configuration change. Callspi_set_speed_mode()in case bus frequency or bus mode changed to let the controller update the configuration.The problem can easily be triggered using the sspi command:
=> sspi 0:0 at 1000
=> sspi 0:0 at 2000
Without this patch, both transfers happen at 1000 Hz. With this patch, the later transfer happens correctly at 2000 Hz.Signed-off-by Marek Vasut <[email protected]>Cc Jagan Teki <[email protected]>Cc Patrick Delaunay <[email protected]>--- drivers/spi/spi-uclass.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/spi/spi-uclass.c +0
-0@@ -405,12 +405,22 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, goto err;
drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 415
Quoted 10 lines
drivers/spi/spi-uclass.c +8
-0} +/* In case bus frequency or mode changed, update it. */ +if ((speed && slave->speed && slave->speed != speed) || + (plat->mode != mode)) { + ret =spi_set_speed_mode (bus, speed, mode); +if (ret) + goto err_speed_mode; + } +
We compare bus (with lastest configured value ) or slave (value requested) here ?
in dm_spi_claim_bus() it is compared with bus :
spi->speed and spi->mode and spi = dev_get_uclass_priv(bus);
+ /* In case bus frequency or mode changed, update it. */
+ if ((speed && bus->speed != speed) || (bus->mode != mode)) {
+ ret = spi_set_speed_mode(bus, speed, mode);
+ if (ret)
+ goto err_speed_mode;
+ bus->speed = speed;
+ bus->mode = mode;
+ }
NB: bus->speed can't be 0 here after previous spi_claim_bus()
PS: the update of spi->speed and spi->mode can be done in spi_set_speed_mode() function
drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 423
Quoted 8 lines
drivers/spi/spi-uclass.c +2
-0*busp = bus; *devp = slave;log_debug ("%s: bus=%p, slave=%p\n" , __func__, bus, *devp);return 0 ; +err_speed_mode: +spi_claim_bus (slave);
here I think it is:
spi_release_bus(slave);
called after previous spi_claim_bus().
drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, · line 426
Quoted 3 lines
drivers/spi/spi-uclass.c +0
-0err:log_debug ("%s: Error path, created=%d, device '%s'\n" , __func__, created, dev->name);
Regards
Patrick
PATCH 1/1 spi: Update speed/mode on change
Quoted 33 lines · Patrick DELAUNAY
Hi Marek,
Quoted 30 lines · Marek Vasut
The
spi_get_bus_and_cs()may be called on the same bus and chipselect with different frequency or mode. This is valid usecase, but the code fails to notify the controller of such a configuration change. Callspi_set_speed_mode()in case bus frequency or bus mode changed to let the controller update the configuration.The problem can easily be triggered using the sspi command:
=> sspi 0:0 at 1000
=> sspi 0:0 at 2000
Without this patch, both transfers happen at 1000 Hz. With this patch, the later transfer happens correctly at 2000 Hz.Signed-off-by Marek Vasut <[email protected]>Cc Jagan Teki <[email protected]>Cc Patrick Delaunay <[email protected]>---
?drivers/spi/spi-uclass.c| 10 ++++++++++
? 1 file changed, 10 insertions(+)drivers/spi/spi-uclass.c +3
-0@@ -405,12 +405,22 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, ????????????? goto err; ????? } +??? /* In case bus frequency or mode changed, update it. */ +??? if ((speed && slave->speed && slave->speed != speed) || +??????? (plat->mode != mode)) {
Quoted 8 lines
drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int · line 415
Quoted 5 lines
drivers/spi/spi-uclass.c +5
-0+??????? ret = spi_set_speed_mode(bus, speed, mode); +??????? if (ret) +??????????? goto err_speed_mode; +??? } +We compare bus (with lastest configured value ) or slave (value requested) here ?
Argh, this should in fact be bus_data->speed , it seems I sent un-rebased patches.
Quoted 13 lines
in
dm_spi_claim_bus()it is compared with bus :
spi->speedandspi->modeand spi =dev_get_uclass_priv(bus);+??? /* In case bus frequency or mode changed, update it. */ +??? if ((speed &&
bus->speed!= speed) || (bus->mode!= mode)) { +??????? ret =spi_set_speed_mode(bus, speed, mode); +??????? if (ret)
+??????????? gotoerr_speed_mode;
+???????bus->speed= speed;
+???????bus->mode= mode;
+??? }
Quoted 4 lines
NB:
bus->speedcan't be 0 here after previousspi_claim_bus()PS: the update of
spi->speedandspi->modecan be done inspi_set_speed_mode()function
I don't think you want to do this every time you call dm_spi_claim_bus()
Quoted 8 lines
drivers/spi/spi-uclass.c int spi_get_bus_and_cs(int busnum, int cs, int · line 421
Quoted 6 lines
drivers/spi/spi-uclass.c +2
-0????? *busp = bus; ????? *devp = slave; ????? log_debug("%s: bus=%p, slave=%p\n", __func__, bus, *devp); ????? return 0; +err_speed_mode: +??? spi_claim_bus(slave);
Quoted 5 lines
here I think it is:
spi_release_bus(slave);called after previous
spi_claim_bus().
Right