On 10/14/19 1:34 PM, Pankaj Sharma wrote: > The Bosch MCAN hardware (3.1.0 and above) supports interrupt flag to > detect Protocol error in arbitration phase. > > Transmit error statistics is currently not updated from the MCAN driver. > Protocol error in arbitration phase is a TX error and the network > statistics should be updated accordingly. > > The member "tx_error" of "struct net_device_stats" should be incremented > as arbitration is a transmit protocol error. Also "arbitration_lost" of > "struct can_device_stats" should be incremented to report arbitration > lost. > > Signed-off-by: Pankaj Sharma <pankj.sha...@samsung.com> > Signed-off-by: Sriram Dash <sriram.d...@samsung.com> > --- > drivers/net/can/m_can/m_can.c | 38 +++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c > index b95b382eb308..7efafee0eec8 100644 > --- a/drivers/net/can/m_can/m_can.c > +++ b/drivers/net/can/m_can/m_can.c > @@ -778,6 +778,39 @@ static inline bool is_lec_err(u32 psr) > return psr && (psr != LEC_UNUSED); > } > > +static inline bool is_protocol_err(u32 irqstatus)
please add the comon m_can_ prefix
> +{
> + if (irqstatus & IR_ERR_LEC_31X)
> + return 1;
> + else
> + return 0;
> +}
> +
> +static int m_can_handle_protocol_error(struct net_device *dev, u32 irqstatus)
> +{
> + struct net_device_stats *stats = &dev->stats;
> + struct m_can_priv *priv = netdev_priv(dev);
> + struct can_frame *cf;
> + struct sk_buff *skb;
> +
> + /* propagate the error condition to the CAN stack */
> + skb = alloc_can_err_skb(dev, &cf);
> + if (unlikely(!skb))
> + return 0;
please handle the stats, even if the allocation of the skb fails.
> +
> + if (priv->version >= 31 && (irqstatus & IR_PEA)) {
> + netdev_dbg(dev, "Protocol error in Arbitration fail\n");
> + stats->tx_errors++;
> + priv->can.can_stats.arbitration_lost++;
> + cf->can_id |= CAN_ERR_LOSTARB;
> + cf->data[0] |= CAN_ERR_LOSTARB_UNSPEC;
> + }
> +
> + netif_receive_skb(skb);
> +
> + return 1;
> +}
> +
> static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
> u32 psr)
> {
> @@ -792,6 +825,11 @@ static int m_can_handle_bus_errors(struct net_device
> *dev, u32 irqstatus,
> is_lec_err(psr))
> work_done += m_can_handle_lec_err(dev, psr & LEC_UNUSED);
>
> + /* handle protocol errors in arbitration phase */
> + if ((priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) &&
> + is_protocol_err(irqstatus))
> + work_done += m_can_handle_protocol_error(dev, irqstatus);
> +
> /* other unproccessed error interrupts */
> m_can_handle_other_err(dev, irqstatus);
>
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
