linux.git/drivers/net/can, branch v4.0-rc2

can: kvaser_usb: Ignore spurious error events after a busoff

2015-02-04T13:07:03+00:00

Sending data in high speed then introducing a busoff results
in spurious BUS_ERROR events from the USBCan-II firmware directly
_after_ the triggered BUS_OFF event.

In the current CAN state handling code, this will lead to an
invalid can state of ACTIVE, ERROR, or PASSIVE even though the
CAN controller has been already shut down due to the busoff.

Guard the state handling code from such invalid events.

Signed-off-by: Ahmed S. Darwish 
Signed-off-by: Marc Kleine-Budde

can: janz-ican3: fix type mismatch in assignment

2015-02-04T13:06:43+00:00

return type of wait_for_completion_timeout is unsigned long not int, this patch
removes the type mismatch by moving the call into the condition.

Signed-off-by: Nicholas Mc Guire 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: add support for PEAK new CANFD USB adapters

2015-01-28T13:47:06+00:00

Add support for the following new PEAK-System technik CANFD USB adapters:

PCAN-USB FD             single CANFD channel USB adapter
PCAN-USB Pro FD         dual CANFD channels USB adapter

Signed-off-by: Stephane Grosjean 
Signed-off-by: Oliver Hartkopp 
Acked-by: Andri Yngvason 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: add peak_usb_netif_rx() new function

2015-01-28T13:47:06+00:00

Add a common function that pushes the skb in the network queue with adding
timestamps information, converted from time values read from the
PEAK USB adapters.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: export pcan_usb_pro functions

2015-01-28T13:47:06+00:00

Add support for the following new PEAK-System technik CANFD USB adapters:

PCAN-USB FD             single CANFD channel USB adapter
PCAN-USB Pro FD         dual CANFD channels USB adapter

The communication protocol has been developed using some mechanisms that
did exist in the PCAN-USB Pro, thus, this patch also changes some
previously static functions and data into global ones.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: upgrade core to new struct canfd_frame

2015-01-28T13:47:06+00:00

Upgrade PEAK-System USB adapters core to the new data structures (names) and
callbacks added for the support of the CANFD extension. This specific patch
includes changes that deal with the new struct canfd_frame.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: upgrade core to data bittiming specs

2015-01-28T13:47:05+00:00

Upgrade PEAK-System USB adapters core to the new data structures (names) and
callbacks added for the support of the CANFD extension. This specific patch
does the mandatory changes to support new data bittiming specs.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: add adapter BEC callback definition

2015-01-28T13:47:05+00:00

Add the definition of a new callback that enable any PEAK-System CAN USB
adapter to grant read access to its Bus Error Counters value. This ability is
not supported by all the PEAK-System adapters, thus, for those, the callback
pointer will be initiaized to NULL, which is correct regarding the linux-can
device driver specs.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: export ctrlmode_supported to adapter specific definition

2015-01-28T13:47:05+00:00

Export the ctrlmode_supported value from the core file to each adapter specific
file. This has been mandatory for supporting the new CANFD extension.

Signed-off-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde

can: peak_usb: constify struct peak_usb_adapter

2015-01-28T13:47:05+00:00

A "struct peak_usb_adapter" describes a certain USB adapter, as this doesn't
change during runtime, this patch marks all USB adapter definitions as const.

Acked-by: Stephane Grosjean 
Signed-off-by: Marc Kleine-Budde