From nobody Mon Feb 9 04:13:53 2026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (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 7A6B91DFDAD for ; Fri, 22 Nov 2024 22:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732313832; cv=none; b=cbZuEhCFcQYjQWXtulow1+F7uMQjaVc4nVr8apRc+we2fMuFpsTqtwTDlcEWttz2qynVJccknP5ApB11ukGyI+SwO30XhPM5wlXNb6Bz7Vm5Ff4M4l3F/PAZIXCda2wiA92HTUHrNW1mzDvogbQHuMB9uzFlNddpC5vsUu+ag/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732313832; c=relaxed/simple; bh=g+KZ+ry5q1eHB2f8lrq1UHjK33bU6W/wJPSO8TRzCfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N16p609Zw2T+lRfJDRqaMW9ZADn+YaUsq4sEsqcHYJp/Ga96GS4P/VFg5NtynUazGuELeSriXq+4mKU8+Ik8cau+JtHVVDjoDdF1aJalHBLM26umx40OQGuf4FekHz6Oxwn0diYdkJWpqfZ7y4cGLno8CJv8vFWmlyfZweBVDXE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com; spf=pass smtp.mailfrom=amarulasolutions.com; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b=Nkk8U3pL; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Nkk8U3pL" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2fb51e00c05so45996431fa.0 for ; Fri, 22 Nov 2024 14:17:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1732313828; x=1732918628; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zeHUsvNMH4naO2lNY0rPoAp0glNUJp2xtRk2ah0U1WQ=; b=Nkk8U3pL2ZODtjNeyIgevRNEO70N9eFjwCKc8MqwrWSCwjy6Ep9mux5NrXE4bKgoXR lIXddL9p4OvpdXOdDR4Mpl1nkGZRQ/YYqqW5dbzMCAMpO+SAvm5LIlyk/Z5EaKMkt18X 6LWdzfKuUOtgn7QCX6Lc5sMnbrmFDJi7D2fDE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732313828; x=1732918628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zeHUsvNMH4naO2lNY0rPoAp0glNUJp2xtRk2ah0U1WQ=; b=NvcDk0a21ZCo8U6eG8eEkM9MZqnPmE29CHnGtcJQCMOYAwBr7LUN1jZav31QwkqP6D GW4lorLvHGPu4VRas8W7nvFrGyKFmUoQFqH3zzE5NJDzR6GmrxnXLa8luc7YJFXWXh+G ZrFowJYRKuCrpE7OT1xd/AmedW+lW/I/aOF53LR2DsG5PrXXHY9al5oAboXtB5GGQ75t aubzyO6aHMiYdQsMqW3OZfmiEkREFIhy5Gm7QuToC3tQ1nyvQ9SpGoTCgOZTcI2ng0vv ByVcRMdo8+EqEmsCCk3eP7He6FtyTQSbDChADly9J0AVs0fwxTWLrHYiElFV46eZjZ8R fJqg== X-Gm-Message-State: AOJu0Ywk6kyVw2luxpw9wWruEevBl1ExkA2ve/jZx5iOt8NZEu5s2lC8 rH7GVoNgzu7XSO7PyUd9D68OwncYHDkWnmOp+sgo6FGjoGZi8P+4fHGJKqHYHaxUrAspNeuW4FR d X-Gm-Gg: ASbGncsP5CgX3PdrZ8b4rJdOWZtrdh38NbZYwHpqPPKQM0eBM/OZI4xKXtctu6EaTD3 F/8ZiUupSnc5yW80k321/j7H2bYkE71VWAaHgTe5MG6coYSl12ffN4xdwmRuQoOnK6YcBjAgz2n OarJzoSMxQK556ilqxsQLJYrOdFx+xz4i6yw4X5+tQUthRAMcTMSYkQ3fzoOHBEB87P4zBT0EXe t8o3hG6yHCD08RqHAM2ro+ncxXa2S0TAKoW5xSv+4rFwMutkzYnkBaFhMZeLXqb9OePEIbV9ein gd6Wjhn6QGBxRTsMxyueGoijRkPI0KvLwjGPRFAo8I/NlXmbBv5ijj2LQUj9lRMP8MqM1OHnKXa cuZPQQg/bwJoI133u X-Google-Smtp-Source: AGHT+IEeFI0foJ6eMpkRjwKJ8WGldp4YObFth65iZk3Vn0s08/RYBKCV/cARJA+mH4yYzwEk4Lk/IA== X-Received: by 2002:a2e:a58b:0:b0:2fb:36df:3b4 with SMTP id 38308e7fff4ca-2ffa7187eb1mr50418561fa.34.1732313828318; Fri, 22 Nov 2024 14:17:08 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-82-54-94-193.retail.telecomitalia.it. [82.54.94.193]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b52fcebsm148226466b.127.2024.11.22.14.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2024 14:17:08 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , "David S. Miller" , Marc Kleine-Budde , Sebastian Haas , Vincent Mailhol , Wolfgang Grandegger , linux-can@vger.kernel.org Subject: [PATCH v2 11/12] can: ems_usb: fix {rx,tx}_errors statistics Date: Fri, 22 Nov 2024 23:15:52 +0100 Message-ID: <20241122221650.633981-12-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241122221650.633981-1-dario.binacchi@amarulasolutions.com> References: <20241122221650.633981-1-dario.binacchi@amarulasolutions.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ems_usb_rx_err() function only incremented the receive error counter and never the transmit error counter, even if the ECC_DIR flag reported that an error had occurred during transmission. Increment the receive/transmit error counter based on the value of the ECC_DIR flag. Fixes: 702171adeed3 ("ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB i= nterface") Signed-off-by: Dario Binacchi --- Changes in v2: - Update statistics even if skb allocation fails drivers/net/can/usb/ems_usb.c | 58 ++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 050c0b49938a..5355bac4dccb 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@ -335,15 +335,14 @@ static void ems_usb_rx_err(struct ems_usb *dev, struc= t ems_cpc_msg *msg) struct net_device_stats *stats =3D &dev->netdev->stats; =20 skb =3D alloc_can_err_skb(dev->netdev, &cf); - if (skb =3D=3D NULL) - return; =20 if (msg->type =3D=3D CPC_MSG_TYPE_CAN_STATE) { u8 state =3D msg->msg.can_state; =20 if (state & SJA1000_SR_BS) { dev->can.state =3D CAN_STATE_BUS_OFF; - cf->can_id |=3D CAN_ERR_BUSOFF; + if (skb) + cf->can_id |=3D CAN_ERR_BUSOFF; =20 dev->can.can_stats.bus_off++; can_bus_off(dev->netdev); @@ -361,44 +360,53 @@ static void ems_usb_rx_err(struct ems_usb *dev, struc= t ems_cpc_msg *msg) =20 /* bus error interrupt */ dev->can.can_stats.bus_error++; - stats->rx_errors++; =20 - cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR; + if (skb) { + cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR; =20 - switch (ecc & SJA1000_ECC_MASK) { - case SJA1000_ECC_BIT: - cf->data[2] |=3D CAN_ERR_PROT_BIT; - break; - case SJA1000_ECC_FORM: - cf->data[2] |=3D CAN_ERR_PROT_FORM; - break; - case SJA1000_ECC_STUFF: - cf->data[2] |=3D CAN_ERR_PROT_STUFF; - break; - default: - cf->data[3] =3D ecc & SJA1000_ECC_SEG; - break; + switch (ecc & SJA1000_ECC_MASK) { + case SJA1000_ECC_BIT: + cf->data[2] |=3D CAN_ERR_PROT_BIT; + break; + case SJA1000_ECC_FORM: + cf->data[2] |=3D CAN_ERR_PROT_FORM; + break; + case SJA1000_ECC_STUFF: + cf->data[2] |=3D CAN_ERR_PROT_STUFF; + break; + default: + cf->data[3] =3D ecc & SJA1000_ECC_SEG; + break; + } } =20 /* Error occurred during transmission? */ - if ((ecc & SJA1000_ECC_DIR) =3D=3D 0) - cf->data[2] |=3D CAN_ERR_PROT_TX; + if ((ecc & SJA1000_ECC_DIR) =3D=3D 0) { + stats->tx_errors++; + if (skb) + cf->data[2] |=3D CAN_ERR_PROT_TX; + } else { + stats->rx_errors++; + } =20 - if (dev->can.state =3D=3D CAN_STATE_ERROR_WARNING || - dev->can.state =3D=3D CAN_STATE_ERROR_PASSIVE) { + if (skb && (dev->can.state =3D=3D CAN_STATE_ERROR_WARNING || + dev->can.state =3D=3D CAN_STATE_ERROR_PASSIVE)) { cf->can_id |=3D CAN_ERR_CRTL; cf->data[1] =3D (txerr > rxerr) ? CAN_ERR_CRTL_TX_PASSIVE : CAN_ERR_CRTL_RX_PASSIVE; } } else if (msg->type =3D=3D CPC_MSG_TYPE_OVERRUN) { - cf->can_id |=3D CAN_ERR_CRTL; - cf->data[1] =3D CAN_ERR_CRTL_RX_OVERFLOW; + if (skb) { + cf->can_id |=3D CAN_ERR_CRTL; + cf->data[1] =3D CAN_ERR_CRTL_RX_OVERFLOW; + } =20 stats->rx_over_errors++; stats->rx_errors++; } =20 - netif_rx(skb); + if (skb) + netif_rx(skb); } =20 /* --=20 2.43.0