Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Marc Kleine-Budde says:

====================
here is our second pull request for net-next. In this series Federico
Vaga adds a pci driver for c_can/d_can hardware using the existing
generic c_can driver. The remaining 6 patches are by Oliver Hartkopp.
He adds CANFD support to the CAN stack while keeping binary
compatibility for existing applications. CANFD is an extension to the
existing CAN standard, it allows longer CAN frames and/or higher data
rates. There's no real hardware available yet, but this series adds
CANFD support to the vcan driver.
====================

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

5 files changed, 298 insertions, 8 deletions

diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
index 25d371cf98dd..3b83bafcd947 100644
--- a/drivers/net/can/c_can/Kconfig
+++ b/drivers/net/can/c_can/Kconfig
@@ -13,4 +13,11 @@ config CAN_C_CAN_PLATFORM
           boards from ST Microelectronics (http://www.st.com) like the
           SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)
           boards like am335x, dm814x, dm813x and dm811x.
+
+config CAN_C_CAN_PCI
+        tristate "Generic PCI Bus based C_CAN/D_CAN driver"
+        depends on PCI
+        ---help---
+          This driver adds support for the C_CAN/D_CAN chips connected
+          to the PCI bus.
 endif
diff --git a/drivers/net/can/c_can/Makefile b/drivers/net/can/c_can/Makefile
index 9273f6d5c4b7..ad1cc842170a 100644
--- a/drivers/net/can/c_can/Makefile
+++ b/drivers/net/can/c_can/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_CAN_C_CAN) += c_can.o
 obj-$(CONFIG_CAN_C_CAN_PLATFORM) += c_can_platform.o
+obj-$(CONFIG_CAN_C_CAN_PCI) += c_can_pci.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c
new file mode 100644
index 000000000000..914aecfa09a9
--- /dev/null
+++ b/drivers/net/can/c_can/c_can_pci.c
@@ -0,0 +1,236 @@
+/*
+ * PCI bus driver for Bosch C_CAN/D_CAN controller
+ *
+ * Copyright (C) 2012 Federico Vaga <federico.vaga@gmail.com>
+ *
+ * Borrowed from c_can_platform.c
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/clk.h>
+#include <linux/pci.h>
+
+#include <linux/can/dev.h>
+
+#include "c_can.h"
+
+enum c_can_pci_reg_align {
+        C_CAN_REG_ALIGN_16,
+        C_CAN_REG_ALIGN_32,
+};
+
+struct c_can_pci_data {
+        /* Specify if is C_CAN or D_CAN */
+        enum c_can_dev_id type;
+        /* Set the register alignment in the memory */
+        enum c_can_pci_reg_align reg_align;
+        /* Set the frequency if clk is not usable */
+        unsigned int freq;
+};
+
+/*
+ * 16-bit c_can registers can be arranged differently in the memory
+ * architecture of different implementations. For example: 16-bit
+ * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.
+ * Handle the same by providing a common read/write interface.
+ */
+static u16 c_can_pci_read_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                enum reg index)
+{
+        return readw(priv->base + priv->regs[index]);
+}
+
+static void c_can_pci_write_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                enum reg index, u16 val)
+{
+        writew(val, priv->base + priv->regs[index]);
+}
+
+static u16 c_can_pci_read_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                enum reg index)
+{
+        return readw(priv->base + 2 * priv->regs[index]);
+}
+
+static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                enum reg index, u16 val)
+{
+        writew(val, priv->base + 2 * priv->regs[index]);
+}
+
+static int __devinit c_can_pci_probe(struct pci_dev *pdev,
+                                     const struct pci_device_id *ent)
+{
+        struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
+        struct c_can_priv *priv;
+        struct net_device *dev;
+        void __iomem *addr;
+        struct clk *clk;
+        int ret;
+
+        ret = pci_enable_device(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "pci_enable_device FAILED\n");
+                goto out;
+        }
+
+        ret = pci_request_regions(pdev, KBUILD_MODNAME);
+        if (ret) {
+                dev_err(&pdev->dev, "pci_request_regions FAILED\n");
+                goto out_disable_device;
+        }
+
+        pci_set_master(pdev);
+        pci_enable_msi(pdev);
+
+        addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
+        if (!addr) {
+                dev_err(&pdev->dev,
+                        "device has no PCI memory resources, "
+                        "failing adapter\n");
+                ret = -ENOMEM;
+                goto out_release_regions;
+        }
+
+        /* allocate the c_can device */
+        dev = alloc_c_can_dev();
+        if (!dev) {
+                ret = -ENOMEM;
+                goto out_iounmap;
+        }
+
+        priv = netdev_priv(dev);
+        pci_set_drvdata(pdev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        dev->irq = pdev->irq;
+        priv->base = addr;
+
+        if (!c_can_pci_data->freq) {
+                /* get the appropriate clk */
+                clk = clk_get(&pdev->dev, NULL);
+                if (IS_ERR(clk)) {
+                        dev_err(&pdev->dev, "no clock defined\n");
+                        ret = -ENODEV;
+                        goto out_free_c_can;
+                }
+                priv->can.clock.freq = clk_get_rate(clk);
+                priv->priv = clk;
+        } else {
+                priv->can.clock.freq = c_can_pci_data->freq;
+                priv->priv = NULL;
+        }
+
+        /* Configure CAN type */
+        switch (c_can_pci_data->type) {
+        case C_CAN_DEVTYPE:
+                priv->regs = reg_map_c_can;
+                break;
+        case D_CAN_DEVTYPE:
+                priv->regs = reg_map_d_can;
+                priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_free_clock;
+        }
+
+        /* Configure access to registers */
+        switch (c_can_pci_data->reg_align) {
+        case C_CAN_REG_ALIGN_32:
+                priv->read_reg = c_can_pci_read_reg_aligned_to_32bit;
+                priv->write_reg = c_can_pci_write_reg_aligned_to_32bit;
+                break;
+        case C_CAN_REG_ALIGN_16:
+                priv->read_reg = c_can_pci_read_reg_aligned_to_16bit;
+                priv->write_reg = c_can_pci_write_reg_aligned_to_16bit;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out_free_clock;
+        }
+
+        ret = register_c_can_dev(dev);
+        if (ret) {
+                dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
+                        KBUILD_MODNAME, ret);
+                goto out_free_clock;
+        }
+
+        dev_dbg(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
+                 KBUILD_MODNAME, priv->regs, dev->irq);
+
+        return 0;
+
+out_free_clock:
+        if (priv->priv)
+                clk_put(priv->priv);
+out_free_c_can:
+        pci_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+out_iounmap:
+        pci_iounmap(pdev, addr);
+out_release_regions:
+        pci_disable_msi(pdev);
+        pci_clear_master(pdev);
+        pci_release_regions(pdev);
+out_disable_device:
+        pci_disable_device(pdev);
+out:
+        return ret;
+}
+
+static void __devexit c_can_pci_remove(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        unregister_c_can_dev(dev);
+
+        if (priv->priv)
+                clk_put(priv->priv);
+
+        pci_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+
+        pci_iounmap(pdev, priv->base);
+        pci_disable_msi(pdev);
+        pci_clear_master(pdev);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+}
+
+static struct c_can_pci_data c_can_sta2x11= {
+        .type = C_CAN_DEVTYPE,
+        .reg_align = C_CAN_REG_ALIGN_32,
+        .freq = 52000000, /* 52 Mhz */
+};
+
+#define C_CAN_ID(_vend, _dev, _driverdata) {            \
+        PCI_DEVICE(_vend, _dev),                        \
+        .driver_data = (unsigned long)&_driverdata,     \
+}
+static DEFINE_PCI_DEVICE_TABLE(c_can_pci_tbl) = {
+        C_CAN_ID(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_CAN,
+                 c_can_sta2x11),
+        {},
+};
+static struct pci_driver c_can_pci_driver = {
+        .name = KBUILD_MODNAME,
+        .id_table = c_can_pci_tbl,
+        .probe = c_can_pci_probe,
+        .remove = __devexit_p(c_can_pci_remove),
+};
+
+module_pci_driver(c_can_pci_driver);
+
+MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PCI CAN bus driver for Bosch C_CAN/D_CAN controller");
+MODULE_DEVICE_TABLE(pci, c_can_pci_tbl);
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f03d7a481a80..239e4dd92ca1 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -33,6 +33,39 @@ MODULE_DESCRIPTION(MOD_DESC);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>");
 
+/* CAN DLC to real data length conversion helpers */
+
+static const u8 dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
+                             8, 12, 16, 20, 24, 32, 48, 64};
+
+/* get data length from can_dlc with sanitized can_dlc */
+u8 can_dlc2len(u8 can_dlc)
+{
+        return dlc2len[can_dlc & 0x0F];
+}
+EXPORT_SYMBOL_GPL(can_dlc2len);
+
+static const u8 len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,         /* 0 - 8 */
+                             9, 9, 9, 9,                        /* 9 - 12 */
+                             10, 10, 10, 10,                    /* 13 - 16 */
+                             11, 11, 11, 11,                    /* 17 - 20 */
+                             12, 12, 12, 12,                    /* 21 - 24 */
+                             13, 13, 13, 13, 13, 13, 13, 13,    /* 25 - 32 */
+                             14, 14, 14, 14, 14, 14, 14, 14,    /* 33 - 40 */
+                             14, 14, 14, 14, 14, 14, 14, 14,    /* 41 - 48 */
+                             15, 15, 15, 15, 15, 15, 15, 15,    /* 49 - 56 */
+                             15, 15, 15, 15, 15, 15, 15, 15};   /* 57 - 64 */
+
+/* map the sanitized data length to an appropriate data length code */
+u8 can_len2dlc(u8 len)
+{
+        if (unlikely(len > 64))
+                return 0xF;
+
+        return len2dlc[len];
+}
+EXPORT_SYMBOL_GPL(can_len2dlc);
+
 #ifdef CONFIG_CAN_CALC_BITTIMING
 #define CAN_CALC_MAX_ERROR 50 /* in one-tenth of a percent */
 
@@ -454,7 +487,7 @@ EXPORT_SYMBOL_GPL(can_bus_off);
 static void can_setup(struct net_device *dev)
 {
         dev->type = ARPHRD_CAN;
-        dev->mtu = sizeof(struct can_frame);
+        dev->mtu = CAN_MTU;
         dev->hard_header_len = 0;
         dev->addr_len = 0;
         dev->tx_queue_len = 10;
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
index ea2d94285936..4f93c0be0053 100644
--- a/drivers/net/can/vcan.c
+++ b/drivers/net/can/vcan.c
@@ -70,13 +70,12 @@ MODULE_PARM_DESC(echo, "Echo sent frames (for testing). Default: 0 (Off)");
 
 static void vcan_rx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
         struct net_device_stats *stats = &dev->stats;
 
         stats->rx_packets++;
-        stats->rx_bytes += cf->can_dlc;
+        stats->rx_bytes += cfd->len;
 
-        skb->protocol  = htons(ETH_P_CAN);
         skb->pkt_type  = PACKET_BROADCAST;
         skb->dev       = dev;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -86,7 +85,7 @@ static void vcan_rx(struct sk_buff *skb, struct net_device *dev)
 
 static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct can_frame *cf = (struct can_frame *)skb->data;
+        struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
         struct net_device_stats *stats = &dev->stats;
         int loop;
 
@@ -94,7 +93,7 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
                 return NETDEV_TX_OK;
 
         stats->tx_packets++;
-        stats->tx_bytes += cf->can_dlc;
+        stats->tx_bytes += cfd->len;
 
         /* set flag whether this packet has to be looped back */
         loop = skb->pkt_type == PACKET_LOOPBACK;
@@ -108,7 +107,7 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
                          * CAN core already did the echo for us
                          */
                         stats->rx_packets++;
-                        stats->rx_bytes += cf->can_dlc;
+                        stats->rx_bytes += cfd->len;
                 }
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
@@ -133,14 +132,28 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+static int vcan_change_mtu(struct net_device *dev, int new_mtu)
+{
+        /* Do not allow changing the MTU while running */
+        if (dev->flags & IFF_UP)
+                return -EBUSY;
+
+        if (new_mtu != CAN_MTU && new_mtu != CANFD_MTU)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+        return 0;
+}
+
 static const struct net_device_ops vcan_netdev_ops = {
         .ndo_start_xmit = vcan_tx,
+        .ndo_change_mtu = vcan_change_mtu,
 };
 
 static void vcan_setup(struct net_device *dev)
 {
         dev->type               = ARPHRD_CAN;
-        dev->mtu                = sizeof(struct can_frame);
+        dev->mtu                = CAN_MTU;
         dev->hard_header_len    = 0;
         dev->addr_len           = 0;
         dev->tx_queue_len       = 0;