#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/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 SLLIN_MAGIC 0x53CA
/* #define BREAK_BY_BAUD */
-static int master = true;
+static bool master = true;
static int baudrate; /* Use LIN_DEFAULT_BAUDRATE when not set */
module_param(master, bool, 0);
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,
};
#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_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;
/* 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
*/
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);
+#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;
- tty->termios->c_oflag = 0;
- tty->termios->c_lflag = 0;
+ termios.c_cflag = cflag;
+ termios.c_oflag = 0;
+ termios.c_lflag = 0;
/* Enable interrupt when UART-Break or Framing error received */
- tty->termios->c_iflag = BRKINT | INPCK;
+ 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);
cf.can_id = id;
cf.can_dlc = len;
- if (cf.can_dlc > 0) {
+ if (cf.can_dlc > 0)
memcpy(&cf.data, data, cf.can_dlc);
- }
skb = dev_alloc_skb(sizeof(struct can_frame));
if (!skb)
*/
static void sllin_write_wakeup(struct tty_struct *tty)
{
- int actual;
+ int actual = 0;
int remains;
struct sllin *sl = (struct sllin *) tty->disc_data;
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;
-
- if (remains > 0) {
- actual = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt,
- sl->tx_cnt - sl->tx_lim);
- sl->tx_cnt += actual;
-
- if (sl->tx_cnt < sl->tx_lim) {
- pr_debug("sllin: sllin_write_wakeup sent %d, "
- "remains %d, waiting\n",
- sl->tx_cnt, sl->tx_lim - sl->tx_cnt);
- return;
+ 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();
+
+ } while (unlikely(test_bit(SLF_TXBUFF_RQ, &sl->flags)));
+
+ 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);
- pr_debug("sllin: sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
+ netdev_dbg(sl->dev, "sllin_write_wakeup sent %d, wakeup\n", sl->tx_cnt);
}
/**
spin_lock(&sl->lock);
if (!netif_running(dev)) {
- printk(KERN_WARNING "%s: xmit: iface is down\n", dev->name);
+ netdev_warn(sl->dev, "xmit: iface is down\n");
goto err_out_unlock;
}
if (sl->tty == NULL) {
+ netdev_warn(sl->dev, "xmit: no tty device connected\n");
goto err_out_unlock;
}
{
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;
/* 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.
******************************************/
-#define SLL_RESPONSE_RECEIVED ((sl->header_received == true) && \
- ((sl->rx_cnt >= sl->rx_expect) || \
- ((sl->rx_len_unknown == true) && (count == 0))))
-
-#define SLL_HEADER_RECEIVED ((sl->header_received == false) && \
- (sl->rx_cnt >= (SLLIN_BUFF_ID + 1)))
-
-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;
- pr_debug("sllin: sllin_receive_buf invoked, count = %u\n", count);
-
- if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev))
- return;
/* Read the characters out of the buffer */
while (count--) {
if (fp && *fp++) {
- pr_debug("sllin: sllin_receive_buf char 0x%02x ignored "
+ 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);
- if (sl->lin_master == true) { /* Report error */
+ /* 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;
- } else { /* 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;
}
}
#ifndef BREAK_BY_BAUD
/* We didn't receive Break character -- fake it! */
if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) {
- pr_debug("sllin: LIN_RX[%d]: 0x00\n", sl->rx_cnt);
+ netdev_dbg(sl->dev, "LIN_RX[%d]: 0x00\n", sl->rx_cnt);
sl->rx_buff[sl->rx_cnt++] = 0x00;
}
-#endif
+#endif /* BREAK_BY_BAUD */
+
if (sl->rx_cnt < SLLIN_BUFF_LEN) {
- pr_debug("sllin: LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
+ netdev_dbg(sl->dev, "LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp);
sl->rx_buff[sl->rx_cnt++] = *cp++;
}
+ }
- if (sl->lin_master == true) {
- if (SLL_RESPONSE_RECEIVED) {
- set_bit(SLF_RXEVENT, &sl->flags);
- wake_up(&sl->kwt_wq);
- pr_debug("sllin: sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
- } else {
- pr_debug("sllin: sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
- }
- } else { /* LIN slave */
- int lin_id;
- struct sllin_conf_entry *sce;
-
- pr_debug("sllin: rx_cnt = %u; header_received = %u\n",
- sl->rx_cnt, sl->header_received);
-
- if (SLL_HEADER_RECEIVED) {
- lin_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
- sce = &sl->linfr_cache[lin_id];
-
- /* Is the length of data set in frame cache? */
- if (sce->frame_fl & LIN_LOC_SLAVE_CACHE) {
- sl->rx_expect += sce->dlc;
- sl->rx_len_unknown = false;
- } else {
- sl->rx_expect += SLLIN_DATA_MAX + 1; /* + checksum */
- sl->rx_len_unknown = true;
- }
-
- sl->header_received = true;
- sll_send_rtr(sl);
- continue;
- }
- if (SLL_RESPONSE_RECEIVED) {
- sll_bump(sl);
- pr_debug("sllin: Received LIN header & LIN response. "
- "rx_cnt = %u, rx_expect = %u\n", sl->rx_cnt,
- sl->rx_expect);
-
- /* 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;
- }
- }
+ if (sl->rx_cnt >= sl->rx_expect) {
+ set_bit(SLF_RXEVENT, &sl->flags);
+ wake_up(&sl->kwt_wq);
+ netdev_dbg(sl->dev, "sllin_receive_buf count %d, wakeup\n", sl->rx_cnt);
+ } else {
+ netdev_dbg(sl->dev, "sllin_receive_buf count %d, waiting\n", sl->rx_cnt);
}
}
+
/*****************************************
* sllin message helper routines
*****************************************/
* @sl:
* @err: Error flag to be sent.
*/
-void sllin_report_error(struct sllin *sl, int err)
+static void sllin_report_error(struct sllin *sl, int err)
{
switch (err) {
case LIN_ERR_CHECKSUM:
*/
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_ID_CONF))
+
+ if (!(cf->can_id & LIN_CTRL_FRAME))
return -1;
sce = &sl->linfr_cache[cf->can_id & LIN_ID_MASK];
- pr_debug("sllin: Setting frame cache with EFF CAN frame. "
- "LIN ID = %d\n", 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->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;
}
unsigned csum = 0;
int i;
- if (enhanced_fl) {
+ if (enhanced_fl)
i = SLLIN_BUFF_ID;
- } else {
+ else
i = SLLIN_BUFF_DATA;
- }
for (; i < length; i++) {
csum += data[i];
#define SLLIN_STPMSG_CHCKSUM_CLS (1 << 1)
#define SLLIN_STPMSG_CHCKSUM_ENH (1 << 2)
-int sllin_setup_msg(struct sllin *sl, int mode, int id,
+static int sllin_setup_msg(struct sllin *sl, int mode, int id,
unsigned char *data, int len)
{
if (id > LIN_ID_MASK)
if ((data != NULL) && len) {
sl->tx_lim += len;
memcpy(sl->tx_buff + SLLIN_BUFF_DATA, data, len);
- sl->tx_buff[sl->tx_lim++] = sllin_checksum(sl->tx_buff,
+ 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 = SLLIN_BUFF_DATA + len + 1;
sl->data_to_send = false;
}
-int sllin_send_tx_buff(struct sllin *sl)
+/**
+ * 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;
+}
+
+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;
+ 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;
+ 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;
+ remains = sl->tx_lim - sl->tx_cnt;
#endif
- res = tty->ops->write(tty, sl->tx_buff + sl->tx_cnt, remains);
- if (res < 0)
- return -1;
-
- 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);
- return -1;
- }
+ if (res < 0)
+ goto error_in_write;
remains -= res;
sl->tx_cnt += res;
- }
- pr_debug("sllin: sllin_send_tx_buff sent %d, remains %d\n",
- sl->tx_cnt, remains);
+ 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;
+ }
+
+ remains -= res;
+ sl->tx_cnt += res;
+ }
+
+ 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;
+
}
#ifdef BREAK_BY_BAUD
-int sllin_send_break(struct sllin *sl)
+static int sllin_send_break(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
unsigned long break_baud;
}
#else /* BREAK_BY_BAUD */
-int sllin_send_break(struct sllin *sl)
+static int sllin_send_break(struct sllin *sl)
{
struct tty_struct *tty = sl->tty;
int retval;
sl->tx_cnt = SLLIN_BUFF_SYNC;
- pr_debug("sllin: Break sent.\n");
+ netdev_dbg(sl->dev, "Break sent.\n");
set_bit(SLF_RXEVENT, &sl->flags);
wake_up(&sl->kwt_wq);
{
struct sllin *sl = container_of(hrtimer, struct sllin, rx_timer);
- sllin_report_error(sl, LIN_ERR_RX_TIMEOUT);
- set_bit(SLF_TMOUTEVENT, &sl->flags);
+ 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_rx_validate() -- Validate received frame, i,e. check checksum
- *
- * @sl:
- */
-static int sllin_rx_validate(struct sllin *sl)
-{
- 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 *scf;
-
- actual_id = sl->rx_buff[SLLIN_BUFF_ID] & LIN_ID_MASK;
- scf = &sl->linfr_cache[actual_id];
- lin_dlc = scf->dlc;
- ext_chcks_fl = scf->frame_fl & LIN_CHECKSUM_EXTENDED;
-
- 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;
-}
-
/*****************************************
* 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;
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;
-
- pr_debug("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);
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_RESPONSE_WAIT) ||
+ (sl->lin_state == SLSTATE_ID_RECEIVED))
&& test_bit(SLF_MSGEVENT, &sl->flags)));
if (test_and_clear_bit(SLF_RXEVENT, &sl->flags)) {
- pr_debug("sllin: 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);
- pr_debug("sllin: sllin_kthread ERROR\n");
+ netdev_dbg(sl->dev, "sllin_kthread ERROR\n");
if (sl->lin_state != SLSTATE_IDLE)
sllin_report_error(sl, LIN_ERR_FRAMING);
}
if (test_and_clear_bit(SLF_TXEVENT, &sl->flags)) {
- pr_debug("sllin: sllin_kthread TXEVENT\n");
+ netdev_dbg(sl->dev, "sllin_kthread TXEVENT\n");
}
if (test_and_clear_bit(SLF_TMOUTEVENT, &sl->flags)) {
- pr_debug("sllin: sllin_kthread TMOUTEVENT\n");
+ netdev_dbg(sl->dev, "sllin_kthread TMOUTEVENT\n");
sllin_reset_buffs(sl);
sl->lin_state = SLSTATE_IDLE;
/* SFF RTR CAN frame -> LIN header */
if (cf->can_id & CAN_RTR_FLAG) {
- spin_lock(&sl->lock);
- pr_debug("sllin: %s: RTR SFF CAN frame, ID = %x\n",
- __FUNCTION__, cf->can_id & LIN_ID_MASK);
+ 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 ((sl->linfr_cache[cf->can_id & LIN_ID_MASK].frame_fl &
- LIN_LOC_SLAVE_CACHE)
- && (sl->linfr_cache[cf->can_id & LIN_ID_MASK].dlc > 0)) {
+ if ((sce->frame_fl & LIN_CACHE_RESPONSE)
+ && (sce->dlc > 0)) {
- pr_debug("sllin: Sending LIN response from linfr_cache\n");
- lin_data = sl->linfr_cache[cf->can_id & LIN_ID_MASK].data;
- lin_dlc = sl->linfr_cache[cf->can_id & LIN_ID_MASK].dlc;
+ 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 = sl->linfr_cache[cf->can_id & LIN_ID_MASK].dlc;
+ lin_dlc = sce->dlc;
}
- spin_unlock(&sl->lock);
+ spin_unlock_irqrestore(&sl->linfr_lock, flags);
+
} else { /* SFF NON-RTR CAN frame -> LIN header + LIN response */
- pr_debug("sllin: %s: NON-RTR SFF CAN frame, ID = %x\n",
- __FUNCTION__, (int)cf->can_id & LIN_ID_MASK);
+ 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;
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);
- pr_debug("sllin: received LIN response in a CAN frame.\n");
+ 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) {
continue;
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: response received ID %d len %d\n",
+ 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) {
- pr_debug("sllin: RX validation failed.\n");
+ netdev_dbg(sl->dev, "RX validation failed.\n");
sllin_report_error(sl, LIN_ERR_CHECKSUM);
} else {
/* Send CAN non-RTR frame with data */
- pr_debug("sllin: sending NON-RTR CAN"
- "frame with LIN payload.");
+ netdev_dbg(sl->dev, "sending NON-RTR CAN frame with LIN payload.");
sll_bump(sl); /* send packet to the network layer */
}
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;
+
case SLSTATE_RESPONSE_SENT:
slstate_response_sent:
if (sl->rx_cnt < sl->tx_lim)
hrtimer_cancel(&sl->rx_timer);
sll_bump(sl); /* send packet to the network layer */
- pr_debug("sllin: response sent ID %d len %d\n",
+ 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;
}
hrtimer_cancel(&sl->rx_timer);
- pr_debug("sllin: sllin_kwthread stopped.\n");
+ netdev_dbg(sl->dev, "sllin_kwthread stopped.\n");
return 0;
}
sl->magic = SLLIN_MAGIC;
sl->dev = dev;
spin_lock_init(&sl->lock);
+ spin_lock_init(&sl->linfr_lock);
sllin_devs[i] = dev;
return sl;
{
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;
if (!test_bit(SLF_INUSE, &sl->flags)) {
/* Perform the low-level SLLIN initialization. */
sl->lin_master = master;
-#ifdef DEBUG
if (master)
pr_debug("sllin: Configured as MASTER\n");
else
pr_debug("sllin: Configured as SLAVE\n");
-#endif
sllin_reset_buffs(sl);
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);
}
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;
}
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);
projects / linux-lin.git / blobdiff