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 27B8B328B58 for ; Mon, 16 Mar 2026 19:18:42 +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=1773688723; cv=none; b=RQYqRapNLJlFISdVdGSUxjMkBKKFvna4lhc9LH33x7ai759aC/s3OinjRjRXr4WCkOYeNkExSyo87J/+Cp7BN+fSBJGFrS9uWqfHyjqtDNHZtpafwVbE+aqcqA/s4Lx00blyz0adt7NAsjIcoFzQMJPTfQAoVaUoKk22fnKbrRU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773688723; c=relaxed/simple; bh=glqE4fFWiFwVez1gL3vzm/XUXT0OU86BK2w6JZtRObs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=day3OU8IGf2RcBqJIDtz7f4f7xfuZ7yEeL8hRfvYh03MrzJgYPaH5sn4+CU1K99Dj/fF0cqNn6Ie5ADUpMZ36WYGBU4g5GZ/tHSKkahsTttPijSRf8jBqsLMyN4OnGE+uZgVUnxsiHBaGfCFnCBXlnZjc2bhEEikyZXviLoG6YE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Yl++siQt; 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="Yl++siQt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43DC0C19421; Mon, 16 Mar 2026 19:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773688722; bh=glqE4fFWiFwVez1gL3vzm/XUXT0OU86BK2w6JZtRObs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yl++siQtIwmnqbFafx6lnCtCTJliqktqjjBsNCt2flZqRwL7drar3AIlvkdWtOCQs rvma8eI/CtJf5IHCufoOSGVqTqbOgyg1T91DEtB9p4DR9oM0DI5R26occAxF3tnJsv wDmRPkelDIp5LFU+NI90AJpExCv45MJHAcz7BK6CrAV3d6pRohYfttuFmgaF+L/nW/ R9hcvH1M9Q4wWG46w0/aN1msgKm06ZenoRMRGJi3CKq6rs6aS2pfqB64dVwuR1pu4R Cf2JI2XASX8j574/siZsU0i9XjrDTRY7pYHJdkk5Tib7bfSvOwka43xWZvuMy7yqET 4cZx79KeXg0Ew== From: Sasha Levin To: stable@vger.kernel.org Cc: Marc Kleine-Budde , Sasha Levin Subject: [PATCH 5.10.y] can: gs_usb: gs_can_open(): always configure bitrates before starting device Date: Mon, 16 Mar 2026 15:18:40 -0400 Message-ID: <20260316191840.1350686-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031636-victory-unviable-f8fc@gregkh> References: <2026031636-victory-unviable-f8fc@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 [ No CAN-FD ] Signed-off-by: Sasha Levin --- drivers/net/can/usb/gs_usb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 58a7ac1d7c7ff..ce5676845f284 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -413,9 +413,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 usb_interface *intf = dev->iface; int rc; @@ -445,7 +444,7 @@ static int gs_usb_set_bittiming(struct net_device *netdev) kfree(dbt); if (rc < 0) - dev_err(netdev->dev.parent, "Couldn't set bittimings (err=%d)", + dev_err(dev->netdev->dev.parent, "Couldn't set bittimings (err=%d)", rc); return (rc > 0) ? 0 : rc; @@ -675,6 +674,13 @@ static int gs_can_open(struct net_device *netdev) if (ctrlmode & CAN_CTRLMODE_3_SAMPLES) flags |= GS_CAN_MODE_TRIPLE_SAMPLE; + rc = gs_usb_set_bittiming(dev); + if (rc) { + netdev_err(netdev, "failed to set bittiming: %pe\n", ERR_PTR(rc)); + kfree(dm); + return rc; + } + /* finally start device */ dev->can.state = CAN_STATE_ERROR_ACTIVE; dm->mode = cpu_to_le32(GS_CAN_MODE_START); @@ -888,7 +894,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 = 0; -- 2.51.0