Merge tag 'linux-can-fixes-for-4.17-20180508' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2018-05-08

this is a pull request for 7 patches for net/master.

The first patch is by Jakob Unterwurzacher and increases the severity of
bus-off messages in the generic CAN device infrastructure. The next two patches
are by Uwe Kleine-König and fix the endianess detection in the flexcan driver.
Jimmy Assarsson's patch for the kvaser driver corrects the stats counter for
dropped tx-messages. Geert Uytterhoeven provides one patch and Sergei Shtylyov
two patches for the rcan_canfd device tree binding description.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 23 insertions, 19 deletions

diff --git a/Documentation/devicetree/bindings/net/can/rcar_canfd.txt b/Documentation/devicetree/bindings/net/can/rcar_canfd.txt
index 93c3a6ae32f9..ac71daa46195 100644
--- a/Documentation/devicetree/bindings/net/can/rcar_canfd.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_canfd.txt
@@ -5,7 +5,9 @@ Required properties:
 - compatible: Must contain one or more of the following:
   - "renesas,rcar-gen3-canfd" for R-Car Gen3 compatible controller.
   - "renesas,r8a7795-canfd" for R8A7795 (R-Car H3) compatible controller.
-  - "renesas,r8a7796-canfd" for R8A7796 (R-Car M3) compatible controller.
+  - "renesas,r8a7796-canfd" for R8A7796 (R-Car M3-W) compatible controller.
+  - "renesas,r8a77970-canfd" for R8A77970 (R-Car V3M) compatible controller.
+  - "renesas,r8a77980-canfd" for R8A77980 (R-Car V3H) compatible controller.
 
   When compatible with the generic version, nodes must list the
   SoC-specific version corresponding to the platform first, followed by the
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index bf343195697e..54111ed218b1 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -303,7 +303,7 @@
                         };
 
                         can1: can@53fe4000 {
-                                compatible = "fsl,imx35-flexcan";
+                                compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan";
                                 reg = <0x53fe4000 0x1000>;
                                 clocks = <&clks 33>, <&clks 33>;
                                 clock-names = "ipg", "per";
@@ -312,7 +312,7 @@
                         };
 
                         can2: can@53fe8000 {
-                                compatible = "fsl,imx35-flexcan";
+                                compatible = "fsl,imx35-flexcan", "fsl,imx25-flexcan";
                                 reg = <0x53fe8000 0x1000>;
                                 clocks = <&clks 34>, <&clks 34>;
                                 clock-names = "ipg", "per";
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 7d647d043f52..3d65c0192f69 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -551,7 +551,7 @@
                         };
 
                         can1: can@53fc8000 {
-                                compatible = "fsl,imx53-flexcan";
+                                compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";
                                 reg = <0x53fc8000 0x4000>;
                                 interrupts = <82>;
                                 clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>,
@@ -561,7 +561,7 @@
                         };
 
                         can2: can@53fcc000 {
-                                compatible = "fsl,imx53-flexcan";
+                                compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";
                                 reg = <0x53fcc000 0x4000>;
                                 interrupts = <83>;
                                 clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>,
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index b1779566c5bb..3c71f1cb205f 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -605,7 +605,7 @@ void can_bus_off(struct net_device *dev)
 {
         struct can_priv *priv = netdev_priv(dev);
 
-        netdev_dbg(dev, "bus-off\n");
+        netdev_info(dev, "bus-off\n");
 
         netif_carrier_off(dev);
 
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 634c51e6b8ae..d53a45bf2a72 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -200,6 +200,7 @@
 #define FLEXCAN_QUIRK_DISABLE_MECR      BIT(4) /* Disable Memory error detection */
 #define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP BIT(5) /* Use timestamp based offloading */
 #define FLEXCAN_QUIRK_BROKEN_PERR_STATE BIT(6) /* No interrupt for error passive */
+#define FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN        BIT(7) /* default to BE register access */
 
 /* Structure of the message buffer */
 struct flexcan_mb {
@@ -288,6 +289,12 @@ struct flexcan_priv {
 
 static const struct flexcan_devtype_data fsl_p1010_devtype_data = {
         .quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |
+                FLEXCAN_QUIRK_BROKEN_PERR_STATE |
+                FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN,
+};
+
+static const struct flexcan_devtype_data fsl_imx25_devtype_data = {
+        .quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |
                 FLEXCAN_QUIRK_BROKEN_PERR_STATE,
 };
 
@@ -1251,9 +1258,9 @@ static void unregister_flexcandev(struct net_device *dev)
 static const struct of_device_id flexcan_of_match[] = {
         { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
         { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
-        { .compatible = "fsl,imx53-flexcan", .data = &fsl_p1010_devtype_data, },
-        { .compatible = "fsl,imx35-flexcan", .data = &fsl_p1010_devtype_data, },
-        { .compatible = "fsl,imx25-flexcan", .data = &fsl_p1010_devtype_data, },
+        { .compatible = "fsl,imx53-flexcan", .data = &fsl_imx25_devtype_data, },
+        { .compatible = "fsl,imx35-flexcan", .data = &fsl_imx25_devtype_data, },
+        { .compatible = "fsl,imx25-flexcan", .data = &fsl_imx25_devtype_data, },
         { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
         { .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
         { .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
@@ -1337,18 +1344,13 @@ static int flexcan_probe(struct platform_device *pdev)
 
         priv = netdev_priv(dev);
 
-        if (of_property_read_bool(pdev->dev.of_node, "big-endian")) {
+        if (of_property_read_bool(pdev->dev.of_node, "big-endian") ||
+            devtype_data->quirks & FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN) {
                 priv->read = flexcan_read_be;
                 priv->write = flexcan_write_be;
         } else {
-                if (of_device_is_compatible(pdev->dev.of_node,
-                                            "fsl,p1010-flexcan")) {
-                        priv->read = flexcan_read_be;
-                        priv->write = flexcan_write_be;
-                } else {
-                        priv->read = flexcan_read_le;
-                        priv->write = flexcan_write_le;
-                }
+                priv->read = flexcan_read_le;
+                priv->write = flexcan_write_le;
         }
 
         priv->can.clock.freq = clock_freq;
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 63587b8e6825..daed57d3d209 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -1179,7 +1179,7 @@ static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev,
 
         skb = alloc_can_skb(priv->netdev, &cf);
         if (!skb) {
-                stats->tx_dropped++;
+                stats->rx_dropped++;
                 return;
         }