From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A24F6C43334 for ; Mon, 13 Jun 2022 07:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229514AbiFMHhX (ORCPT ); Mon, 13 Jun 2022 03:37:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbiFMHhW (ORCPT ); Mon, 13 Jun 2022 03:37:22 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 251B8399 for ; Mon, 13 Jun 2022 00:37:20 -0700 (PDT) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=bjornoya.blackshift.org) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o0edJ-0006ct-5A; Mon, 13 Jun 2022 09:37:09 +0200 Received: from pengutronix.de (unknown [IPv6:2a01:4f8:1c1c:29e9:22:41ff:fe00:1400]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id 27A7993925; Mon, 13 Jun 2022 07:37:07 +0000 (UTC) Date: Mon, 13 Jun 2022 09:37:06 +0200 From: Marc Kleine-Budde To: Dario Binacchi Cc: linux-kernel@vger.kernel.org, michael@amarulasolutions.com, Amarula patchwork , Oliver Hartkopp , "David S. Miller" , Eric Dumazet , Greg Kroah-Hartman , Jakub Kicinski , Jiri Slaby , Paolo Abeni , Sebastian Andrzej Siewior , Vincent Mailhol , Wolfgang Grandegger , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH v3 13/13] can: slcan: extend the protocol with CAN state info Message-ID: <20220613073706.rk3bve57zi2p3nnz@pengutronix.de> References: <20220612213927.3004444-1-dario.binacchi@amarulasolutions.com> <20220612213927.3004444-14-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="6oqspa3zxzgl76ei" Content-Disposition: inline In-Reply-To: <20220612213927.3004444-14-dario.binacchi@amarulasolutions.com> X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-can@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-can@vger.kernel.org --6oqspa3zxzgl76ei Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 12.06.2022 23:39:27, Dario Binacchi wrote: > It extends the protocol to receive the adapter CAN state changes > (warning, busoff, etc.) and forward them to the netdev upper levels. >=20 > Signed-off-by: Dario Binacchi >=20 > --- >=20 > Changes in v3: > - Drop the patch "can: slcan: simplify the device de-allocation". > - Add the patch "can: netlink: dump bitrate 0 if can_priv::bittiming.bitr= ate is -1U". >=20 > Changes in v2: > - Continue error handling even if no skb can be allocated. >=20 > drivers/net/can/slcan/slcan-core.c | 66 ++++++++++++++++++++++++++++++ > 1 file changed, 66 insertions(+) >=20 > diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/s= lcan-core.c > index 48077edb9497..5ba1c141f942 100644 > --- a/drivers/net/can/slcan/slcan-core.c > +++ b/drivers/net/can/slcan/slcan-core.c > @@ -78,6 +78,9 @@ MODULE_PARM_DESC(maxdev, "Maximum number of slcan inter= faces"); > #define SLC_CMD_LEN 1 > #define SLC_SFF_ID_LEN 3 > #define SLC_EFF_ID_LEN 8 > +#define SLC_STATE_LEN 1 > +#define SLC_STATE_BE_RXCNT_LEN 3 > +#define SLC_STATE_BE_TXCNT_LEN 3 > =20 > struct slcan { > struct can_priv can; > @@ -175,6 +178,67 @@ int slcan_enable_err_rst_on_open(struct net_device *= ndev, bool on) > * STANDARD SLCAN DECAPSULATION * > **********************************************************************= **/ > =20 > +static void slc_bump_state(struct slcan *sl) > +{ > + struct net_device *dev =3D sl->dev; > + struct sk_buff *skb; > + struct can_frame *cf; > + char *cmd =3D sl->rbuff; > + u32 rxerr, txerr; > + enum can_state state, rx_state, tx_state; > + > + if (*cmd !=3D 's') > + return; Checked by the caller? > + > + cmd +=3D SLC_CMD_LEN; > + switch (*cmd) { > + case 'a': > + state =3D CAN_STATE_ERROR_ACTIVE; > + break; > + case 'w': > + state =3D CAN_STATE_ERROR_WARNING; > + break; > + case 'p': > + state =3D CAN_STATE_ERROR_PASSIVE; > + break; > + case 'f': > + state =3D CAN_STATE_BUS_OFF; > + break; > + default: > + return; > + } > + > + if (state =3D=3D sl->can.state) > + return; > + > + cmd +=3D SLC_STATE_BE_RXCNT_LEN + 1; Have you checked that you have received that much data? > + cmd[SLC_STATE_BE_TXCNT_LEN] =3D 0; > + if (kstrtou32(cmd, 10, &txerr)) > + return; > + > + *cmd =3D 0; > + cmd -=3D SLC_STATE_BE_RXCNT_LEN; > + if (kstrtou32(cmd, 10, &rxerr)) > + return; Why do you parse TX first and then RX? > + > + skb =3D alloc_can_err_skb(dev, &cf); > + > + if (skb) { > + cf->data[6] =3D txerr; > + cf->data[7] =3D rxerr; > + } > + > + tx_state =3D txerr >=3D rxerr ? state : 0; > + rx_state =3D txerr <=3D rxerr ? state : 0; > + can_change_state(dev, skb ? cf : NULL, tx_state, rx_state); alloc_can_err_skb() set cf to NULL if no skb can be allocated. > + > + if (state =3D=3D CAN_STATE_BUS_OFF) > + can_bus_off(dev); > + > + if (skb) > + netif_rx(skb); > +} > + > static void slc_bump_err(struct slcan *sl) > { > struct net_device *dev =3D sl->dev; > @@ -378,6 +442,8 @@ static void slc_bump(struct slcan *sl) > return slc_bump_frame(sl); > case 'e': > return slc_bump_err(sl); > + case 's': > + return slc_bump_state(sl); > default: > return; > } > --=20 > 2.32.0 >=20 >=20 Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | --6oqspa3zxzgl76ei Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEBsvAIBsPu6mG7thcrX5LkNig010FAmKm6R8ACgkQrX5LkNig 013IcQf/RNMwVpm+FAcGxglx3iuEuWVuSiGq7MbcJwkk76TTGqujlPrtx/PrlcPc 80btvN7GEUIe7067Xh5bW2828IbgFLoJPqtJImGSt9Fq2g2tf+VhIREg/QVRrmOp tFbexW9NJRxtE8Lzv8Uwngyap2RiksFQ6ik6J7Rlb7sNYs3JHPdCNtOi/8wS+oH1 cj2tM5yhxd491oPOqO6TAMJknsC2MErKYDn+ItY55g5mF25C/CTu5K7dU4PMMNJY adIgjFWWhGa/0lu/MM8Qrq27f4ZObDRN5D0HqeweicJnxrxAn20pYxVCnNgObgKW dXmzRRsn95N1rt+i1/1mF/lijO3Vsg== =5O8X -----END PGP SIGNATURE----- --6oqspa3zxzgl76ei--