Linux CAN drivers development
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
	kernel@pengutronix.de,
	Jeroen Hofstee <jhofstee@victronenergy.com>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH net-next 16/29] can: gs_usb: add support for reading error counters
Date: Wed, 26 Oct 2022 10:39:54 +0200	[thread overview]
Message-ID: <20221026084007.1583333-17-mkl@pengutronix.de> (raw)
In-Reply-To: <20221026084007.1583333-1-mkl@pengutronix.de>

From: Jeroen Hofstee <jhofstee@victronenergy.com>

Add support for reading the device state and CAN error counters, using
the GS_USB_BREQ_GET_STATE control message, if supported by the device,
indicated by the GS_CAN_FEATURE_GET_STATE feature flag.

Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
Link: https://lore.kernel.org/all/20221019221016.1659260-8-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/usb/gs_usb.c | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 3f00e8d79b75..ccb1a29835a2 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -961,6 +961,42 @@ static int gs_can_open(struct net_device *netdev)
 	return 0;
 }
 
+static int gs_usb_get_state(const struct net_device *netdev,
+			    struct can_berr_counter *bec,
+			    enum can_state *state)
+{
+	struct gs_can *dev = netdev_priv(netdev);
+	struct gs_device_state ds;
+	int rc;
+
+	rc = usb_control_msg_recv(interface_to_usbdev(dev->iface), 0,
+				  GS_USB_BREQ_GET_STATE,
+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
+				  dev->channel, 0,
+				  &ds, sizeof(ds),
+				  USB_CTRL_GET_TIMEOUT,
+				  GFP_KERNEL);
+	if (rc)
+		return rc;
+
+	if (le32_to_cpu(ds.state) >= CAN_STATE_MAX)
+		return -EOPNOTSUPP;
+
+	*state = le32_to_cpu(ds.state);
+	bec->txerr = le32_to_cpu(ds.txerr);
+	bec->rxerr = le32_to_cpu(ds.rxerr);
+
+	return 0;
+}
+
+static int gs_usb_can_get_berr_counter(const struct net_device *netdev,
+				       struct can_berr_counter *bec)
+{
+	enum can_state state;
+
+	return gs_usb_get_state(netdev, bec, &state);
+}
+
 static int gs_can_close(struct net_device *netdev)
 {
 	int rc;
@@ -1235,6 +1271,9 @@ static struct gs_can *gs_make_candev(unsigned int channel,
 	if (feature & GS_CAN_FEATURE_BERR_REPORTING)
 		dev->can.ctrlmode_supported |= CAN_CTRLMODE_BERR_REPORTING;
 
+	if (feature & GS_CAN_FEATURE_GET_STATE)
+		dev->can.do_get_berr_counter = gs_usb_can_get_berr_counter;
+
 	/* The CANtact Pro from LinkLayer Labs is based on the
 	 * LPC54616 µC, which is affected by the NXP LPC USB transfer
 	 * erratum. However, the current firmware (version 2) doesn't
-- 
2.35.1



  parent reply	other threads:[~2022-10-26  8:41 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-26  8:39 [PATCH net-next 0/29] pull-request: can-next 2022-10-26 Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 01/29] can: add termination resistor documentation Marc Kleine-Budde
2022-10-26 13:00   ` patchwork-bot+netdevbpf
2022-10-26  8:39 ` [PATCH net-next 02/29] can: j1939: j1939_session_tx_eoma(): fix debug info Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 03/29] can: remove obsolete PCH CAN driver Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 04/29] can: ucan: Replace zero-length array with DECLARE_FLEX_ARRAY() helper Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 05/29] can: kvaser_usb: Remove -Warray-bounds exception Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 06/29] can: m_can: is_lec_err(): clean up LEC error handling Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 07/29] can: m_can: m_can_handle_bus_errors(): add support for handling DLEC error on CAN-FD frames Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 08/29] can: gs_usb: mention candleLight as supported device Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 09/29] can: gs_usb: gs_make_candev(): set netdev->dev_id Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 10/29] can: gs_usb: gs_can_open(): allow loopback and listen only at the same time Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 11/29] can: gs_usb: gs_can_open(): sort checks for ctrlmode Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 12/29] can: gs_usb: gs_can_open(): merge setting of timestamp flags and init Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 13/29] can: gs_usb: document GS_CAN_FEATURE_BERR_REPORTING Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 14/29] can: gs_usb: add ability to enable / disable berr reporting Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 15/29] can: gs_usb: document GS_CAN_FEATURE_GET_STATE Marc Kleine-Budde
2022-10-26  8:39 ` Marc Kleine-Budde [this message]
2022-10-26  8:39 ` [PATCH net-next 17/29] can: kvaser_usb: kvaser_usb_leaf: Get capabilities from device Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 18/29] can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 19/29] can: kvaser_usb: kvaser_usb_leaf: Handle CMD_ERROR_EVENT Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 20/29] can: kvaser_usb_leaf: Set Warning state even without bus errors Marc Kleine-Budde
2022-10-26  8:39 ` [PATCH net-next 21/29] can: kvaser_usb_leaf: Fix improved state not being reported Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 22/29] can: kvaser_usb_leaf: Fix wrong CAN state after stopping Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 23/29] can: kvaser_usb_leaf: Ignore stale bus-off after start Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 24/29] can: kvaser_usb_leaf: Fix bogus restart events Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 25/29] can: kvaser_usb: Add struct kvaser_usb_busparams Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 26/29] can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 27/29] can: m_can: use consistent indention Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 28/29] can: ucan: ucan_disconnect(): change unregister_netdev() to unregister_candev() Marc Kleine-Budde
2022-10-26  8:40 ` [PATCH net-next 29/29] can: rcar_canfd: Use devm_reset_control_get_optional_exclusive Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221026084007.1583333-17-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=davem@davemloft.net \
    --cc=jhofstee@victronenergy.com \
    --cc=kernel@pengutronix.de \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox