linux.git/drivers/net/can, branch v4.9-rc2 Linux kernel source tree Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-03T02:20:41+00:00 David S. Miller davem@davemloft.net 2016-10-03T01:17:07+00:00 b50afd203a5ef1998c18d6519ad2b2c546d6af22 Three sets of overlapping changes. Nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net> 
Three sets of overlapping changes.  Nothing serious.

Signed-off-by: David S. Miller <davem@davemloft.net>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-23T10:46:57+00:00 David S. Miller davem@davemloft.net 2016-09-23T10:46:57+00:00 d6989d4bbe6c4d1c2a76696833a07f044e85694d 






can: dev: fix deadlock reported after bus-off
2016-09-22T08:01:21+00:00

Sergei Miroshnichenko
sergeimir@emcraft.com

2016-09-07T13:51:12+00:00

9abefcb1aaa58b9d5aa40a8bb12c87d02415e4c8

A timer was used to restart after the bus-off state, leading to a
relatively large can_restart() executed in an interrupt context,
which in turn sets up pinctrl. When this happens during system boot,
there is a high probability of grabbing the pinctrl_list_mutex,
which is locked already by the probe() of other device, making the
kernel suspect a deadlock condition [1].

To resolve this issue, the restart_timer is replaced by a delayed
work.

[1] https://github.com/victronenergy/venus/issues/24

Signed-off-by: Sergei Miroshnichenko <sergeimir@emcraft.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>





A timer was used to restart after the bus-off state, leading to a
relatively large can_restart() executed in an interrupt context,
which in turn sets up pinctrl. When this happens during system boot,
there is a high probability of grabbing the pinctrl_list_mutex,
which is locked already by the probe() of other device, making the
kernel suspect a deadlock condition [1].

To resolve this issue, the restart_timer is replaced by a delayed
work.

[1] https://github.com/victronenergy/venus/issues/24

Signed-off-by: Sergei Miroshnichenko <sergeimir@emcraft.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>







net: can: ifi: Configure transmitter delay
2016-09-21T08:32:24+00:00

Marek Vasut
marex@denx.de

2016-09-19T19:34:01+00:00

8d58790b832e13d6006d842037732304af357c3c

Configure the transmitter delay register at +0x1c to correctly handle
the CAN FD bitrate switch (BRS). This moves the SSP (secondary sample
point) to a proper offset, so that the TDC mechanism works and won't
generate error frames on the CAN link.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>





Configure the transmitter delay register at +0x1c to correctly handle
the CAN FD bitrate switch (BRS). This moves the SSP (secondary sample
point) to a proper offset, so that the TDC mechanism works and won't
generate error frames on the CAN link.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>







can: flexcan: fix resume function
2016-09-19T14:09:05+00:00

Fabio Estevam
fabio.estevam@nxp.com

2016-08-17T15:41:08+00:00

4de349e786a3a2d51bd02d56f3de151bbc3c3df9

On a imx6ul-pico board the following error is seen during system suspend:

dpm_run_callback(): platform_pm_resume+0x0/0x54 returns -110
PM: Device 2090000.flexcan failed to resume: error -110

The reason for this suspend error is because when the CAN interface is not
active the clocks are disabled and then flexcan_chip_enable() will
always fail due to a timeout error.

In order to fix this issue, only call flexcan_chip_enable/disable()
when the CAN interface is active.

Based on a patch from Dong Aisheng in the NXP kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>





On a imx6ul-pico board the following error is seen during system suspend:

dpm_run_callback(): platform_pm_resume+0x0/0x54 returns -110
PM: Device 2090000.flexcan failed to resume: error -110

The reason for this suspend error is because when the CAN interface is not
active the clocks are disabled and then flexcan_chip_enable() will
always fail due to a timeout error.

In order to fix this issue, only call flexcan_chip_enable/disable()
when the CAN interface is active.

Based on a patch from Dong Aisheng in the NXP kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>







net: can: usb: usb_8dev: don't print error when allocating urb fails
2016-08-13T21:53:39+00:00

Wolfram Sang
wsa-dev@sang-engineering.com

2016-08-11T21:05:25+00:00

7fe7cfa43a99056ffa52aed4053693dedc3cbbbb

kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







net: can: usb: peak_usb: pcan_usb_core: don't print error when allocating urb fails
2016-08-13T21:53:39+00:00

Wolfram Sang
wsa-dev@sang-engineering.com

2016-08-11T21:05:24+00:00

2479204b256392a170ba819411b14c3da0bee1b5

kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







net: can: usb: kvaser_usb: don't print error when allocating urb fails
2016-08-13T21:53:39+00:00

Wolfram Sang
wsa-dev@sang-engineering.com

2016-08-11T21:05:23+00:00

bc1af47df2bc52b8cfad7e455fd1cb6fbd8cd6b3

kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







net: can: usb: gs_usb: don't print error when allocating urb fails
2016-08-13T21:53:39+00:00

Wolfram Sang
wsa-dev@sang-engineering.com

2016-08-11T21:05:22+00:00

2a4a1e4013bddb60939328cc8bb99adf458d14af

kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>







net: can: usb: esd_usb2: don't print error when allocating urb fails
2016-08-13T21:53:39+00:00

Wolfram Sang
wsa-dev@sang-engineering.com

2016-08-11T21:05:21+00:00

912f85e104f4dfc46bf33e6b5eef1f72a39d0336

kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>





kmalloc will print enough information in case of failure.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: David S. Miller <davem@davemloft.net>