michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: Fix Issue #8226

Browse source 
This commit is a fix for Issue #8226
- Error flags are assigned to the correct mailbox now.
- set_filter_mutex is moved from can_stm32_attach to the wrappers
  can_stm32_attach_isr and can_stm32_attach_msgq. This protects
  response_type variable.
- Waiting for empty mailbox semaphore return value
  is checked for none zero values to check all error states.
- The mailbox tx_int_sem is reset before the sending is triggered.

Signed-off-by: Alexander Wachter <alexander.wachter@student.tugraz.at>
This commit is contained in:
Alexander Wachter 2018-06-08 09:23:47 +02:00 • committed by Kumar Gala
commit 39cb4b4167
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/can/stm32_can.c
View file

@ -100,7 +100,7 @@ void can_stm32_tx_isr_handler(CAN_TypeDef *can, struct can_stm32_data *data)
} }
if ((can->TSR & CAN_TSR_RQCP1) | bus_off) { if ((can->TSR & CAN_TSR_RQCP1) | bus_off) {
data->mb0.error_flags = data->mb1.error_flags =
can->TSR & CAN_TSR_TXOK1 ? CAN_TX_OK : can->TSR & CAN_TSR_TXOK1 ? CAN_TX_OK :
can->TSR & CAN_TSR_TERR1 ? CAN_TX_ERR : can->TSR & CAN_TSR_TERR1 ? CAN_TX_ERR :
can->TSR & CAN_TSR_ALST1 ? CAN_TX_ARB_LOST : can->TSR & CAN_TSR_ALST1 ? CAN_TX_ARB_LOST :
@ -342,7 +342,7 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
k_mutex_unlock(tx_mutex); k_mutex_unlock(tx_mutex);
SYS_LOG_DBG("Transmit buffer full. Wait with timeout (%dms)", SYS_LOG_DBG("Transmit buffer full. Wait with timeout (%dms)",
timeout); timeout);
if (k_sem_take(&data->tx_int_sem, timeout) == -EAGAIN) { if (k_sem_take(&data->tx_int_sem, timeout)) {
return CAN_TIMEOUT; return CAN_TIMEOUT;
} }
@ -365,6 +365,7 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
} }
mb->tx_callback = callback; mb->tx_callback = callback;
k_sem_reset(&mb->tx_int_sem);
/* mailbix identifier register setup */ /* mailbix identifier register setup */
mailbox->TIR &= CAN_TI0R_TXRQ; mailbox->TIR &= CAN_TI0R_TXRQ;
@ -390,7 +391,6 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
k_mutex_unlock(tx_mutex); k_mutex_unlock(tx_mutex);
if (callback == NULL) { if (callback == NULL) {
k_sem_reset(&mb->tx_int_sem);
k_sem_take(&mb->tx_int_sem, K_FOREVER); k_sem_take(&mb->tx_int_sem, K_FOREVER);
return mb->error_flags; return mb->error_flags;
} }
@ -741,14 +741,11 @@ static inline int can_stm32_attach(struct device *dev, void *response_ptr,
int filter_index_tmp = 0; int filter_index_tmp = 0;
int filter_nr; int filter_nr;
k_mutex_lock(&data->set_filter_mutex, K_FOREVER);
filter_nr = can_stm32_set_filter(filter, data, can, &filter_index_tmp); filter_nr = can_stm32_set_filter(filter, data, can, &filter_index_tmp);
if (filter_nr != CAN_NO_FREE_FILTER) { if (filter_nr != CAN_NO_FREE_FILTER) {
data->rx_response[filter_index_tmp] = response_ptr; data->rx_response[filter_index_tmp] = response_ptr;
} }
k_mutex_unlock(&data->set_filter_mutex);
*filter_index = filter_index_tmp; *filter_index = filter_index_tmp;
return filter_nr; return filter_nr;
} }
@ -760,8 +757,10 @@ int can_stm32_attach_msgq(struct device *dev, struct k_msgq *msgq,
int filter_index; int filter_index;
struct can_stm32_data *data = DEV_DATA(dev); struct can_stm32_data *data = DEV_DATA(dev);
k_mutex_lock(&data->set_filter_mutex, K_FOREVER);
filter_nr = can_stm32_attach(dev, msgq, filter, &filter_index); filter_nr = can_stm32_attach(dev, msgq, filter, &filter_index);
data->response_type |= (1ULL << filter_index); data->response_type |= (1ULL << filter_index);
k_mutex_unlock(&data->set_filter_mutex);
return filter_nr; return filter_nr;
} }
@ -772,8 +771,10 @@ int can_stm32_attach_isr(struct device *dev, can_rx_callback_t isr,
int filter_nr; int filter_nr;
int filter_index; int filter_index;
k_mutex_lock(&data->set_filter_mutex, K_FOREVER);
filter_nr = can_stm32_attach(dev, isr, filter, &filter_index); filter_nr = can_stm32_attach(dev, isr, filter, &filter_index);
data->response_type &= ~(1ULL << filter_index); data->response_type &= ~(1ULL << filter_index);
k_mutex_unlock(&data->set_filter_mutex);
return filter_nr; return filter_nr;
} }