From patchwork Tue Jul 26 21:02:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2259 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B24343F081 for ; Tue, 26 Jul 2022 23:03:36 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id w15-20020a056402268f00b0043be4012ea9sf5205055edd.4 for ; Tue, 26 Jul 2022 14:03:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658869416; cv=pass; d=google.com; s=arc-20160816; b=QP9j20uSgewj5yAxMsDp2yD190UmnqUKcyj6Mqc8pQ4wxpIh3H+m/KGTSdp9oLiYta njVRpcfI/WWMgpHbGUr50gD3zyFTHYWzjK3rkqFFwQ/5Y60HyOuorAr6Bi97KGFDE6al x4zR9HtB6oAMwrCz40Yx9MmdibKhrQCdoXkRQRPe0FLm43t0DEfh7oNGWarSM7v6Iv5h 6YFMaGytQla2rJWBbFlxHrItkjROpPEWYkhk6TFQLY6EaoDsSwqGSY/7C942S4GRdDoL xdsIVq0ome7FBaYbf0WAYEHTMKtMJ70kHGNOQ5mouc2SD0K9S7kMmEDmRko1rnp5Rh4k gZVw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tbhBm4/YjxjWLoWLq+GTpb3Kl8rYi7D38+dhw+2hI4I=; b=xtUcMLuhuaIWgg7RWmMrpHK8Tm6/yh08i0gNns0p5tEncPLqtl2T3NNFsiHzNkK8ik Wn+ea3kj2F+Qxt8GubqHY3bVDI//jzEcf/OO82KgobtChbDvthNdc6AvYNyMIUS/omwX PJtyjn3N/lQRdyoLRON6JuwRRQL4k+QNY2/SFkAsCfpC1Q6Q6mL6BE53FK8KVZeHRG7Y gvCtwjhnjNjNnMtsKLtLknycWsAPpK4hVeMx0+0L4BpLdU/8DJzGaAcjT+71/uwZgVSp biJZPhaebui5WTzvAxWLkPOMecBd5w4f/et6MyiX3BnA0VPMCkj3BUE3BsUZDvmsZPNg 9xqQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fFao0muv; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=tbhBm4/YjxjWLoWLq+GTpb3Kl8rYi7D38+dhw+2hI4I=; b=f+8jBaNkb/tYfYaX15z2vsyH+mLVvA59feYuU2AtSarkBkPPK0prB5KbYFeZSw0ar3 P68Axp/giaJe1G8i4VzlzLAPN8viGBcemrmzl3ghLkF+b/ubVePvk92bENGVbTaGzaQo k8uU9RGXJ1KV3cLjfYIA3HzetUmbl8/AoAIzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=tbhBm4/YjxjWLoWLq+GTpb3Kl8rYi7D38+dhw+2hI4I=; b=Ph1xcN42+hcPuqa0WFZD3GnqO45sAWWp4Yn1Q3X5qZWABUag5pJ3/Bixc/n9Rs2CG/ pHZ+VNVhfg+0M85UrxjG0n3+Vc86f/sERgrNzipqyPVhhlS5VEyyuz5zbHY9dG3dwJze Va5IMBEaMmDSVHTsKtqYOHRe4fIBG7lwubV4BV3fAX3Feo18IicWjj3umZby4/ykzm0N tYT/mLvXb0rnpLMzf1leCNoE69lpC24V6Q16irbNqRFkgnkHM9YKOKzrn/7Y5YamaHfz T2OWsJe+xqKT4vZkpHliPUIn5WCBeZI70qXzVim+2c/ezstNsiONydimTrnndAzJnqnL QEbQ== X-Gm-Message-State: AJIora+lu3B1gYf1X1vMWnSpjeJTSjCZXN44ueQWFxQCtaqTwmILz7EO fi5Jy0rkTkUMJnIG5JzG6mzQjntW X-Google-Smtp-Source: AGRyM1vzBvCBvaTYf3mVnXYGBUfpb1tNj/ZyAETr+uSaHSqH7oo1AcGJO7M9NHS/gxkzH4ZjvbARpw== X-Received: by 2002:a17:907:1dc4:b0:72b:4d85:c7c4 with SMTP id og4-20020a1709071dc400b0072b4d85c7c4mr15334103ejc.258.1658869416568; Tue, 26 Jul 2022 14:03:36 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:22d0:b0:72b:cf5:145f with SMTP id q16-20020a17090622d000b0072b0cf5145fls1350162eja.5.-pod-prod-gmail; Tue, 26 Jul 2022 14:03:35 -0700 (PDT) X-Received: by 2002:a17:907:7b87:b0:72e:d45a:17af with SMTP id ne7-20020a1709077b8700b0072ed45a17afmr15519293ejc.73.1658869415457; Tue, 26 Jul 2022 14:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658869415; cv=none; d=google.com; s=arc-20160816; b=qjdhYoj2OG+2M1DoEpDkhTSA+KH1Lhi1QE8s7xDXDEEHFGxY6r/kl1Ols60wEl72DY EzymgFqV5qOL59sA4E5FQU2Kt+dYFQK8fVaq2nBAtlLClFgC+MyKcjYnQ+dGbF6tbQ9C f2fdeUkjcpdWr5xZCLtFjhsziAQusIgZZPw1bBIfQjbWC+NTDFGz86lgB6NiJRn3dGas PYUBlouwqIC3HsHQ+5Tg4CWB4YJu2QH58iMPrnfm++nh5NURUZjEg4oKpA2M6Rpeugy8 5hVdrlcQC8Ux1JTTVwKju1ohoiGO9GkAh8NRWiXcxw6I5/Ma3cQUnXoPjokyEnRKvmjm +zTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jASsf99AUDo012UYQLBftY2iklAzdZ3iQKBsZI8nWRw=; b=S/+NLb0xVww7w+O/m/w4g7Hr/jNSB8LwvKp5I4+pE3kfM/YJ12W32IgjU0EiAoV0VM OdkCHqZNGU7jFD2S7fwRWTyOEnaAW9iBQE68fwWri71qsQ78IGKPo5JCST+j/fJeVBn7 rWQJ3AGyrtTE12vLgLtwaBUMwDT0kPVPFCNQpmtZTotvgjrVcp5dgw/AHccTU+3+3Wr8 U0ls12IbE13xcYe9Qd8n3rFppnTlH71qHLMHW/xXtygLIjAtGHxsuhbx89klb2Sofu9R HYGw+V2JKqbo7kLe3eCjMzbeVMg8bixinTQPn+iUAEHz9/mB/tDM3N5Bl1jqdt22Iuul peIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fFao0muv; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id d3-20020a1709063ec300b0072695cb151fsor6072432ejj.0.2022.07.26.14.03.35 for (Google Transport Security); Tue, 26 Jul 2022 14:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:4fc4:b0:6da:b4c6:fadb with SMTP id i4-20020a1709064fc400b006dab4c6fadbmr15668908ejw.282.1658869415190; Tue, 26 Jul 2022 14:03:35 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-87-14-98-67.retail.telecomitalia.it. [87.14.98.67]) by smtp.gmail.com with ESMTPSA id y19-20020aa7d513000000b0043a7293a03dsm9092849edq.7.2022.07.26.14.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 14:03:34 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-can@vger.kernel.org, Marc Kleine-Budde , Oliver Hartkopp , michael@amarulasolutions.com, Amarula patchwork , Jeroen Hofstee , Dario Binacchi , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Wolfgang Grandegger , netdev@vger.kernel.org Subject: [RFC PATCH v3 8/9] can: slcan: add support to set bit time register (btr) Date: Tue, 26 Jul 2022 23:02:16 +0200 Message-Id: <20220726210217.3368497-9-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220726210217.3368497-1-dario.binacchi@amarulasolutions.com> References: <20220726210217.3368497-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=fFao0muv; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , It allows to set the bit time register with tunable values. The setting can only be changed if the interface is down: ip link set dev can0 down ethtool --set-tunable can0 can-btr 0x31c ip link set dev can0 up Suggested-by: Marc Kleine-Budde Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/slcan/slcan-core.c | 58 ++++++++++++++++++++------- drivers/net/can/slcan/slcan-ethtool.c | 13 ++++++ drivers/net/can/slcan/slcan.h | 1 + 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c index 45e521910236..3905f21e7788 100644 --- a/drivers/net/can/slcan/slcan-core.c +++ b/drivers/net/can/slcan/slcan-core.c @@ -99,6 +99,7 @@ struct slcan { #define CF_ERR_RST 0 /* Reset errors on open */ wait_queue_head_t xcmd_wait; /* Wait queue for commands */ /* transmission */ + u32 btr; /* bit timing register */ }; static const u32 slcan_bitrate_const[] = { @@ -128,6 +129,17 @@ int slcan_enable_err_rst_on_open(struct net_device *ndev, bool on) return 0; } +int slcan_set_btr(struct net_device *ndev, u32 btr) +{ + struct slcan *sl = netdev_priv(ndev); + + if (netif_running(ndev)) + return -EBUSY; + + sl->btr = btr; + return 0; +} + /************************************************************************* * SLCAN ENCAPSULATION FORMAT * *************************************************************************/ @@ -699,22 +711,40 @@ static int slcan_netdev_open(struct net_device *dev) return err; } - if (sl->can.bittiming.bitrate != CAN_BITRATE_UNKNOWN) { - for (s = 0; s < ARRAY_SIZE(slcan_bitrate_const); s++) { - if (sl->can.bittiming.bitrate == slcan_bitrate_const[s]) - break; + if (sl->can.bittiming.bitrate != CAN_BITRATE_UNKNOWN || sl->btr) { + if (sl->can.bittiming.bitrate != CAN_BITRATE_UNKNOWN) { + for (s = 0; s < ARRAY_SIZE(slcan_bitrate_const); s++) { + if (sl->can.bittiming.bitrate == + slcan_bitrate_const[s]) + break; + } + + /* The CAN framework has already validate the bitrate + * value, so we can avoid to check if `s' has been + * properly set. + */ + snprintf(cmd, sizeof(cmd), "C\rS%d\r", s); + err = slcan_transmit_cmd(sl, cmd); + if (err) { + netdev_err(dev, + "failed to send bitrate command 'C\\rS%d\\r'\n", + s); + goto cmd_transmit_failed; + } } - /* The CAN framework has already validate the bitrate value, - * so we can avoid to check if `s' has been properly set. - */ - snprintf(cmd, sizeof(cmd), "C\rS%d\r", s); - err = slcan_transmit_cmd(sl, cmd); - if (err) { - netdev_err(dev, - "failed to send bitrate command 'C\\rS%d\\r'\n", - s); - goto cmd_transmit_failed; + if (sl->btr) { + u32 btr = sl->btr & GENMASK(15, 0); + + snprintf(cmd, sizeof(cmd), "C\rs%04x\r", btr); + err = slcan_transmit_cmd(sl, cmd); + if (err) { + netdev_err(dev, + "failed to send bit timing command 'C\\rs%04x\\r'\n", + btr); + goto cmd_transmit_failed; + } + } if (test_bit(CF_ERR_RST, &sl->cmd_flags)) { diff --git a/drivers/net/can/slcan/slcan-ethtool.c b/drivers/net/can/slcan/slcan-ethtool.c index bf0afdc4e49d..8e2e77bbffda 100644 --- a/drivers/net/can/slcan/slcan-ethtool.c +++ b/drivers/net/can/slcan/slcan-ethtool.c @@ -52,11 +52,24 @@ static int slcan_get_sset_count(struct net_device *netdev, int sset) } } +static int slcan_set_tunable(struct net_device *netdev, + const struct ethtool_tunable *tuna, + const void *data) +{ + switch (tuna->id) { + case ETHTOOL_CAN_BTR: + return slcan_set_btr(netdev, *(u32 *)data); + default: + return -EINVAL; + } +} + static const struct ethtool_ops slcan_ethtool_ops = { .get_strings = slcan_get_strings, .get_priv_flags = slcan_get_priv_flags, .set_priv_flags = slcan_set_priv_flags, .get_sset_count = slcan_get_sset_count, + .set_tunable = slcan_set_tunable, }; void slcan_set_ethtool_ops(struct net_device *netdev) diff --git a/drivers/net/can/slcan/slcan.h b/drivers/net/can/slcan/slcan.h index d463c8d99e22..1ac412fe8c95 100644 --- a/drivers/net/can/slcan/slcan.h +++ b/drivers/net/can/slcan/slcan.h @@ -13,6 +13,7 @@ bool slcan_err_rst_on_open(struct net_device *ndev); int slcan_enable_err_rst_on_open(struct net_device *ndev, bool on); +int slcan_set_btr(struct net_device *ndev, u32 btr); void slcan_set_ethtool_ops(struct net_device *ndev); #endif /* _SLCAN_H */