Skip to content

fix(CAN): Avoid double counting RX overflow drops #11184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdfk-prog wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

fix(CAN): Avoid double counting RX overflow drops #11184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion components/drivers/can/dev_can.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,15 +968,19 @@ rt_err_t rt_hw_can_register(struct rt_can_device *can,
*/
void rt_hw_can_isr(struct rt_can_device *can, int event)
{
rt_bool_t is_rxof_event = RT_FALSE;

switch (event & 0xff)
{
case RT_CAN_EVENT_RXOF_IND:
{
rt_base_t level;
is_rxof_event = RT_TRUE;
level = rt_hw_local_irq_disable();
can->status.dropedrcvpkg++;
rt_hw_local_irq_enable(level);
}
/* FALLTHROUGH: RX overflow still tries to fetch one pending frame into software FIFO. */
case RT_CAN_EVENT_RX_IND:
{
struct rt_can_msg tmpmsg;
Expand Down Expand Up @@ -1020,7 +1024,10 @@ void rt_hw_can_isr(struct rt_can_device *can, int event)
else if (!rt_list_isempty(&rx_fifo->uselist))
{
listmsg = rt_list_entry(rx_fifo->uselist.next, struct rt_can_msg_list, list);
can->status.dropedrcvpkg++;
if (!is_rxof_event)
{
can->status.dropedrcvpkg++;
}
rt_list_remove(&listmsg->list);
#ifdef RT_CAN_USING_HDR
rt_list_remove(&listmsg->hdrlist);
Expand Down
Loading