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 0C3E72185A0; Thu, 12 Dec 2024 15:30:41 +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=1734017441; cv=none; b=BtpT999d52dmpbxVygP/Iucn7SLm3qESoo7sw+2WtBwR1r1p6HAXyC1zoGr7mWPpC/jLrSxzV1mQEHxkCNteDk+Nak1ET0/CSMjR6g8nk9OIx99V5Mj56YdZnt9EYT67uHkYxTTH8N/wXh05qj04ELgNdGgkfSbbJ3jXM7gjA1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734017441; c=relaxed/simple; bh=wD90aT/GNT/MNMaEgyxVvwYJFXZym95hjfz2B+17aAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=brb9xkoxFsL2abeHkGrrgmAhuLmVCZC2qlAZqoB45OZLEDYk9ja/DDiutGOv09TM1Q+RU2e3u235hpoyvyF5V1wseGQwtPncDjkxtMvoaVLohNZNc4+mfwRYkP5V/IxKOigmyczKaGfNe85IEDyB2eLFxQNxAy0rr1Obtz75Q9A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FErsF+hA; 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="FErsF+hA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AA15C4CED7; Thu, 12 Dec 2024 15:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734017440; bh=wD90aT/GNT/MNMaEgyxVvwYJFXZym95hjfz2B+17aAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FErsF+hAR90U7oNGAr5oFwq/RExxuEMXY4gwidnpWPkUQLJ1JOyhds5b3x7DOByWj jJcQqVZZgTnv5NOOcu0lSStmY3xgvB4wGp4nl1/rWK7A0xas0tPMOiwkrZEos2ef4R tIuL44X/zj5y7+fEpZV9pHtnczNIvQb6QvaPMEAk= 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 014/356] can: sun4i_can: sun4i_can_err(): fix {rx,tx}_errors statistics Date: Thu, 12 Dec 2024 15:55:33 +0100 Message-ID: <20241212144245.183427050@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 595a81988a6fe06eb5849e972c8b9cb21c4e0d54 ] The sun4i_can_err() function only incremented the receive error counter and never the transmit error counter, even if the STA_ERR_DIR flag reported that an error had occurred during transmission. Increment the receive/transmit error counter based on the value of the STA_ERR_DIR flag. Fixes: 0738eff14d81 ("can: Allwinner A10/A20 CAN Controller support - Kernel module") Signed-off-by: Dario Binacchi Link: https://patch.msgid.link/20241122221650.633981-11-dario.binacchi@amarulasolutions.com Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/sun4i_can.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index 80f7aa2531dc0..283fbf59e66d5 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -579,11 +579,9 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) /* bus error interrupt */ netdev_dbg(dev, "bus error interrupt\n"); priv->can.can_stats.bus_error++; - stats->rx_errors++; + ecc = readl(priv->base + SUN4I_REG_STA_ADDR); if (likely(skb)) { - ecc = readl(priv->base + SUN4I_REG_STA_ADDR); - cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR; switch (ecc & SUN4I_STA_MASK_ERR) { @@ -601,9 +599,15 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) >> 16; break; } - /* error occurred during transmission? */ - if ((ecc & SUN4I_STA_ERR_DIR) == 0) + } + + /* error occurred during transmission? */ + if ((ecc & SUN4I_STA_ERR_DIR) == 0) { + if (likely(skb)) cf->data[2] |= CAN_ERR_PROT_TX; + stats->tx_errors++; + } else { + stats->rx_errors++; } } if (isrc & SUN4I_INT_ERR_PASSIVE) { -- 2.43.0