X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=module%2Felmcan.c;h=239970d04fd32fbc044536cdabc75771cf58126d;hb=09f98cc94e56158bdc4ab6c317bdd6570f5724b7;hp=538134cf38f71666bfe310da68c8378429232889;hpb=183c77ad6d6a64a7715a5e95fd8e68986019c3b2;p=elmcan.git diff --git a/module/elmcan.c b/module/elmcan.c index 538134c..239970d 100644 --- a/module/elmcan.c +++ b/module/elmcan.c @@ -194,10 +194,10 @@ static void elm327_send(struct elmcan *elm, const void *buf, size_t len) } -/* - * Take the ELM327 out of almost any state and back into command mode - * - * Assumes elm->lock taken. +/* Take the ELM327 out of almost any state and back into command mode. + * We send ELM327_MAGIC_CHAR which will either abort any running + * operation, or be echoed back to us in case we're already in command + * mode. */ static void elm327_kick_into_cmd_mode(struct elmcan *elm) { @@ -209,12 +209,7 @@ static void elm327_kick_into_cmd_mode(struct elmcan *elm) } -/* - * Schedule a CAN frame, and any necessary config changes, - * to be sent down the TTY. - * - * Assumes elm->lock taken. - */ +/* Schedule a CAN frame and necessary config changes to be sent to the TTY. */ static void elm327_send_frame(struct elmcan *elm, struct can_frame *frame) { /* Schedule any necessary changes in ELM327's CAN configuration */ @@ -374,15 +369,6 @@ static inline void elm327_hw_failure(struct elmcan *elm) * (assumes elm->lock taken) * ************************************************************************/ -static bool elm327_is_ready_char(char c) -{ - /* Bits 0xc0 are sometimes set (randomly), hence the mask. - * Probably bad hardware. - */ - return (c & 0x3f) == ELM327_READY_CHAR; -} - - static void elm327_parse_error(struct elmcan *elm, int len) { struct can_frame frame; @@ -402,8 +388,8 @@ static void elm327_parse_error(struct elmcan *elm, int len) if (!memcmp(elm->rxbuf, "BUFFER FULL", 11)) { /* This case will only happen if the last data * line was complete. - * Otherwise, elm327_parse_frame() will emit the - * error frame instead. + * Otherwise, elm327_parse_frame() will heuristically + * emit this error frame instead. */ frame.can_id |= CAN_ERR_CRTL; frame.data[1] = CAN_ERR_CRTL_RX_OVERFLOW; @@ -443,6 +429,18 @@ static void elm327_parse_error(struct elmcan *elm, int len) } +/* Parse CAN frames coming as ASCII from ELM327. + * They can be of various formats: + * + * 29-bit ID (EFF): 12 34 56 78 D PL PL PL PL PL PL PL PL + * 11-bit ID (!EFF): 123 D PL PL PL PL PL PL PL PL + * + * where D = DLC, PL = payload byte + * + * Instead of a payload, RTR indicates a remote request. + * + * We will use the spaces and line length to guess the format. + */ static int elm327_parse_frame(struct elmcan *elm, int len) { struct can_frame frame; @@ -532,13 +530,13 @@ static int elm327_parse_frame(struct elmcan *elm, int len) /* Check for RTR frame */ if (elm->rxfill >= hexlen + 3 - && elm->rxbuf[hexlen + 0] == 'R' - && elm->rxbuf[hexlen + 1] == 'T' - && elm->rxbuf[hexlen + 2] == 'R') { + && !memcmp(&elm->rxbuf[hexlen], "RTR", 3)) { frame.can_id |= CAN_RTR_FLAG; } - /* Is the line long enough to hold the advertised payload? */ + /* Is the line long enough to hold the advertised payload? + * Note: RTR frames have a DLC, but no actual payload. + */ if (!(frame.can_id & CAN_RTR_FLAG) && (hexlen < frame.can_dlc * 3 + datastart)) { /* Incomplete frame. */ @@ -602,7 +600,6 @@ static void elm327_parse_line(struct elmcan *elm, int len) } } - static void elm327_handle_prompt(struct elmcan *elm) { struct can_frame *frame = &elm->can_frame; @@ -618,22 +615,14 @@ static void elm327_handle_prompt(struct elmcan *elm) /* Reconfigure ELM327 step by step as indicated by elm->cmds_todo */ if (test_bit(ELM_TODO_INIT, &elm->cmds_todo)) { - elm327_send(elm, *elm->next_init_cmd, strlen(*elm->next_init_cmd)); + strcpy(local_txbuf, *elm->next_init_cmd); + elm->next_init_cmd++; if (!(*elm->next_init_cmd)) { clear_bit(ELM_TODO_INIT, &elm->cmds_todo); netdev_info(elm->dev, "Initialization finished.\n"); } - /* Some chips are unreliable and need extra time after - * init commands, as seen with a clone. - * So let's do a dummy get-cmd-prompt dance. - */ - elm->state = ELM_NOTINIT; - elm327_kick_into_cmd_mode(elm); - - return; - } else if (test_and_clear_bit(ELM_TODO_SILENT_MONITOR, &elm->cmds_todo)) { sprintf(local_txbuf, "ATCSM%i\r", !(!(elm->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))); @@ -688,13 +677,20 @@ static void elm327_handle_prompt(struct elmcan *elm) } +static bool elm327_is_ready_char(char c) +{ + /* Bits 0xc0 are sometimes set (randomly), hence the mask. + * Probably bad hardware. + */ + return (c & 0x3f) == ELM327_READY_CHAR; +} + static void elm327_drop_bytes(struct elmcan *elm, int i) { memmove(&elm->rxbuf[0], &elm->rxbuf[i], sizeof(elm->rxbuf) - i); elm->rxfill -= i; } - static void elm327_parse_rxbuf(struct elmcan *elm) { int len; @@ -702,7 +698,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm) switch (elm->state) { case ELM_NOTINIT: elm->rxfill = 0; - return; + break; case ELM_GETMAGICCHAR: { @@ -724,7 +720,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm) elm327_drop_bytes(elm, i); - return; + break; } case ELM_GETPROMPT: @@ -733,7 +729,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm) elm327_handle_prompt(elm); elm->rxfill = 0; - return; + break; case ELM_RECEIVING: /* Find delimiting feedback lines. */ @@ -750,7 +746,7 @@ static void elm327_parse_rxbuf(struct elmcan *elm) netdev_err(elm->dev, "RX buffer overflow. Faulty ELM327 or UART?\n"); elm327_hw_failure(elm); - return; + break; } else if (len == elm->rxfill) { if (elm327_is_ready_char(elm->rxbuf[elm->rxfill - 1])) { /* The ELM327's AT ST response timeout ran out, @@ -760,13 +756,13 @@ static void elm327_parse_rxbuf(struct elmcan *elm) elm->rxfill = 0; elm327_handle_prompt(elm); - return; + break; } /* No found - we haven't received a full line yet. * Wait for more data. */ - return; + break; } /* We have a full line to parse. */ @@ -791,7 +787,6 @@ static void elm327_parse_rxbuf(struct elmcan *elm) * (takes elm->lock) * ************************************************************************/ -/* Netdevice DOWN -> UP routine */ static int elmcan_netdev_open(struct net_device *dev) { struct elmcan *elm = netdev_priv(dev); @@ -816,7 +811,6 @@ static int elmcan_netdev_open(struct net_device *dev) return err; } - /* Initialize the ELM327 */ elm327_init(elm); spin_unlock_bh(&elm->lock); @@ -827,15 +821,12 @@ static int elmcan_netdev_open(struct net_device *dev) return 0; } -/* Netdevice UP -> DOWN routine */ static int elmcan_netdev_close(struct net_device *dev) { struct elmcan *elm = netdev_priv(dev); spin_lock_bh(&elm->lock); if (elm->tty) { - /* TTY discipline is running. */ - /* Interrupt whatever we're doing right now */ elm327_send(elm, ELM327_MAGIC_STRING, 1); @@ -859,7 +850,7 @@ static int elmcan_netdev_close(struct net_device *dev) return 0; } -/* Send a can_frame to a TTY queue. */ +/* Send a can_frame to a TTY. */ static netdev_tx_t elmcan_netdev_start_xmit(struct sk_buff *skb, struct net_device *dev) { @@ -882,9 +873,10 @@ static netdev_tx_t elmcan_netdev_start_xmit(struct sk_buff *skb, /* We shouldn't get here after a hardware fault: * can_bus_off() calls netif_carrier_off() */ - BUG_ON(elm->hw_failure); + WARN_ON(elm->hw_failure); if (elm->tty == NULL + || elm->hw_failure || elm->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) { spin_unlock(&elm->lock); goto out; @@ -905,16 +897,12 @@ out: return NETDEV_TX_OK; } -static int elmcan_netdev_change_mtu(struct net_device *dev, int new_mtu) -{ - return -EINVAL; -} static const struct net_device_ops elmcan_netdev_ops = { .ndo_open = elmcan_netdev_open, .ndo_stop = elmcan_netdev_close, .ndo_start_xmit = elmcan_netdev_start_xmit, - .ndo_change_mtu = elmcan_netdev_change_mtu, + .ndo_change_mtu = can_change_mtu, }; @@ -927,19 +915,17 @@ static const struct net_device_ops elmcan_netdev_ops = { * (takes elm->lock) * ************************************************************************/ -/* - * Get a reference to our struct, taking into account locks/refcounts. +/* Get a reference to our struct, taking into account locks/refcounts. * This is to ensure ordering in case we are shutting down, and to ensure - * there is a refcount at all (because tty->disc_data may be NULL). + * there is a refcount at all (otherwise tty->disc_data may be freed and + * before we increment the refcount). + * Use this for anything that can race against elmcan_ldisc_close(). */ static struct elmcan *get_elm(struct tty_struct *tty) { struct elmcan *elm; bool got_ref; - /* Lock all elmcan TTYs, so tty->disc_data can't become NULL - * the moment before we increase the reference counter. - */ spin_lock_bh(&elmcan_discdata_lock); elm = (struct elmcan *) tty->disc_data; @@ -963,14 +949,26 @@ static void put_elm(struct elmcan *elm) } +static bool elmcan_is_valid_rx_char(char c) +{ + return (accept_flaky_uart + || isdigit(c) + || isupper(c) + || ELM327_MAGIC_CHAR == c + || ELM327_READY_CHAR == c + || '<' == c + || 'a' == c + || 'b' == c + || 'v' == c + || '.' == c + || '?' == c + || '\r' == c + || ' ' == c); +} -/* - * Handle the 'receiver data ready' interrupt. - * This function is called by the 'tty_io' module in the kernel when - * a block of ELM327 CAN data has been received, which can now be parsed - * 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 +/* Handle incoming ELM327 ASCII data. + * This will not be re-entered while running, but other ldisc + * functions may be called in parallel. */ static void elmcan_ldisc_rx(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) @@ -981,23 +979,18 @@ static void elmcan_ldisc_rx(struct tty_struct *tty, return; spin_lock_bh(&elm->lock); - if (elm->hw_failure) { - spin_unlock_bh(&elm->lock); - put_elm(elm); - return; + if (elm->hw_failure) { + goto out; } - /* Read the characters out of the buffer */ while (count-- && elm->rxfill < sizeof(elm->rxbuf)) { if (fp && *fp++) { netdev_err(elm->dev, "Error in received character stream. Check your wiring."); elm327_hw_failure(elm); - spin_unlock_bh(&elm->lock); - put_elm(elm); - return; + goto out; } /* Ignore NUL characters, which the PIC microcontroller may @@ -1007,33 +1000,15 @@ static void elmcan_ldisc_rx(struct tty_struct *tty, */ if (*cp != 0) { /* Check for stray characters on the UART line. - * No idea what causes this. + * Likely caused by bad hardware. */ - if (!accept_flaky_uart - && !isdigit(*cp) - && !isupper(*cp) - && ELM327_MAGIC_CHAR != *cp - && ELM327_READY_CHAR != *cp - && '<' != *cp - && 'a' != *cp - && 'b' != *cp - && 'v' != *cp - && '.' != *cp - && '?' != *cp - && '\r' != *cp - && ' ' != *cp) { - /* We've received an invalid character, so bail. - * There's something wrong with the ELM327, or - * with the UART line. - */ + if (!elmcan_is_valid_rx_char(*cp)) { netdev_err(elm->dev, "Received illegal character %02x.\n", *cp); elm327_hw_failure(elm); - spin_unlock_bh(&elm->lock); - put_elm(elm); - return; + goto out; } elm->rxbuf[elm->rxfill++] = *cp; @@ -1046,26 +1021,25 @@ static void elmcan_ldisc_rx(struct tty_struct *tty, netdev_err(elm->dev, "Receive buffer overflowed. Bad chip or wiring?"); elm327_hw_failure(elm); - spin_unlock_bh(&elm->lock); - put_elm(elm); - return; + goto out; } elm327_parse_rxbuf(elm); - spin_unlock_bh(&elm->lock); +out: + spin_unlock_bh(&elm->lock); put_elm(elm); } -/* - * Write out remaining transmit buffer. + +/* Write out remaining transmit buffer. * Scheduled when TTY is writable. */ static void elmcan_ldisc_tx_worker(struct work_struct *work) { /* No need to use get_elm() here, as we'll always flush workers - * befory destroying the elmcan object. + * before destroying the elmcan object. */ struct elmcan *elm = container_of(work, struct elmcan, tx_work); ssize_t actual; @@ -1083,7 +1057,7 @@ static void elmcan_ldisc_tx_worker(struct work_struct *work) if (elm->txleft <= 0) { /* Our TTY write buffer is empty: - * We can start transmission of another packet + * Allow netdev to hand us another packet */ clear_bit(TTY_DO_WRITE_WAKEUP, &elm->tty->flags); spin_unlock_bh(&elm->lock); @@ -1106,11 +1080,7 @@ static void elmcan_ldisc_tx_worker(struct work_struct *work) spin_unlock_bh(&elm->lock); } - -/* - * Called by the driver when there's room for more data. - * Schedule the transmit. - */ +/* Called by the driver when there's room for more data. */ static void elmcan_ldisc_tx_wakeup(struct tty_struct *tty) { struct elmcan *elm = get_elm(tty); @@ -1124,7 +1094,6 @@ static void elmcan_ldisc_tx_wakeup(struct tty_struct *tty) } - /* ELM327 can only handle bitrates that are integer divisors of 500 kHz, * or 7/8 of that. Divisors are 1 to 64. * Currently we don't implement support for 7/8 rates. @@ -1140,22 +1109,14 @@ static const u32 elmcan_bitrate_const[64] = { 62500, 71428, 83333, 100000, 125000, 166666, 250000, 500000 }; -/* Dummy function to claim we're changing the bitrate. - * We actually do this when opening the net device. - */ + +/* Dummy needed to use bitrate_const */ static int elmcan_do_set_bittiming(struct net_device *netdev) { return 0; } -/* - * Open the high-level part of the elmcan channel. - * This function is called by the TTY module when the - * elmcan line discipline is called for. - * - * Called in process context serialized from other ldisc calls. - */ static int elmcan_ldisc_open(struct tty_struct *tty) { struct net_device *dev; @@ -1169,7 +1130,6 @@ static int elmcan_ldisc_open(struct tty_struct *tty) return -EOPNOTSUPP; - /* OK. Find a free elmcan channel to use. */ dev = alloc_candev(sizeof(struct elmcan), 0); if (!dev) return -ENFILE; @@ -1211,8 +1171,7 @@ static int elmcan_ldisc_open(struct tty_struct *tty) return 0; } -/* - * Close down an elmcan channel. +/* Close down an elmcan channel. * This means flushing out any pending queues, and then returning. * This call is serialized against other ldisc functions: * Once this is called, no other ldisc function of ours is entered. @@ -1221,15 +1180,12 @@ static int elmcan_ldisc_open(struct tty_struct *tty) */ static void elmcan_ldisc_close(struct tty_struct *tty) { - /* Use get_elm() to synchronize against other users */ struct elmcan *elm = get_elm(tty); if (!elm) return; - /* Tear down network side. - * unregister_netdev() calls .ndo_stop() so we don't have to. - */ + /* unregister_netdev() calls .ndo_stop() so we don't have to. */ unregister_candev(elm->dev); /* Decrease the refcount twice, once for our own get_elm(), @@ -1239,13 +1195,10 @@ static void elmcan_ldisc_close(struct tty_struct *tty) put_elm(elm); put_elm(elm); - /* Spin until refcount reaches 0 */ while (atomic_read(&elm->refcount) > 0) msleep_interruptible(10); - /* At this point, all ldisc calls to us will be no-ops. - * Since the refcount is 0, they are bailing immediately. - */ + /* At this point, all ldisc calls to us have become no-ops. */ /* Mark channel as dead */ spin_lock_bh(&elm->lock); @@ -1253,12 +1206,10 @@ static void elmcan_ldisc_close(struct tty_struct *tty) elm->tty = NULL; spin_unlock_bh(&elm->lock); - /* Flush TTY side */ flush_work(&elm->tx_work); netdev_info(elm->dev, "elmcan off %s.\n", tty->name); - /* Free our memory */ free_candev(elm->dev); } @@ -1268,7 +1219,6 @@ static int elmcan_ldisc_hangup(struct tty_struct *tty) return 0; } -/* Perform I/O control on an active elmcan channel. */ static int elmcan_ldisc_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { @@ -1313,12 +1263,6 @@ static struct tty_ldisc_ops elmcan_ldisc = { - - - /************************************************************************ - * Module init/exit * - ************************************************************************/ - static int __init elmcan_init(void) { int status; @@ -1326,7 +1270,6 @@ static int __init elmcan_init(void) pr_info("ELM327 based best-effort CAN interface driver\n"); pr_info("This device is severely limited as a CAN interface, see documentation.\n"); - /* Fill in our line protocol discipline, and register it */ status = tty_register_ldisc(N_ELMCAN, &elmcan_ldisc); if (status) pr_err("can't register line discipline\n");