Skip to content

Commit b12a43e

Browse files
Andri Yngvasonmarckleinebudde
authored andcommitted
can: mscan: Consolidate and unify state change handling
Replacing error state change handling with the new mechanism. Signed-off-by: Andri Yngvason <andri.yngvason@marel.com> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 215db18 commit b12a43e

File tree

1 file changed

+14
-34
lines changed

1 file changed

+14
-34
lines changed

drivers/net/can/mscan/mscan.c

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -289,18 +289,15 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
289289
return NETDEV_TX_OK;
290290
}
291291

292-
/* This function returns the old state to see where we came from */
293-
static enum can_state check_set_state(struct net_device *dev, u8 canrflg)
292+
static enum can_state get_new_state(struct net_device *dev, u8 canrflg)
294293
{
295294
struct mscan_priv *priv = netdev_priv(dev);
296-
enum can_state state, old_state = priv->can.state;
297295

298-
if (canrflg & MSCAN_CSCIF && old_state <= CAN_STATE_BUS_OFF) {
299-
state = state_map[max(MSCAN_STATE_RX(canrflg),
300-
MSCAN_STATE_TX(canrflg))];
301-
priv->can.state = state;
302-
}
303-
return old_state;
296+
if (unlikely(canrflg & MSCAN_CSCIF))
297+
return state_map[max(MSCAN_STATE_RX(canrflg),
298+
MSCAN_STATE_TX(canrflg))];
299+
300+
return priv->can.state;
304301
}
305302

306303
static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
@@ -349,7 +346,7 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
349346
struct mscan_priv *priv = netdev_priv(dev);
350347
struct mscan_regs __iomem *regs = priv->reg_base;
351348
struct net_device_stats *stats = &dev->stats;
352-
enum can_state old_state;
349+
enum can_state new_state;
353350

354351
netdev_dbg(dev, "error interrupt (canrflg=%#x)\n", canrflg);
355352
frame->can_id = CAN_ERR_FLAG;
@@ -363,27 +360,13 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
363360
frame->data[1] = 0;
364361
}
365362

366-
old_state = check_set_state(dev, canrflg);
367-
/* State changed */
368-
if (old_state != priv->can.state) {
369-
switch (priv->can.state) {
370-
case CAN_STATE_ERROR_WARNING:
371-
frame->can_id |= CAN_ERR_CRTL;
372-
priv->can.can_stats.error_warning++;
373-
if ((priv->shadow_statflg & MSCAN_RSTAT_MSK) <
374-
(canrflg & MSCAN_RSTAT_MSK))
375-
frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
376-
if ((priv->shadow_statflg & MSCAN_TSTAT_MSK) <
377-
(canrflg & MSCAN_TSTAT_MSK))
378-
frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
379-
break;
380-
case CAN_STATE_ERROR_PASSIVE:
381-
frame->can_id |= CAN_ERR_CRTL;
382-
priv->can.can_stats.error_passive++;
383-
frame->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
384-
break;
385-
case CAN_STATE_BUS_OFF:
386-
frame->can_id |= CAN_ERR_BUSOFF;
363+
new_state = get_new_state(dev, canrflg);
364+
if (new_state != priv->can.state) {
365+
can_change_state(dev, frame,
366+
state_map[MSCAN_STATE_TX(canrflg)],
367+
state_map[MSCAN_STATE_RX(canrflg)]);
368+
369+
if (priv->can.state == CAN_STATE_BUS_OFF) {
387370
/*
388371
* The MSCAN on the MPC5200 does recover from bus-off
389372
* automatically. To avoid that we stop the chip doing
@@ -396,9 +379,6 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
396379
MSCAN_SLPRQ | MSCAN_INITRQ);
397380
}
398381
can_bus_off(dev);
399-
break;
400-
default:
401-
break;
402382
}
403383
}
404384
priv->shadow_statflg = canrflg & MSCAN_STAT_MSK;

0 commit comments

Comments
 (0)