michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: return -ENETUNREACH from can_send() if in bus off state

Browse source 
Change the error code for can_send() when the CAN controller is in bus off
state from -ENETDOWN to -ENETUNREACH.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-08-19 10:43:34 +02:00 • committed by Fabio Baltieri
commit fda3f54002
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/can/can_mcan.c
View file

@ -825,7 +825,7 @@ int can_mcan_send(const struct device *dev,
}
if (can->psr & CAN_MCAN_PSR_BO) {
return -ENETDOWN;
return -ENETUNREACH;
}
ret = k_sem_take(&data->tx_sem, timeout);

6
drivers/can/can_mcux_flexcan.c
View file

@ -364,7 +364,7 @@ static int mcux_flexcan_send(const struct device *dev,
(void)mcux_flexcan_get_state(dev, &state, NULL);
if (state == CAN_STATE_BUS_OFF) {
LOG_DBG("Transmit failed, bus-off");
return -ENETDOWN;
return -ENETUNREACH;
}
if (k_sem_take(&data->tx_allocs_sem, timeout) != 0) {
@ -582,9 +582,9 @@ static inline void mcux_flexcan_transfer_error_status(const struct device *dev,
FLEXCAN_TransferAbortSend(config->base, &data->handle,
ALLOC_IDX_TO_TXMB_IDX(alloc));
if (function != NULL) {
function(dev, -ENETDOWN, arg);
function(dev, -ENETUNREACH, arg);
} else {
data->tx_cbs[alloc].status = -ENETDOWN;
data->tx_cbs[alloc].status = -ENETUNREACH;
k_sem_give(&data->tx_cbs[alloc].done);
}

4
drivers/can/can_sja1000.c
View file

@ -313,7 +313,7 @@ int can_sja1000_send(const struct device *dev, const struct can_frame *frame, k_
if (data->state == CAN_STATE_BUS_OFF) {
LOG_DBG("transmit failed, bus-off");
return -ENETDOWN;
return -ENETUNREACH;
}
if (k_sem_take(&data->tx_idle, timeout) != 0) {
@ -544,7 +544,7 @@ static void can_sja1000_handle_error_warning_irq(const struct device *dev)
sr = can_sja1000_read_reg(dev, CAN_SJA1000_SR);
if ((sr & CAN_SJA1000_SR_BS) != 0) {
data->state = CAN_STATE_BUS_OFF;
can_sja1000_tx_done(dev, -ENETDOWN);
can_sja1000_tx_done(dev, -ENETUNREACH);
#ifdef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY
/* Recover bus now unless interrupted in the middle of a MOD register change. */
err = k_mutex_lock(&data->mod_lock, K_NO_WAIT);

8
drivers/can/can_stm32.c
View file

@ -215,7 +215,7 @@ static inline void can_stm32_tx_isr_handler(const struct device *dev)
can->TSR & CAN_TSR_TXOK0 ? 0 :
can->TSR & CAN_TSR_TERR0 ? -EIO :
can->TSR & CAN_TSR_ALST0 ? -EBUSY :
bus_off ? -ENETDOWN :
bus_off ? -ENETUNREACH :
-EIO;
/* clear the request. */
can->TSR |= CAN_TSR_RQCP0;
@ -227,7 +227,7 @@ static inline void can_stm32_tx_isr_handler(const struct device *dev)
can->TSR & CAN_TSR_TXOK1 ? 0 :
can->TSR & CAN_TSR_TERR1 ? -EIO :
can->TSR & CAN_TSR_ALST1 ? -EBUSY :
bus_off ? -ENETDOWN :
bus_off ? -ENETUNREACH :
-EIO;
/* clear the request. */
can->TSR |= CAN_TSR_RQCP1;
@ -239,7 +239,7 @@ static inline void can_stm32_tx_isr_handler(const struct device *dev)
can->TSR & CAN_TSR_TXOK2 ? 0 :
can->TSR & CAN_TSR_TERR2 ? -EIO :
can->TSR & CAN_TSR_ALST2 ? -EBUSY :
bus_off ? -ENETDOWN :
bus_off ? -ENETUNREACH :
-EIO;
/* clear the request. */
can->TSR |= CAN_TSR_RQCP2;
@ -692,7 +692,7 @@ static int can_stm32_send(const struct device *dev, const struct can_frame *fram
}
if (can->ESR & CAN_ESR_BOFF) {
return -ENETDOWN;
return -ENETUNREACH;
}
k_mutex_lock(&data->inst_mutex, K_FOREVER);