From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 29BA5205135 for ; Tue, 29 Oct 2024 11:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202393; cv=none; b=YJ8pDgEhKHl2Mq1r9U6KTGAYKxBIySfn/wc8YBrvBukNsFtRbMvTLXsujtEpBFTMjfJ65kiA7/geJ2rWiboaRzmWdoH+BlP0MkTHvRoewno3iMenCUwRrJOJUG1bMexwZiNPYg0G+EvGVmx62o4lOMLdt3ynkK4gYPmgGVfPyfs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202393; c=relaxed/simple; bh=MYi4S650y33mN73Kf9uazMkGdu+8CjicgD9fCZT8FKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dI3Dt3q/4j/srJPlikZwwMlcwiPs/SSr3uE1rYyVizBUB9eKUpMZTD8U7bTMZ7HbWF8+HD2x77SAreFK0Ira/6+e6eO4sAu3lbVs2Sll0F8fpjBgq5t/E6MlEOvEiT9W8op6dws9vWU/vFm9RtB0kBVNX08yspj+u0Zo/zxJvoI= 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=OkgwDSj5; arc=none smtp.client-ip=209.85.208.45 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="OkgwDSj5" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5c9c28c1e63so6327691a12.0 for ; Tue, 29 Oct 2024 04:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202389; x=1730807189; 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=QeZLl8zUuEL6V9/kOSR2k3pEjiYcKf6aSxS5b01tjs0=; b=OkgwDSj5bEiKIgiUaGviEZkWotgzHy0r4z7CfeOh+SoWMDpHWfJMgE1jsyF/uYDJRM bH/HaiydkrYvHTrBnamwst50mS6kSpO3GUQrLxAQTSktuRzxyP6reu3zDD94FeiP4+JK bnb8VNfsHAbqxS6mwXk0SR5MZ71zZGSuF/MV4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202389; x=1730807189; 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=QeZLl8zUuEL6V9/kOSR2k3pEjiYcKf6aSxS5b01tjs0=; b=LyXUSnjw0AacYQSNZRH9JoT91A8G6T/lDg/jfoMybuybYmjD0FpWfFriVR4X1GSfLn LvLL9lz8qkY0YhAymRlK35zLLX1VbOadtCAVVWmMrYA0voNYKUfji/SC8TTvuc7r2tdD PqnVyHgAmPM12WrlOYnNTxdGSIQzljfGybVAnNtKYNc5iOMbdJ4uCNk5uoDnBca+b3qH kpklFOVQWhnNCYHiWoPFQCzDocD5mDXmq8FCzE6lpoGWYrOSMAUS/+tPUSrCkqcKY+dx 5Ndm1B7vYa3r5lZL0ijK0kOJoc9qyB18O8aHTlsEcML5w/7OHgOLlwFBj7dBREE7kwJ7 Oc6w== X-Gm-Message-State: AOJu0Yy7ceW5pd4z8oGuBjzOqkBp5TTTb2/hBJKv/GpUZti5u6MlYfAf f+S0LgibT8uv6fsHekijYEu6vgSIEaSepcLb3cBSLzUTPLw3YltN6quS30A+DnziNHPhanNItcY vTJE= X-Google-Smtp-Source: AGHT+IG0az3xTPFahoyYAxTC+lhA3oJJQQ7Bh7+sxOSbR2RbP2MPBmSUOm7IuDoXUgWCFF2NCcbQ1g== X-Received: by 2002:a05:6402:5215:b0:5cb:ee14:d08d with SMTP id 4fb4d7f45d1cf-5cbee14d13fmr3714450a12.15.1730202389145; Tue, 29 Oct 2024 04:46:29 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:28 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Gal Pressman , Jakub Kicinski , Kory Maincent , Marc Kleine-Budde , Paolo Abeni , Sabrina Dubroca , Shannon Nelson , Vincent Mailhol , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH v3 1/6] can: dev: add generic function can_update_bus_error_stats() Date: Tue, 29 Oct 2024 12:45:25 +0100 Message-ID: <20241029114622.2989827-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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 function aims to generalize the statistics update by centralizing the related code, thus avoiding code duplication. Signed-off-by: Dario Binacchi --- Changes in v3: - Drop double assignement of "priv" variable. - Check "dev" parameter is not NULL. drivers/net/can/dev/dev.c | 30 ++++++++++++++++++++++++++++++ include/linux/can/dev.h | 1 + 2 files changed, 31 insertions(+) diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c index 6792c14fd7eb..4ad0698b0a74 100644 --- a/drivers/net/can/dev/dev.c +++ b/drivers/net/can/dev/dev.c @@ -16,6 +16,36 @@ #include #include =20 +void can_update_bus_error_stats(struct net_device *dev, struct can_frame *= cf) +{ + struct can_priv *priv; + bool rx_errors =3D false, tx_errors =3D false; + + if (!dev || !cf || !(cf->can_id & (CAN_ERR_PROT | CAN_ERR_BUSERROR))) + return; + + priv =3D netdev_priv(dev); + priv->can_stats.bus_error++; + + if ((cf->can_id & CAN_ERR_ACK) && cf->data[3] =3D=3D CAN_ERR_PROT_LOC_ACK) + tx_errors =3D true; + else if (cf->data[2] & (CAN_ERR_PROT_BIT1 | CAN_ERR_PROT_BIT0)) + tx_errors =3D true; + + if (cf->data[2] & (CAN_ERR_PROT_FORM | CAN_ERR_PROT_STUFF)) + rx_errors =3D true; + else if ((cf->data[2] & CAN_ERR_PROT_BIT) && + (cf->data[3] =3D=3D CAN_ERR_PROT_LOC_CRC_SEQ)) + rx_errors =3D true; + + if (rx_errors) + dev->stats.rx_errors++; + + if (tx_errors) + dev->stats.tx_errors++; +} +EXPORT_SYMBOL_GPL(can_update_bus_error_stats); + static void can_update_state_error_stats(struct net_device *dev, enum can_state new_state) { diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 23492213ea35..0977656b366d 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -201,6 +201,7 @@ void can_state_get_by_berr_counter(const struct net_dev= ice *dev, enum can_state *rx_state); void can_change_state(struct net_device *dev, struct can_frame *cf, enum can_state tx_state, enum can_state rx_state); +void can_update_bus_error_stats(struct net_device *dev, struct can_frame *= cf); =20 #ifdef CONFIG_OF void of_can_transceiver(struct net_device *dev); --=20 2.43.0 From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (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 382F4205AC7 for ; Tue, 29 Oct 2024 11:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202395; cv=none; b=FwMlKUxkdhvBlNMOqJ5Xz/vHlip1oMyTZ8BbANukqM+ZwpxKgLtjxaklFme3PJdxxbBSdw58YO0Ru3LGZDCGj5ACScG18nrO25EOgpP9uEV0Sq1TYlDJPcNPZP6uRzmrzlhqmdPg2WgZ3Th2u9tHvhB/U6ZbKULrGUN/DXM14JY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202395; c=relaxed/simple; bh=lvBH4nDZzUSZ6y5ghSyZfw8hPI3PkCQivKPs3UeNvug=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I+t86C2Q9T0l5Po5cwZD+0mrnEh1YSoVuw3hlHcjKux0UsfwtUYFUnYVA+we3GTF94S1dRevvecGKQzOMUgs6qTt8WSZ8WgWTv4Z9DgRYyEkoGoPs/nSYrJkWK9z7Dd6WtvtVjsRO7pskGval0YSgv3mQKgnEd0zuYvJTtfGjYM= 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=cJAgIi0/; arc=none smtp.client-ip=209.85.208.54 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="cJAgIi0/" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5c99be0a4bbso7286302a12.2 for ; Tue, 29 Oct 2024 04:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202391; x=1730807191; 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=rwyMMsHa5HEUfO6bt7mbb/5lMim+t5T1aF2qtApwxpM=; b=cJAgIi0/7SPUxJ7HNHDysZlTDGtxTn1tz/tcmQOEyXxvPbunMzaOfZCLAAl+1AOwCR qFQ3DyEVD558cPGtRGsvjhyuh5S4hAm4+Zv6IIIdfimu5w/CtlslfSCE4ep5h+zlF4uN U3Joh581iucoGm1pHb/0/50k007fFG1v3Ezq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202391; x=1730807191; 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=rwyMMsHa5HEUfO6bt7mbb/5lMim+t5T1aF2qtApwxpM=; b=R6AIeVxjivBZqIN4QtdGXEx0TMSSW35zmQtTNcXo1E04pnBaD6oF13DapKors3HaZz Ewmz6Xi4YINkEqcOxRWs9N3exMXj7LYrTQi2yAkhuEWt03g/jGMLhA9O0f6eF6if80df CHhxZwUj7KpI4/B3SL6EaFRxmCPwsOI6qoAn4YQPDKmthmCyh8el5h+aGW3DISt5uAz+ 1b8xddtGZv+3VsihyFGW16HDww7T3pc16nEUAWHEW6tttidYyg5iKTGw+oTGNod/28LK XSmcx1iKhfoo+bqf5+GMle49FmtHcxU+8DNN5wJw2Q3sLgqWkubY3jAb3bdD+2+dARuU OuXQ== X-Gm-Message-State: AOJu0Yw+PaQzBYB05plGcpE3w4Trnemqka6hJ7bJ49CzI2U0xzvnfsAk /HxWYCe6yeJBqp32wQwkdIONaUSP4EVDtsq54GVqt19DWR8tjJZ9DmevjlmGZGAXzQQkFMirkEr YgkM= X-Google-Smtp-Source: AGHT+IEZ6J2w8U62gC+m+8rB9mJkk7F6Y/9g2nTY0WJfkMv8EwABuhHpl3lj0h7DTiCw+LecXrTl/g== X-Received: by 2002:a05:6402:5191:b0:5cb:78b8:7056 with SMTP id 4fb4d7f45d1cf-5cbbfa9b3fbmr7045227a12.33.1730202391375; Tue, 29 Oct 2024 04:46:31 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:31 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Frank Li , Haibo Chen , Jakub Kicinski , Marc Kleine-Budde , Paolo Abeni , Rob Herring , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Vincent Mailhol , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH v3 2/6] can: flexcan: use can_update_bus_error_stats() Date: Tue, 29 Oct 2024 12:45:26 +0100 Message-ID: <20241029114622.2989827-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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 patch delegates the statistics update in case of bus error to the can_update_bus_error_stats(). Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/flexcan/flexcan-core.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexc= an/flexcan-core.c index ac1a860986df..790b8e162d73 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -819,7 +819,6 @@ static void flexcan_irq_bus_err(struct net_device *dev,= u32 reg_esr) struct flexcan_regs __iomem *regs =3D priv->regs; struct sk_buff *skb; struct can_frame *cf; - bool rx_errors =3D false, tx_errors =3D false; u32 timestamp; int err; =20 @@ -834,41 +833,31 @@ static void flexcan_irq_bus_err(struct net_device *de= v, u32 reg_esr) if (reg_esr & FLEXCAN_ESR_BIT1_ERR) { netdev_dbg(dev, "BIT1_ERR irq\n"); cf->data[2] |=3D CAN_ERR_PROT_BIT1; - tx_errors =3D true; } if (reg_esr & FLEXCAN_ESR_BIT0_ERR) { netdev_dbg(dev, "BIT0_ERR irq\n"); cf->data[2] |=3D CAN_ERR_PROT_BIT0; - tx_errors =3D true; } if (reg_esr & FLEXCAN_ESR_ACK_ERR) { netdev_dbg(dev, "ACK_ERR irq\n"); cf->can_id |=3D CAN_ERR_ACK; cf->data[3] =3D CAN_ERR_PROT_LOC_ACK; - tx_errors =3D true; } if (reg_esr & FLEXCAN_ESR_CRC_ERR) { netdev_dbg(dev, "CRC_ERR irq\n"); cf->data[2] |=3D CAN_ERR_PROT_BIT; cf->data[3] =3D CAN_ERR_PROT_LOC_CRC_SEQ; - rx_errors =3D true; } if (reg_esr & FLEXCAN_ESR_FRM_ERR) { netdev_dbg(dev, "FRM_ERR irq\n"); cf->data[2] |=3D CAN_ERR_PROT_FORM; - rx_errors =3D true; } if (reg_esr & FLEXCAN_ESR_STF_ERR) { netdev_dbg(dev, "STF_ERR irq\n"); cf->data[2] |=3D CAN_ERR_PROT_STUFF; - rx_errors =3D true; } =20 - priv->can.can_stats.bus_error++; - if (rx_errors) - dev->stats.rx_errors++; - if (tx_errors) - dev->stats.tx_errors++; + can_update_bus_error_stats(dev, cf); =20 err =3D can_rx_offload_queue_timestamp(&priv->offload, skb, timestamp); if (err) --=20 2.43.0 From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 42595206040 for ; Tue, 29 Oct 2024 11:46:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202398; cv=none; b=bxJTuZbPjV05uioqN8ExXT6fsIeBOgCN/CQT9chMDM/5OqlZVAmECQ4d5Mw5jNfy3Owlw0Ufnykp9Y3pprImbo41EmCVa5dbiv04Fwrf0yBxYWt44BXRjNcoknC3aUGkv3gDWECz0G9zFXaOwqBY0LGcu1hAS46K6KGawMoxXgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202398; c=relaxed/simple; bh=qRJCyHLXDHPViQRK0r4I6eZdcHjED1uaQM2TcWTM2SI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ni57tQigeoDWsrCzxHP3ZBCFzs+fEldRn1AEycxGcJAmqgeH+tiC5KeuDbCwFP4/p/FMRSdwuAxoBZaACkotCakt+dBAxuRvI/6dV5N+WYoYA/l24e8iZ+i1LZiTS6B0LanHuRmXIl6Vra7B7SzoC7aaYEau0Vo1IRm+h06SxW8= 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=KKPTYpwp; arc=none smtp.client-ip=209.85.208.47 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="KKPTYpwp" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5c99be0a4bbso7286346a12.2 for ; Tue, 29 Oct 2024 04:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202393; x=1730807193; 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=Nbw+NGEXr7m2rV0cbMmuavLOG9IUHHd4c12xVVX95f4=; b=KKPTYpwpGfJYnK8yiiOwUCNWDVQm+yMX+2hDpdwFuWDJ9OGSVnLvmfHnSrGLvFkXcs RvmZYOufCG4tGn2y6L+mt6R9u6KjKhKciJHmr/+a5o+cus1R7WE2ee9v7IFykQu5/x0c tQlIld4ZucFYl/LBHURhVuD9JYt7V1l6Rx25g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202393; x=1730807193; 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=Nbw+NGEXr7m2rV0cbMmuavLOG9IUHHd4c12xVVX95f4=; b=raLTBnHLH6SJc/BAI+hO6ll/EESAavMtG/jJBSS79piJaTfWz2hNC5Yup4oGMV2SE5 7Y6bfjSNgXaye/PqhBPE+MFCk/D0oQA/qerFzKj2SA/nX+U14KFK1TArvBkTgMGgZH5X FD6bsDgsAKOp/GAWmb9B5DnIwynvR3HLQrrFqJ5ii2SLwlGmUAjBeFAypsChxVnUNULP j9H9M3VWQIyeZoa48BFlbflhT5SYsKF8fSerX+DFEQq0F4ssyxAMEAxWLUPMgeEOoDpW wgjM8knNo/u4eVa6oLkF4rmbakqitKNMjU8tu9oF1dXdnGTEuXyPWFsm/ceVlyqY9UMF FPfA== X-Gm-Message-State: AOJu0Yx1xm3cdze7ZStZR9Y7jA9uDc8ZSUuZRR9efqY5VPXOMXVs1lz1 2omhXbCtJgYA15GmICM01lFrHju4eDulefCTWBTVPFXDr9K/xPoQqV+sHB2SX2xf/b6W3Jtly1B fIsM= X-Google-Smtp-Source: AGHT+IEr9NBZlyeYnYIfXfkfSPE8h1G/DkRYurTn5HC8Kw95XILRDI+sujvZBHNAwQ/Z179qoYcvZg== X-Received: by 2002:a05:6402:3787:b0:5c8:95ce:8cc2 with SMTP id 4fb4d7f45d1cf-5cbbf8b20c8mr8968166a12.16.1730202393242; Tue, 29 Oct 2024 04:46:33 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:32 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Marc Kleine-Budde , Vincent Mailhol , linux-can@vger.kernel.org Subject: [RFC PATCH v3 3/6] can: dev: add helpers to setup an error frame Date: Tue, 29 Oct 2024 12:45:27 +0100 Message-ID: <20241029114622.2989827-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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" These helpers can prevent errors and code duplication when setting up a CAN error frame. Signed-off-by: Dario Binacchi --- Changes in v3: - Drop the check of "cf" parameter not NULL Changes in v2: - Replace macros with static inline functions - Update the commit message include/linux/can/dev.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 0977656b366d..da85c44808d5 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -168,6 +168,43 @@ static inline bool can_dev_dropped_skb(struct net_devi= ce *dev, struct sk_buff *s return can_dropped_invalid_skb(dev, skb); } =20 +static inline void can_frame_error_init(struct can_frame *cf) +{ + cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR; +} + +static inline void can_frame_set_err_bit0(struct can_frame *cf) +{ + cf->data[2] |=3D CAN_ERR_PROT_BIT0; +} + +static inline void can_frame_set_err_bit1(struct can_frame *cf) +{ + cf->data[2] |=3D CAN_ERR_PROT_BIT1; +} + +static inline void can_frame_set_err_ack(struct can_frame *cf) +{ + cf->can_id |=3D CAN_ERR_ACK; + cf->data[3] =3D CAN_ERR_PROT_LOC_ACK; +} + +static inline void can_frame_set_err_crc(struct can_frame *cf) +{ + cf->data[2] |=3D CAN_ERR_PROT_BIT; + cf->data[3] =3D CAN_ERR_PROT_LOC_CRC_SEQ; +} + +static inline void can_frame_set_err_form(struct can_frame *cf) +{ + cf->data[2] |=3D CAN_ERR_PROT_FORM; +} + +static inline void can_frame_set_err_stuff(struct can_frame *cf) +{ + cf->data[2] |=3D CAN_ERR_PROT_STUFF; +} + void can_setup(struct net_device *dev); =20 struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb= _max, --=20 2.43.0 From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 A5B7720604C for ; Tue, 29 Oct 2024 11:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202398; cv=none; b=h8mJjfHw9d743a3msZop6uGL1k4MndiKDKnLfwJqV2YBzS4Da/WjEo+FKpxvys6wDdFqto2q9isd38Gz9Yek0kPXVuYg2yyZia+wWCqOQW/JwcjJTKhjMK+XOM0DSfm1i/lAqeqJ6C/JdwQuCcEIWhy4HB08z6Qk4B2OGv/PfhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202398; c=relaxed/simple; bh=ObcxKrOJuRTNwCOEUuw+kHKZ0OKSz2WYHmM1Yr7rSe0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i0hn2p7gKAacrT85WUCibpdZmcrckTe1UKicsguDTSSUq4F6x2gDnSeZmekqU/qF4nMYJLlCMJI9e3ep4ozlY8T915j0Conv985NvVmaE/LfZKLJ9jC+wXKYtwrMID0mTaXl7+8aEoydFF09A8Bx0Btaa3aKlPC6k4P7DKsfbcQ= 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=PinnH299; arc=none smtp.client-ip=209.85.208.48 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="PinnH299" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5cb15b84544so6760714a12.2 for ; Tue, 29 Oct 2024 04:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202395; x=1730807195; 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=7adbskWkIDNXIMmiplteQ28nVqw9eSy+g9bzGzeRhzI=; b=PinnH299/uEy4TxyYXuZhDS/pn+2eH4oHGcd9XwzRb9S4mBn0goYlyuqvWoSxyR+LD ti7Go3C6H8l850c6IlCpeqywWGELhU12icqtX3eVBXHq9bsp1hXeNAnzBJOs1Tj/AiTZ 5CucjPNsDO4bhRxzCDD3Scz0e76R6e9R6HAWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202395; x=1730807195; 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=7adbskWkIDNXIMmiplteQ28nVqw9eSy+g9bzGzeRhzI=; b=Wr07ao0dRxFGH/I+PjpwKbK4duFLB7ff0N9JTRG9y7hvlYFHnoNAB7i8noTOIgOoLg mG6TetE0QovKZG27aq6GPpl1sI+77xbWnmkt4efFuu4e5fC8ojovdsAnmCCK5sKWFTJG fUySWHX/QRvkqMElmPNFlw7MFiR9Mc+Z69RD0WkEggx04ap1Y+YBhdC7byqyI1KYjjea lbH61yrRQzX6/zxC1Pj/Ba7wMaoSSpgCXo+Uzw1NjpIzbOUu48E9bvGu59UvX6JuxAFi 3JhBBvXTuEO+7DCYsdJ2+HCqB5KJMn7pf/EDwF4MBNyHm5JzpsED6vKLbPcInLEImpy7 CKkw== X-Gm-Message-State: AOJu0YxD2WHevxaKTa5zVpcOvD0G8UdJDUR1k54FbkYNpCFymaJeoj10 RiHQimesWyQYEGT28Oj3Iam4wCZX2rZjsF/xeDdZl+KhLmW/vQ09H7xIM8aNWGAPZTyO4aThBzC rF5E= X-Google-Smtp-Source: AGHT+IEHZCG9S0yeWDe0PN2X2hte0+8dcnp+dlwTiRKwdv0plWgzGS6JkeJjpjq8WZy/HEjHYA/Vhw== X-Received: by 2002:a05:6402:43cb:b0:5cb:6ca3:af96 with SMTP id 4fb4d7f45d1cf-5cbbf8acc32mr10238323a12.19.1730202394731; Tue, 29 Oct 2024 04:46:34 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:34 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Haibo Chen , Han Xu , Jakub Kicinski , Marc Kleine-Budde , Paolo Abeni , Rob Herring , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Vincent Mailhol , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH v3 4/6] can: flexcan: use helpers to setup the error frame Date: Tue, 29 Oct 2024 12:45:28 +0100 Message-ID: <20241029114622.2989827-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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 patch replaces the code that directly accesses cf->data[] for setting up the CAN error frame with the appropriate helpers. Signed-off-by: Dario Binacchi --- (no changes since v2) Changes in v2: - Replace the macros with static inline funcions calls. - Update the commit message drivers/net/can/flexcan/flexcan-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexc= an/flexcan-core.c index 790b8e162d73..85a124a31752 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -828,33 +828,31 @@ static void flexcan_irq_bus_err(struct net_device *de= v, u32 reg_esr) if (unlikely(!skb)) return; =20 - cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR; + can_frame_error_init(cf); =20 if (reg_esr & FLEXCAN_ESR_BIT1_ERR) { netdev_dbg(dev, "BIT1_ERR irq\n"); - cf->data[2] |=3D CAN_ERR_PROT_BIT1; + can_frame_set_err_bit1(cf); } if (reg_esr & FLEXCAN_ESR_BIT0_ERR) { netdev_dbg(dev, "BIT0_ERR irq\n"); - cf->data[2] |=3D CAN_ERR_PROT_BIT0; + can_frame_set_err_bit0(cf); } if (reg_esr & FLEXCAN_ESR_ACK_ERR) { netdev_dbg(dev, "ACK_ERR irq\n"); - cf->can_id |=3D CAN_ERR_ACK; - cf->data[3] =3D CAN_ERR_PROT_LOC_ACK; + can_frame_set_err_ack(cf); } if (reg_esr & FLEXCAN_ESR_CRC_ERR) { netdev_dbg(dev, "CRC_ERR irq\n"); - cf->data[2] |=3D CAN_ERR_PROT_BIT; - cf->data[3] =3D CAN_ERR_PROT_LOC_CRC_SEQ; + can_frame_set_err_crc(cf); } if (reg_esr & FLEXCAN_ESR_FRM_ERR) { netdev_dbg(dev, "FRM_ERR irq\n"); - cf->data[2] |=3D CAN_ERR_PROT_FORM; + can_frame_set_err_form(cf); } if (reg_esr & FLEXCAN_ESR_STF_ERR) { netdev_dbg(dev, "STF_ERR irq\n"); - cf->data[2] |=3D CAN_ERR_PROT_STUFF; + can_frame_set_err_stuff(cf); } =20 can_update_bus_error_stats(dev, cf); --=20 2.43.0 From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 5F6A320605E for ; Tue, 29 Oct 2024 11:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202400; cv=none; b=IVi/691+EvCYMIzcEfmd/ShH43ypX/PEy/s+sjyQBHpbZCBHf6/xFjXyrykePnVVOz1HJe/qdQIlNdW7AUtgso9NZ0bo8XnPnH0mSk0X34arSOEJF0pHutI2eeUzB5P/dlb7wZhMdOYKrMlzA55RasfxYp0k28icyU7CG2ll9XU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202400; c=relaxed/simple; bh=0/yE3dp//A3vvjwYzpCckP/0syues54g/5VxcsiMRZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jErZ3WTg26uzuLA/Z0LE5nk/d+sW3l28zpNO2Q8yRqHSRnDbJ9kCnZ3/s/KN3CXIOnoSXbiMWRpRC56pbcuBLhXCIufzO99bDKdDt6zORkeJFQfEVlFbpuDIdMSDZCMCZFPqdSx5ANJitLitY6RJXmnhaQCZpYop4OW6tugZQCY= 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=S10ms+dy; arc=none smtp.client-ip=209.85.218.46 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="S10ms+dy" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-a9a1b71d7ffso803433566b.1 for ; Tue, 29 Oct 2024 04:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202396; x=1730807196; 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=+TS+cafYkOpOnfMipNar/zvOqT/SxcL5voxlp49ONDY=; b=S10ms+dybXzQjDLbQzaSTHjffxynuYrJ1SVOBo4acZY7YD9VdBzpr6M7Hrr9tXbdZ9 5rDbcKR+JiUYGaQ5M4Ho8V03OgCTB9dFCnVyNpZavrDc49dZ3U5o+3zQ0ycbpvzsNGL1 WwV1U6cG3mCD8i3Ro9gMJxTOzkNzWAKLFBpRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202396; x=1730807196; 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=+TS+cafYkOpOnfMipNar/zvOqT/SxcL5voxlp49ONDY=; b=On5ExHcObiB7BzThPo2zRsltsIhmywH7b+VrXTAagz8VvGvXZyyVZXMpNsIfkAHQJt fnTivALMuh/5PCh89tC9Tz3sj3IZbhijSzsafTSMrsiNKr/2MRs4cvbgTt6y9DIaurEJ 7CaLj4SSlKklRS0VeGbACrFnwD9aRoWWkZgIQOqzV2Q4Bd6kRJ10jAR97S1KabH56lGs Bh/Gam8u8K0a0tOH72OjBMNJCYAUlRKdRgA10+gC7UQG9cdsTRNknG2UOiIMd2ElOr5T Rxy+EUFJDqmk7b0FkF7LIB+dVlN/oWF1Jjh4O5vla8DnDYPefkHASCtt50actoOlq4hO Isjw== X-Gm-Message-State: AOJu0Yyx+Q8xjzOckI4cm9bM1UMmP2dYr57ooEop27VHi3Z5xN0cEKOF NQ62YID/wskl2rQUnzDU1OWkNdVYTzNJhLGM0JCz5gltjTg1P1GeRtA6i9+pUi4RBvP0GOvFPws qlfM= X-Google-Smtp-Source: AGHT+IGbgYFdBMldwJvh1QAYxgQq9RkNF80spFGp6jjZj5BcQ03m7jmdDQTRfwoDsuQjcF+Mv6prMw== X-Received: by 2002:a17:906:4fcc:b0:a9a:3dc0:8911 with SMTP id a640c23a62f3a-a9de5ce1801mr1152393966b.16.1730202396546; Tue, 29 Oct 2024 04:46:36 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:35 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Marc Kleine-Budde , Vincent Mailhol , linux-can@vger.kernel.org Subject: [RFC PATCH v3 5/6] can: netlink: extend stats to the error types (ack, CRC, form, ...) Date: Tue, 29 Oct 2024 12:45:29 +0100 Message-ID: <20241029114622.2989827-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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 CAN bus protocol specifies 5 CAN error types: - Bit Error [Transmitter] - Bit Stuffing Error [Receiver] - Form Error [Receiver] - ACK Error (Acknowledgment) [Transmitter] - CRC Error (Cyclic Redundancy Check) [Receiver] The patch also adds the corresponding counters to the statistics. Since each device/driver can determine which of these errors has occurred, why not export this information along with the more general counters? Signed-off-by: Dario Binacchi --- (no changes since v1) include/uapi/linux/can/netlink.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netl= ink.h index 02ec32d69474..8b33549e7e19 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -114,6 +114,12 @@ struct can_device_stats { __u32 bus_off; /* Changes to bus off state */ __u32 arbitration_lost; /* Arbitration lost errors */ __u32 restarts; /* CAN controller re-starts */ + __u32 bit_error; /* Bit error */ + __u32 stuff_error; /* Bit stuffing error */ + __u32 form_error; /* form error */ + __u32 ack_error; /* ack error */ + __u32 crc_error; /* CRC error */ + __u32 pad; }; =20 /* --=20 2.43.0 From nobody Sun Feb 8 13:43:19 2026 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 B98B220695B for ; Tue, 29 Oct 2024 11:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202402; cv=none; b=u9tPEinvxcnmHmjc49/yZYlBeMycLtR754kw1xY/TbG3iu+agj8xnahH2rFM1V64kOKPAW4cpbu8AWHeCMoWQDfyNGy0RWx++MiEaSSgPCI2anmXpmcDslbfxiyBrnExQef2l6UV6IrXySwOzAvPrme8tib/QqXBnlxIJCAMZns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730202402; c=relaxed/simple; bh=zGQNeCdJfkEacQEWhKkyV5Ry31CnGCgUtEGDHPY8Ta4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eaObVe1ReM3UWQdTnH3J5ex0OAHxyzjM5PsGnfcSsY7Q2UHayiSFk9a7Eq5RS8pgTZytUtWRWdtboBftg/oOO3PnwquhWeNTkYTlqIywad5ZOWIt6e7EY5VkohpfcnrmY0MUxb70ApNslegFJEXKF69JePfKJ9FVDrtzial9Sb8= 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=qevd+j0V; arc=none smtp.client-ip=209.85.208.52 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="qevd+j0V" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5c9454f3bfaso6385079a12.2 for ; Tue, 29 Oct 2024 04:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730202399; x=1730807199; 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=I7zf1SxmTLYYJKdIBWggPPFkkyvCdLLyYv8BJT477vU=; b=qevd+j0VfLZCBEtrY68CFWvqnI32U6jQGkuFLKhVohrN3u084HFOk7u3latWqJPE9p fktwG9TBisZm1INugFL94ydvswjdNbATutcprpDWO1Y56BqNpn438CDkFXonvqxV5Bua r8spWVhzbICqRQ5hxfZYo1S/f/+P/6gduESLY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730202399; x=1730807199; 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=I7zf1SxmTLYYJKdIBWggPPFkkyvCdLLyYv8BJT477vU=; b=O4lzHs3LRB75+brDpYGWKMwQFYxJQt3HRHpmCSOfZNnSZy3qADMY8O5gtLBo2eaVzN ZDeDtCEFlN5b9v9CNZSiibjGJ8AbRn2Sq+AWDXSz5B96VyCY3uvuY0nN9+X2fCb978eJ dMo1q508v+wedKhSWGChvQvFDxC/R5OEp1qS42pBxBth+CpdKXvm+1dDxEq5dNN4CYjO UKeOKkdOoLZhb0OBcef1RXUYA2JtBl3sBmR2WcMJogEIHMeSFl3Nvbs8OBG+RrJNokHD rv6m8wD0oFHaiwj7YHGcbj7dSTRpDoCn50+mUP8v5A5xcqXXsDEviKlu+q0w8Hasn8VB X6KQ== X-Gm-Message-State: AOJu0Yzb1BUdCOKRerGSFkb5tUnVxjZNwodx3xpH7fl/+wcLWzxlpftp eQ1HR+e88/MpevZP0hGtF30tEkpKmJLPRSmsx4QkDJiFUjlL8jiIwxkXrEapeIrRuXZDuC2dXk2 L/mA= X-Google-Smtp-Source: AGHT+IFQPjRGEu5AzAkALhjbGjgLzCygsqqvVu/v3wZnXp+FNxqihXgz0zlaCUYVkgQ0pA+esg6IPw== X-Received: by 2002:a05:6402:40d5:b0:5c9:4022:872d with SMTP id 4fb4d7f45d1cf-5cbbfa66f3dmr9918447a12.32.1730202398864; Tue, 29 Oct 2024 04:46:38 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.41.207]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cbb6297a09sm3869301a12.21.2024.10.29.04.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 04:46:38 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Gal Pressman , Jakub Kicinski , Kory Maincent , Marc Kleine-Budde , Paolo Abeni , Rahul Rameshbabu , Shannon Nelson , Vincent Mailhol , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC PATCH v3 6/6] can: dev: update the error types stats (ack, CRC, form, ...) Date: Tue, 29 Oct 2024 12:45:30 +0100 Message-ID: <20241029114622.2989827-7-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241029114622.2989827-1-dario.binacchi@amarulasolutions.com> References: <20241029114622.2989827-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 patch modifies can_update_bus_error_stats() by also updating the counters related to the types of CAN errors. Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/dev/dev.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c index 4ad0698b0a74..ed2bdc6fe4a1 100644 --- a/drivers/net/can/dev/dev.c +++ b/drivers/net/can/dev/dev.c @@ -27,16 +27,31 @@ void can_update_bus_error_stats(struct net_device *dev,= struct can_frame *cf) priv =3D netdev_priv(dev); priv->can_stats.bus_error++; =20 - if ((cf->can_id & CAN_ERR_ACK) && cf->data[3] =3D=3D CAN_ERR_PROT_LOC_ACK) + if ((cf->can_id & CAN_ERR_ACK) && cf->data[3] =3D=3D CAN_ERR_PROT_LOC_ACK= ) { + priv->can_stats.ack_error++; tx_errors =3D true; - else if (cf->data[2] & (CAN_ERR_PROT_BIT1 | CAN_ERR_PROT_BIT0)) + } + + if (cf->data[2] & (CAN_ERR_PROT_BIT1 | CAN_ERR_PROT_BIT0)) { + priv->can_stats.bit_error++; tx_errors =3D true; + } =20 - if (cf->data[2] & (CAN_ERR_PROT_FORM | CAN_ERR_PROT_STUFF)) + if (cf->data[2] & CAN_ERR_PROT_FORM) { + priv->can_stats.form_error++; rx_errors =3D true; - else if ((cf->data[2] & CAN_ERR_PROT_BIT) && - (cf->data[3] =3D=3D CAN_ERR_PROT_LOC_CRC_SEQ)) + } + + if (cf->data[2] & CAN_ERR_PROT_STUFF) { + priv->can_stats.stuff_error++; rx_errors =3D true; + } + + if ((cf->data[2] & CAN_ERR_PROT_BIT) && + cf->data[3] =3D=3D CAN_ERR_PROT_LOC_CRC_SEQ) { + priv->can_stats.crc_error++; + rx_errors =3D true; + } =20 if (rx_errors) dev->stats.rx_errors++; --=20 2.43.0