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 57E283290BB for ; Mon, 16 Mar 2026 17:19:50 +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=1773681590; cv=none; b=ghasBW+eBBhbygmJB0bSafWodMg/oRnv6O8UM3p7K2LoLeLQ9LQLpWYiX4peR+e0g/BXbrI+tEFQ3So2Tp9kCML/bPjnebu+qE110EDXUOpiQj6Q5yRI6+16h7GPiaxoGSefxKabmUxs6G7cK+59+ULJB+G6xNZFmzyWLEJXAl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681590; c=relaxed/simple; bh=lMJiEaRVtHVG+fjTJQf8PNP2RUE2gP/oSLY2gGb3c4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nD6Ba+B595JvyknWV7LoKbTHtIvfEp0OVERIxbToplY3bKO5cmWrFDTRKQPh/YuqAr3V7t7bNOx4r1fO+UVKT32aYwKKxMl7UlGYC/KF5PXFjuLWgTnrnV7GtCSOLZBYHISuppjBPBCZ8yJUvORx6E6gaU3DgJ/FTjAaUR+VamY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d0532AOC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d0532AOC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79EDEC19421; Mon, 16 Mar 2026 17:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773681589; bh=lMJiEaRVtHVG+fjTJQf8PNP2RUE2gP/oSLY2gGb3c4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d0532AOCTV2YaOGRvQDocApQzQcFGhSxzks8bdd6Bs64wrHYIxup8VSDRFIl62QsJ HTXytfoYKG3zeQy1CaGVJYz5LIvPyutBNmPXt9wWV68+d40S6JQDX/DZd19J25ojCx 6S/3NlI7zShVG50qlOs/in9VnHVKX2YvRI4C+gxfWzZ+MLY8iDEvdbxwV6wtdciYF3 492JDFYQJrwqBCdLac7V3SPYq0kJ+PSHWLYPxpF56hx+PflHJtrYcbbV9Q2Dl6CPgi HWDsFIkPmzXYe7Zh5QeSlbJl3MpZPQNQL8ito8XkFYbIntZp8ato+PwlG11lR7ixNe J6FQqbFqsweHw== From: Sasha Levin To: stable@vger.kernel.org Cc: Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.6.y] can: gs_usb: gs_can_open(): always configure bitrates before starting device Date: Mon, 16 Mar 2026 13:19:47 -0400 Message-ID: <20260316171947.1022973-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031629-lying-cleat-fa45@gregkh> References: <2026031629-lying-cleat-fa45@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Marc Kleine-Budde [ Upstream commit 2df6162785f31f1bbb598cfc3b08e4efc88f80b6 ] So far the driver populated the struct can_priv::do_set_bittiming() and struct can_priv::fd::do_set_data_bittiming() callbacks. Before bringing up the interface, user space has to configure the bitrates. With these callbacks the configuration is directly forwarded into the CAN hardware. Then the interface can be brought up. An ifdown-ifup cycle (without changing the bit rates) doesn't re-configure the bitrates in the CAN hardware. This leads to a problem with the CANable-2.5 [1] firmware, which resets the configured bit rates during ifdown. To fix the problem remove both bit timing callbacks and always configure the bitrates in the struct net_device_ops::ndo_open() callback. [1] https://github.com/Elmue/CANable-2.5-firmware-Slcan-and-Candlelight Cc: stable@vger.kernel.org Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices") Link: https://patch.msgid.link/20260219-gs_usb-always-configure-bitrates-v2-1-671f8ba5b0a5@pengutronix.de Signed-off-by: Marc Kleine-Budde [ adapted the `.fd` sub-struct ] Signed-off-by: Sasha Levin --- drivers/net/can/usb/gs_usb.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 7a3c6493a3536..bde945d99edd1 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -769,9 +769,8 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) } } -static int gs_usb_set_bittiming(struct net_device *netdev) +static int gs_usb_set_bittiming(struct gs_can *dev) { - struct gs_can *dev = netdev_priv(netdev); struct can_bittiming *bt = &dev->can.bittiming; struct gs_device_bittiming dbt = { .prop_seg = cpu_to_le32(bt->prop_seg), @@ -788,9 +787,8 @@ static int gs_usb_set_bittiming(struct net_device *netdev) GFP_KERNEL); } -static int gs_usb_set_data_bittiming(struct net_device *netdev) +static int gs_usb_set_data_bittiming(struct gs_can *dev) { - struct gs_can *dev = netdev_priv(netdev); struct can_bittiming *bt = &dev->can.data_bittiming; struct gs_device_bittiming dbt = { .prop_seg = cpu_to_le32(bt->prop_seg), @@ -1054,6 +1052,20 @@ static int gs_can_open(struct net_device *netdev) if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) flags |= GS_CAN_MODE_HW_TIMESTAMP; + rc = gs_usb_set_bittiming(dev); + if (rc) { + netdev_err(netdev, "failed to set bittiming: %pe\n", ERR_PTR(rc)); + goto out_usb_kill_anchored_urbs; + } + + if (ctrlmode & CAN_CTRLMODE_FD) { + rc = gs_usb_set_data_bittiming(dev); + if (rc) { + netdev_err(netdev, "failed to set data bittiming: %pe\n", ERR_PTR(rc)); + goto out_usb_kill_anchored_urbs; + } + } + /* finally start device */ dev->can.state = CAN_STATE_ERROR_ACTIVE; dm.flags = cpu_to_le32(flags); @@ -1354,7 +1366,6 @@ static struct gs_can *gs_make_candev(unsigned int channel, dev->can.state = CAN_STATE_STOPPED; dev->can.clock.freq = le32_to_cpu(bt_const.fclk_can); dev->can.bittiming_const = &dev->bt_const; - dev->can.do_set_bittiming = gs_usb_set_bittiming; dev->can.ctrlmode_supported = CAN_CTRLMODE_CC_LEN8_DLC; @@ -1378,7 +1389,6 @@ static struct gs_can *gs_make_candev(unsigned int channel, * GS_CAN_FEATURE_BT_CONST_EXT is set. */ dev->can.data_bittiming_const = &dev->bt_const; - dev->can.do_set_data_bittiming = gs_usb_set_data_bittiming; } if (feature & GS_CAN_FEATURE_TERMINATION) { -- 2.51.0