]> rtime.felk.cvut.cz Git - linux-lin.git/blobdiff - sllin/sllin.c
sllin: Fix checksum mode decision
[linux-lin.git] / sllin / sllin.c
index bfa5dc515336d2ea9b1df1f18c576a27c5172fe4..487b72ad337d2c64a411c60710889f8c2dac63d8 100644 (file)
@@ -1,11 +1,8 @@
 /*
  * sllin.c - serial line LIN interface driver (using tty line discipline)
  *
- * This file is derived from linux/drivers/net/slip.c
- *
- * slip.c Authors  : Laurence Culhane <loz@holmes.demon.co.uk>
- *                   Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>
- * sllin.c Author  : Oliver Hartkopp <socketcan@hartkopp.net>
+ * This file is derived from drivers/net/can/slcan.c
+ * slcan.c Author: Oliver Hartkopp <socketcan@hartkopp.net>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
- *
+ * Idea:       Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
+ * Copyright:  (c) 2011 Czech Technical University in Prague
+ *             (c) 2011 Volkswagen Group Research
+ * Authors:    Pavel Pisa <pisa@cmp.felk.cvut.cz>
+ *             Rostislav Lisovy <lisovy@kormus.cz>
+ *             Michal Sojka <sojkam1@fel.cvut.cz>
+ * Funded by:  Volkswagen Group Research
  */
 
+#define DEBUG                  1 /* Enables pr_debug() printouts */
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 
-#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/can.h>
 #include <linux/kthread.h>
+#include <linux/hrtimer.h>
+#include <linux/version.h>
+#include "linux/lin_bus.h"
 
 /* Should be in include/linux/tty.h */
-#define N_SLLIN         25
+#define N_SLLIN                        25
+/* -------------------------------- */
 
 static __initdata const char banner[] =
        KERN_INFO "sllin: serial line LIN interface driver\n";
@@ -68,9 +75,18 @@ static __initdata const char banner[] =
 MODULE_ALIAS_LDISC(N_SLLIN);
 MODULE_DESCRIPTION("serial line LIN interface");
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>");
+MODULE_AUTHOR("Pavel Pisa <pisa@cmp.felk.cvut.cz>");
+
+#define SLLIN_MAGIC            0x53CA
+/* #define BREAK_BY_BAUD */
+
+static bool master = true;
+static int baudrate; /* Use LIN_DEFAULT_BAUDRATE when not set */
 
-#define SLLIN_MAGIC 0x53CA
+module_param(master, bool, 0);
+MODULE_PARM_DESC(master, "LIN interface is Master device");
+module_param(baudrate, int, 0);
+MODULE_PARM_DESC(baudrate, "Baudrate of LIN interface");
 
 static int maxdev = 10;                /* MAX number of SLLIN channels;
                                   This can be overridden with
@@ -79,22 +95,36 @@ module_param(maxdev, int, 0);
 MODULE_PARM_DESC(maxdev, "Maximum number of sllin interfaces");
 
 /* maximum buffer len to store whole LIN message*/
-#define SLLIN_DATA_MAX  8
-#define SLLIN_BUFF_LEN (1 /*break*/ + 1 /*sync*/ + 1 /*ID*/ + \
-                         SLLIN_DATA_MAX + 1 /*checksum*/)
-#define SLLIN_BUFF_BREAK 0
-#define SLLIN_BUFF_SYNC         1
-#define SLLIN_BUFF_ID   2
-#define SLLIN_BUFF_DATA         3
+#define SLLIN_DATA_MAX         8
+#define SLLIN_BUFF_LEN         (1 /*break*/ + 1 /*sync*/ + 1 /*ID*/ + \
+                               SLLIN_DATA_MAX + 1 /*checksum*/)
+#define SLLIN_BUFF_BREAK       0
+#define SLLIN_BUFF_SYNC                1
+#define SLLIN_BUFF_ID          2
+#define SLLIN_BUFF_DATA                3
+
+#define SLLIN_SAMPLES_PER_CHAR 10
+#define SLLIN_CHARS_TO_TIMEOUT 24
 
 enum slstate {
        SLSTATE_IDLE = 0,
        SLSTATE_BREAK_SENT,
        SLSTATE_ID_SENT,
-       SLSTATE_RESPONSE_WAIT,
+       SLSTATE_RESPONSE_WAIT, /* Wait for response */
+       SLSTATE_RESPONSE_WAIT_BUS, /* Wait for response from LIN bus
+                               only (CAN frames from network stack
+                               are not processed in this moment) */
+       SLSTATE_ID_RECEIVED,
        SLSTATE_RESPONSE_SENT,
 };
 
+struct sllin_conf_entry {
+       int dlc;                /* Length of data in LIN frame */
+       canid_t frame_fl;       /* LIN frame flags. Passed from userspace as
+                                  canid_t data type */
+       u8 data[8];             /* LIN frame data payload */
+};
+
 struct sllin {
        int                     magic;
 
@@ -107,14 +137,20 @@ struct sllin {
        unsigned char           rx_buff[SLLIN_BUFF_LEN]; /* LIN Rx buffer */
        unsigned char           tx_buff[SLLIN_BUFF_LEN]; /* LIN Tx buffer */
        int                     rx_expect;      /* expected number of Rx chars */
-       int                     rx_lim;         /* maximum Rx chars for ID  */
+       int                     rx_lim;         /* maximum Rx chars for current frame */
        int                     rx_cnt;         /* message buffer Rx fill level  */
        int                     tx_lim;         /* actual limit of bytes to Tx */
        int                     tx_cnt;         /* number of already Tx bytes */
        char                    lin_master;     /* node is a master node */
        int                     lin_baud;       /* LIN baudrate */
-       int                     lin_state;      /* state */
-       int                     id_to_send;     /* there is ID to be sent */
+       int                     lin_state;      /* state */
+       char                    id_to_send;     /* there is ID to be sent */
+       char                    data_to_send;   /* there are data to be sent */
+       char                    resp_len_known; /* Length of the response is known */
+       char                    header_received;/* In Slave mode, set when header was already
+                                                  received */
+       char                    rx_len_unknown; /* We are not sure how much data will be sent to us --
+                                                  we just guess the length */
 
        unsigned long           flags;          /* Flag values/ mode etc     */
 #define SLF_INUSE              0               /* Channel in use            */
@@ -122,166 +158,137 @@ struct sllin {
 #define SLF_RXEVENT            2               /* Rx wake event             */
 #define SLF_TXEVENT            3               /* Tx wake event             */
 #define SLF_MSGEVENT           4               /* CAN message to sent       */
+#define SLF_TMOUTEVENT         5               /* Timeout on received data  */
+#define SLF_TXBUFF_RQ          6               /* Req. to send buffer to UART*/
+#define SLF_TXBUFF_INPR                7               /* Above request in progress */
 
        dev_t                   line;
        struct task_struct      *kwthread;
-       wait_queue_head_t       kwt_wq;
+       wait_queue_head_t       kwt_wq;         /* Wait queue used by kwthread */
+       struct hrtimer          rx_timer;       /* RX timeout timer */
+       ktime_t                 rx_timer_timeout; /* RX timeout timer value */
+       struct sk_buff          *tx_req_skb;    /* Socket buffer with CAN frame
+                                               received from network stack*/
+
+       /* List with configurations for each of 0 to LIN_ID_MAX LIN IDs */
+       struct sllin_conf_entry linfr_cache[LIN_ID_MAX + 1];
+       spinlock_t              linfr_lock;     /* frame cache and buffers lock */
 };
 
 static struct net_device **sllin_devs;
+static int sllin_configure_frame_cache(struct sllin *sl, struct can_frame *cf);
+static void sllin_slave_receive_buf(struct tty_struct *tty,
+                             const unsigned char *cp, char *fp, int count);
+static void sllin_master_receive_buf(struct tty_struct *tty,
+                             const unsigned char *cp, char *fp, int count);
+
 
+/* Values of two parity bits in LIN Protected
+   Identifier for each particular LIN ID */
 const unsigned char sllin_id_parity_table[] = {
-        0x80,0xc0,0x40,0x00,0xc0,0x80,0x00,0x40,
-        0x00,0x40,0xc0,0x80,0x40,0x00,0x80,0xc0,
-        0x40,0x00,0x80,0xc0,0x00,0x40,0xc0,0x80,
-        0xc0,0x80,0x00,0x40,0x80,0xc0,0x40,0x00,
-        0x00,0x40,0xc0,0x80,0x40,0x00,0x80,0xc0,
-        0x80,0xc0,0x40,0x00,0xc0,0x80,0x00,0x40,
-        0xc0,0x80,0x00,0x40,0x80,0xc0,0x40,0x00,
-        0x40,0x00,0x80,0xc0,0x00,0x40,0xc0,0x80
+       0x80, 0xc0, 0x40, 0x00, 0xc0, 0x80, 0x00, 0x40,
+       0x00, 0x40, 0xc0, 0x80, 0x40, 0x00, 0x80, 0xc0,
+       0x40, 0x00, 0x80, 0xc0, 0x00, 0x40, 0xc0, 0x80,
+       0xc0, 0x80, 0x00, 0x40, 0x80, 0xc0, 0x40, 0x00,
+       0x00, 0x40, 0xc0, 0x80, 0x40, 0x00, 0x80, 0xc0,
+       0x80, 0xc0, 0x40, 0x00, 0xc0, 0x80, 0x00, 0x40,
+       0xc0, 0x80, 0x00, 0x40, 0x80, 0xc0, 0x40, 0x00,
+       0x40, 0x00, 0x80, 0xc0, 0x00, 0x40, 0xc0, 0x80
 };
 
+/**
+ * sltty_change_speed() -- Change baudrate of Serial device belonging
+ *                        to particular @tty
+ *
+ * @tty:       Pointer to TTY to change speed for.
+ * @speed:     Integer value of new speed. It is possible to
+ *             assign non-standard values, i.e. those which
+ *             are not defined in termbits.h.
+ */
 static int sltty_change_speed(struct tty_struct *tty, unsigned speed)
 {
-       struct ktermios old_termios;
+       struct ktermios old_termios, termios;
        int cflag;
 
        mutex_lock(&tty->termios_mutex);
 
-       old_termios = *(tty->termios);
-       cflag = tty->termios->c_cflag;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+       old_termios = termios = *(tty->termios);
+#else
+       old_termios = termios = tty->termios;
+#endif
+
+       cflag = CS8 | CREAD | CLOCAL | HUPCL;
        cflag &= ~(CBAUD | CIBAUD);
        cflag |= BOTHER;
-       tty->termios->c_cflag = cflag;
+       termios.c_cflag = cflag;
+       termios.c_oflag = 0;
+       termios.c_lflag = 0;
+
+       /* Enable interrupt when UART-Break or Framing error received */
+       termios.c_iflag = BRKINT | INPCK;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
+       *(tty->termios) = termios;
+#else
+       tty->termios = termios;
+#endif
 
        tty_encode_baud_rate(tty, speed, speed);
 
        if (tty->ops->set_termios)
                tty->ops->set_termios(tty, &old_termios);
-       //priv->io.speed = speed;
+
        mutex_unlock(&tty->termios_mutex);
 
        return 0;
 }
 
-
-/* Send one completely decapsulated can_frame to the network layer */
-static void sll_bump(struct sllin *sl)
+/* Send one can_frame to the network layer */
+static void sllin_send_canfr(struct sllin *sl, canid_t id, char *data, int len)
 {
-//     struct sk_buff *skb;
-//     struct can_frame cf;
-//     int i, dlc_pos, tmp;
-//     unsigned long ultmp;
-//     char cmd = sl->rbuff[0];
-//
-//     if ((cmd != 't') && (cmd != 'T') && (cmd != 'r') && (cmd != 'R'))
-//             return;
-//
-//     if (cmd & 0x20) /* tiny chars 'r' 't' => standard frame format */
-//             dlc_pos = 4; /* dlc position tiiid */
-//     else
-//             dlc_pos = 9; /* dlc position Tiiiiiiiid */
-//
-//     if (!((sl->rbuff[dlc_pos] >= '0') && (sl->rbuff[dlc_pos] < '9')))
-//             return;
-//
-//     cf.can_dlc = sl->rbuff[dlc_pos] - '0'; /* get can_dlc from ASCII val */
-//
-//     sl->rbuff[dlc_pos] = 0; /* terminate can_id string */
-//
-//     if (strict_strtoul(sl->rbuff+1, 16, &ultmp))
-//             return;
-//
-//     cf.can_id = ultmp;
-//
-//     if (!(cmd & 0x20)) /* NO tiny chars => extended frame format */
-//             cf.can_id |= CAN_EFF_FLAG;
-//
-//     if ((cmd | 0x20) == 'r') /* RTR frame */
-//             cf.can_id |= CAN_RTR_FLAG;
-//
-//     *(u64 *) (&cf.data) = 0; /* clear payload */
-//
-//     for (i = 0, dlc_pos++; i < cf.can_dlc; i++) {
-//
-//             tmp = asc2nibble(sl->rbuff[dlc_pos++]);
-//             if (tmp > 0x0F)
-//                     return;
-//             cf.data[i] = (tmp << 4);
-//             tmp = asc2nibble(sl->rbuff[dlc_pos++]);
-//             if (tmp > 0x0F)
-//                     return;
-//             cf.data[i] |= tmp;
-//     }
-//
-//
-//     skb = dev_alloc_skb(sizeof(struct can_frame));
-//     if (!skb)
-//             return;
-//
-//     skb->dev = sl->dev;
-//     skb->protocol = htons(ETH_P_CAN);
-//     skb->pkt_type = PACKET_BROADCAST;
-//     skb->ip_summed = CHECKSUM_UNNECESSARY;
-//     memcpy(skb_put(skb, sizeof(struct can_frame)),
-//            &cf, sizeof(struct can_frame));
-//     netif_rx(skb);
-//
-//     sl->dev->stats.rx_packets++;
-//     sl->dev->stats.rx_bytes += cf.can_dlc;
-}
-
-
- /************************************************************************
-  *                    STANDARD SLLIN ENCAPSULATION                     *
-  ************************************************************************/
-
-/* Convert particular CAN frame into LIN frame and send it to TTY queue. */
-static void sll_encaps(struct sllin *sl, struct can_frame *cf)
-{
-       int actual, idx, i;
-       char lframe[16] = {0x00, 0x55}; /* Fake break, Sync byte */
-       struct tty_struct *tty = sl->tty;
+       struct sk_buff *skb;
+       struct can_frame cf;
 
-       pr_debug("sllin: %s() invoked\n", __FUNCTION__);
+       cf.can_id = id;
+       cf.can_dlc = len;
+       if (cf.can_dlc > 0)
+               memcpy(&cf.data, data, cf.can_dlc);
 
-       /* We do care only about SFF frames */
-       if (cf->can_id & CAN_EFF_FLAG)
+       skb = dev_alloc_skb(sizeof(struct can_frame));
+       if (!skb)
                return;
 
-       /* Send only header */
-       if (cf->can_id & CAN_RTR_FLAG) {
-               pr_debug("sllin: %s() RTR CAN frame\n", __FUNCTION__);
-               lframe[2] = (u8)cf->can_id; /* Get one byte LIN ID */
+       skb->dev = sl->dev;
+       skb->protocol = htons(ETH_P_CAN);
+       skb->pkt_type = PACKET_BROADCAST;
+       skb->ip_summed = CHECKSUM_UNNECESSARY;
+       memcpy(skb_put(skb, sizeof(struct can_frame)),
+              &cf, sizeof(struct can_frame));
+       netif_rx(skb);
 
-               sltty_change_speed(tty, sl->lin_baud * 2 / 3);
-               tty->ops->write(tty, &lframe[0], 1);
-               sltty_change_speed(tty, sl->lin_baud);
-               tty->ops->write(tty, &lframe[1], 1);
-               tty->ops->write(tty, &lframe[2], 1);
-       } else {
-               pr_debug("sllin: %s() non-RTR CAN frame\n", __FUNCTION__);
-               /*      idx = strlen(sl->xbuff);
-
-                       for (i = 0; i < cf->can_dlc; i++)
-                       sprintf(&sl->xbuff[idx + 2*i], "%02X", cf->data[i]);
-
-                * Order of next two lines is *very* important.
-                * When we are sending a little amount of data,
-                * the transfer may be completed inside the ops->write()
-                * routine, because it's running with interrupts enabled.
-                * In this case we *never* got WRITE_WAKEUP event,
-                * if we did not request it before write operation.
-                *       14 Oct 1994  Dmitry Gorodchanin.
-
-                set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
-                actual = sl->tty->ops->write(sl->tty, sl->xbuff, strlen(sl->xbuff));
-                sl->xleft = strlen(sl->xbuff) - actual;
-                sl->xhead = sl->xbuff + actual;
-                sl->dev->stats.tx_bytes += cf->can_dlc;
-                */
-       }
+       sl->dev->stats.rx_packets++;
+       sl->dev->stats.rx_bytes += cf.can_dlc;
+}
+
+/**
+ * sll_bump() -- Send data of received LIN frame (existing in sl->rx_buff)
+ *              as CAN frame
+ *
+ * @sl:
+ */
+static void sll_bump(struct sllin *sl)
+{
+       int len = sl->rx_cnt - SLLIN_BUFF_DATA - 1; /* without checksum */
+       len = (len < 0) ? 0 : len;
+
+       sllin_send_canfr(sl, sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK,
+               sl->rx_buff + SLLIN_BUFF_DATA, len);
+}
 
+static void sll_send_rtr(struct sllin *sl)
+{
+       sllin_send_canfr(sl, (sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK) |
+               CAN_RTR_FLAG, NULL, 0);
 }
 
 /*
@@ -290,7 +297,7 @@ static void sll_encaps(struct sllin *sl, struct can_frame *cf)
  */
 static void sllin_write_wakeup(struct tty_struct *tty)
 {
-       int actual;
+       int actual = 0;
        int remains;
        struct sllin *sl = (struct sllin *) tty->disc_data;
 
@@ -298,53 +305,85 @@ static void sllin_write_wakeup(struct tty_struct *tty)
        if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
                return;
 
-       if (sl->lin_state != SLSTATE_BREAK_SENT)
-               remains = sl->tx_lim - sl->tx_cnt;
-       else
-               remains = SLLIN_BUFF_BREAK + 1 - sl->tx_cnt;
+       set_bit(SLF_TXBUFF_RQ, &sl->flags);
+       do {
+               if (unlikely(test_and_set_bit(SLF_TXBUFF_INPR, &sl->flags)))
+                       return; /* ongoing concurrent processing */
+
+               clear_bit(SLF_TXBUFF_RQ, &sl->flags);
+               smp_mb__after_clear_bit();
+
+               if (sl->lin_state != SLSTATE_BREAK_SENT)
+                       remains = sl->tx_lim - sl->tx_cnt;
+               else
+                       remains = SLLIN_BUFF_BREAK + 1 - sl->tx_cnt;
+
+               if (remains > 0) {
+                       actual = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt,
+                               sl->tx_cnt - sl->tx_lim);
+                       sl->tx_cnt += actual;
+                       remains -= actual;
+               }
+               clear_bit(SLF_TXBUFF_INPR, &sl->flags);
+               smp_mb__after_clear_bit();
 
-       if (remains > 0) {
-               actual = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, sl->tx_cnt - sl->tx_lim);
-               sl->tx_cnt += actual;
+       } while (unlikely(test_bit(SLF_TXBUFF_RQ, &sl->flags)));
 
-               if (sl->tx_cnt < sl->tx_lim) {
-                       printk(KERN_INFO "sllin_write_wakeup sent %d, remains %d, waiting\n",
-                               sl->tx_cnt, sl->tx_lim - sl->tx_cnt);
-                       return;
-               }
+       if ((remains > 0) && (actual >= 0)) {
+               netdev_dbg(sl->dev, "sllin_write_wakeup sent %d, remains %d, waiting\n",
+                       sl->tx_cnt, sl->tx_lim - sl->tx_cnt);
+               return;
        }
 
        clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
        set_bit(SLF_TXEVENT, &sl->flags);
        wake_up(&sl->kwt_wq);
 
-       printk(KERN_INFO "sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
+       netdev_dbg(sl->dev, "sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
 }
 
-/* Send a can_frame to a TTY queue. */
+/**
+ * sll_xmit() -- Send a can_frame to a TTY queue.
+ *
+ * @skb: Pointer to Socket buffer to be sent.
+ * @dev: Network device where @skb will be sent.
+ */
 static netdev_tx_t sll_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct sllin *sl = netdev_priv(dev);
+       struct can_frame *cf;
 
        if (skb->len != sizeof(struct can_frame))
-               goto out;
+               goto err_out;
 
        spin_lock(&sl->lock);
        if (!netif_running(dev))  {
-               spin_unlock(&sl->lock);
-               printk(KERN_WARNING "%s: xmit: iface is down\n", dev->name);
-               goto out;
+               netdev_warn(sl->dev, "xmit: iface is down\n");
+               goto err_out_unlock;
        }
        if (sl->tty == NULL) {
-               spin_unlock(&sl->lock);
-               goto out;
+               netdev_warn(sl->dev, "xmit: no tty device connected\n");
+               goto err_out_unlock;
+       }
+
+       cf = (struct can_frame *) skb->data;
+       if (cf->can_id & LIN_CTRL_FRAME) {
+               sllin_configure_frame_cache(sl, cf);
+               goto free_out_unlock;
        }
 
        netif_stop_queue(sl->dev);
-       sll_encaps(sl, (struct can_frame *) skb->data); /* encaps & send */
+
+       sl->tx_req_skb = skb;
+       set_bit(SLF_MSGEVENT, &sl->flags);
+       wake_up(&sl->kwt_wq);
        spin_unlock(&sl->lock);
+       return NETDEV_TX_OK;
 
-out:
+free_out_unlock:
+err_out_unlock:
+       spin_unlock(&sl->lock);
+err_out:
        kfree_skb(skb);
        return NETDEV_TX_OK;
 }
@@ -377,7 +416,7 @@ static int sll_open(struct net_device *dev)
 {
        struct sllin *sl = netdev_priv(dev);
 
-       pr_debug("sllin: %s() invoked\n", __FUNCTION__);
+       netdev_dbg(sl->dev, "%s() invoked\n", __func__);
 
        if (sl->tty == NULL)
                return -ENODEV;
@@ -415,70 +454,164 @@ static void sll_setup(struct net_device *dev)
 
        /* New-style flags. */
        dev->flags              = IFF_NOARP;
-       dev->features           = NETIF_F_NO_CSUM;
+       dev->features           = NETIF_F_HW_CSUM; /* NETIF_F_NO_CSUM;*/
 }
 
 /******************************************
   Routines looking at TTY side.
  ******************************************/
-
-/*
- * Handle the 'receiver data ready' interrupt.
- * This function is called by the 'tty_io' module in the kernel when
- * a block of SLLIN data has been received, which can now be decapsulated
- * and sent on to some IP layer for further processing. This will not
- * be re-entered while running but other ldisc functions may be called
- * in parallel
- */
-
-static void sllin_receive_buf(struct tty_struct *tty,
+static void sllin_master_receive_buf(struct tty_struct *tty,
                              const unsigned char *cp, char *fp, int count)
 {
        struct sllin *sl = (struct sllin *) tty->disc_data;
 
-       printk(KERN_INFO "sllin_receive_buf invoked\n");
-
-       if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
-               return;
-
        /* Read the characters out of the buffer */
        while (count--) {
                if (fp && *fp++) {
-                       if (!test_and_set_bit(SLF_ERROR, &sl->flags))
-                               sl->dev->stats.rx_errors++;
-                       printk(KERN_INFO "sllin_receive_buf char 0x%02x ignored due marker 0x%02x, flags 0x%lx\n",
+                       netdev_dbg(sl->dev, "sllin_master_receive_buf char 0x%02x ignored "
+                               "due marker 0x%02x, flags 0x%lx\n",
                                *cp, *(fp-1), sl->flags);
-                       cp++;
-                       continue;
+
+                       /* i.e. Real error -- not Break */
+                       if (sl->rx_cnt > SLLIN_BUFF_BREAK) {
+                               set_bit(SLF_ERROR, &sl->flags);
+                               wake_up(&sl->kwt_wq);
+                               return;
+                       }
                }
 
-               if (sl->rx_cnt < SLLIN_BUFF_LEN)  {
+#ifndef BREAK_BY_BAUD
+               /* We didn't receive Break character -- fake it! */
+               if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
+                       netdev_dbg(sl->dev, "LIN_RX[%d]: 0x00\n", sl->rx_cnt);
+                       sl->rx_buff[sl->rx_cnt++] = 0x00;
+               }
+#endif /* BREAK_BY_BAUD */
+
+               if (sl->rx_cnt < SLLIN_BUFF_LEN) {
+                       netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
                        sl->rx_buff[sl->rx_cnt++] = *cp++;
                }
        }
 
-       if(sl->rx_cnt >= sl->rx_expect) {
+
+       if (sl->rx_cnt >= sl->rx_expect) {
                set_bit(SLF_RXEVENT, &sl->flags);
                wake_up(&sl->kwt_wq);
-               printk(KERN_INFO "sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
+               netdev_dbg(sl->dev, "sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
        } else {
-               printk(KERN_INFO "sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
+               netdev_dbg(sl->dev, "sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
        }
 }
 
+
 /*****************************************
  *  sllin message helper routines
  *****************************************/
+/**
+ * sllin_report_error() -- Report an error by sending CAN frame
+ *     with particular error flag set in can_id
+ *
+ * @sl:
+ * @err: Error flag to be sent.
+ */
+static void sllin_report_error(struct sllin *sl, int err)
+{
+       switch (err) {
+       case LIN_ERR_CHECKSUM:
+               sl->dev->stats.rx_crc_errors++;
+               break;
+
+       case LIN_ERR_RX_TIMEOUT:
+               sl->dev->stats.rx_errors++;
+               break;
+
+       case LIN_ERR_FRAMING:
+               sl->dev->stats.rx_frame_errors++;
+               break;
+       }
+
+       sllin_send_canfr(sl, 0 | CAN_EFF_FLAG |
+               (err & ~LIN_ID_MASK), NULL, 0);
+}
+
+/**
+ * sllin_configure_frame_cache() -- Configure particular entry in linfr_cache
+ *
+ * @sl:
+ * @cf: Pointer to CAN frame sent to this driver
+ *     holding configuration information
+ */
+static int sllin_configure_frame_cache(struct sllin *sl, struct can_frame *cf)
+{
+       unsigned long flags;
+       struct sllin_conf_entry *sce;
+
+       if (!(cf->can_id & LIN_CTRL_FRAME))
+               return -1;
+
+       sce = &sl->linfr_cache[cf->can_id & LIN_ID_MASK];
+       netdev_dbg(sl->dev, "Setting frame cache with EFF CAN frame. LIN ID = %d\n",
+               cf->can_id & LIN_ID_MASK);
+
+       spin_lock_irqsave(&sl->linfr_lock, flags);
+
+       sce->dlc = cf->can_dlc;
+       if (sce->dlc > SLLIN_DATA_MAX)
+               sce->dlc = SLLIN_DATA_MAX;
+
+       sce->frame_fl = (cf->can_id & ~LIN_ID_MASK) & CAN_EFF_MASK;
+       memcpy(sce->data, cf->data, cf->can_dlc);
+
+       spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+       return 0;
+}
+
+/**
+ * sllin_checksum() -- Count checksum for particular data
+ *
+ * @data:       Pointer to the buffer containing whole LIN
+ *              frame (i.e. including break and sync bytes).
+ * @length:     Length of the buffer.
+ * @enhanced_fl: Flag determining whether Enhanced or Classic
+ *              checksum should be counted.
+ */
+static inline unsigned sllin_checksum(unsigned char *data, int length, int enhanced_fl)
+{
+       unsigned csum = 0;
+       int i;
 
-int sllin_setup_msg(struct sllin *sl, int mode, int id,
+       if (enhanced_fl)
+               i = SLLIN_BUFF_ID;
+       else
+               i = SLLIN_BUFF_DATA;
+
+       for (; i < length; i++) {
+               csum += data[i];
+               if (csum > 255)
+                       csum -= 255;
+       }
+
+       return ~csum & 0xff;
+}
+
+#define SLLIN_STPMSG_RESPONLY          (1) /* Message will be LIN Response only */
+#define SLLIN_STPMSG_CHCKSUM_CLS       (1 << 1)
+#define SLLIN_STPMSG_CHCKSUM_ENH       (1 << 2)
+
+static int sllin_setup_msg(struct sllin *sl, int mode, int id,
                unsigned char *data, int len)
 {
-       if (id > 0x3f)
+       if (id > LIN_ID_MASK)
                return -1;
 
-       sl->rx_cnt = 0;
-       sl->tx_cnt = 0;
-       sl->rx_expect = 0;
+       if (!(mode & SLLIN_STPMSG_RESPONLY)) {
+               sl->rx_cnt = 0;
+               sl->tx_cnt = 0;
+               sl->rx_expect = 0;
+               sl->rx_lim = SLLIN_BUFF_LEN;
+       }
 
        sl->tx_buff[SLLIN_BUFF_BREAK] = 0;
        sl->tx_buff[SLLIN_BUFF_SYNC]  = 0x55;
@@ -486,77 +619,279 @@ int sllin_setup_msg(struct sllin *sl, int mode, int id,
        sl->tx_lim = SLLIN_BUFF_DATA;
 
        if ((data != NULL) && len) {
-               int i;
-               unsigned csum  = 0;
-
                sl->tx_lim += len;
                memcpy(sl->tx_buff + SLLIN_BUFF_DATA, data, len);
-               /* compute data parity there */
-               for (i = SLLIN_BUFF_DATA; i < sl->tx_lim; i++) {
-                       csum += sl->tx_buff[i];
-                       if (csum > 255)
-                               csum -= 255;
-               }
-
-               sl->tx_buff[sl->tx_lim++] = csum;
+               sl->tx_buff[sl->tx_lim] = sllin_checksum(sl->tx_buff,
+                               sl->tx_lim, mode & SLLIN_STPMSG_CHCKSUM_ENH);
+               sl->tx_lim++;
        }
        if (len != 0)
-               sl->rx_lim += len + 1;
+               sl->rx_lim = SLLIN_BUFF_DATA + len + 1;
 
        return 0;
 }
 
+static void sllin_reset_buffs(struct sllin *sl)
+{
+       sl->rx_cnt = 0;
+       sl->rx_expect = 0;
+       sl->rx_lim = sl->lin_master ? 0 : SLLIN_BUFF_LEN;
+       sl->tx_cnt = 0;
+       sl->tx_lim = 0;
+       sl->id_to_send = false;
+       sl->data_to_send = false;
+}
+
+/**
+ * sllin_rx_validate() -- Validate received frame, i,e. check checksum
+ *
+ * @sl:
+ */
+static int sllin_rx_validate(struct sllin *sl)
+{
+       unsigned long flags;
+       int actual_id;
+       int ext_chcks_fl;
+       int lin_dlc;
+       unsigned char rec_chcksm = sl->rx_buff[sl->rx_cnt - 1];
+       struct sllin_conf_entry *sce;
+
+       actual_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+       sce = &sl->linfr_cache[actual_id];
+
+       spin_lock_irqsave(&sl->linfr_lock, flags);
+       lin_dlc = sce->dlc;
+       ext_chcks_fl = sce->frame_fl & LIN_CHECKSUM_EXTENDED;
+       spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+       if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1, ext_chcks_fl) !=
+               rec_chcksm) {
+
+               /* Type of checksum is configured for particular frame */
+               if (lin_dlc > 0) {
+                       return -1;
+               } else {
+                       if (sllin_checksum(sl->rx_buff, sl->rx_cnt - 1,
+                               !ext_chcks_fl) != rec_chcksm) {
+                               return -1;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+static void sllin_slave_finish_rx_msg(struct sllin *sl)
+{
+       if (sllin_rx_validate(sl) == -1) {
+               netdev_dbg(sl->dev, "sllin: RX validation failed.\n");
+               sllin_report_error(sl, LIN_ERR_CHECKSUM);
+       } else {
+               /* Send CAN non-RTR frame with data */
+               netdev_dbg(sl->dev, "sllin: sending NON-RTR CAN frame with LIN payload.");
+               sll_bump(sl); /* send packet to the network layer */
+       }
+       /* Prepare for reception of new header */
+       sl->rx_cnt = 0;
+       sl->rx_expect = SLLIN_BUFF_ID + 1;
+       sl->rx_len_unknown = false; /* We do know exact length of the header */
+       sl->header_received = false;
+}
 
-int sllin_send_tx_buff(struct sllin *sl)
+static void sllin_slave_receive_buf(struct tty_struct *tty,
+                             const unsigned char *cp, char *fp, int count)
+{
+       struct sllin *sl = (struct sllin *) tty->disc_data;
+       int lin_id;
+       struct sllin_conf_entry *sce;
+
+
+       /* Read the characters out of the buffer */
+       while (count--) {
+               if (fp && *fp++) {
+                       /*
+                        * If we don't know the length of the current message
+                        * we received the break of the next message.
+                        * Evaluate the previous one before continuing
+                        */
+                       if (sl->rx_len_unknown == true)
+                       {
+                               hrtimer_cancel(&sl->rx_timer);
+                               sllin_slave_finish_rx_msg(sl);
+
+                               set_bit(SLF_RXEVENT, &sl->flags);
+                               wake_up(&sl->kwt_wq);
+                       }
+
+                       netdev_dbg(sl->dev, "sllin_slave_receive_buf char 0x%02x ignored "
+                               "due marker 0x%02x, flags 0x%lx\n",
+                               *cp, *(fp-1), sl->flags);
+
+                       /* Received Break */
+                       sl->rx_cnt = 0;
+                       sl->rx_expect = SLLIN_BUFF_ID + 1;
+                       sl->rx_len_unknown = false; /* We do know exact length of the header */
+                       sl->header_received = false;
+               }
+
+               if (sl->rx_cnt < SLLIN_BUFF_LEN) {
+                       netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
+
+                       /* We did not receive break (0x00) character */
+                       if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
+                               sl->rx_buff[sl->rx_cnt++] = 0x00;
+                       }
+
+                       if (sl->rx_cnt == SLLIN_BUFF_SYNC) {
+                               /* 'Duplicated' break character -- ignore */
+                               if (*cp == 0x00) {
+                                       cp++;
+                                       continue;
+                               }
+
+                               /* Wrong sync character */
+                               if (*cp != 0x55)
+                                       break;
+                       }
+
+                       sl->rx_buff[sl->rx_cnt++] = *cp++;
+               }
+
+               /* Header received */
+               if ((sl->header_received == false) && (sl->rx_cnt >= (SLLIN_BUFF_ID + 1))) {
+                       unsigned long flags;
+
+                       lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+                       sce = &sl->linfr_cache[lin_id];
+
+                       spin_lock_irqsave(&sl->linfr_lock, flags);
+
+                       sl->lin_state = SLSTATE_ID_RECEIVED;
+                       /* Is the length of data set in frame cache? */
+                       if (sce->frame_fl & LIN_CACHE_RESPONSE) {
+                               sl->rx_expect += sce->dlc + 1; /* + checksum */
+                               sl->rx_len_unknown = false;
+                               set_bit(SLF_MSGEVENT, &sl->flags);
+                               wake_up(&sl->kwt_wq);
+                       } else {
+                               sl->rx_expect += SLLIN_DATA_MAX + 1; /* + checksum */
+                               sl->rx_len_unknown = true;
+                       }
+                       spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+                       sl->header_received = true;
+
+                       hrtimer_start(&sl->rx_timer,
+                               ktime_add(ktime_get(), sl->rx_timer_timeout),
+                               HRTIMER_MODE_ABS);
+                       sll_send_rtr(sl);
+                       continue;
+               }
+
+               /* Response received */
+               if ((sl->header_received == true) &&
+                       ((sl->rx_cnt >= sl->rx_expect))) {
+
+                       hrtimer_cancel(&sl->rx_timer);
+                       netdev_dbg(sl->dev, "Received LIN header & LIN response. "
+                                       "rx_cnt = %u, rx_expect = %u\n", sl->rx_cnt,
+                                       sl->rx_expect);
+                       sllin_slave_finish_rx_msg(sl);
+
+                       set_bit(SLF_RXEVENT, &sl->flags);
+                       wake_up(&sl->kwt_wq);
+               }
+       }
+}
+
+static void sllin_receive_buf(struct tty_struct *tty,
+                             const unsigned char *cp, char *fp, int count)
+{
+       struct sllin *sl = (struct sllin *) tty->disc_data;
+       netdev_dbg(sl->dev, "sllin_receive_buf invoked, count = %u\n", count);
+
+       if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
+               return;
+
+       if (sl->lin_master)
+               sllin_master_receive_buf(tty, cp, fp, count);
+       else
+               sllin_slave_receive_buf(tty, cp, fp, count);
+
+}
+
+static int sllin_send_tx_buff(struct sllin *sl)
 {
        struct tty_struct *tty = sl->tty;
        int remains;
        int res;
 
-       if (sl->lin_state != SLSTATE_BREAK_SENT)
+       set_bit(SLF_TXBUFF_RQ, &sl->flags);
+       do {
+               if (unlikely(test_and_set_bit(SLF_TXBUFF_INPR, &sl->flags)))
+                       return 0;       /* ongoing concurrent processing */
+
+               clear_bit(SLF_TXBUFF_RQ, &sl->flags);
+               smp_mb__after_clear_bit();
+
+#ifdef BREAK_BY_BAUD
+               if (sl->lin_state != SLSTATE_BREAK_SENT)
+                       remains = sl->tx_lim - sl->tx_cnt;
+               else
+                       remains = 1;
+#else
                remains = sl->tx_lim - sl->tx_cnt;
-       else
-               remains = 1;
+#endif
 
+               res = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, remains);
+               if (res < 0)
+                       goto error_in_write;
 
-       res = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, remains);
-       if (res < 0)
-               return -1;
+               remains -= res;
+               sl->tx_cnt += res;
 
-       remains -= res;
-       sl->tx_cnt += res;
+               if (remains > 0) {
+                       set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                       res = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, remains);
+                       if (res < 0) {
+                               clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+                               goto error_in_write;
+                       }
 
-       if (remains > 0) {
-               set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-               res = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, remains);
-               if (res < 0) {
-                       clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
-                       return -1;
+                       remains -= res;
+                       sl->tx_cnt += res;
                }
-               
-               remains -= res;
-               sl->tx_cnt += res;
-       }
 
-       printk(KERN_INFO "sllin_send_tx_buff sent %d, remains %d\n",
-                       sl->tx_cnt, remains);
+               netdev_dbg(sl->dev, "sllin_send_tx_buff sent %d, remains %d\n",
+                               sl->tx_cnt, remains);
+
+               clear_bit(SLF_TXBUFF_INPR, &sl->flags);
+               smp_mb__after_clear_bit();
+
+       } while (unlikely(test_bit(SLF_TXBUFF_RQ, &sl->flags)));
 
        return 0;
+
+error_in_write:
+       clear_bit(SLF_TXBUFF_INPR, &sl->flags);
+       return -1;
+
 }
 
-int sllin_send_break(struct sllin *sl)
+#ifdef BREAK_BY_BAUD
+static int sllin_send_break(struct sllin *sl)
 {
        struct tty_struct *tty = sl->tty;
-       unsigned long break_baud = sl->lin_baud;
+       unsigned long break_baud;
        int res;
 
-       //break_baud = (break_baud * 8) / 14;
-       break_baud /= 2;
-
+       break_baud = ((sl->lin_baud * 2) / 3);
        sltty_change_speed(tty, break_baud);
 
-       sl->rx_expect = SLLIN_BUFF_BREAK + 1;
+       tty->ops->flush_buffer(tty);
+       sl->rx_cnt = SLLIN_BUFF_BREAK;
 
+       sl->rx_expect = SLLIN_BUFF_BREAK + 1;
        sl->lin_state = SLSTATE_BREAK_SENT;
 
        res = sllin_send_tx_buff(sl);
@@ -567,76 +902,367 @@ int sllin_send_break(struct sllin *sl)
 
        return 0;
 }
+#else /* BREAK_BY_BAUD */
+
+static int sllin_send_break(struct sllin *sl)
+{
+       struct tty_struct *tty = sl->tty;
+       int retval;
+       unsigned long break_baud;
+       unsigned long usleep_range_min;
+       unsigned long usleep_range_max;
+
+       break_baud = ((sl->lin_baud * 2) / 3);
+       sl->rx_cnt = SLLIN_BUFF_BREAK;
+       sl->rx_expect = SLLIN_BUFF_BREAK + 1;
+       sl->lin_state = SLSTATE_BREAK_SENT;
+
+       /* Do the break ourselves; Inspired by
+          http://lxr.linux.no/#linux+v3.1.2/drivers/tty/tty_io.c#L2452 */
+       retval = tty->ops->break_ctl(tty, -1);
+       if (retval)
+               return retval;
+
+       /* udelay(712); */
+       usleep_range_min = (1000000l * SLLIN_SAMPLES_PER_CHAR) / break_baud;
+       usleep_range_max = usleep_range_min + 50;
+       usleep_range(usleep_range_min, usleep_range_max);
+
+       retval = tty->ops->break_ctl(tty, 0);
+       usleep_range_min = (1000000l * 1 /* 1 bit */) / break_baud;
+       usleep_range_max = usleep_range_min + 30;
+       usleep_range(usleep_range_min, usleep_range_max);
+
+       tty->ops->flush_buffer(tty);
+
+       sl->tx_cnt = SLLIN_BUFF_SYNC;
+
+       netdev_dbg(sl->dev, "Break sent.\n");
+       set_bit(SLF_RXEVENT, &sl->flags);
+       wake_up(&sl->kwt_wq);
+
+       return 0;
+}
+#endif /* BREAK_BY_BAUD */
+
+
+static enum hrtimer_restart sllin_rx_timeout_handler(struct hrtimer *hrtimer)
+{
+       struct sllin *sl = container_of(hrtimer, struct sllin, rx_timer);
+
+       if (sl->lin_master) {
+               sllin_report_error(sl, LIN_ERR_RX_TIMEOUT);
+               set_bit(SLF_TMOUTEVENT, &sl->flags);
+       } else {
+               sllin_slave_finish_rx_msg(sl);
+               set_bit(SLF_RXEVENT, &sl->flags);
+       }
+       wake_up(&sl->kwt_wq);
+
+       return HRTIMER_NORESTART;
+}
 
 /*****************************************
  *  sllin_kwthread - kernel worker thread
  *****************************************/
 
-int sllin_kwthread(void *ptr)
+static int sllin_kwthread(void *ptr)
 {
        struct sllin *sl = (struct sllin *)ptr;
        struct tty_struct *tty = sl->tty;
-       int res;
+       struct sched_param schparam = { .sched_priority = 40 };
+       int tx_bytes = 0; /* Used for Network statistics */
+       unsigned long flags;
+       int lin_id;
+       struct sllin_conf_entry *sce;
 
-       printk(KERN_INFO "sllin: sllin_kwthread started.\n");
+       netdev_dbg(sl->dev, "sllin_kwthread started.\n");
+       sched_setscheduler(current, SCHED_FIFO, &schparam);
 
        clear_bit(SLF_ERROR, &sl->flags);
-
        sltty_change_speed(tty, sl->lin_baud);
 
-       sllin_setup_msg(sl, 0, 0x33, NULL, 0);
-       sl->id_to_send = 1;
-
        while (!kthread_should_stop()) {
+               struct can_frame *cf;
+               u8 *lin_data;
+               int lin_dlc;
+               u8 lin_data_buff[SLLIN_DATA_MAX];
+
 
                if ((sl->lin_state == SLSTATE_IDLE) && sl->lin_master &&
                        sl->id_to_send) {
-                       if(sllin_send_break(sl)<0) {
+                       if (sllin_send_break(sl) < 0) {
                                /* error processing */
                        }
-
                }
 
                wait_event_killable(sl->kwt_wq, kthread_should_stop() ||
                        test_bit(SLF_RXEVENT, &sl->flags) ||
-                       test_bit(SLF_TXEVENT, &sl->flags));
+                       test_bit(SLF_TXEVENT, &sl->flags) ||
+                       test_bit(SLF_TMOUTEVENT, &sl->flags) ||
+                       test_bit(SLF_ERROR, &sl->flags) ||
+                       (((sl->lin_state == SLSTATE_IDLE) ||
+                               (sl->lin_state == SLSTATE_RESPONSE_WAIT) ||
+                               (sl->lin_state == SLSTATE_ID_RECEIVED))
+                               && test_bit(SLF_MSGEVENT, &sl->flags)));
 
                if (test_and_clear_bit(SLF_RXEVENT, &sl->flags)) {
-                       printk(KERN_INFO "sllin_kthread RXEVENT \n");
+                       netdev_dbg(sl->dev, "sllin_kthread RXEVENT\n");
+               }
+
+               if (test_and_clear_bit(SLF_ERROR, &sl->flags)) {
+                       unsigned long usleep_range_min;
+                       unsigned long usleep_range_max;
+                       hrtimer_cancel(&sl->rx_timer);
+                       netdev_dbg(sl->dev, "sllin_kthread ERROR\n");
+
+                       if (sl->lin_state != SLSTATE_IDLE)
+                               sllin_report_error(sl, LIN_ERR_FRAMING);
+
+                       usleep_range_min = (1000000l * SLLIN_SAMPLES_PER_CHAR * 10) /
+                                               sl->lin_baud;
+                       usleep_range_max = usleep_range_min + 50;
+                       usleep_range(usleep_range_min, usleep_range_max);
+                       sllin_reset_buffs(sl);
+                       sl->lin_state = SLSTATE_IDLE;
                }
 
                if (test_and_clear_bit(SLF_TXEVENT, &sl->flags)) {
-                       printk(KERN_INFO "sllin_kthread TXEVENT \n");
+                       netdev_dbg(sl->dev, "sllin_kthread TXEVENT\n");
+               }
+
+               if (test_and_clear_bit(SLF_TMOUTEVENT, &sl->flags)) {
+                       netdev_dbg(sl->dev, "sllin_kthread TMOUTEVENT\n");
+                       sllin_reset_buffs(sl);
+
+                       sl->lin_state = SLSTATE_IDLE;
                }
 
                switch (sl->lin_state) {
-                       case SLSTATE_BREAK_SENT:
-                               if (sl->rx_cnt <= SLLIN_BUFF_BREAK)
-                                       continue;
+               case SLSTATE_IDLE:
+                       if (!test_bit(SLF_MSGEVENT, &sl->flags))
+                               break;
+
+                       cf = (struct can_frame *)sl->tx_req_skb->data;
+
+                       /* SFF RTR CAN frame -> LIN header */
+                       if (cf->can_id & CAN_RTR_FLAG) {
+                               struct sllin_conf_entry *sce;
+
+                               netdev_dbg(sl->dev, "%s: RTR SFF CAN frame, ID = %x\n",
+                                       __func__, cf->can_id & LIN_ID_MASK);
+
+                               sce = &sl->linfr_cache[cf->can_id & LIN_ID_MASK];
+                               spin_lock_irqsave(&sl->linfr_lock, flags);
+
+                               /* Is there Slave response in linfr_cache to be sent? */
+                               if ((sce->frame_fl & LIN_CACHE_RESPONSE)
+                                       && (sce->dlc > 0)) {
+
+                                       netdev_dbg(sl->dev, "Sending LIN response from linfr_cache\n");
+
+                                       lin_data = sce->data;
+                                       lin_dlc = sce->dlc;
+                                       if (lin_dlc > SLLIN_DATA_MAX)
+                                               lin_dlc = SLLIN_DATA_MAX;
+                                       memcpy(lin_data_buff, lin_data, lin_dlc);
+                                       lin_data = lin_data_buff;
+                               } else {
+                                       lin_data = NULL;
+                                       lin_dlc = sce->dlc;
+                               }
+                               spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
+                       } else { /* SFF NON-RTR CAN frame -> LIN header + LIN response */
+                               netdev_dbg(sl->dev, "%s: NON-RTR SFF CAN frame, ID = %x\n",
+                                       __func__, (int)cf->can_id & LIN_ID_MASK);
+
+                               lin_data = cf->data;
+                               lin_dlc = cf->can_dlc;
+                               if (lin_dlc > SLLIN_DATA_MAX)
+                                       lin_dlc = SLLIN_DATA_MAX;
+                               tx_bytes = lin_dlc;
+                       }
+
+                       if (sllin_setup_msg(sl, 0, cf->can_id & LIN_ID_MASK,
+                               lin_data, lin_dlc) != -1) {
 
-                               res = sltty_change_speed(tty, sl->lin_baud);
+                               sl->id_to_send = true;
+                               sl->data_to_send = (lin_data != NULL) ? true : false;
+                               sl->resp_len_known = (lin_dlc > 0) ? true : false;
+                               sl->dev->stats.tx_packets++;
+                               sl->dev->stats.tx_bytes += tx_bytes;
+                       }
+
+                       clear_bit(SLF_MSGEVENT, &sl->flags);
+                       kfree_skb(sl->tx_req_skb);
+                       netif_wake_queue(sl->dev);
+                       hrtimer_start(&sl->rx_timer,
+                               ktime_add(ktime_get(), sl->rx_timer_timeout),
+                               HRTIMER_MODE_ABS);
+                       break;
+
+               case SLSTATE_BREAK_SENT:
+#ifdef BREAK_BY_BAUD
+                       if (sl->rx_cnt <= SLLIN_BUFF_BREAK)
+                               continue;
+
+                       res = sltty_change_speed(tty, sl->lin_baud);
+#endif
+
+                       sl->lin_state = SLSTATE_ID_SENT;
+                       sllin_send_tx_buff(sl);
+                       break;
 
+               case SLSTATE_ID_SENT:
+                       hrtimer_cancel(&sl->rx_timer);
+                       sl->id_to_send = false;
+                       if (sl->data_to_send) {
                                sllin_send_tx_buff(sl);
+                               sl->lin_state = SLSTATE_RESPONSE_SENT;
+                               sl->rx_expect = sl->tx_lim;
+                               goto slstate_response_sent;
+                       } else {
+                               if (sl->resp_len_known) {
+                                       sl->rx_expect = sl->rx_lim;
+                               } else {
+                                       sl->rx_expect = SLLIN_BUFF_DATA + 2;
+                               }
+                               sl->lin_state = SLSTATE_RESPONSE_WAIT;
+                               /* If we don't receive anything, timer will "unblock" us */
+                               hrtimer_start(&sl->rx_timer,
+                                       ktime_add(ktime_get(), sl->rx_timer_timeout),
+                                       HRTIMER_MODE_ABS);
+                               goto slstate_response_wait;
+                       }
+                       break;
 
-                               sl->lin_state = SLSTATE_ID_SENT;
+               case SLSTATE_RESPONSE_WAIT:
+slstate_response_wait:
+                       if (test_bit(SLF_MSGEVENT, &sl->flags)) {
+                               unsigned char *lin_buff;
+                               cf = (struct can_frame *)sl->tx_req_skb->data;
+
+                               lin_buff = (sl->lin_master) ? sl->tx_buff : sl->rx_buff;
+                               if (cf->can_id == (lin_buff[SLLIN_BUFF_ID] & LIN_ID_MASK)) {
+                                       hrtimer_cancel(&sl->rx_timer);
+                                       netdev_dbg(sl->dev, "received LIN response in a CAN frame.\n");
+                                       if (sllin_setup_msg(sl, SLLIN_STPMSG_RESPONLY,
+                                               cf->can_id & LIN_ID_MASK,
+                                               cf->data, cf->can_dlc) != -1) {
+
+                                               sl->rx_expect = sl->tx_lim;
+                                               sl->data_to_send = true;
+                                               sl->dev->stats.tx_packets++;
+                                               sl->dev->stats.tx_bytes += tx_bytes;
+
+                                               if (!sl->lin_master) {
+                                                       sl->tx_cnt = SLLIN_BUFF_DATA;
+                                               }
+
+                                               sllin_send_tx_buff(sl);
+                                               clear_bit(SLF_MSGEVENT, &sl->flags);
+                                               kfree_skb(sl->tx_req_skb);
+                                               netif_wake_queue(sl->dev);
+
+                                               sl->lin_state = SLSTATE_RESPONSE_SENT;
+                                               goto slstate_response_sent;
+                                       }
+                               } else {
+                                       sl->lin_state = SLSTATE_RESPONSE_WAIT_BUS;
+                               }
+                       }
 
-                               break;
-                       case SLSTATE_ID_SENT:
-                               sl->id_to_send = 0;
-                               sl->lin_state = SLSTATE_IDLE;
-                               break;
-               }
+                       /* Be aware, no BREAK here */
+               case SLSTATE_RESPONSE_WAIT_BUS:
+                       if (sl->rx_cnt < sl->rx_expect)
+                               continue;
+
+                       hrtimer_cancel(&sl->rx_timer);
+                       netdev_dbg(sl->dev, "response received ID %d len %d\n",
+                               sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1);
+
+                       if (sllin_rx_validate(sl) == -1) {
+                               netdev_dbg(sl->dev, "RX validation failed.\n");
+                               sllin_report_error(sl, LIN_ERR_CHECKSUM);
+                       } else {
+                               /* Send CAN non-RTR frame with data */
+                               netdev_dbg(sl->dev, "sending NON-RTR CAN frame with LIN payload.");
+                               sll_bump(sl); /* send packet to the network layer */
+                       }
 
+                       sl->id_to_send = false;
+                       sl->lin_state = SLSTATE_IDLE;
+                       break;
 
+               case SLSTATE_ID_RECEIVED:
+                       lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
+                       sce = &sl->linfr_cache[lin_id];
+                       spin_lock_irqsave(&sl->linfr_lock, flags);
+
+                       if ((sce->frame_fl & LIN_CACHE_RESPONSE)
+                                       && (sce->dlc > 0)
+                                       && (test_bit(SLF_MSGEVENT, &sl->flags))) {
+                               int mode;
+
+                               netdev_dbg(sl->dev, "Sending LIN response from linfr_cache\n");
+
+                               lin_data = sce->data;
+                               lin_dlc = sce->dlc;
+                               if (lin_dlc > SLLIN_DATA_MAX)
+                                       lin_dlc = SLLIN_DATA_MAX;
+                               memcpy(lin_data_buff, lin_data, lin_dlc);
+                               lin_data = lin_data_buff;
+                               tx_bytes = lin_dlc;
+
+                               mode = SLLIN_STPMSG_RESPONLY;
+                               if (sce->frame_fl & LIN_CHECKSUM_EXTENDED)
+                                       mode |= SLLIN_STPMSG_CHCKSUM_ENH;
+
+                               if (sllin_setup_msg(sl, mode, lin_id & LIN_ID_MASK,
+                                       lin_data, lin_dlc) != -1) {
+
+                                       sl->rx_expect = sl->tx_lim;
+                                       sl->data_to_send = true;
+                                       sl->dev->stats.tx_packets++;
+                                       sl->dev->stats.tx_bytes += tx_bytes;
+                                       sl->resp_len_known = true;
+
+                                       if (!sl->lin_master) {
+                                               sl->tx_cnt = SLLIN_BUFF_DATA;
+                                       }
+                                       sllin_send_tx_buff(sl);
+                               }
+
+                               clear_bit(SLF_MSGEVENT, &sl->flags);
+                               kfree_skb(sl->tx_req_skb);
+                               netif_wake_queue(sl->dev);
+                               hrtimer_start(&sl->rx_timer,
+                                       ktime_add(ktime_get(), sl->rx_timer_timeout),
+                                       HRTIMER_MODE_ABS);
+                       }
+                       spin_unlock_irqrestore(&sl->linfr_lock, flags);
+                       sl->lin_state = SLSTATE_IDLE;
+                       break;
 
-               /* sll_bump(sl); send packet to the network layer */
+               case SLSTATE_RESPONSE_SENT:
+slstate_response_sent:
+                       if (sl->rx_cnt < sl->tx_lim)
+                               continue;
 
-               /* sl->dev->stats.tx_packets++; send frames statistic */
-               /* netif_wake_queue(sl->dev); allow next Tx packet arrival */
-       }
+                       hrtimer_cancel(&sl->rx_timer);
+                       sll_bump(sl); /* send packet to the network layer */
+                       netdev_dbg(sl->dev, "response sent ID %d len %d\n",
+                               sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1);
 
+                       sl->id_to_send = false;
+                       sl->lin_state = SLSTATE_IDLE;
+                       break;
+               }
+       }
 
-       printk(KERN_INFO "sllin: sllin_kwthread stopped.\n");
+       hrtimer_cancel(&sl->rx_timer);
+       netdev_dbg(sl->dev, "sllin_kwthread stopped.\n");
 
        return 0;
 }
@@ -707,11 +1333,11 @@ static struct sllin *sll_alloc(dev_t line)
        }
 
        sl = netdev_priv(dev);
-
        /* Initialize channel control data */
        sl->magic = SLLIN_MAGIC;
        sl->dev = dev;
        spin_lock_init(&sl->lock);
+       spin_lock_init(&sl->linfr_lock);
        sllin_devs[i] = dev;
 
        return sl;
@@ -731,7 +1357,8 @@ static int sllin_open(struct tty_struct *tty)
 {
        struct sllin *sl;
        int err;
-       pr_debug("sllin: %s() invoked\n", __FUNCTION__);
+
+       pr_debug("sllin: %s() invoked\n", __func__);
 
        if (!capable(CAP_NET_ADMIN))
                return -EPERM;
@@ -767,16 +1394,26 @@ static int sllin_open(struct tty_struct *tty)
 
        if (!test_bit(SLF_INUSE, &sl->flags)) {
                /* Perform the low-level SLLIN initialization. */
-               sl->rx_cnt    = 0;
-               sl->rx_expect = 0;
-               sl->tx_cnt    = 0;
-               sl->tx_lim    = 0;
+               sl->lin_master = master;
+               if (master)
+                       pr_debug("sllin: Configured as MASTER\n");
+               else
+                       pr_debug("sllin: Configured as SLAVE\n");
 
-               sl->lin_baud  = 2400;
+               sllin_reset_buffs(sl);
+
+               sl->lin_baud = (baudrate == 0) ? LIN_DEFAULT_BAUDRATE : baudrate;
+               pr_debug("sllin: Baudrate set to %u\n", sl->lin_baud);
 
-               sl->lin_master = 1;
                sl->lin_state = SLSTATE_IDLE;
 
+               hrtimer_init(&sl->rx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+               sl->rx_timer.function = sllin_rx_timeout_handler;
+               /* timeval_to_ktime(msg_head->ival1); */
+               sl->rx_timer_timeout = ns_to_ktime(
+                       (1000000000l / sl->lin_baud) *
+                       SLLIN_SAMPLES_PER_CHAR * SLLIN_CHARS_TO_TIMEOUT);
+
                set_bit(SLF_INUSE, &sl->flags);
 
                init_waitqueue_head(&sl->kwt_wq);
@@ -791,7 +1428,7 @@ static int sllin_open(struct tty_struct *tty)
 
        /* Done.  We have linked the TTY line to a channel. */
        rtnl_unlock();
-       tty->receive_room = SLLIN_BUFF_LEN * 40;        /* We don't flow control */
+       tty->receive_room = SLLIN_BUFF_LEN * 40; /* We don't flow control */
 
        /* TTY layer expects 0 on success */
        return 0;
@@ -891,20 +1528,27 @@ static int __init sllin_init(void)
                maxdev = 4; /* Sanity */
 
        printk(banner);
-       printk(KERN_INFO "sllin: %d dynamic interface channels.\n", maxdev);
+       pr_debug("sllin: %d dynamic interface channels.\n", maxdev);
 
        sllin_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
        if (!sllin_devs) {
-               printk(KERN_ERR "sllin: can't allocate sllin device array!\n");
+               pr_err("sllin: can't allocate sllin device array!\n");
                return -ENOMEM;
        }
 
        /* Fill in our line protocol discipline, and register it */
        status = tty_register_ldisc(N_SLLIN, &sll_ldisc);
        if (status)  {
-               printk(KERN_ERR "sllin: can't register line discipline\n");
+               pr_err("sllin: can't register line discipline\n");
                kfree(sllin_devs);
        }
+
+#ifdef BREAK_BY_BAUD
+       pr_debug("sllin: Break is generated by baud-rate change.");
+#else
+       pr_debug("sllin: Break is generated manually with tiny sleep.");
+#endif
+
        return status;
 }
 
@@ -951,8 +1595,7 @@ static void __exit sllin_exit(void)
 
                sl = netdev_priv(dev);
                if (sl->tty) {
-                       printk(KERN_ERR "%s: tty discipline still running\n",
-                              dev->name);
+                       netdev_dbg(sl->dev, "tty discipline still running\n");
                        /* Intentionally leak the control block. */
                        dev->destructor = NULL;
                }
@@ -965,7 +1608,7 @@ static void __exit sllin_exit(void)
 
        i = tty_unregister_ldisc(N_SLLIN);
        if (i)
-               printk(KERN_ERR "sllin: can't unregister ldisc (err %d)\n", i);
+               pr_err("sllin: can't unregister ldisc (err %d)\n", i);
 }
 
 module_init(sllin_init);