Commit 669904d1 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: rockchip_canfd: add stats support for errata workarounds 



The driver contains workarounds for some of the rk3568v2 errata. Add
ethtool-based statistics ("ethtool -S") to track how often an erratum
workaround was needed.

Tested-by: default avatarAlibek Omarov <a1ba.omarov@gmail.com>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20240904-rockchip-canfd-v5-15-8ae22bcb27cc@pengutronix.de


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7ba7111b

drivers/net/can/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_CAN_ROCKCHIP_CANFD) += rockchip_canfd.o 


rockchip_canfd-objs :=

rockchip_canfd-objs += rockchip_canfd-core.o

rockchip_canfd-objs += rockchip_canfd-ethtool.o

rockchip_canfd-objs += rockchip_canfd-rx.o

rockchip_canfd-objs += rockchip_canfd-timestamp.o

rockchip_canfd-objs += rockchip_canfd-tx.o

drivers/net/can/rockchip/rockchip_canfd-core.c

+2 −0
Original line number Diff line number Diff line
@@ -800,6 +800,8 @@ static int rkcanfd_register(struct rkcanfd_priv *priv) 
	if (err)

		goto out_pm_runtime_disable;



	rkcanfd_ethtool_init(priv);



	err = register_candev(ndev);

	if (err)

		goto out_pm_runtime_put_sync;

drivers/net/can/rockchip/rockchip_canfd-ethtool.c

0 → 100644
+73 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// Copyright (c) 2023, 2024 Pengutronix,

//               Marc Kleine-Budde <kernel@pengutronix.de>

//



#include <linux/ethtool.h>



#include "rockchip_canfd.h"



enum rkcanfd_stats_type {

	RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS,

	RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS,

};



static const char rkcanfd_stats_strings[][ETH_GSTRING_LEN] = {

	[RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS] = "rx_fifo_empty_errors",

	[RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS] = "tx_extended_as_standard_errors",

};



static void

rkcanfd_ethtool_get_strings(struct net_device *ndev, u32 stringset, u8 *buf)

{

	switch (stringset) {

	case ETH_SS_STATS:

		memcpy(buf, rkcanfd_stats_strings,

		       sizeof(rkcanfd_stats_strings));

	}

}



static int rkcanfd_ethtool_get_sset_count(struct net_device *netdev, int sset)

{

	switch (sset) {

	case ETH_SS_STATS:

		return ARRAY_SIZE(rkcanfd_stats_strings);

	default:

		return -EOPNOTSUPP;

	}

}



static void

rkcanfd_ethtool_get_ethtool_stats(struct net_device *ndev,

				  struct ethtool_stats *stats, u64 *data)

{

	struct rkcanfd_priv *priv = netdev_priv(ndev);

	struct rkcanfd_stats *rkcanfd_stats;

	unsigned int start;



	rkcanfd_stats = &priv->stats;



	do {

		start = u64_stats_fetch_begin(&rkcanfd_stats->syncp);



		data[RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS] =

			u64_stats_read(&rkcanfd_stats->rx_fifo_empty_errors);

		data[RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS] =

			u64_stats_read(&rkcanfd_stats->tx_extended_as_standard_errors);

	} while (u64_stats_fetch_retry(&rkcanfd_stats->syncp, start));

}



static const struct ethtool_ops rkcanfd_ethtool_ops = {

	.get_ts_info = ethtool_op_get_ts_info,

	.get_strings = rkcanfd_ethtool_get_strings,

	.get_sset_count = rkcanfd_ethtool_get_sset_count,

	.get_ethtool_stats = rkcanfd_ethtool_get_ethtool_stats,

};



void rkcanfd_ethtool_init(struct rkcanfd_priv *priv)

{

	priv->ndev->ethtool_ops = &rkcanfd_ethtool_ops;



	u64_stats_init(&priv->stats.syncp);

}

drivers/net/can/rockchip/rockchip_canfd-rx.c

+12 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static int rkcanfd_rxstx_filter(struct rkcanfd_priv *priv, 
				bool *tx_done)

{

	struct net_device_stats *stats = &priv->ndev->stats;

	struct rkcanfd_stats *rkcanfd_stats = &priv->stats;

	const struct canfd_frame *cfd_nominal;

	const struct sk_buff *skb;

	unsigned int tx_tail;
@@ -166,6 +167,9 @@ static int rkcanfd_rxstx_filter(struct rkcanfd_priv *priv, 
		return 0;



	/* Affected by Erratum 6 */

	u64_stats_update_begin(&rkcanfd_stats->syncp);

	u64_stats_inc(&rkcanfd_stats->tx_extended_as_standard_errors);

	u64_stats_update_end(&rkcanfd_stats->syncp);



	/* Manual handling of CAN Bus Error counters. See

	 * rkcanfd_get_corrected_berr_counter() for detailed
@@ -211,8 +215,15 @@ static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv) 
			 cfd->data, sizeof(cfd->data));



	/* Erratum 5: Counters for TXEFIFO and RXFIFO may be wrong */

	if (rkcanfd_fifo_header_empty(header))

	if (rkcanfd_fifo_header_empty(header)) {

		struct rkcanfd_stats *rkcanfd_stats = &priv->stats;



		u64_stats_update_begin(&rkcanfd_stats->syncp);

		u64_stats_inc(&rkcanfd_stats->rx_fifo_empty_errors);

		u64_stats_update_end(&rkcanfd_stats->syncp);



		return 0;

	}



	len = rkcanfd_fifo_header_to_cfd_header(priv, header, cfd);

drivers/net/can/rockchip/rockchip_canfd.h

+14 −0
Original line number Diff line number Diff line
@@ -446,6 +446,16 @@ struct rkcanfd_fifo_header { 
	u32 ts;

};



struct rkcanfd_stats {

	struct u64_stats_sync syncp;



	/* Erratum 5 */

	u64_stats_t rx_fifo_empty_errors;



	/* Erratum 6 */

	u64_stats_t tx_extended_as_standard_errors;

};



struct rkcanfd_priv {

	struct can_priv can;

	struct can_rx_offload offload;
@@ -461,6 +471,8 @@ struct rkcanfd_priv { 


	struct can_berr_counter bec;



	struct rkcanfd_stats stats;



	struct reset_control *reset;

	struct clk_bulk_data *clks;

	int clks_num;
@@ -515,6 +527,8 @@ rkcanfd_get_tx_free(const struct rkcanfd_priv *priv) 
	return RKCANFD_TXFIFO_DEPTH - rkcanfd_get_tx_pending(priv);

}



void rkcanfd_ethtool_init(struct rkcanfd_priv *priv);



int rkcanfd_handle_rx_int(struct rkcanfd_priv *priv);



void rkcanfd_timestamp_init(struct rkcanfd_priv *priv);