From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBA5325A350 for ; Wed, 10 Sep 2025 08:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757494079; cv=none; b=NA0BkgKQuiwzQ6HApgvrzUi+lSCa4rcMX0hbge6MF5ajKdlPaeBjwvqWQa1xuJltgvZIM6buziTiVck2xc6N4PZGjtYm5NI/NkyH0ivU1HXF9kZL++DzUUxEa1PFG85CSgu5kgTC1bCaBWDDaTF2CI55BbVL6XUirVA5QH6xJus= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757494079; c=relaxed/simple; bh=5Wxy+cByCfGdHHb4M2ZsMYsBI19fkHCRvTB58Mup2WI=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=swSzeM2fQOf5iWGN8XnpNg4Nosfo/fWwJNKJOLqJqQ8NCJeW+Q+NUhy87Zd+ZJRIQri0IHzKchB96NTid+NmXc1+V47vtVif6PH7RbTfpgX/Xlw5MPBevcvzzkhulh6eL3IOWEDryYYzvEdYXo7XZ5x4/8mYPeZ8CuzfDLwtnQ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=VuE9AfxW; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="VuE9AfxW" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-628caee5ba2so837643a12.1 for ; Wed, 10 Sep 2025 01:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1757494074; x=1758098874; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Np8jfN3sYCP+UmiGDdyhOB20Mr6qqzZDL1HeGBXkwGc=; b=VuE9AfxW7MCHGW9SdJp/vK5WvuLsuvgOaUFfhpanXsdr+ocKybKrppHJUfKkRZy8yy bR+8XctnRcM8W2H+9vP80pKpEaor1gikmPEzehCYPvFHPJpznoi8GTqzoSz/2y7XKIXz DnlDdUX2/rSG7Jo+aTptGjH4wBmYgnX/zDsN2klgZGbBsDXlL1poSktyvbc/Oc/73D7f aRRnrWSlfzS7lB7kGRE5nUwFFPsknjYJHJ1x7ys1I/8VR/W8H6JEcYPGTTwf5f9FWDDq JXDPWEhpM766/up/yLNi/MxRZAbtL5XQHGoOI5x96+LsQrCtvxCaByuuqwvXM/J0ZZbB EsUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757494074; x=1758098874; h=in-reply-to:references:to:from:subject:cc:message-id:date :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Np8jfN3sYCP+UmiGDdyhOB20Mr6qqzZDL1HeGBXkwGc=; b=C9LyuA3cal8WhtFU6ziW4tKG5iH9S61rrBcB6i/bvKidVpgeBHOyJrA1ywJT2RBIvP 1g/m9/+sDtWROvgZWOeX8mrrIryHG8aRMy7UNHpU4fyc5xGixgK3lMYFinqLoFZSYw6u vuNc4DRV+LQNRXNnaRPgtsXV4PxcGSsW4IxAWm8tna9l7htU7dRSt8OFQog7xFbdDPly EQXWjoGAD/rZuOAUQExuRgnVBXTP9p73/OcFQcWdsGGve6qnU/cRQ+YlsqgWRIWAsHPo 5Jlo++Ff67bkIoPDoA5/yb9M67mIEIlGcWHORT2p3w/5z6P6JnBFiI3tJDAd4sSnh2k+ slnw== X-Forwarded-Encrypted: i=1; AJvYcCWMdOzTfjkGEfAJI0CDvcNd/ZR/ubzeftsean3OhWScbt8OHFkuOYf2WAV820HNIXpfadr6EEvk62owr4s=@vger.kernel.org X-Gm-Message-State: AOJu0YyKoHLezTV8y7dAchBhjxKXHsl61ccS24aHqaXMurPANVVzsfw9 tzkzUmDiZCjOaaFUh5aDaNqsr4VOj15lM1csw6Z6/fopMXl+ziHT7XTgVsayJUjiD58= X-Gm-Gg: ASbGncsKNjeAl6DnnKnTlphM7WEi6JS+7RyGSDiObx7gGR8UTy9TM7YOyFXxj6N/6Dn zGdytDPnScqoKbzcDIHOxuz+mYsIU40lRID+XV2ZuIiSe86OI+y23W0LGv6bJ/bLN15NuBjyPSn SJqtcjVeQe2/vW4f7Mlxoyj191eNj+TvDX7qyey81lG+CyTGOhkHfutizYwEiEbsLnRdq2kBJS0 aQtqdHc+G7HyG5sFN4LYKQq+wcpyBmVIyRH6OTqLVhTmsfrP8CqxwOpwgV6NeL+6EtAH4WIkEXs cF+SNraFbAYNhj1nIgFJKJN4cmEaiLKTw1nS2FrJgM3zAqsGVYv5PaFeTH/PuyD6ACCH7lEa9TY E5RsWam5GrTZff80= X-Google-Smtp-Source: AGHT+IFFXA9GkG6+WLmmoEATkhmBMPCC6WdDDdJFkTbluD5Nd2yRv1fYzfd/AlqQM/vXH5uJHFTLTg== X-Received: by 2002:a17:906:ef04:b0:af9:8739:10ca with SMTP id a640c23a62f3a-b0493282aecmr1879849966b.28.1757494074240; Wed, 10 Sep 2025 01:47:54 -0700 (PDT) Received: from localhost ([195.52.61.108]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b078340ddb3sm126731466b.96.2025.09.10.01.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 01:47:53 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: multipart/signed; boundary=8030d55e11177121433a9ebb9e4a605ad54d0a0699010de488929059151e; micalg=pgp-sha512; protocol="application/pgp-signature" Date: Wed, 10 Sep 2025 10:47:45 +0200 Message-Id: Cc: , , Subject: Re: [PATCH v2 3/7] can: m_can: m_can_handle_state_errors(): fix CAN state transition to Error Active From: "Markus Schneider-Pargmann" To: "Marc Kleine-Budde" , "Chandrasekar Ramakrishnan" , "Vincent Mailhol" , "Patrik Flykt" , "Dong Aisheng" , "Varka Bhadram" , "Wu Bo" , "Philipp Zabel" X-Mailer: aerc 0.20.1 References: <20250909-m_can-fix-state-handling-v2-0-af9fa240b68a@pengutronix.de> <20250909-m_can-fix-state-handling-v2-3-af9fa240b68a@pengutronix.de> In-Reply-To: <20250909-m_can-fix-state-handling-v2-3-af9fa240b68a@pengutronix.de> --8030d55e11177121433a9ebb9e4a605ad54d0a0699010de488929059151e Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 On Tue Sep 9, 2025 at 7:53 PM CEST, Marc Kleine-Budde wrote: > The CAN Error State is determined by the receive and transmit error > counters. The CAN error counters decrease when reception/transmission > is successful, so that a status transition back to the Error Active > status is possible. This transition is not handled by > m_can_handle_state_errors(). > > Add the missing detection of the Error Active state to > m_can_handle_state_errors() and extend the handling of this state in > m_can_handle_state_change(). > > Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support") > Fixes: cd0d83eab2e0 ("can: m_can: m_can_handle_state_change(): fix state = change") > Signed-off-by: Marc Kleine-Budde Reviewed-by: Markus Schneider-Pargmann > --- > drivers/net/can/m_can/m_can.c | 55 ++++++++++++++++++++++++++-----------= ------ > 1 file changed, 33 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.= c > index 16b38e6c3985..3edf01b098a4 100644 > --- a/drivers/net/can/m_can/m_can.c > +++ b/drivers/net/can/m_can/m_can.c > @@ -812,6 +812,9 @@ static int m_can_handle_state_change(struct net_devic= e *dev, > u32 timestamp =3D 0; > =20 > switch (new_state) { > + case CAN_STATE_ERROR_ACTIVE: > + cdev->can.state =3D CAN_STATE_ERROR_ACTIVE; > + break; > case CAN_STATE_ERROR_WARNING: > /* error warning state */ > cdev->can.can_stats.error_warning++; > @@ -841,6 +844,12 @@ static int m_can_handle_state_change(struct net_devi= ce *dev, > __m_can_get_berr_counter(dev, &bec); > =20 > switch (new_state) { > + case CAN_STATE_ERROR_ACTIVE: > + cf->can_id |=3D CAN_ERR_CRTL | CAN_ERR_CNT; > + cf->data[1] =3D CAN_ERR_CRTL_ACTIVE; > + cf->data[6] =3D bec.txerr; > + cf->data[7] =3D bec.rxerr; > + break; > case CAN_STATE_ERROR_WARNING: > /* error warning state */ > cf->can_id |=3D CAN_ERR_CRTL | CAN_ERR_CNT; > @@ -877,30 +886,33 @@ static int m_can_handle_state_change(struct net_dev= ice *dev, > return 1; > } > =20 > -static int m_can_handle_state_errors(struct net_device *dev, u32 psr) > +static enum can_state > +m_can_state_get_by_psr(struct m_can_classdev *cdev) > +{ > + u32 reg_psr; > + > + reg_psr =3D m_can_read(cdev, M_CAN_PSR); > + > + if (reg_psr & PSR_BO) > + return CAN_STATE_BUS_OFF; > + if (reg_psr & PSR_EP) > + return CAN_STATE_ERROR_PASSIVE; > + if (reg_psr & PSR_EW) > + return CAN_STATE_ERROR_WARNING; > + > + return CAN_STATE_ERROR_ACTIVE; > +} > + > +static int m_can_handle_state_errors(struct net_device *dev) > { > struct m_can_classdev *cdev =3D netdev_priv(dev); > - int work_done =3D 0; > + enum can_state new_state; > =20 > - if (psr & PSR_EW && cdev->can.state !=3D CAN_STATE_ERROR_WARNING) { > - netdev_dbg(dev, "entered error warning state\n"); > - work_done +=3D m_can_handle_state_change(dev, > - CAN_STATE_ERROR_WARNING); > - } > + new_state =3D m_can_state_get_by_psr(cdev); > + if (new_state =3D=3D cdev->can.state) > + return 0; > =20 > - if (psr & PSR_EP && cdev->can.state !=3D CAN_STATE_ERROR_PASSIVE) { > - netdev_dbg(dev, "entered error passive state\n"); > - work_done +=3D m_can_handle_state_change(dev, > - CAN_STATE_ERROR_PASSIVE); > - } > - > - if (psr & PSR_BO && cdev->can.state !=3D CAN_STATE_BUS_OFF) { > - netdev_dbg(dev, "entered error bus off state\n"); > - work_done +=3D m_can_handle_state_change(dev, > - CAN_STATE_BUS_OFF); > - } > - > - return work_done; > + return m_can_handle_state_change(dev, new_state); > } > =20 > static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus= ) > @@ -1031,8 +1043,7 @@ static int m_can_rx_handler(struct net_device *dev,= int quota, u32 irqstatus) > } > =20 > if (irqstatus & IR_ERR_STATE) > - work_done +=3D m_can_handle_state_errors(dev, > - m_can_read(cdev, M_CAN_PSR)); > + work_done +=3D m_can_handle_state_errors(dev); > =20 > if (irqstatus & IR_ERR_BUS_30X) > work_done +=3D m_can_handle_bus_errors(dev, irqstatus, --8030d55e11177121433a9ebb9e4a605ad54d0a0699010de488929059151e Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iKMEABYKAEsWIQSJYVVm/x+5xmOiprOFwVZpkBVKUwUCaME7MRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIRHG1zcEBiYXlsaWJyZS5jb20ACgkQhcFWaZAVSlOS 8AEA/Cz2GJhok5svEAkYHHWsmzLyszwnF5r0b55RL8ER42MBAMfpsfCTPI8cu+0P 6IlWMBIo+cSY4NQOgdHs7ffWTvIK =cVYp -----END PGP SIGNATURE----- --8030d55e11177121433a9ebb9e4a605ad54d0a0699010de488929059151e--