From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00DA3217707; Thu, 12 Dec 2024 15:30:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734017448; cv=none; b=jhrWdfFjA9t2tGanSotoYZal5BiUNOYKGugPZjbWpbhCVYR9xx+1IEw8qXEqti1352mIQ9ZPkz22AzF213uJiaz9kagY8qA26o9NH5tBZvGIvAkgMcNnHPpNWmrFT9xtByq69d/1JdRZtR1RxKOlmWgwwqrJjQ2ArqzZWuWQ2TM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734017448; c=relaxed/simple; bh=Qp3tkI5E/R9a3wADCsnthJdkrgF9Ds0r+4RwWx4HuMc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VlGnIJupjW441Txbjg0WtQcJLRVzDnhfEXl7PtSKx9+HkDeIMXk6Ttmr6ZEcG9UhNEeBbljUTe9T0Ny94w3z+MeSXWgIdShep9YBkd06LNKXDryjRj3mpvQG0f95rS81PS5KSXAeHOctfOO7V3FKuznUSU05epXywSuhDHGBUK4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Z1f0/F1g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Z1f0/F1g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DACAC4CECE; Thu, 12 Dec 2024 15:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734017447; bh=Qp3tkI5E/R9a3wADCsnthJdkrgF9Ds0r+4RwWx4HuMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z1f0/F1gCKbNs5fZT2VAiuVonAyGhEobKaUBDIM55nTludl/roZZXc3OzEzrzTmXJ V/NfuqIOHdI6P0ulSq7NpEp1hxkG3nU/zRTgk52cRt0Bl9yDiHWNc1lSlQDEDMm4st DLwIyajAWh0KADvZuDGRA4rTOrsiF84EPRoPNEUE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dario Binacchi , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.6 016/356] can: f81604: f81604_handle_can_bus_errors(): fix {rx,tx}_errors statistics Date: Thu, 12 Dec 2024 15:55:35 +0100 Message-ID: <20241212144245.263910270@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144244.601729511@linuxfoundation.org> References: <20241212144244.601729511@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dario Binacchi [ Upstream commit d7b916540c2ba3d2a88c27b2a6287b39d8eac052 ] The f81604_handle_can_bus_errors() 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: 88da17436973 ("can: usb: f81604: add Fintek F81604 support") Signed-off-by: Dario Binacchi Link: https://patch.msgid.link/20241122221650.633981-13-dario.binacchi@amarulasolutions.com Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/usb/f81604.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/usb/f81604.c b/drivers/net/can/usb/f81604.c index ec8cef7fd2d53..fb9fb16507f0b 100644 --- a/drivers/net/can/usb/f81604.c +++ b/drivers/net/can/usb/f81604.c @@ -526,7 +526,6 @@ static void f81604_handle_can_bus_errors(struct f81604_port_priv *priv, netdev_dbg(netdev, "bus error interrupt\n"); priv->can.can_stats.bus_error++; - stats->rx_errors++; if (skb) { cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR; @@ -548,10 +547,15 @@ static void f81604_handle_can_bus_errors(struct f81604_port_priv *priv, /* set error location */ cf->data[3] = data->ecc & F81604_SJA1000_ECC_SEG; + } - /* Error occurred during transmission? */ - if ((data->ecc & F81604_SJA1000_ECC_DIR) == 0) + /* Error occurred during transmission? */ + if ((data->ecc & F81604_SJA1000_ECC_DIR) == 0) { + stats->tx_errors++; + if (skb) cf->data[2] |= CAN_ERR_PROT_TX; + } else { + stats->rx_errors++; } set_bit(F81604_CLEAR_ECC, &priv->clear_flags); -- 2.43.0