mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Franklin S Cooper Jr <fcooper@ti.com>
To: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<netdev@vger.kernel.org>, <linux-can@vger.kernel.org>,
	<wg@grandegger.com>, <mkl@pengutronix.de>, <robh+dt@kernel.org>,
	<quentin.schulz@free-electrons.com>,
	<dev.kurt@vandijck-laurijssen.be>, <andrew@lunn.ch>
Cc: Franklin S Cooper Jr <fcooper@ti.com>
Subject: [PATCH 1/4] can: dev: Add support for limiting configured bitrate
Date: Wed, 19 Jul 2017 18:36:51 -0500	[thread overview]
Message-ID: <20170719233654.25908-2-fcooper@ti.com> (raw)
In-Reply-To: <20170719233654.25908-1-fcooper@ti.com>

Various CAN or CAN-FD IP may be able to run at a faster rate than
what the transceiver the CAN node is connected to. This can lead to
unexpected errors. However, CAN transceivers typically have fixed
limitations and provide no means to discover these limitations at
runtime. Therefore, add support for a fixed-transceiver node that
can be reused by other CAN peripheral drivers to determine for both
CAN and CAN-FD what the max bitrate that can be used. If the user
tries to configure CAN to pass these maximum bitrates it will throw
an error.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 drivers/net/can/dev.c   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/can/dev.h |  5 +++++
 2 files changed, 53 insertions(+)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 365a8cc..fbab87d 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -27,6 +27,7 @@
 #include <linux/can/skb.h>
 #include <linux/can/netlink.h>
 #include <linux/can/led.h>
+#include <linux/of.h>
 #include <net/rtnetlink.h>
 
 #define MOD_DESC "CAN device driver interface"
@@ -806,6 +807,21 @@ int open_candev(struct net_device *dev)
 		return -EINVAL;
 	}
 
+	if (priv->max_trans_arbitration_speed > 0 &&
+	    priv->bittiming.bitrate > priv->max_trans_arbitration_speed) {
+		netdev_err(dev, "arbitration bitrate surpasses transceiver capabilities of %d bps\n",
+			   priv->max_trans_arbitration_speed);
+		return -EINVAL;
+	}
+
+	if (priv->max_trans_data_speed  >= 0 &&
+	    (priv->ctrlmode & CAN_CTRLMODE_FD) &&
+	    (priv->data_bittiming.bitrate > priv->max_trans_data_speed)) {
+		netdev_err(dev, "canfd data bitrate surpasses transceiver capabilities of %d bps\n",
+			   priv->max_trans_data_speed);
+		return -EINVAL;
+	}
+
 	/* Switch carrier on if device was stopped while in bus-off state */
 	if (!netif_carrier_ok(dev))
 		netif_carrier_on(dev);
@@ -814,6 +830,38 @@ int open_candev(struct net_device *dev)
 }
 EXPORT_SYMBOL_GPL(open_candev);
 
+#ifdef CONFIG_OF
+void of_transceiver_is_fixed(struct net_device *dev)
+{
+	struct device_node *dn;
+	struct can_priv *priv = netdev_priv(dev);
+	u32 max_frequency;
+	struct device_node *np;
+
+	np = dev->dev.parent->of_node;
+
+	/* New binding */
+	dn = of_get_child_by_name(np, "fixed-transceiver");
+	if (!dn)
+		return;
+
+	of_property_read_u32(dn, "max-arbitration-speed", &max_frequency);
+
+	if (max_frequency > 0)
+		priv->max_trans_arbitration_speed = max_frequency;
+	else
+		priv->max_trans_arbitration_speed = -1;
+
+	of_property_read_u32(dn, "max-data-speed", &max_frequency);
+
+	if (max_frequency >= 0)
+		priv->max_trans_data_speed = max_frequency;
+	else
+		priv->max_trans_data_speed = -1;
+}
+EXPORT_SYMBOL(of_transceiver_is_fixed);
+#endif
+
 /*
  * Common close function for cleanup before the device gets closed.
  *
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 141b05a..aec72b5 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -69,6 +69,9 @@ struct can_priv {
 	unsigned int echo_skb_max;
 	struct sk_buff **echo_skb;
 
+	unsigned int max_trans_arbitration_speed;
+	unsigned int max_trans_data_speed;
+
 #ifdef CONFIG_CAN_LEDS
 	struct led_trigger *tx_led_trig;
 	char tx_led_trig_name[CAN_LED_NAME_SZ];
@@ -165,6 +168,8 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
 unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
 void can_free_echo_skb(struct net_device *dev, unsigned int idx);
 
+void of_transceiver_is_fixed(struct net_device *dev);
+
 struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
 struct sk_buff *alloc_canfd_skb(struct net_device *dev,
 				struct canfd_frame **cfd);
-- 
2.10.0

  reply	other threads:[~2017-07-19 23:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-19 23:36 [PATCH 0/4] can: Add new binding to limit bit rate used Franklin S Cooper Jr
2017-07-19 23:36 ` Franklin S Cooper Jr [this message]
2017-07-20  7:43   ` [PATCH 1/4] can: dev: Add support for limiting configured bitrate Oliver Hartkopp
2017-07-20 15:55     ` Franklin S Cooper Jr
2017-07-26 20:04       ` Kurt Van Dijck
2017-07-27  1:44         ` Franklin S Cooper Jr
2017-07-20  9:52   ` Sergei Shtylyov
2017-07-20 15:59     ` Franklin S Cooper Jr
2017-07-19 23:36 ` [PATCH 2/4] can: fixed-transceiver: Add documentation for CAN fixed transceiver bindings Franklin S Cooper Jr
2017-07-20  9:45   ` Sergei Shtylyov
2017-07-19 23:36 ` [PATCH 3/4] can: m_can: Update documentation to mention new fixed transceiver binding Franklin S Cooper Jr
2017-07-24 19:50   ` Rob Herring
2017-07-19 23:36 ` [PATCH 4/4] can: m_can: Add call to of_transceiver_is_fixed Franklin S Cooper Jr

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=20170719233654.25908-2-fcooper@ti.com \
    --to=fcooper@ti.com \
    --cc=andrew@lunn.ch \
    --cc=dev.kurt@vandijck-laurijssen.be \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=quentin.schulz@free-electrons.com \
    --cc=robh+dt@kernel.org \
    --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

all inboxes | Powered by JetHome®