linux-stable.git/drivers/net/can, branch v4.6.2

can: fix handling of unmodifiable configuration options

2016-06-01T19:17:59+00:00

commit bb208f144cf3f59d8f89a09a80efd04389718907 upstream.

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  
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Greg Kroah-Hartman

can: rcar_can: Add r8a7795 support

2016-03-10T09:30:21+00:00

Added r8a7795 SoC support.

Signed-off-by: Ramesh Shanmugasundaram 
Acked-by: Rob Herring 
Signed-off-by: Marc Kleine-Budde

can: ifi: Add obscure bit swap for EFF frame IDs

2016-03-10T09:19:09+00:00

In case of CAN2.0 EFF frame, the controller handles frame IDs in a
rather bizzare way. The ID is split into an extended part, IDX[28:11]
and standard part, ID[10:0]. In the TX path, the core first sends the
top 11 bits of the IDX, followed by ID and finally the rest of IDX.
In the RX path, the core stores the ID the LSbit part of IDX field,
followed by the LSbit parts of real IDX. The MSbit parts of IDX are
stored in ID field of the register.

This patch implements the necessary bit shuffling to mitigate this
obscure behavior. In case two of these controllers are connected
together, the RX and TX bit swapping nullifies itself and the issue
does not manifest. The issue only manifests when talking to another
different CAN controller.

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: Fix RX and TX ID mask

2016-03-10T09:19:09+00:00

The RX and TX ID mask for CAN2.0 is 11 bits wide. This patch fixes
the incorrect mask, which caused the CAN IDs to miss the MSBit both
on receive and transmit.

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: Fix TX DLC configuration

2016-03-10T09:19:09+00:00

The TX DLC, the transmission length information, was not written
into the transmit configuration register. When using the CAN core
with different CAN controller, the receiving CAN controller will
receive only the ID part of the CAN frame, but no data at all.

This patch adds the TX DLC into the register to fix this issue.

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: Fix clock generator configuration

2016-03-10T09:19:09+00:00

The clock generation does not match reality when using the CAN IP
core outside of the FPGA design. This patch fixes the computation
of values which are programmed into the clock generator registers.

First, there are some off-by-one errors which manifest themselves
only when communicating with different controller, so those are
fixed.

Second, the bits in the clock generator registers have different
meaning depending on whether the core is in ISO CANFD mode or any
of the other modes (BOSCH CANFD or CAN2.0). Detect the ISO CANFD
mode and fix handling of this special case of clock configuration.

Finally, the CAN clock speed is in CANCLOCK register, not SYSCLOCK
register, so fix this as well.

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-03-08T17:34:12+00:00

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: David S. Miller

can: mcp251x: avoid write to error flag register if it's unnecessary

2016-03-04T07:45:17+00:00

Only two bits (RX0OVR and RX1OVR) are writable in EFLG, write is useless
if these bits aren't set.

Signed-off-by: Ed Spiridonov 
Signed-off-by: Marc Kleine-Budde

can: rcar: add gen[12] fallback compatibility strings

2016-02-26T07:43:18+00:00

Add fallback compatibility string for R-Car Gen 1 and Gen2.

In the case of Renesas R-Car hardware we know that there are generations of
SoCs, e.g. Gen 1 and Gen 2. But beyond that its not clear what the
relationship between IP blocks might be. For example, I believe that
r8a7779 is older than r8a7778 but that doesn't imply that the latter is a
descendant of the former or vice versa.

We can, however, by examining the documentation and behaviour of the
hardware at run-time observe that the current driver implementation appears
to be compatible with the IP blocks on SoCs within a given generation.

For the above reasons and convenience when enabling new SoCs a
per-generation fallback compatibility string scheme being adopted for
drivers for Renesas SoCs.

Signed-off-by: Simon Horman 
Acked-by: Rob Herring 
Acked-by: Geert Uytterhoeven 
Signed-off-by: Marc Kleine-Budde

can: ems_usb: fix coding style

2016-02-26T07:43:18+00:00

This patch fixes the coding style issues introduced in commit:

    90cfde46586d can: ems_usb: Fix possible tx overflow

Reported-by: Sergei Shtylyov 
Signed-off-by: Marc Kleine-Budde