* [PATCH v3] can: m_can: add support for handling arbitration error [not found] <CGME20191030114039epcas5p434c9a7ffb715f2af2f4d3745239b5bbd@epcas5p4.samsung.com> @ 2019-10-30 11:38 ` Pankaj Sharma 2019-11-06 5:59 ` pankj.sharma 2019-11-06 10:35 ` Marc Kleine-Budde 0 siblings, 2 replies; 4+ messages in thread From: Pankaj Sharma @ 2019-10-30 11:38 UTC (permalink / raw) To: linux-can, netdev, linux-kernel Cc: wg, mkl, davem, pankaj.dubey, rcsekar, jhofstee, simon.horman, Pankaj Sharma, Sriram Dash 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.sharma@samsung.com> Signed-off-by: Sriram Dash <sriram.dash@samsung.com> --- changes in v3: - handle arbitration lost stats even if the allocation of the skb fails changes in v2: - common m_can_ prefix for is_protocol_err function - handling stats even if the allocation of the skb fails - resolving build errors on net-next branch drivers/net/can/m_can/m_can.c | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 75e7490c4299..02c5795b7393 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -778,6 +778,43 @@ static inline bool is_lec_err(u32 psr) return psr && (psr != LEC_UNUSED); } +static inline bool m_can_is_protocol_err(u32 irqstatus) +{ + return irqstatus & IR_ERR_LEC_31X; +} + +static int m_can_handle_protocol_error(struct net_device *dev, u32 irqstatus) +{ + struct net_device_stats *stats = &dev->stats; + struct m_can_classdev *cdev = 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); + + /* update tx error stats since there is protocol error */ + stats->tx_errors++; + + /* update arbitration lost status */ + if (cdev->version >= 31 && (irqstatus & IR_PEA)) { + netdev_dbg(dev, "Protocol error in Arbitration fail\n"); + cdev->can.can_stats.arbitration_lost++; + if (skb) { + cf->can_id |= CAN_ERR_LOSTARB; + cf->data[0] |= CAN_ERR_LOSTARB_UNSPEC; + } + } + + if (unlikely(!skb)) { + netdev_dbg(dev, "allocation of skb failed\n"); + return 0; + } + netif_receive_skb(skb); + + return 1; +} + static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, u32 psr) { @@ -792,6 +829,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 ((cdev->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) && + m_can_is_protocol_err(irqstatus)) + work_done += m_can_handle_protocol_error(dev, irqstatus); + /* other unproccessed error interrupts */ m_can_handle_other_err(dev, irqstatus); -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH v3] can: m_can: add support for handling arbitration error 2019-10-30 11:38 ` [PATCH v3] can: m_can: add support for handling arbitration error Pankaj Sharma @ 2019-11-06 5:59 ` pankj.sharma 2019-11-06 10:35 ` Marc Kleine-Budde 1 sibling, 0 replies; 4+ messages in thread From: pankj.sharma @ 2019-11-06 5:59 UTC (permalink / raw) To: mkl, wg Cc: davem, pankaj.dubey, rcsekar, jhofstee, simon.horman, 'Sriram Dash', linux-can, netdev, linux-kernel Gentle Ping! > From: Pankaj Sharma <pankj.sharma@samsung.com> > Subject: [PATCH v3] can: m_can: add support for handling arbitration error > > 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.sharma@samsung.com> > Signed-off-by: Sriram Dash <sriram.dash@samsung.com> > --- > > changes in v3: > - handle arbitration lost stats even if the allocation of the skb fails > > changes in v2: > - common m_can_ prefix for is_protocol_err function > - handling stats even if the allocation of the skb fails > - resolving build errors on net-next branch > > drivers/net/can/m_can/m_can.c | 42 > +++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c > index 75e7490c4299..02c5795b7393 100644 > --- a/drivers/net/can/m_can/m_can.c > +++ b/drivers/net/can/m_can/m_can.c > @@ -778,6 +778,43 @@ static inline bool is_lec_err(u32 psr) > return psr && (psr != LEC_UNUSED); > } > > +static inline bool m_can_is_protocol_err(u32 irqstatus) { > + return irqstatus & IR_ERR_LEC_31X; > +} > + > +static int m_can_handle_protocol_error(struct net_device *dev, u32 > +irqstatus) { > + struct net_device_stats *stats = &dev->stats; > + struct m_can_classdev *cdev = 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); > + > + /* update tx error stats since there is protocol error */ > + stats->tx_errors++; > + > + /* update arbitration lost status */ > + if (cdev->version >= 31 && (irqstatus & IR_PEA)) { > + netdev_dbg(dev, "Protocol error in Arbitration fail\n"); > + cdev->can.can_stats.arbitration_lost++; > + if (skb) { > + cf->can_id |= CAN_ERR_LOSTARB; > + cf->data[0] |= CAN_ERR_LOSTARB_UNSPEC; > + } > + } > + > + if (unlikely(!skb)) { > + netdev_dbg(dev, "allocation of skb failed\n"); > + return 0; > + } > + netif_receive_skb(skb); > + > + return 1; > +} > + > static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, > u32 psr) > { > @@ -792,6 +829,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 ((cdev->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) && > + m_can_is_protocol_err(irqstatus)) > + work_done += m_can_handle_protocol_error(dev, irqstatus); > + > /* other unproccessed error interrupts */ > m_can_handle_other_err(dev, irqstatus); > > -- > 2.17.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v3] can: m_can: add support for handling arbitration error @ 2019-11-06 5:59 ` pankj.sharma 0 siblings, 0 replies; 4+ messages in thread From: pankj.sharma @ 2019-11-06 5:59 UTC (permalink / raw) To: mkl, wg Cc: davem, pankaj.dubey, rcsekar, jhofstee, simon.horman, 'Sriram Dash', linux-can, netdev, linux-kernel Gentle Ping! > From: Pankaj Sharma <pankj.sharma@samsung.com> > Subject: [PATCH v3] can: m_can: add support for handling arbitration error > > 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.sharma@samsung.com> > Signed-off-by: Sriram Dash <sriram.dash@samsung.com> > --- > > changes in v3: > - handle arbitration lost stats even if the allocation of the skb fails > > changes in v2: > - common m_can_ prefix for is_protocol_err function > - handling stats even if the allocation of the skb fails > - resolving build errors on net-next branch > > drivers/net/can/m_can/m_can.c | 42 > +++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c > index 75e7490c4299..02c5795b7393 100644 > --- a/drivers/net/can/m_can/m_can.c > +++ b/drivers/net/can/m_can/m_can.c > @@ -778,6 +778,43 @@ static inline bool is_lec_err(u32 psr) > return psr && (psr != LEC_UNUSED); > } > > +static inline bool m_can_is_protocol_err(u32 irqstatus) { > + return irqstatus & IR_ERR_LEC_31X; > +} > + > +static int m_can_handle_protocol_error(struct net_device *dev, u32 > +irqstatus) { > + struct net_device_stats *stats = &dev->stats; > + struct m_can_classdev *cdev = 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); > + > + /* update tx error stats since there is protocol error */ > + stats->tx_errors++; > + > + /* update arbitration lost status */ > + if (cdev->version >= 31 && (irqstatus & IR_PEA)) { > + netdev_dbg(dev, "Protocol error in Arbitration fail\n"); > + cdev->can.can_stats.arbitration_lost++; > + if (skb) { > + cf->can_id |= CAN_ERR_LOSTARB; > + cf->data[0] |= CAN_ERR_LOSTARB_UNSPEC; > + } > + } > + > + if (unlikely(!skb)) { > + netdev_dbg(dev, "allocation of skb failed\n"); > + return 0; > + } > + netif_receive_skb(skb); > + > + return 1; > +} > + > static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, > u32 psr) > { > @@ -792,6 +829,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 ((cdev->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) && > + m_can_is_protocol_err(irqstatus)) > + work_done += m_can_handle_protocol_error(dev, irqstatus); > + > /* other unproccessed error interrupts */ > m_can_handle_other_err(dev, irqstatus); > > -- > 2.17.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] can: m_can: add support for handling arbitration error 2019-10-30 11:38 ` [PATCH v3] can: m_can: add support for handling arbitration error Pankaj Sharma 2019-11-06 5:59 ` pankj.sharma @ 2019-11-06 10:35 ` Marc Kleine-Budde 1 sibling, 0 replies; 4+ messages in thread From: Marc Kleine-Budde @ 2019-11-06 10:35 UTC (permalink / raw) To: Pankaj Sharma, linux-can, netdev, linux-kernel Cc: wg, davem, pankaj.dubey, rcsekar, jhofstee, simon.horman, Sriram Dash [-- Attachment #1.1: Type: text/plain, Size: 1032 bytes --] On 10/30/19 12:38 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.sharma@samsung.com> > Signed-off-by: Sriram Dash <sriram.dash@samsung.com> Added to linux-can-next. Tnx, 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 | [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-06 10:35 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <CGME20191030114039epcas5p434c9a7ffb715f2af2f4d3745239b5bbd@epcas5p4.samsung.com> 2019-10-30 11:38 ` [PATCH v3] can: m_can: add support for handling arbitration error Pankaj Sharma 2019-11-06 5:59 ` pankj.sharma 2019-11-06 5:59 ` pankj.sharma 2019-11-06 10:35 ` Marc Kleine-Budde
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.