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

can: ifi: Add more detailed error reporting

2016-05-09T09:07:28+00:00

The updated specification for the IFI CANFD core contains description
of more detailed error reporting capability of the core. Implement
support for this detailed error reporting.

Signed-off-by: Marek Vasut 
Signed-off-by: Marc Kleine-Budde

can: ifi: Increment TX counters only on real transmission

2016-05-09T09:07:28+00:00

Only increment the TX counters in the irq handler if a CAN message
was sent. The current code incremented the counters also if the TX
FIFO empty interrupt happened, which is incorrect.

Signed-off-by: Marek Vasut 
Cc: Marc Kleine-Budde 
Cc: Mark Rutland 
Cc: Oliver Hartkopp 
Cc: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: ifi: Treat CAN_CTRLMODE_FD_NON_ISO correctly

2016-05-09T09:07:28+00:00

The CAN_CTRLMODE_FD flag is set for both ISO and BOSCH CANFD mode,
while the CAN_CTRLMODE_FD_NON_ISO is additional flag which is only
set for CANFD-BOSCH mode. Fix the handling of the flags to reflect
this.

Signed-off-by: Marek Vasut 
Cc: Marc Kleine-Budde 
Cc: Mark Rutland 
Cc: Oliver Hartkopp 
Cc: Wolfgang Grandegger 
Reviewed-by: Oliver Hartkopp 
Signed-off-by: Marc Kleine-Budde

can: ifi: Unify timing constants

2016-05-09T09:07:28+00:00

There is no distinction between bittiming constants for the slow and
fast part of the CANFD operation on this controller, so just use one
single bittiming constant set.

Signed-off-by: Marek Vasut 
Cc: Marc Kleine-Budde 
Cc: Mark Rutland 
Cc: Oliver Hartkopp 
Cc: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: ifi: Update timing configuration code

2016-05-09T09:07:28+00:00

The updated documentation regarding the IFI CANFD core from April 2016
adds more details regarding the timing calculation. There is no longer
any distinction in the timing calculation between CANFD and CAN2.0, but
instead there are two timing modes -- 4_12_6_6 and 7_9_8_8 -- where the
numbers mean the width in bits of the SJW/Prescaler/TimeA/TimeB fields.
The code uses 7_9_8_8 mode, which allows more fine-grained control over
the timing.

Signed-off-by: Marek Vasut 
Cc: Marc Kleine-Budde 
Cc: Mark Rutland 
Cc: Oliver Hartkopp 
Cc: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: ifi: Start NAPI poll on bus warning too

2016-05-09T09:07:28+00:00

Start the NAPI polling in case the bus warning interrupt happens,
since it is the poll function which checks and reports the warning.

Signed-off-by: Marek Vasut 
Cc: Marc Kleine-Budde 
Cc: Mark Rutland 
Cc: Oliver Hartkopp 
Cc: Wolfgang Grandegger 
Signed-off-by: Marc Kleine-Budde

can: gs_usb: modify the usb device table to use only the first usb interface

2016-05-09T09:07:28+00:00

Modified the USB device table to use only the first USB interface, as is
the case with GS USB devices. This allows other GS USB compatible
devices to be more flexible with their remaining interfaces.

Signed-off-by: Maximilian Schneider 
Signed-off-by: Marc Kleine-Budde

can: janz-ican3: error handling for CAL/CANopen firmware

2016-05-09T09:07:28+00:00

My patch of May 2015 was missing the changed handling of error
indications. With CAL/CANopen firmware the NMTS-SlaveEventIndication
must be used instead of CAN-EventIndication. An appropriate slave node
must be configured to report the errors.

In our department (about 15 development systems with Janz ICAN3-
modules with firmware 1.48, my system also with firmware ICANOS 1.35)
we use the driver with this patch for about one year: no known problems.

Signed-off-by: Andreas Gröger 
Signed-off-by: Marc Kleine-Budde

can: fix handling of unmodifiable configuration options

2016-05-09T09:07:28+00:00

As described in 'can: m_can: tag current CAN FD controllers as non-ISO'
(6cfda7fbebe) it is possible to define fixed configuration options by
setting the according bit in 'ctrlmode' and clear it in 'ctrlmode_supported'.
This leads to the incovenience that the fixed configuration bits can not be
passed by netlink even when they have the correct values (e.g. non-ISO, FD).

This patch fixes that issue and not only allows fixed set bit values to be set
again but now requires(!) to provide these fixed values at configuration time.
A valid CAN FD configuration consists of a nominal/arbitration bittiming, a
data bittiming and a control mode with CAN_CTRLMODE_FD set - which is now
enforced by a new can_validate() function. This fix additionally removed the
inconsistency that was prohibiting the support of 'CANFD-only' controller
drivers, like the RCar CAN FD.

For this reason a new helper can_set_static_ctrlmode() has been introduced to
provide a proper interface to handle static enabled CAN controller options.

Reported-by: Ramesh Shanmugasundaram 
Signed-off-by: Oliver Hartkopp 
Reviewed-by: Ramesh Shanmugasundaram  
Cc:  # >= 3.18
Signed-off-by: Marc Kleine-Budde

can: mcp251x: Replace create_freezable_workqueue with alloc_workqueue

2016-05-09T09:07:28+00:00

Replace scheduled to be removed create_freezable_workqueue with
alloc_workqueue.

priv->wq should be explicitly set as freezable to ensure it is frozen
in the suspend sequence and work items are drained so that no new work
item starts execution until thawed. Thus, use of WQ_FREEZABLE flag
here is required.

WQ_MEM_RECLAIM flag has been set here to ensure forward progress
regardless of memory pressure.

The order of execution is not important so set @max_active as 0.

Signed-off-by: Amitoj Kaur Chawla 
Acked-by: Tejun Heo 
Signed-off-by: Marc Kleine-Budde