From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: Amarula patchwork <linux-amarula@amarulasolutions.com>,
michael@amarulasolutions.com,
Dario Binacchi <dario.binacchi@amarulasolutions.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Paolo Abeni <pabeni@redhat.com>,
Wolfgang Grandegger <wg@grandegger.com>,
linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: [RFC PATCH 07/13] can: slcan: set bitrate by CAN device driver API
Date: Tue, 7 Jun 2022 11:47:46 +0200 [thread overview]
Message-ID: <20220607094752.1029295-8-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20220607094752.1029295-1-dario.binacchi@amarulasolutions.com>
It allows to set the bitrate via ip tool, as it happens for the other
CAN device drivers. It still remains possible to set the bitrate via
slcand or slcan_attach utilities. In case the ip tool is used, the
driver will send the serial command to the adapter.
The struct can_bittiming_const and struct can_priv::clock.freq has been
set with empirical values that allow you to get a correct bit timing, so
that the slc_do_set_bittiming() can be called.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
DTS properties could be used to set the can.clock.freq and the
can.bittiming_const variables. This way the parameters could be changed
based on the type of the adapter.
drivers/net/can/slcan.c | 54 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 53 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index dbd4ebdfa024..f1bf32b70c4d 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -105,6 +105,18 @@ struct slcan {
static struct net_device **slcan_devs;
static DEFINE_SPINLOCK(slcan_lock);
+static const struct can_bittiming_const slcan_bittiming_const = {
+ .name = KBUILD_MODNAME,
+ .tseg1_min = 2,
+ .tseg1_max = 256,
+ .tseg2_min = 1,
+ .tseg2_max = 128,
+ .sjw_max = 128,
+ .brp_min = 1,
+ .brp_max = 256,
+ .brp_inc = 1,
+};
+
/************************************************************************
* SLCAN ENCAPSULATION FORMAT *
************************************************************************/
@@ -435,6 +447,7 @@ static int slc_close(struct net_device *dev)
netif_stop_queue(dev);
close_candev(dev);
sl->can.state = CAN_STATE_STOPPED;
+ sl->can.bittiming.bitrate = 0;
sl->rcount = 0;
sl->xleft = 0;
spin_unlock_bh(&sl->lock);
@@ -456,7 +469,9 @@ static int slc_open(struct net_device *dev)
* can.bittiming.bitrate is 0, causing open_candev() to fail.
* So let's set to a fake value.
*/
- sl->can.bittiming.bitrate = -1;
+ if (sl->can.bittiming.bitrate == 0)
+ sl->can.bittiming.bitrate = -1UL;
+
err = open_candev(dev);
if (err) {
netdev_err(dev, "failed to open can device\n");
@@ -554,6 +569,40 @@ static void slc_sync(void)
}
}
+static int slc_do_set_bittiming(struct net_device *dev)
+{
+ struct slcan *sl = netdev_priv(dev);
+ unsigned char cmd[SLC_MTU];
+ int i, s = -1, err;
+ unsigned int bitrates[] = {
+ 10000, 20000, 50000, 100000,
+ 125000, 250000, 500000, 800000,
+ 1000000,
+ };
+
+ for (i = 0; i < ARRAY_SIZE(bitrates); i++) {
+ if (sl->can.bittiming.bitrate == bitrates[i]) {
+ s = i;
+ break;
+ }
+ }
+
+ if (s < 0) {
+ netdev_err(dev, "invalid bitrate\n");
+ return -EINVAL;
+ }
+
+ snprintf(cmd, sizeof(cmd), "C\rS%d\r", s);
+ err = slcan_transmit_cmd(sl, cmd);
+ if (err) {
+ sl->can.bittiming.bitrate = 0;
+ netdev_err(sl->dev,
+ "failed to send bitrate command 'C\\rS%d\\r'\n", s);
+ }
+
+ return err;
+}
+
/* Find a free SLCAN channel, and link in this `tty' line. */
static struct slcan *slc_alloc(void)
{
@@ -583,6 +632,9 @@ static struct slcan *slc_alloc(void)
/* Initialize channel control data */
sl->magic = SLCAN_MAGIC;
sl->dev = dev;
+ sl->can.clock.freq = 24 * 1000 * 1000;
+ sl->can.bittiming_const = &slcan_bittiming_const;
+ sl->can.do_set_bittiming = slc_do_set_bittiming;
spin_lock_init(&sl->lock);
INIT_WORK(&sl->tx_work, slcan_transmit);
init_waitqueue_head(&sl->xcmd_wait);
--
2.32.0
next prev parent reply other threads:[~2022-06-07 9:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 9:47 [RFC PATCH 00/13] can: slcan: extend supported features Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 01/13] can: slcan: use the BIT() helper Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 02/13] can: slcan: use netdev helpers to print out messages Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 03/13] can: slcan: use the alloc_can_skb() helper Dario Binacchi
2022-06-07 10:15 ` Marc Kleine-Budde
2022-06-07 9:47 ` [RFC PATCH 04/13] can: slcan: use CAN network device driver API Dario Binacchi
2022-06-07 11:13 ` Marc Kleine-Budde
2022-06-08 16:42 ` Dario Binacchi
2022-06-09 7:07 ` Marc Kleine-Budde
2022-06-12 21:24 ` Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 05/13] can: slcan: simplify the device de-allocation Dario Binacchi
2022-06-07 20:45 ` Oliver Hartkopp
2022-06-07 9:47 ` [RFC PATCH 06/13] can: slcan: allow to send commands to the adapter Dario Binacchi
2022-06-09 7:16 ` Marc Kleine-Budde
2022-06-11 21:43 ` Dario Binacchi
2022-06-12 10:39 ` Marc Kleine-Budde
2022-06-07 9:47 ` Dario Binacchi [this message]
2022-06-07 10:09 ` [RFC PATCH 07/13] can: slcan: set bitrate by CAN device driver API Marc Kleine-Budde
2022-06-07 9:47 ` [RFC PATCH 08/13] can: slcan: send the open command to the adapter Dario Binacchi
2022-06-07 11:00 ` Marc Kleine-Budde
2022-06-07 9:47 ` [RFC PATCH 09/13] can: slcan: send the close " Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 10/13] can: slcan: move driver into separate sub directory Dario Binacchi
2022-06-07 9:47 ` [RFC PATCH 11/13] can: slcan: add ethtool support to reset adapter errors Dario Binacchi
2022-06-07 10:52 ` Marc Kleine-Budde
2022-06-08 16:33 ` Dario Binacchi
2022-06-09 6:38 ` Marc Kleine-Budde
2022-06-09 7:24 ` Dario Binacchi
2022-06-09 8:01 ` Marc Kleine-Budde
2022-06-09 8:52 ` Dario Binacchi
2022-06-10 10:51 ` Marc Kleine-Budde
2022-06-07 9:47 ` [RFC PATCH 12/13] can: slcan: extend the protocol with error info Dario Binacchi
2022-06-07 10:56 ` Marc Kleine-Budde
2022-06-07 9:47 ` [RFC PATCH 13/13] can: slcan: extend the protocol with CAN state info Dario Binacchi
2022-06-07 10:13 ` Marc Kleine-Budde
2022-06-07 10:27 ` [RFC PATCH 00/13] can: slcan: extend supported features Vincent MAILHOL
2022-06-07 10:39 ` Marc Kleine-Budde
2022-06-07 12:20 ` Vincent MAILHOL
2022-06-07 12:19 ` Vincent MAILHOL
2022-06-07 23:55 ` Max Staudt
2022-06-08 0:15 ` Max Staudt
2022-06-08 7:19 ` Marc Kleine-Budde
2022-06-08 12:55 ` Max Staudt
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=20220607094752.1029295-8-dario.binacchi@amarulasolutions.com \
--to=dario.binacchi@amarulasolutions.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@amarulasolutions.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=wg@grandegger.com \
/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;
as well as URLs for NNTP newsgroup(s).