2009-10-07 06:59:47 +04:00
|
|
|
/*
|
|
|
|
* TI HECC (CAN) device driver
|
|
|
|
*
|
|
|
|
* This driver supports TI's HECC (High End CAN Controller module) and the
|
|
|
|
* specs for the same is available at <http://www.ti.com>
|
|
|
|
*
|
|
|
|
* Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
* Copyright (C) 2019 Jeroen Hofstee <jhofstee@victronenergy.com>
|
2009-10-07 06:59:47 +04:00
|
|
|
*
|
|
|
|
* 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 Free Software Foundation version 2.
|
|
|
|
*
|
|
|
|
* This program is distributed as is WITHOUT ANY WARRANTY of any
|
|
|
|
* kind, whether express or implied; without even the implied warranty
|
|
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/clk.h>
|
2011-09-16 11:57:43 +04:00
|
|
|
#include <linux/io.h>
|
2017-02-17 18:52:33 +03:00
|
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/of_device.h>
|
|
|
|
#include <linux/regulator/consumer.h>
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
#include <linux/can/dev.h>
|
|
|
|
#include <linux/can/error.h>
|
2012-12-18 21:51:00 +04:00
|
|
|
#include <linux/can/led.h>
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
#include <linux/can/rx-offload.h>
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
#define DRV_NAME "ti_hecc"
|
|
|
|
#define HECC_MODULE_VERSION "0.7"
|
|
|
|
MODULE_VERSION(HECC_MODULE_VERSION);
|
|
|
|
#define DRV_DESC "TI High End CAN Controller Driver " HECC_MODULE_VERSION
|
|
|
|
|
|
|
|
/* TX / RX Mailbox Configuration */
|
|
|
|
#define HECC_MAX_MAILBOXES 32 /* hardware mailboxes - do not change */
|
|
|
|
#define MAX_TX_PRIO 0x3F /* hardware value - do not change */
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* Important Note: TX mailbox configuration
|
2009-10-07 06:59:47 +04:00
|
|
|
* TX mailboxes should be restricted to the number of SKB buffers to avoid
|
|
|
|
* maintaining SKB buffers separately. TX mailboxes should be a power of 2
|
|
|
|
* for the mailbox logic to work. Top mailbox numbers are reserved for RX
|
|
|
|
* and lower mailboxes for TX.
|
|
|
|
*
|
|
|
|
* HECC_MAX_TX_MBOX HECC_MB_TX_SHIFT
|
|
|
|
* 4 (default) 2
|
|
|
|
* 8 3
|
|
|
|
* 16 4
|
|
|
|
*/
|
|
|
|
#define HECC_MB_TX_SHIFT 2 /* as per table above */
|
|
|
|
#define HECC_MAX_TX_MBOX BIT(HECC_MB_TX_SHIFT)
|
|
|
|
|
|
|
|
#define HECC_TX_PRIO_SHIFT (HECC_MB_TX_SHIFT)
|
|
|
|
#define HECC_TX_PRIO_MASK (MAX_TX_PRIO << HECC_MB_TX_SHIFT)
|
|
|
|
#define HECC_TX_MB_MASK (HECC_MAX_TX_MBOX - 1)
|
|
|
|
#define HECC_TX_MASK ((HECC_MAX_TX_MBOX - 1) | HECC_TX_PRIO_MASK)
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
/* RX mailbox configuration
|
2009-10-07 06:59:47 +04:00
|
|
|
*
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
* The remaining mailboxes are used for reception and are delivered
|
|
|
|
* based on their timestamp, to avoid a hardware race when CANME is
|
|
|
|
* changed while CAN-bus traffic is being received.
|
2009-10-07 06:59:47 +04:00
|
|
|
*/
|
|
|
|
#define HECC_MAX_RX_MBOX (HECC_MAX_MAILBOXES - HECC_MAX_TX_MBOX)
|
|
|
|
#define HECC_RX_FIRST_MBOX (HECC_MAX_MAILBOXES - 1)
|
|
|
|
|
|
|
|
/* TI HECC module registers */
|
|
|
|
#define HECC_CANME 0x0 /* Mailbox enable */
|
|
|
|
#define HECC_CANMD 0x4 /* Mailbox direction */
|
|
|
|
#define HECC_CANTRS 0x8 /* Transmit request set */
|
|
|
|
#define HECC_CANTRR 0xC /* Transmit request */
|
|
|
|
#define HECC_CANTA 0x10 /* Transmission acknowledge */
|
|
|
|
#define HECC_CANAA 0x14 /* Abort acknowledge */
|
|
|
|
#define HECC_CANRMP 0x18 /* Receive message pending */
|
|
|
|
#define HECC_CANRML 0x1C /* Remote message lost */
|
|
|
|
#define HECC_CANRFP 0x20 /* Remote frame pending */
|
|
|
|
#define HECC_CANGAM 0x24 /* SECC only:Global acceptance mask */
|
|
|
|
#define HECC_CANMC 0x28 /* Master control */
|
|
|
|
#define HECC_CANBTC 0x2C /* Bit timing configuration */
|
|
|
|
#define HECC_CANES 0x30 /* Error and status */
|
|
|
|
#define HECC_CANTEC 0x34 /* Transmit error counter */
|
|
|
|
#define HECC_CANREC 0x38 /* Receive error counter */
|
|
|
|
#define HECC_CANGIF0 0x3C /* Global interrupt flag 0 */
|
|
|
|
#define HECC_CANGIM 0x40 /* Global interrupt mask */
|
|
|
|
#define HECC_CANGIF1 0x44 /* Global interrupt flag 1 */
|
|
|
|
#define HECC_CANMIM 0x48 /* Mailbox interrupt mask */
|
|
|
|
#define HECC_CANMIL 0x4C /* Mailbox interrupt level */
|
|
|
|
#define HECC_CANOPC 0x50 /* Overwrite protection control */
|
|
|
|
#define HECC_CANTIOC 0x54 /* Transmit I/O control */
|
|
|
|
#define HECC_CANRIOC 0x58 /* Receive I/O control */
|
|
|
|
#define HECC_CANLNT 0x5C /* HECC only: Local network time */
|
|
|
|
#define HECC_CANTOC 0x60 /* HECC only: Time-out control */
|
|
|
|
#define HECC_CANTOS 0x64 /* HECC only: Time-out status */
|
|
|
|
#define HECC_CANTIOCE 0x68 /* SCC only:Enhanced TX I/O control */
|
|
|
|
#define HECC_CANRIOCE 0x6C /* SCC only:Enhanced RX I/O control */
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
/* TI HECC RAM registers */
|
|
|
|
#define HECC_CANMOTS 0x80 /* Message object time stamp */
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
/* Mailbox registers */
|
|
|
|
#define HECC_CANMID 0x0
|
|
|
|
#define HECC_CANMCF 0x4
|
|
|
|
#define HECC_CANMDL 0x8
|
|
|
|
#define HECC_CANMDH 0xC
|
|
|
|
|
|
|
|
#define HECC_SET_REG 0xFFFFFFFF
|
|
|
|
#define HECC_CANID_MASK 0x3FF /* 18 bits mask for extended id's */
|
|
|
|
#define HECC_CCE_WAIT_COUNT 100 /* Wait for ~1 sec for CCE bit */
|
|
|
|
|
|
|
|
#define HECC_CANMC_SCM BIT(13) /* SCC compat mode */
|
|
|
|
#define HECC_CANMC_CCR BIT(12) /* Change config request */
|
|
|
|
#define HECC_CANMC_PDR BIT(11) /* Local Power down - for sleep mode */
|
|
|
|
#define HECC_CANMC_ABO BIT(7) /* Auto Bus On */
|
|
|
|
#define HECC_CANMC_STM BIT(6) /* Self test mode - loopback */
|
|
|
|
#define HECC_CANMC_SRES BIT(5) /* Software reset */
|
|
|
|
|
|
|
|
#define HECC_CANTIOC_EN BIT(3) /* Enable CAN TX I/O pin */
|
|
|
|
#define HECC_CANRIOC_EN BIT(3) /* Enable CAN RX I/O pin */
|
|
|
|
|
|
|
|
#define HECC_CANMID_IDE BIT(31) /* Extended frame format */
|
|
|
|
#define HECC_CANMID_AME BIT(30) /* Acceptance mask enable */
|
|
|
|
#define HECC_CANMID_AAM BIT(29) /* Auto answer mode */
|
|
|
|
|
|
|
|
#define HECC_CANES_FE BIT(24) /* form error */
|
|
|
|
#define HECC_CANES_BE BIT(23) /* bit error */
|
|
|
|
#define HECC_CANES_SA1 BIT(22) /* stuck at dominant error */
|
|
|
|
#define HECC_CANES_CRCE BIT(21) /* CRC error */
|
|
|
|
#define HECC_CANES_SE BIT(20) /* stuff bit error */
|
|
|
|
#define HECC_CANES_ACKE BIT(19) /* ack error */
|
|
|
|
#define HECC_CANES_BO BIT(18) /* Bus off status */
|
|
|
|
#define HECC_CANES_EP BIT(17) /* Error passive status */
|
|
|
|
#define HECC_CANES_EW BIT(16) /* Error warning status */
|
|
|
|
#define HECC_CANES_SMA BIT(5) /* suspend mode ack */
|
|
|
|
#define HECC_CANES_CCE BIT(4) /* Change config enabled */
|
|
|
|
#define HECC_CANES_PDA BIT(3) /* Power down mode ack */
|
|
|
|
|
|
|
|
#define HECC_CANBTC_SAM BIT(7) /* sample points */
|
|
|
|
|
|
|
|
#define HECC_BUS_ERROR (HECC_CANES_FE | HECC_CANES_BE |\
|
|
|
|
HECC_CANES_CRCE | HECC_CANES_SE |\
|
|
|
|
HECC_CANES_ACKE)
|
|
|
|
|
|
|
|
#define HECC_CANMCF_RTR BIT(4) /* Remote transmit request */
|
|
|
|
|
|
|
|
#define HECC_CANGIF_MAIF BIT(17) /* Message alarm interrupt */
|
|
|
|
#define HECC_CANGIF_TCOIF BIT(16) /* Timer counter overflow int */
|
|
|
|
#define HECC_CANGIF_GMIF BIT(15) /* Global mailbox interrupt */
|
|
|
|
#define HECC_CANGIF_AAIF BIT(14) /* Abort ack interrupt */
|
|
|
|
#define HECC_CANGIF_WDIF BIT(13) /* Write denied interrupt */
|
|
|
|
#define HECC_CANGIF_WUIF BIT(12) /* Wake up interrupt */
|
|
|
|
#define HECC_CANGIF_RMLIF BIT(11) /* Receive message lost interrupt */
|
|
|
|
#define HECC_CANGIF_BOIF BIT(10) /* Bus off interrupt */
|
|
|
|
#define HECC_CANGIF_EPIF BIT(9) /* Error passive interrupt */
|
|
|
|
#define HECC_CANGIF_WLIF BIT(8) /* Warning level interrupt */
|
|
|
|
#define HECC_CANGIF_MBOX_MASK 0x1F /* Mailbox number mask */
|
|
|
|
#define HECC_CANGIM_I1EN BIT(1) /* Int line 1 enable */
|
|
|
|
#define HECC_CANGIM_I0EN BIT(0) /* Int line 0 enable */
|
|
|
|
#define HECC_CANGIM_DEF_MASK 0x700 /* only busoff/warning/passive */
|
|
|
|
#define HECC_CANGIM_SIL BIT(2) /* system interrupts to int line 1 */
|
|
|
|
|
|
|
|
/* CAN Bittiming constants as per HECC specs */
|
2012-07-16 14:58:31 +04:00
|
|
|
static const struct can_bittiming_const ti_hecc_bittiming_const = {
|
2009-10-07 06:59:47 +04:00
|
|
|
.name = DRV_NAME,
|
|
|
|
.tseg1_min = 1,
|
|
|
|
.tseg1_max = 16,
|
|
|
|
.tseg2_min = 1,
|
|
|
|
.tseg2_max = 8,
|
|
|
|
.sjw_max = 4,
|
|
|
|
.brp_min = 1,
|
|
|
|
.brp_max = 256,
|
|
|
|
.brp_inc = 1,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ti_hecc_priv {
|
|
|
|
struct can_priv can; /* MUST be first member/field */
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
struct can_rx_offload offload;
|
2009-10-07 06:59:47 +04:00
|
|
|
struct net_device *ndev;
|
|
|
|
struct clk *clk;
|
|
|
|
void __iomem *base;
|
2017-02-17 18:52:33 +03:00
|
|
|
void __iomem *hecc_ram;
|
|
|
|
void __iomem *mbx;
|
|
|
|
bool use_hecc1int;
|
2009-10-07 06:59:47 +04:00
|
|
|
spinlock_t mbx_lock; /* CANME register needs protection */
|
|
|
|
u32 tx_head;
|
|
|
|
u32 tx_tail;
|
2017-02-17 18:52:33 +03:00
|
|
|
struct regulator *reg_xceiver;
|
2009-10-07 06:59:47 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static inline int get_tx_head_mb(struct ti_hecc_priv *priv)
|
|
|
|
{
|
|
|
|
return priv->tx_head & HECC_TX_MB_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int get_tx_tail_mb(struct ti_hecc_priv *priv)
|
|
|
|
{
|
|
|
|
return priv->tx_tail & HECC_TX_MB_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int get_tx_head_prio(struct ti_hecc_priv *priv)
|
|
|
|
{
|
|
|
|
return (priv->tx_head >> HECC_TX_PRIO_SHIFT) & MAX_TX_PRIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void hecc_write_lam(struct ti_hecc_priv *priv, u32 mbxno, u32 val)
|
|
|
|
{
|
2017-02-17 18:52:33 +03:00
|
|
|
__raw_writel(val, priv->hecc_ram + mbxno * 4);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
static inline u32 hecc_read_stamp(struct ti_hecc_priv *priv, u32 mbxno)
|
|
|
|
{
|
|
|
|
return __raw_readl(priv->hecc_ram + HECC_CANMOTS + mbxno * 4);
|
|
|
|
}
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
static inline void hecc_write_mbx(struct ti_hecc_priv *priv, u32 mbxno,
|
2019-07-25 16:07:19 +03:00
|
|
|
u32 reg, u32 val)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
2017-02-17 18:52:33 +03:00
|
|
|
__raw_writel(val, priv->mbx + mbxno * 0x10 + reg);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 hecc_read_mbx(struct ti_hecc_priv *priv, u32 mbxno, u32 reg)
|
|
|
|
{
|
2017-02-17 18:52:33 +03:00
|
|
|
return __raw_readl(priv->mbx + mbxno * 0x10 + reg);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void hecc_write(struct ti_hecc_priv *priv, u32 reg, u32 val)
|
|
|
|
{
|
|
|
|
__raw_writel(val, priv->base + reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 hecc_read(struct ti_hecc_priv *priv, int reg)
|
|
|
|
{
|
|
|
|
return __raw_readl(priv->base + reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void hecc_set_bit(struct ti_hecc_priv *priv, int reg,
|
2019-07-25 16:07:19 +03:00
|
|
|
u32 bit_mask)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
|
|
|
hecc_write(priv, reg, hecc_read(priv, reg) | bit_mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void hecc_clear_bit(struct ti_hecc_priv *priv, int reg,
|
2019-07-25 16:07:19 +03:00
|
|
|
u32 bit_mask)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
|
|
|
hecc_write(priv, reg, hecc_read(priv, reg) & ~bit_mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 hecc_get_bit(struct ti_hecc_priv *priv, int reg, u32 bit_mask)
|
|
|
|
{
|
|
|
|
return (hecc_read(priv, reg) & bit_mask) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_set_btc(struct ti_hecc_priv *priv)
|
|
|
|
{
|
|
|
|
struct can_bittiming *bit_timing = &priv->can.bittiming;
|
|
|
|
u32 can_btc;
|
|
|
|
|
|
|
|
can_btc = (bit_timing->phase_seg2 - 1) & 0x7;
|
|
|
|
can_btc |= ((bit_timing->phase_seg1 + bit_timing->prop_seg - 1)
|
|
|
|
& 0xF) << 3;
|
|
|
|
if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) {
|
|
|
|
if (bit_timing->brp > 4)
|
|
|
|
can_btc |= HECC_CANBTC_SAM;
|
|
|
|
else
|
2019-07-25 16:11:32 +03:00
|
|
|
netdev_warn(priv->ndev,
|
|
|
|
"WARN: Triple sampling not set due to h/w limitations");
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
can_btc |= ((bit_timing->sjw - 1) & 0x3) << 8;
|
|
|
|
can_btc |= ((bit_timing->brp - 1) & 0xFF) << 16;
|
|
|
|
|
|
|
|
/* ERM being set to 0 by default meaning resync at falling edge */
|
|
|
|
|
|
|
|
hecc_write(priv, HECC_CANBTC, can_btc);
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_info(priv->ndev, "setting CANBTC=%#x\n", can_btc);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-17 18:52:33 +03:00
|
|
|
static int ti_hecc_transceiver_switch(const struct ti_hecc_priv *priv,
|
|
|
|
int on)
|
2010-02-26 16:22:03 +03:00
|
|
|
{
|
2017-02-17 18:52:33 +03:00
|
|
|
if (!priv->reg_xceiver)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (on)
|
|
|
|
return regulator_enable(priv->reg_xceiver);
|
|
|
|
else
|
|
|
|
return regulator_disable(priv->reg_xceiver);
|
2010-02-26 16:22:03 +03:00
|
|
|
}
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
static void ti_hecc_reset(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
u32 cnt;
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_dbg(ndev, "resetting hecc ...\n");
|
2009-10-07 06:59:47 +04:00
|
|
|
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_SRES);
|
|
|
|
|
|
|
|
/* Set change control request and wait till enabled */
|
|
|
|
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* INFO: It has been observed that at times CCE bit may not be
|
2009-10-07 06:59:47 +04:00
|
|
|
* set and hw seems to be ok even if this bit is not set so
|
|
|
|
* timing out with a timing of 1ms to respect the specs
|
|
|
|
*/
|
|
|
|
cnt = HECC_CCE_WAIT_COUNT;
|
|
|
|
while (!hecc_get_bit(priv, HECC_CANES, HECC_CANES_CCE) && cnt != 0) {
|
|
|
|
--cnt;
|
|
|
|
udelay(10);
|
|
|
|
}
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* Note: On HECC, BTC can be programmed only in initialization mode, so
|
2009-10-07 06:59:47 +04:00
|
|
|
* it is expected that the can bittiming parameters are set via ip
|
|
|
|
* utility before the device is opened
|
|
|
|
*/
|
|
|
|
ti_hecc_set_btc(priv);
|
|
|
|
|
|
|
|
/* Clear CCR (and CANMC register) and wait for CCE = 0 enable */
|
|
|
|
hecc_write(priv, HECC_CANMC, 0);
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* INFO: CAN net stack handles bus off and hence disabling auto-bus-on
|
2009-10-07 06:59:47 +04:00
|
|
|
* hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_ABO);
|
|
|
|
*/
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* INFO: It has been observed that at times CCE bit may not be
|
2009-10-07 06:59:47 +04:00
|
|
|
* set and hw seems to be ok even if this bit is not set so
|
|
|
|
*/
|
|
|
|
cnt = HECC_CCE_WAIT_COUNT;
|
|
|
|
while (hecc_get_bit(priv, HECC_CANES, HECC_CANES_CCE) && cnt != 0) {
|
|
|
|
--cnt;
|
|
|
|
udelay(10);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enable TX and RX I/O Control pins */
|
|
|
|
hecc_write(priv, HECC_CANTIOC, HECC_CANTIOC_EN);
|
|
|
|
hecc_write(priv, HECC_CANRIOC, HECC_CANRIOC_EN);
|
|
|
|
|
|
|
|
/* Clear registers for clean operation */
|
|
|
|
hecc_write(priv, HECC_CANTA, HECC_SET_REG);
|
|
|
|
hecc_write(priv, HECC_CANRMP, HECC_SET_REG);
|
|
|
|
hecc_write(priv, HECC_CANGIF0, HECC_SET_REG);
|
|
|
|
hecc_write(priv, HECC_CANGIF1, HECC_SET_REG);
|
|
|
|
hecc_write(priv, HECC_CANME, 0);
|
|
|
|
hecc_write(priv, HECC_CANMD, 0);
|
|
|
|
|
|
|
|
/* SCC compat mode NOT supported (and not needed too) */
|
|
|
|
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_SCM);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ti_hecc_start(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
u32 cnt, mbxno, mbx_mask;
|
|
|
|
|
|
|
|
/* put HECC in initialization mode and set btc */
|
|
|
|
ti_hecc_reset(ndev);
|
|
|
|
|
2019-07-26 10:09:33 +03:00
|
|
|
priv->tx_head = HECC_TX_MASK;
|
|
|
|
priv->tx_tail = HECC_TX_MASK;
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
/* Enable local and global acceptance mask registers */
|
|
|
|
hecc_write(priv, HECC_CANGAM, HECC_SET_REG);
|
|
|
|
|
|
|
|
/* Prepare configured mailboxes to receive messages */
|
|
|
|
for (cnt = 0; cnt < HECC_MAX_RX_MBOX; cnt++) {
|
|
|
|
mbxno = HECC_MAX_MAILBOXES - 1 - cnt;
|
|
|
|
mbx_mask = BIT(mbxno);
|
|
|
|
hecc_clear_bit(priv, HECC_CANME, mbx_mask);
|
|
|
|
hecc_write_mbx(priv, mbxno, HECC_CANMID, HECC_CANMID_AME);
|
|
|
|
hecc_write_lam(priv, mbxno, HECC_SET_REG);
|
|
|
|
hecc_set_bit(priv, HECC_CANMD, mbx_mask);
|
|
|
|
hecc_set_bit(priv, HECC_CANME, mbx_mask);
|
|
|
|
hecc_set_bit(priv, HECC_CANMIM, mbx_mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prevent message over-write & Enable interrupts */
|
|
|
|
hecc_write(priv, HECC_CANOPC, HECC_SET_REG);
|
2017-02-17 18:52:33 +03:00
|
|
|
if (priv->use_hecc1int) {
|
2009-10-07 06:59:47 +04:00
|
|
|
hecc_write(priv, HECC_CANMIL, HECC_SET_REG);
|
|
|
|
hecc_write(priv, HECC_CANGIM, HECC_CANGIM_DEF_MASK |
|
|
|
|
HECC_CANGIM_I1EN | HECC_CANGIM_SIL);
|
|
|
|
} else {
|
|
|
|
hecc_write(priv, HECC_CANMIL, 0);
|
|
|
|
hecc_write(priv, HECC_CANGIM,
|
2019-07-25 16:07:19 +03:00
|
|
|
HECC_CANGIM_DEF_MASK | HECC_CANGIM_I0EN);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
priv->can.state = CAN_STATE_ERROR_ACTIVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ti_hecc_stop(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
|
|
|
|
/* Disable interrupts and disable mailboxes */
|
|
|
|
hecc_write(priv, HECC_CANGIM, 0);
|
|
|
|
hecc_write(priv, HECC_CANMIM, 0);
|
|
|
|
hecc_write(priv, HECC_CANME, 0);
|
|
|
|
priv->can.state = CAN_STATE_STOPPED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_do_set_mode(struct net_device *ndev, enum can_mode mode)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case CAN_MODE_START:
|
|
|
|
ti_hecc_start(ndev);
|
|
|
|
netif_wake_queue(ndev);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EOPNOTSUPP;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-02-01 14:14:13 +04:00
|
|
|
static int ti_hecc_get_berr_counter(const struct net_device *ndev,
|
2019-07-25 16:07:19 +03:00
|
|
|
struct can_berr_counter *bec)
|
2012-02-01 14:14:13 +04:00
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
|
|
|
|
bec->txerr = hecc_read(priv, HECC_CANTEC);
|
|
|
|
bec->rxerr = hecc_read(priv, HECC_CANREC);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* ti_hecc_xmit: HECC Transmit
|
2009-10-07 06:59:47 +04:00
|
|
|
*
|
|
|
|
* The transmit mailboxes start from 0 to HECC_MAX_TX_MBOX. In HECC the
|
|
|
|
* priority of the mailbox for tranmission is dependent upon priority setting
|
|
|
|
* field in mailbox registers. The mailbox with highest value in priority field
|
|
|
|
* is transmitted first. Only when two mailboxes have the same value in
|
|
|
|
* priority field the highest numbered mailbox is transmitted first.
|
|
|
|
*
|
|
|
|
* To utilize the HECC priority feature as described above we start with the
|
|
|
|
* highest numbered mailbox with highest priority level and move on to the next
|
|
|
|
* mailbox with the same priority level and so on. Once we loop through all the
|
|
|
|
* transmit mailboxes we choose the next priority level (lower) and so on
|
|
|
|
* until we reach the lowest priority level on the lowest numbered mailbox
|
|
|
|
* when we stop transmission until all mailboxes are transmitted and then
|
|
|
|
* restart at highest numbered mailbox with highest priority.
|
|
|
|
*
|
|
|
|
* Two counters (head and tail) are used to track the next mailbox to transmit
|
|
|
|
* and to track the echo buffer for already transmitted mailbox. The queue
|
|
|
|
* is stopped when all the mailboxes are busy or when there is a priority
|
|
|
|
* value roll-over happens.
|
|
|
|
*/
|
|
|
|
static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
struct can_frame *cf = (struct can_frame *)skb->data;
|
|
|
|
u32 mbxno, mbx_mask, data;
|
|
|
|
unsigned long flags;
|
|
|
|
|
2010-01-12 13:00:46 +03:00
|
|
|
if (can_dropped_invalid_skb(ndev, skb))
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
mbxno = get_tx_head_mb(priv);
|
|
|
|
mbx_mask = BIT(mbxno);
|
|
|
|
spin_lock_irqsave(&priv->mbx_lock, flags);
|
|
|
|
if (unlikely(hecc_read(priv, HECC_CANME) & mbx_mask)) {
|
|
|
|
spin_unlock_irqrestore(&priv->mbx_lock, flags);
|
|
|
|
netif_stop_queue(ndev);
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_err(priv->ndev,
|
2019-07-25 16:07:19 +03:00
|
|
|
"BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n",
|
|
|
|
priv->tx_head, priv->tx_tail);
|
2009-10-07 06:59:47 +04:00
|
|
|
return NETDEV_TX_BUSY;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&priv->mbx_lock, flags);
|
|
|
|
|
|
|
|
/* Prepare mailbox for transmission */
|
2011-08-23 07:05:48 +04:00
|
|
|
data = cf->can_dlc | (get_tx_head_prio(priv) << 8);
|
2009-10-07 06:59:47 +04:00
|
|
|
if (cf->can_id & CAN_RTR_FLAG) /* Remote transmission request */
|
|
|
|
data |= HECC_CANMCF_RTR;
|
|
|
|
hecc_write_mbx(priv, mbxno, HECC_CANMCF, data);
|
|
|
|
|
|
|
|
if (cf->can_id & CAN_EFF_FLAG) /* Extended frame format */
|
|
|
|
data = (cf->can_id & CAN_EFF_MASK) | HECC_CANMID_IDE;
|
|
|
|
else /* Standard frame format */
|
|
|
|
data = (cf->can_id & CAN_SFF_MASK) << 18;
|
|
|
|
hecc_write_mbx(priv, mbxno, HECC_CANMID, data);
|
|
|
|
hecc_write_mbx(priv, mbxno, HECC_CANMDL,
|
2019-07-25 16:07:19 +03:00
|
|
|
be32_to_cpu(*(__be32 *)(cf->data)));
|
2009-10-07 06:59:47 +04:00
|
|
|
if (cf->can_dlc > 4)
|
|
|
|
hecc_write_mbx(priv, mbxno, HECC_CANMDH,
|
2019-07-25 16:07:19 +03:00
|
|
|
be32_to_cpu(*(__be32 *)(cf->data + 4)));
|
2009-10-07 06:59:47 +04:00
|
|
|
else
|
|
|
|
*(u32 *)(cf->data + 4) = 0;
|
|
|
|
can_put_echo_skb(skb, ndev, mbxno);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&priv->mbx_lock, flags);
|
|
|
|
--priv->tx_head;
|
|
|
|
if ((hecc_read(priv, HECC_CANME) & BIT(get_tx_head_mb(priv))) ||
|
2019-07-25 16:07:19 +03:00
|
|
|
(priv->tx_head & HECC_TX_MASK) == HECC_TX_MASK) {
|
2009-10-07 06:59:47 +04:00
|
|
|
netif_stop_queue(ndev);
|
|
|
|
}
|
|
|
|
hecc_set_bit(priv, HECC_CANME, mbx_mask);
|
|
|
|
spin_unlock_irqrestore(&priv->mbx_lock, flags);
|
|
|
|
|
|
|
|
hecc_clear_bit(priv, HECC_CANMD, mbx_mask);
|
|
|
|
hecc_set_bit(priv, HECC_CANMIM, mbx_mask);
|
|
|
|
hecc_write(priv, HECC_CANTRS, mbx_mask);
|
|
|
|
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
|
|
|
|
2019-07-25 16:10:07 +03:00
|
|
|
static inline
|
|
|
|
struct ti_hecc_priv *rx_offload_to_priv(struct can_rx_offload *offload)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
return container_of(offload, struct ti_hecc_priv, offload);
|
|
|
|
}
|
2009-10-07 06:59:47 +04:00
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
static unsigned int ti_hecc_mailbox_read(struct can_rx_offload *offload,
|
|
|
|
struct can_frame *cf,
|
|
|
|
u32 *timestamp, unsigned int mbxno)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = rx_offload_to_priv(offload);
|
2019-07-25 10:00:44 +03:00
|
|
|
u32 data;
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
data = hecc_read_mbx(priv, mbxno, HECC_CANMID);
|
|
|
|
if (data & HECC_CANMID_IDE)
|
|
|
|
cf->can_id = (data & CAN_EFF_MASK) | CAN_EFF_FLAG;
|
|
|
|
else
|
|
|
|
cf->can_id = (data >> 18) & CAN_SFF_MASK;
|
2019-07-26 10:29:14 +03:00
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
|
|
|
|
if (data & HECC_CANMCF_RTR)
|
|
|
|
cf->can_id |= CAN_RTR_FLAG;
|
2009-12-12 07:13:21 +03:00
|
|
|
cf->can_dlc = get_can_dlc(data & 0xF);
|
2019-07-26 10:29:14 +03:00
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
|
2014-01-11 22:11:24 +04:00
|
|
|
*(__be32 *)(cf->data) = cpu_to_be32(data);
|
2009-10-07 06:59:47 +04:00
|
|
|
if (cf->can_dlc > 4) {
|
|
|
|
data = hecc_read_mbx(priv, mbxno, HECC_CANMDH);
|
2014-01-11 22:11:24 +04:00
|
|
|
*(__be32 *)(cf->data + 4) = cpu_to_be32(data);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
*timestamp = hecc_read_stamp(priv, mbxno);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
return 1;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_error(struct net_device *ndev, int int_status,
|
2019-07-25 16:07:19 +03:00
|
|
|
int err_status)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
struct can_frame *cf;
|
|
|
|
struct sk_buff *skb;
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
u32 timestamp;
|
2009-10-07 06:59:47 +04:00
|
|
|
|
2011-03-31 05:57:33 +04:00
|
|
|
/* propagate the error condition to the can stack */
|
2009-10-20 11:08:01 +04:00
|
|
|
skb = alloc_can_err_skb(ndev, &cf);
|
2009-10-07 06:59:47 +04:00
|
|
|
if (!skb) {
|
|
|
|
if (printk_ratelimit())
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_err(priv->ndev,
|
2019-07-25 16:11:32 +03:00
|
|
|
"%s: alloc_can_err_skb() failed\n",
|
|
|
|
__func__);
|
2009-10-07 06:59:47 +04:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (int_status & HECC_CANGIF_WLIF) { /* warning level int */
|
|
|
|
if ((int_status & HECC_CANGIF_BOIF) == 0) {
|
|
|
|
priv->can.state = CAN_STATE_ERROR_WARNING;
|
|
|
|
++priv->can.can_stats.error_warning;
|
|
|
|
cf->can_id |= CAN_ERR_CRTL;
|
|
|
|
if (hecc_read(priv, HECC_CANTEC) > 96)
|
|
|
|
cf->data[1] |= CAN_ERR_CRTL_TX_WARNING;
|
|
|
|
if (hecc_read(priv, HECC_CANREC) > 96)
|
|
|
|
cf->data[1] |= CAN_ERR_CRTL_RX_WARNING;
|
|
|
|
}
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_EW);
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_dbg(priv->ndev, "Error Warning interrupt\n");
|
2009-10-07 06:59:47 +04:00
|
|
|
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (int_status & HECC_CANGIF_EPIF) { /* error passive int */
|
|
|
|
if ((int_status & HECC_CANGIF_BOIF) == 0) {
|
|
|
|
priv->can.state = CAN_STATE_ERROR_PASSIVE;
|
|
|
|
++priv->can.can_stats.error_passive;
|
|
|
|
cf->can_id |= CAN_ERR_CRTL;
|
|
|
|
if (hecc_read(priv, HECC_CANTEC) > 127)
|
|
|
|
cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
|
|
|
|
if (hecc_read(priv, HECC_CANREC) > 127)
|
|
|
|
cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
|
|
|
|
}
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_EP);
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_dbg(priv->ndev, "Error passive interrupt\n");
|
2009-10-07 06:59:47 +04:00
|
|
|
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
|
|
|
|
}
|
|
|
|
|
2019-07-24 15:16:29 +03:00
|
|
|
/* Need to check busoff condition in error status register too to
|
2009-10-07 06:59:47 +04:00
|
|
|
* ensure warning interrupts don't hog the system
|
|
|
|
*/
|
|
|
|
if ((int_status & HECC_CANGIF_BOIF) || (err_status & HECC_CANES_BO)) {
|
|
|
|
priv->can.state = CAN_STATE_BUS_OFF;
|
|
|
|
cf->can_id |= CAN_ERR_BUSOFF;
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_BO);
|
|
|
|
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);
|
|
|
|
/* Disable all interrupts in bus-off to avoid int hog */
|
|
|
|
hecc_write(priv, HECC_CANGIM, 0);
|
2015-01-16 17:30:28 +03:00
|
|
|
++priv->can.can_stats.bus_off;
|
2009-10-07 06:59:47 +04:00
|
|
|
can_bus_off(ndev);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (err_status & HECC_BUS_ERROR) {
|
|
|
|
++priv->can.can_stats.bus_error;
|
|
|
|
cf->can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT;
|
|
|
|
if (err_status & HECC_CANES_FE) {
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_FE);
|
|
|
|
cf->data[2] |= CAN_ERR_PROT_FORM;
|
|
|
|
}
|
|
|
|
if (err_status & HECC_CANES_BE) {
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_BE);
|
|
|
|
cf->data[2] |= CAN_ERR_PROT_BIT;
|
|
|
|
}
|
|
|
|
if (err_status & HECC_CANES_SE) {
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_SE);
|
|
|
|
cf->data[2] |= CAN_ERR_PROT_STUFF;
|
|
|
|
}
|
|
|
|
if (err_status & HECC_CANES_CRCE) {
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE);
|
2015-11-21 20:41:20 +03:00
|
|
|
cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
if (err_status & HECC_CANES_ACKE) {
|
|
|
|
hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE);
|
2015-11-21 20:41:20 +03:00
|
|
|
cf->data[3] = CAN_ERR_PROT_LOC_ACK;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
timestamp = hecc_read(priv, HECC_CANLNT);
|
|
|
|
can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);
|
2012-02-01 13:50:23 +04:00
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static irqreturn_t ti_hecc_interrupt(int irq, void *dev_id)
|
|
|
|
{
|
|
|
|
struct net_device *ndev = (struct net_device *)dev_id;
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
struct net_device_stats *stats = &ndev->stats;
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
u32 mbxno, mbx_mask, int_status, err_status, stamp;
|
|
|
|
unsigned long flags, rx_pending;
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
int_status = hecc_read(priv,
|
2019-07-25 16:07:19 +03:00
|
|
|
priv->use_hecc1int ?
|
|
|
|
HECC_CANGIF1 : HECC_CANGIF0);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
if (!int_status)
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
|
|
|
err_status = hecc_read(priv, HECC_CANES);
|
|
|
|
if (err_status & (HECC_BUS_ERROR | HECC_CANES_BO |
|
2019-07-25 16:07:19 +03:00
|
|
|
HECC_CANES_EP | HECC_CANES_EW))
|
|
|
|
ti_hecc_error(ndev, int_status, err_status);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
if (int_status & HECC_CANGIF_GMIF) {
|
|
|
|
while (priv->tx_tail - priv->tx_head > 0) {
|
|
|
|
mbxno = get_tx_tail_mb(priv);
|
|
|
|
mbx_mask = BIT(mbxno);
|
|
|
|
if (!(mbx_mask & hecc_read(priv, HECC_CANTA)))
|
|
|
|
break;
|
|
|
|
hecc_clear_bit(priv, HECC_CANMIM, mbx_mask);
|
|
|
|
hecc_write(priv, HECC_CANTA, mbx_mask);
|
|
|
|
spin_lock_irqsave(&priv->mbx_lock, flags);
|
|
|
|
hecc_clear_bit(priv, HECC_CANME, mbx_mask);
|
|
|
|
spin_unlock_irqrestore(&priv->mbx_lock, flags);
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
stamp = hecc_read_stamp(priv, mbxno);
|
2019-07-25 16:10:07 +03:00
|
|
|
stats->tx_bytes +=
|
|
|
|
can_rx_offload_get_echo_skb(&priv->offload,
|
|
|
|
mbxno, stamp);
|
2009-10-07 06:59:47 +04:00
|
|
|
stats->tx_packets++;
|
2012-12-18 21:51:00 +04:00
|
|
|
can_led_event(ndev, CAN_LED_EVENT_TX);
|
2009-10-07 06:59:47 +04:00
|
|
|
--priv->tx_tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* restart queue if wrap-up or if queue stalled on last pkt */
|
2019-07-25 16:07:19 +03:00
|
|
|
if ((priv->tx_head == priv->tx_tail &&
|
|
|
|
((priv->tx_head & HECC_TX_MASK) != HECC_TX_MASK)) ||
|
|
|
|
(((priv->tx_tail & HECC_TX_MASK) == HECC_TX_MASK) &&
|
|
|
|
((priv->tx_head & HECC_TX_MASK) == HECC_TX_MASK)))
|
2009-10-07 06:59:47 +04:00
|
|
|
netif_wake_queue(ndev);
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
/* offload RX mailboxes and let NAPI deliver them */
|
|
|
|
while ((rx_pending = hecc_read(priv, HECC_CANRMP))) {
|
|
|
|
can_rx_offload_irq_offload_timestamp(&priv->offload,
|
|
|
|
rx_pending);
|
|
|
|
hecc_write(priv, HECC_CANRMP, rx_pending);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clear all interrupt conditions - read back to avoid spurious ints */
|
2017-02-17 18:52:33 +03:00
|
|
|
if (priv->use_hecc1int) {
|
2009-10-07 06:59:47 +04:00
|
|
|
hecc_write(priv, HECC_CANGIF1, HECC_SET_REG);
|
|
|
|
int_status = hecc_read(priv, HECC_CANGIF1);
|
|
|
|
} else {
|
|
|
|
hecc_write(priv, HECC_CANGIF0, HECC_SET_REG);
|
|
|
|
int_status = hecc_read(priv, HECC_CANGIF0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_open(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = request_irq(ndev->irq, ti_hecc_interrupt, IRQF_SHARED,
|
2019-07-25 16:07:19 +03:00
|
|
|
ndev->name, ndev);
|
2009-10-07 06:59:47 +04:00
|
|
|
if (err) {
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_err(ndev, "error requesting interrupt\n");
|
2009-10-07 06:59:47 +04:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2010-02-26 16:22:03 +03:00
|
|
|
ti_hecc_transceiver_switch(priv, 1);
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
/* Open common can device */
|
|
|
|
err = open_candev(ndev);
|
|
|
|
if (err) {
|
2012-02-01 14:02:05 +04:00
|
|
|
netdev_err(ndev, "open_candev() failed %d\n", err);
|
2010-02-26 16:22:03 +03:00
|
|
|
ti_hecc_transceiver_switch(priv, 0);
|
2009-10-07 06:59:47 +04:00
|
|
|
free_irq(ndev->irq, ndev);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-12-18 21:51:00 +04:00
|
|
|
can_led_event(ndev, CAN_LED_EVENT_OPEN);
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
ti_hecc_start(ndev);
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
can_rx_offload_enable(&priv->offload);
|
2009-10-07 06:59:47 +04:00
|
|
|
netif_start_queue(ndev);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_close(struct net_device *ndev)
|
|
|
|
{
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
|
|
|
|
netif_stop_queue(ndev);
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
can_rx_offload_disable(&priv->offload);
|
2009-10-07 06:59:47 +04:00
|
|
|
ti_hecc_stop(ndev);
|
|
|
|
free_irq(ndev->irq, ndev);
|
|
|
|
close_candev(ndev);
|
2010-02-26 16:22:03 +03:00
|
|
|
ti_hecc_transceiver_switch(priv, 0);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
2012-12-18 21:51:00 +04:00
|
|
|
can_led_event(ndev, CAN_LED_EVENT_STOP);
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct net_device_ops ti_hecc_netdev_ops = {
|
|
|
|
.ndo_open = ti_hecc_open,
|
|
|
|
.ndo_stop = ti_hecc_close,
|
|
|
|
.ndo_start_xmit = ti_hecc_xmit,
|
2014-03-07 12:23:41 +04:00
|
|
|
.ndo_change_mtu = can_change_mtu,
|
2009-10-07 06:59:47 +04:00
|
|
|
};
|
|
|
|
|
2017-02-17 18:52:33 +03:00
|
|
|
static const struct of_device_id ti_hecc_dt_ids[] = {
|
|
|
|
{
|
|
|
|
.compatible = "ti,am3517-hecc",
|
|
|
|
},
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, ti_hecc_dt_ids);
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
static int ti_hecc_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct net_device *ndev = (struct net_device *)0;
|
|
|
|
struct ti_hecc_priv *priv;
|
2017-02-17 18:52:33 +03:00
|
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
struct resource *res, *irq;
|
|
|
|
struct regulator *reg_xceiver;
|
2009-10-07 06:59:47 +04:00
|
|
|
int err = -ENODEV;
|
|
|
|
|
2017-02-17 18:52:33 +03:00
|
|
|
if (!IS_ENABLED(CONFIG_OF) || !np)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
reg_xceiver = devm_regulator_get(&pdev->dev, "xceiver");
|
|
|
|
if (PTR_ERR(reg_xceiver) == -EPROBE_DEFER)
|
|
|
|
return -EPROBE_DEFER;
|
|
|
|
else if (IS_ERR(reg_xceiver))
|
|
|
|
reg_xceiver = NULL;
|
|
|
|
|
|
|
|
ndev = alloc_candev(sizeof(struct ti_hecc_priv), HECC_MAX_TX_MBOX);
|
|
|
|
if (!ndev) {
|
|
|
|
dev_err(&pdev->dev, "alloc_candev failed\n");
|
|
|
|
return -ENOMEM;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
2017-02-17 18:52:33 +03:00
|
|
|
priv = netdev_priv(ndev);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
2017-02-17 18:52:33 +03:00
|
|
|
/* handle hecc memory */
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hecc");
|
|
|
|
if (!res) {
|
|
|
|
dev_err(&pdev->dev, "can't get IORESOURCE_MEM hecc\n");
|
|
|
|
return -EINVAL;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
2017-02-17 18:52:33 +03:00
|
|
|
|
|
|
|
priv->base = devm_ioremap_resource(&pdev->dev, res);
|
2017-04-25 09:44:05 +03:00
|
|
|
if (IS_ERR(priv->base)) {
|
2017-02-17 18:52:33 +03:00
|
|
|
dev_err(&pdev->dev, "hecc ioremap failed\n");
|
2017-04-25 09:44:05 +03:00
|
|
|
return PTR_ERR(priv->base);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
2017-02-17 18:52:33 +03:00
|
|
|
|
|
|
|
/* handle hecc-ram memory */
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hecc-ram");
|
|
|
|
if (!res) {
|
|
|
|
dev_err(&pdev->dev, "can't get IORESOURCE_MEM hecc-ram\n");
|
|
|
|
return -EINVAL;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
2017-02-17 18:52:33 +03:00
|
|
|
|
|
|
|
priv->hecc_ram = devm_ioremap_resource(&pdev->dev, res);
|
2017-04-25 09:44:05 +03:00
|
|
|
if (IS_ERR(priv->hecc_ram)) {
|
2017-02-17 18:52:33 +03:00
|
|
|
dev_err(&pdev->dev, "hecc-ram ioremap failed\n");
|
2017-04-25 09:44:05 +03:00
|
|
|
return PTR_ERR(priv->hecc_ram);
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
2017-02-17 18:52:33 +03:00
|
|
|
/* handle mbx memory */
|
|
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mbx");
|
|
|
|
if (!res) {
|
|
|
|
dev_err(&pdev->dev, "can't get IORESOURCE_MEM mbx\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->mbx = devm_ioremap_resource(&pdev->dev, res);
|
2017-04-25 09:44:05 +03:00
|
|
|
if (IS_ERR(priv->mbx)) {
|
2017-02-17 18:52:33 +03:00
|
|
|
dev_err(&pdev->dev, "mbx ioremap failed\n");
|
2017-04-25 09:44:05 +03:00
|
|
|
return PTR_ERR(priv->mbx);
|
2017-02-17 18:52:33 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
|
|
if (!irq) {
|
|
|
|
dev_err(&pdev->dev, "No irq resource\n");
|
|
|
|
goto probe_exit;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
priv->ndev = ndev;
|
2017-02-17 18:52:33 +03:00
|
|
|
priv->reg_xceiver = reg_xceiver;
|
|
|
|
priv->use_hecc1int = of_property_read_bool(np, "ti,use-hecc1int");
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
priv->can.bittiming_const = &ti_hecc_bittiming_const;
|
|
|
|
priv->can.do_set_mode = ti_hecc_do_set_mode;
|
2012-02-01 14:14:13 +04:00
|
|
|
priv->can.do_get_berr_counter = ti_hecc_get_berr_counter;
|
2010-01-14 10:08:34 +03:00
|
|
|
priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
|
2009-10-07 06:59:47 +04:00
|
|
|
|
2011-08-23 07:05:57 +04:00
|
|
|
spin_lock_init(&priv->mbx_lock);
|
2009-10-07 06:59:47 +04:00
|
|
|
ndev->irq = irq->start;
|
|
|
|
ndev->flags |= IFF_ECHO;
|
|
|
|
platform_set_drvdata(pdev, ndev);
|
|
|
|
SET_NETDEV_DEV(ndev, &pdev->dev);
|
|
|
|
ndev->netdev_ops = &ti_hecc_netdev_ops;
|
|
|
|
|
|
|
|
priv->clk = clk_get(&pdev->dev, "hecc_ck");
|
|
|
|
if (IS_ERR(priv->clk)) {
|
|
|
|
dev_err(&pdev->dev, "No clock available\n");
|
|
|
|
err = PTR_ERR(priv->clk);
|
|
|
|
priv->clk = NULL;
|
|
|
|
goto probe_exit_candev;
|
|
|
|
}
|
|
|
|
priv->can.clock.freq = clk_get_rate(priv->clk);
|
|
|
|
|
2017-01-18 13:35:57 +03:00
|
|
|
err = clk_prepare_enable(priv->clk);
|
|
|
|
if (err) {
|
|
|
|
dev_err(&pdev->dev, "clk_prepare_enable() failed\n");
|
|
|
|
goto probe_exit_clk;
|
|
|
|
}
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
priv->offload.mailbox_read = ti_hecc_mailbox_read;
|
|
|
|
priv->offload.mb_first = HECC_RX_FIRST_MBOX;
|
|
|
|
priv->offload.mb_last = HECC_MAX_TX_MBOX;
|
|
|
|
err = can_rx_offload_add_timestamp(ndev, &priv->offload);
|
|
|
|
if (err) {
|
|
|
|
dev_err(&pdev->dev, "can_rx_offload_add_timestamp() failed\n");
|
|
|
|
goto probe_exit_clk;
|
|
|
|
}
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
err = register_candev(ndev);
|
|
|
|
if (err) {
|
|
|
|
dev_err(&pdev->dev, "register_candev() failed\n");
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
goto probe_exit_offload;
|
2009-10-07 06:59:47 +04:00
|
|
|
}
|
2012-12-18 21:51:00 +04:00
|
|
|
|
|
|
|
devm_can_led_init(ndev);
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%u)\n",
|
2019-07-25 16:07:19 +03:00
|
|
|
priv->base, (u32)ndev->irq);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
probe_exit_offload:
|
|
|
|
can_rx_offload_del(&priv->offload);
|
2009-10-07 06:59:47 +04:00
|
|
|
probe_exit_clk:
|
|
|
|
clk_put(priv->clk);
|
|
|
|
probe_exit_candev:
|
|
|
|
free_candev(ndev);
|
|
|
|
probe_exit:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-12-03 18:22:44 +04:00
|
|
|
static int ti_hecc_remove(struct platform_device *pdev)
|
2009-10-07 06:59:47 +04:00
|
|
|
{
|
|
|
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(ndev);
|
|
|
|
|
2012-09-19 16:58:45 +04:00
|
|
|
unregister_candev(ndev);
|
2017-01-18 13:35:57 +03:00
|
|
|
clk_disable_unprepare(priv->clk);
|
2009-10-07 06:59:47 +04:00
|
|
|
clk_put(priv->clk);
|
can: ti_hecc: use timestamp based rx-offloading
As already mentioned in [1] and included in [2], there is an off by one
issue since the high bank is already enabled when the _next_ mailbox to
be read has index 12, so the mailbox being read was 13. The message can
therefore go into mailbox 31 and the driver will be repolled until the
mailbox 12 eventually receives a msg. Or the message might end up in the
12th mailbox, but then it would become disabled after reading it and only
be enabled again in the next "round" after mailbox 13 was read, which can
cause out of order messages, since the lower priority mailboxes can
accept messages in the meantime.
As mentioned in [3] there is a hardware race condition when changing the
CANME register while messages are being received. Even when including a
busy poll on reception, like in [2] there are still overflows and out of
order messages at times, but less then without the busy loop polling.
Unlike what the patch suggests, the polling time is not in the microsecond
range, but takes as long as a current CAN bus reception needs to finish,
so typically more in the fraction of millisecond range. Since the timeout
is in jiffies it won't timeout.
Even with these additional fixes the driver is still not able to provide a
proper FIFO which doesn't drop packages. So change the driver to use
rx-offload and base order on timestamp instead of message box numbers. As
a side affect, this also fixes [4] and [5].
Before this change messages with a single byte counter were dropped /
received out of order at a bitrate of 250kbit/s on an am3517. With this
patch that no longer occurs up to and including 1Mbit/s.
[1] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post6
[2] http://arago-project.org/git/projects/?p=linux-omap3.git;a=commit;h=02346892777f07245de4d5af692513ebd852dcb2
[3] https://linux-can.vger.kernel.narkive.com/zgO9inVi/patch-can-ti-hecc-fix-rx-wrong-sequence-issue#post5
[4] https://patchwork.ozlabs.org/patch/895956/
[5] https://www.spinics.net/lists/netdev/msg494971.html
Cc: Anant Gole <anantgole@ti.com>
Cc: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2019-04-29 15:03:32 +03:00
|
|
|
can_rx_offload_del(&priv->offload);
|
2009-10-07 06:59:47 +04:00
|
|
|
free_candev(ndev);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-22 06:35:36 +03:00
|
|
|
#ifdef CONFIG_PM
|
|
|
|
static int ti_hecc_suspend(struct platform_device *pdev, pm_message_t state)
|
|
|
|
{
|
|
|
|
struct net_device *dev = platform_get_drvdata(pdev);
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(dev);
|
|
|
|
|
|
|
|
if (netif_running(dev)) {
|
|
|
|
netif_stop_queue(dev);
|
|
|
|
netif_device_detach(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
|
|
|
|
priv->can.state = CAN_STATE_SLEEPING;
|
|
|
|
|
2017-01-18 13:35:57 +03:00
|
|
|
clk_disable_unprepare(priv->clk);
|
2010-02-22 06:35:36 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ti_hecc_resume(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct net_device *dev = platform_get_drvdata(pdev);
|
|
|
|
struct ti_hecc_priv *priv = netdev_priv(dev);
|
2017-01-18 13:35:57 +03:00
|
|
|
int err;
|
2010-02-22 06:35:36 +03:00
|
|
|
|
2017-01-18 13:35:57 +03:00
|
|
|
err = clk_prepare_enable(priv->clk);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2010-02-22 06:35:36 +03:00
|
|
|
|
|
|
|
hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_PDR);
|
|
|
|
priv->can.state = CAN_STATE_ERROR_ACTIVE;
|
|
|
|
|
|
|
|
if (netif_running(dev)) {
|
|
|
|
netif_device_attach(dev);
|
|
|
|
netif_start_queue(dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define ti_hecc_suspend NULL
|
|
|
|
#define ti_hecc_resume NULL
|
|
|
|
#endif
|
|
|
|
|
2009-10-07 06:59:47 +04:00
|
|
|
/* TI HECC netdevice driver: platform driver structure */
|
|
|
|
static struct platform_driver ti_hecc_driver = {
|
|
|
|
.driver = {
|
|
|
|
.name = DRV_NAME,
|
2017-02-17 18:52:33 +03:00
|
|
|
.of_match_table = ti_hecc_dt_ids,
|
2009-10-07 06:59:47 +04:00
|
|
|
},
|
|
|
|
.probe = ti_hecc_probe,
|
2012-12-03 18:22:44 +04:00
|
|
|
.remove = ti_hecc_remove,
|
2010-02-22 06:35:36 +03:00
|
|
|
.suspend = ti_hecc_suspend,
|
|
|
|
.resume = ti_hecc_resume,
|
2009-10-07 06:59:47 +04:00
|
|
|
};
|
|
|
|
|
2011-11-27 19:42:31 +04:00
|
|
|
module_platform_driver(ti_hecc_driver);
|
2009-10-07 06:59:47 +04:00
|
|
|
|
|
|
|
MODULE_AUTHOR("Anant Gole <anantgole@ti.com>");
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
|
|
MODULE_DESCRIPTION(DRV_DESC);
|
2012-10-29 17:18:04 +04:00
|
|
|
MODULE_ALIAS("platform:" DRV_NAME);
|