X-Git-Url: http://rtime.felk.cvut.cz/gitweb/linux-lin.git/blobdiff_plain/d0129b0be24b9d6cfedb1b08cae086876381e46f..672c80832f08ab2a1d925d26afda0f5d2288a33c:/sllin/sllin.c diff --git a/sllin/sllin.c b/sllin/sllin.c index 459ae9f..487b72a 100644 --- a/sllin/sllin.c +++ b/sllin/sllin.c @@ -1,4 +1,4 @@ -/* +/* * sllin.c - serial line LIN interface driver (using tty line discipline) * * This file is derived from drivers/net/can/slcan.c @@ -32,7 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * Idea: Oliver Hartkopp + * Idea: Oliver Hartkopp * Copyright: (c) 2011 Czech Technical University in Prague * (c) 2011 Volkswagen Group Research * Authors: Pavel Pisa @@ -41,12 +41,11 @@ * Funded by: Volkswagen Group Research */ -#define DEBUG 1 /* Enables pr_debug() printouts */ +#define DEBUG 1 /* Enables pr_debug() printouts */ #include #include -#include #include #include #include @@ -63,10 +62,11 @@ #include #include #include +#include #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[] = @@ -77,11 +77,11 @@ MODULE_DESCRIPTION("serial line LIN interface"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Pavel Pisa "); -#define SLLIN_MAGIC 0x53CA +#define SLLIN_MAGIC 0x53CA /* #define BREAK_BY_BAUD */ -static int master = true; -static int baudrate = 0; /* Use LIN_DEFAULT_BAUDRATE when not set */ +static bool master = true; +static int baudrate; /* Use LIN_DEFAULT_BAUDRATE when not set */ module_param(master, bool, 0); MODULE_PARM_DESC(master, "LIN interface is Master device"); @@ -95,13 +95,13 @@ 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_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 + 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 @@ -114,6 +114,7 @@ enum slstate { 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, }; @@ -142,10 +143,14 @@ struct sllin { 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 */ - char 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 */ @@ -153,7 +158,9 @@ 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_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; @@ -165,23 +172,28 @@ struct sllin { /* 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 }; /** @@ -195,22 +207,31 @@ const unsigned char sllin_id_parity_table[] = { */ 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); @@ -230,9 +251,8 @@ static void sllin_send_canfr(struct sllin *sl, canid_t id, char *data, int len) 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) @@ -258,9 +278,17 @@ static void sllin_send_canfr(struct sllin *sl, canid_t id, char *data, int len) */ 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, - sl->rx_cnt - SLLIN_BUFF_DATA - 1); /* without checksum */ + 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); } /* @@ -269,7 +297,7 @@ static void sll_bump(struct sllin *sl) */ static void sllin_write_wakeup(struct tty_struct *tty) { - int actual; + int actual = 0; int remains; struct sllin *sl = (struct sllin *) tty->disc_data; @@ -277,29 +305,41 @@ 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; - - 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); } /** @@ -318,10 +358,11 @@ static netdev_tx_t sll_xmit(struct sk_buff *skb, struct net_device *dev) 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; } @@ -375,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; @@ -413,88 +454,81 @@ 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. ******************************************/ - -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\n"); - - if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev)) - return; - /* Read the characters out of the buffer */ while (count--) { if (fp && *fp++) { + 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); + + /* i.e. Real error -- not Break */ if (sl->rx_cnt > SLLIN_BUFF_BREAK) { set_bit(SLF_ERROR, &sl->flags); - - pr_debug("sllin: sllin_receive_buf char 0x%02x ignored " - "due marker 0x%02x, flags 0x%lx\n", - *cp, *(fp-1), sl->flags); - - if (sl->lin_master == true) { - wake_up(&sl->kwt_wq); - return; - } - - cp++; - continue; + wake_up(&sl->kwt_wq); + return; } } - if (sl->rx_cnt < SLLIN_BUFF_LEN) { #ifndef BREAK_BY_BAUD - /* We didn't receive Break character */ - if ((sl->rx_cnt == SLLIN_BUFF_BREAK) && (*cp == 0x55)) { - sl->rx_buff[sl->rx_cnt++] = 0x00; - } -#endif - pr_debug("sllin: LIN_RX[%d]: 0x%02x\n", sl->rx_cnt, *cp); + /* 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) { set_bit(SLF_RXEVENT, &sl->flags); wake_up(&sl->kwt_wq); - pr_debug("sllin: 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 { - pr_debug("sllin: 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 + * with particular error flag set in can_id * * @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: - sl->dev->stats.rx_crc_errors++; - break; + 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_RX_TIMEOUT: + sl->dev->stats.rx_errors++; + break; - case LIN_ERR_FRAMING: - sl->dev->stats.rx_frame_errors++; - break; + case LIN_ERR_FRAMING: + sl->dev->stats.rx_frame_errors++; + break; } sllin_send_canfr(sl, 0 | CAN_EFF_FLAG | @@ -510,13 +544,17 @@ void sllin_report_error(struct sllin *sl, int err) */ 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) @@ -525,15 +563,17 @@ static int sllin_configure_frame_cache(struct sllin *sl, struct can_frame *cf) 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 + * @data: Pointer to the buffer containing whole LIN * frame (i.e. including break and sync bytes). - * @length: Length of the buffer. + * @length: Length of the buffer. * @enhanced_fl: Flag determining whether Enhanced or Classic * checksum should be counted. */ @@ -542,11 +582,10 @@ static inline unsigned sllin_checksum(unsigned char *data, int length, int enhan 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]; @@ -561,7 +600,7 @@ static inline unsigned sllin_checksum(unsigned char *data, int length, int enhan #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) @@ -582,8 +621,9 @@ int sllin_setup_msg(struct sllin *sl, int mode, int id, 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; @@ -602,48 +642,244 @@ static void sllin_reset_buffs(struct sllin *sl) 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; @@ -668,7 +904,7 @@ int sllin_send_break(struct sllin *sl) } #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; @@ -701,7 +937,7 @@ int sllin_send_break(struct sllin *sl) 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); @@ -714,61 +950,33 @@ static enum hrtimer_restart sllin_rx_timeout_handler(struct hrtimer *hrtimer) { 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); @@ -783,7 +991,7 @@ int sllin_kwthread(void *ptr) 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 */ } } @@ -794,18 +1002,19 @@ int sllin_kwthread(void *ptr) 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); @@ -819,187 +1028,241 @@ int sllin_kwthread(void *ptr) } 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; } switch (sl->lin_state) { - case SLSTATE_IDLE: - if (!test_bit(SLF_MSGEVENT, &sl->flags)) - break; + case SLSTATE_IDLE: + if (!test_bit(SLF_MSGEVENT, &sl->flags)) + break; - cf = (struct can_frame *)sl->tx_req_skb->data; + cf = (struct can_frame *)sl->tx_req_skb->data; - /* 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); - - /* 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)) { - - 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; - 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; - } - spin_unlock(&sl->lock); - } 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); + /* 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); - lin_data = cf->data; - lin_dlc = cf->can_dlc; + 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; - tx_bytes = lin_dlc; + 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); - if (sllin_setup_msg(sl, 0, cf->can_id & LIN_ID_MASK, - lin_data, lin_dlc) != -1) { + } 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); - 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; - } + lin_data = cf->data; + lin_dlc = cf->can_dlc; + if (lin_dlc > SLLIN_DATA_MAX) + lin_dlc = SLLIN_DATA_MAX; + tx_bytes = lin_dlc; + } - 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; + if (sllin_setup_msg(sl, 0, cf->can_id & LIN_ID_MASK, + lin_data, lin_dlc) != -1) { + + 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; + } - case SLSTATE_BREAK_SENT: + 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; + if (sl->rx_cnt <= SLLIN_BUFF_BREAK) + continue; - res = sltty_change_speed(tty, sl->lin_baud); + res = sltty_change_speed(tty, sl->lin_baud); #endif - sl->lin_state = SLSTATE_ID_SENT; - sllin_send_tx_buff(sl); - break; + 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; + 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 { - 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; + sl->rx_expect = SLLIN_BUFF_DATA + 2; } - break; + 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; + + 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; - 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); - pr_debug("sllin: 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; + 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; } - } else { - sl->lin_state = SLSTATE_RESPONSE_WAIT_BUS; + + 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; } + } - /* Be aware, no BREAK here */ - case SLSTATE_RESPONSE_WAIT_BUS: - if (sl->rx_cnt < sl->rx_expect) - continue; + /* Be aware, no BREAK here */ + case SLSTATE_RESPONSE_WAIT_BUS: + if (sl->rx_cnt < sl->rx_expect) + continue; - hrtimer_cancel(&sl->rx_timer); - pr_debug("sllin: response received ID %d len %d\n", - sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1); + 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 */ + } - if (sllin_rx_validate(sl) == -1) { - pr_debug("sllin: 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."); - 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); } - sl->id_to_send = false; - sl->lin_state = SLSTATE_IDLE; - break; + 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) - continue; + case SLSTATE_RESPONSE_SENT: +slstate_response_sent: + if (sl->rx_cnt < sl->tx_lim) + continue; - hrtimer_cancel(&sl->rx_timer); - sll_bump(sl); /* send packet to the network layer */ - pr_debug("sllin: response sent ID %d len %d\n", - sl->rx_buff[SLLIN_BUFF_ID], sl->rx_cnt - SLLIN_BUFF_DATA - 1); + 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; + sl->id_to_send = false; + sl->lin_state = SLSTATE_IDLE; + break; } } hrtimer_cancel(&sl->rx_timer); - pr_debug("sllin: sllin_kwthread stopped.\n"); + netdev_dbg(sl->dev, "sllin_kwthread stopped.\n"); return 0; } @@ -1074,6 +1337,7 @@ static struct sllin *sll_alloc(dev_t line) sl->magic = SLLIN_MAGIC; sl->dev = dev; spin_lock_init(&sl->lock); + spin_lock_init(&sl->linfr_lock); sllin_devs[i] = dev; return sl; @@ -1093,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; @@ -1130,6 +1395,10 @@ static int sllin_open(struct tty_struct *tty) if (!test_bit(SLF_INUSE, &sl->flags)) { /* Perform the low-level SLLIN initialization. */ sl->lin_master = master; + if (master) + pr_debug("sllin: Configured as MASTER\n"); + else + pr_debug("sllin: Configured as SLAVE\n"); sllin_reset_buffs(sl); @@ -1263,14 +1532,14 @@ static int __init sllin_init(void) 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); } @@ -1326,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; } @@ -1340,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);