Skip to content

Commit 50b1c5b

Browse files
Joakim Zhanggregkh
authored andcommitted
can: flexcan: fix timeout when set small bitrate
commit 247e535 upstream. Current we can meet timeout issue when setting a small bitrate like 10000 as follows on i.MX6UL EVK board (ipg clock = 66MHZ, per clock = 30MHZ): | root@imx6ul7d:~# ip link set can0 up type can bitrate 10000 A link change request failed with some changes committed already. Interface can0 may have been left with an inconsistent configuration, please check. | RTNETLINK answers: Connection timed out It is caused by calling of flexcan_chip_unfreeze() timeout. Originally the code is using usleep_range(10, 20) for unfreeze operation, but the patch (8badd65 can: flexcan: avoid calling usleep_range from interrupt context) changed it into udelay(10) which is only a half delay of before, there're also some other delay changes. After double to FLEXCAN_TIMEOUT_US to 100 can fix the issue. Meanwhile, Rasmus Villemoes reported that even with a timeout of 100, flexcan_probe() fails on the MPC8309, which requires a value of at least 140 to work reliably. 250 works for everyone. Signed-off-by: Joakim Zhang <[email protected]> Reviewed-by: Dong Aisheng <[email protected]> Cc: linux-stable <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ce8c476 commit 50b1c5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/can/flexcan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
#define FLEXCAN_MB_CNT_LENGTH(x) (((x) & 0xf) << 16)
172172
#define FLEXCAN_MB_CNT_TIMESTAMP(x) ((x) & 0xffff)
173173

174-
#define FLEXCAN_TIMEOUT_US (50)
174+
#define FLEXCAN_TIMEOUT_US (250)
175175

176176
/* FLEXCAN hardware feature flags
177177
*

0 commit comments

Comments
 (0)