sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FlexCAN Fix TX abort process

Browse Source
This commit is contained in:
Peter van der Perk 2021-06-09 17:14:40 +02:00 committed by Xiang Xiao
parent 6e6eecaa73
commit 3b94669b7f
3 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/src/imxrt/imxrt_flexcan.c
View File

@ -1006,10 +1006,13 @@ static void imxrt_txdone(FAR struct imxrt_driver_s *priv)
NETDEV_TXDONE(&priv->dev);
#ifdef TX_TIMEOUT_WQ
/* We are here because a transmission completed, so the
* corresponding watchdog can be canceled.
* corresponding watchdog can be canceled
* mailbox be set to inactive
*/
wd_cancel(priv->txtimeout[mbi]);
wd_cancel(&priv->txtimeout[mbi]);
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_INACTIVE;
#endif
}
@ -1129,7 +1132,9 @@ static int imxrt_flexcan_interrupt(int irq, FAR void *context,
static void imxrt_txtimeout_work(FAR void *arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
uint32_t flags;
uint32_t mbi;
uint32_t mb_bit;
struct timespec ts;
struct timeval *now = (struct timeval *)&ts;
@ -1140,6 +1145,8 @@ static void imxrt_txtimeout_work(FAR void *arg)
* transmit function transmitted a new frame
*/
flags = getreg32(priv->base + IMXRT_CAN_IFLAG1_OFFSET);
for (mbi = 0; mbi < TXMBCOUNT; mbi++)
{
if (priv->txmb[mbi].deadline.tv_sec != 0
@ -1147,6 +1154,14 @@ static void imxrt_txtimeout_work(FAR void *arg)
|| now->tv_usec > priv->txmb[mbi].deadline.tv_usec))
{
NETDEV_TXTIMEOUTS(&priv->dev);
mb_bit = 1 << (RXMBCOUNT + mbi);
if (flags & mb_bit)
{
putreg32(mb_bit, priv->base + IMXRT_CAN_IFLAG1_OFFSET);
}
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_ABORT;
priv->txmb[mbi].pending = TX_ABORT;

17
arch/arm/src/kinetis/kinetis_flexcan.c
View File

@ -1005,10 +1005,13 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv)
NETDEV_TXDONE(&priv->dev);
#ifdef TX_TIMEOUT_WQ
/* We are here because a transmission completed, so the
* corresponding watchdog can be canceled.
* corresponding watchdog can be canceled
* mailbox be set to inactive
*/
wd_cancel(&priv->txtimeout[mbi]);
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_INACTIVE;
#endif
}
@ -1128,7 +1131,9 @@ static int kinetis_flexcan_interrupt(int irq, FAR void *context,
static void kinetis_txtimeout_work(FAR void *arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
uint32_t flags;
uint32_t mbi;
uint32_t mb_bit;
struct timespec ts;
struct timeval *now = (struct timeval *)&ts;
@ -1139,6 +1144,8 @@ static void kinetis_txtimeout_work(FAR void *arg)
* transmit function transmitted a new frame
*/
flags = getreg32(priv->base + KINETIS_CAN_IFLAG1_OFFSET);
for (mbi = 0; mbi < TXMBCOUNT; mbi++)
{
if (priv->txmb[mbi].deadline.tv_sec != 0
@ -1146,6 +1153,14 @@ static void kinetis_txtimeout_work(FAR void *arg)
|| now->tv_usec > priv->txmb[mbi].deadline.tv_usec))
{
NETDEV_TXTIMEOUTS(&priv->dev);
mb_bit = 1 << (RXMBCOUNT + mbi);
if (flags & mb_bit)
{
putreg32(mb_bit, priv->base + KINETIS_CAN_IFLAG1_OFFSET);
}
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_ABORT;
priv->txmb[mbi].pending = TX_ABORT;

17
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
View File

@ -1006,10 +1006,13 @@ static void s32k1xx_txdone(FAR struct s32k1xx_driver_s *priv)
NETDEV_TXDONE(&priv->dev);
#ifdef TX_TIMEOUT_WQ
/* We are here because a transmission completed, so the
* corresponding watchdog can be canceled.
* corresponding watchdog can be canceled
* mailbox be set to inactive
*/
wd_cancel(&priv->txtimeout[mbi]);
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_INACTIVE;
#endif
}
@ -1129,7 +1132,9 @@ static int s32k1xx_flexcan_interrupt(int irq, FAR void *context,
static void s32k1xx_txtimeout_work(FAR void *arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
uint32_t flags;
uint32_t mbi;
uint32_t mb_bit;
struct timespec ts;
struct timeval *now = (struct timeval *)&ts;
@ -1140,6 +1145,8 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
* transmit function transmitted a new frame
*/
flags = getreg32(priv->base + S32K1XX_CAN_IFLAG1_OFFSET);
for (mbi = 0; mbi < TXMBCOUNT; mbi++)
{
if (priv->txmb[mbi].deadline.tv_sec != 0
@ -1147,6 +1154,14 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
|| now->tv_usec > priv->txmb[mbi].deadline.tv_usec))
{
NETDEV_TXTIMEOUTS(&priv->dev);
mb_bit = 1 << (RXMBCOUNT + mbi);
if (flags & mb_bit)
{
putreg32(mb_bit, priv->base + S32K1XX_CAN_IFLAG1_OFFSET);
}
struct mb_s *mb = &priv->tx[mbi];
mb->cs.code = CAN_TXMB_ABORT;
priv->txmb[mbi].pending = TX_ABORT;