From: Roger Quadros <rogerq@ti.com>
To: <wg@grandegger.com>, <mkl@pengutronix.de>
Cc: <wsa@the-dreams.de>, <tony@atomide.com>, <tglx@linutronix.de>,
<mugunthanvnm@ti.com>, <george.cherian@ti.com>, <balbi@ti.com>,
<nsekhar@ti.com>, <nm@ti.com>,
<sergei.shtylyov@cogentembedded.com>,
<linux-omap@vger.kernel.org>, <linux-can@vger.kernel.org>,
<netdev@vger.kernel.org>
Subject: [PATCH v5 6/8] net: can: c_can: Disable pins when CAN interface is down
Date: Thu, 13 Nov 2014 17:23:43 +0200 [thread overview]
Message-ID: <5464CCFF.5010004@ti.com> (raw)
In-Reply-To: <1415371762-29885-7-git-send-email-rogerq@ti.com>
DRA7 CAN IP suffers from a problem which causes it to be prevented
from fully turning OFF (i.e. stuck in transition) if the module was
disabled while there was traffic on the CAN_RX line.
To work around this issue we select the SLEEP pin state by default
on probe and use the DEFAULT pin state on CAN up and back to the
SLEEP pin state on CAN down.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/net/can/c_can/c_can.c | 37 +++++++++++++++++++++++++++++++++++++
drivers/net/can/c_can/c_can.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 8e78bb4..c80cb3d 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -35,6 +35,7 @@
#include <linux/list.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
+#include <linux/pinctrl/consumer.h>
#include <linux/can.h>
#include <linux/can/dev.h>
@@ -587,6 +588,21 @@ static int c_can_chip_config(struct net_device *dev)
return c_can_set_bittiming(dev);
}
+/*
+ * Selects the pinctrl state specified in the name.
+ */
+static void c_can_pinctrl_select_state(struct c_can_priv *priv,
+ const char *name)
+{
+ if (!IS_ERR(priv->pinctrl)) {
+ struct pinctrl_state *s;
+
+ s = pinctrl_lookup_state(priv->pinctrl, name);
+ if (!IS_ERR(s))
+ pinctrl_select_state(priv->pinctrl, s);
+ }
+}
+
static int c_can_start(struct net_device *dev)
{
struct c_can_priv *priv = netdev_priv(dev);
@@ -603,6 +619,8 @@ static int c_can_start(struct net_device *dev)
priv->can.state = CAN_STATE_ERROR_ACTIVE;
+ /* activate pins */
+ c_can_pinctrl_select_state(priv, PINCTRL_STATE_DEFAULT);
return 0;
}
@@ -611,6 +629,9 @@ static void c_can_stop(struct net_device *dev)
struct c_can_priv *priv = netdev_priv(dev);
c_can_irq_control(priv, false);
+
+ /* deactivate pins */
+ c_can_pinctrl_select_state(priv, PINCTRL_STATE_SLEEP);
priv->can.state = CAN_STATE_STOPPED;
}
@@ -1244,6 +1265,22 @@ int register_c_can_dev(struct net_device *dev)
struct c_can_priv *priv = netdev_priv(dev);
int err;
+ priv->pinctrl = devm_pinctrl_get(dev->dev.parent);
+ if (!IS_ERR(priv->pinctrl)) {
+ struct pinctrl_state *s;
+
+ /* Deactivate pins to prevent DRA7 DCAN IP from being
+ * stuck in transition when module is disabled.
+ * Pins are activated in c_can_start() and deactivated
+ * in c_can_stop()
+ */
+ s = pinctrl_lookup_state(priv->pinctrl, PINCTRL_STATE_SLEEP);
+ if (!IS_ERR(s))
+ pinctrl_select_state(priv->pinctrl, s);
+ } else {
+ netdev_dbg(dev, "failed to get pinctrl\n");
+ }
+
c_can_pm_runtime_enable(priv);
dev->flags |= IFF_ECHO; /* we support local echo */
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index c6715ca..3cedf48 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -210,6 +210,7 @@ struct c_can_priv {
u32 comm_rcv_high;
u32 rxmasked;
u32 dlc[C_CAN_MSG_OBJ_TX_NUM];
+ struct pinctrl *pinctrl;
};
struct net_device *alloc_c_can_dev(void);
--
1.8.3.2
next prev parent reply other threads:[~2014-11-13 15:24 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 14:49 [PATCH v4 0/8] net: can: Use syscon regmap for TI specific RAMINIT register Roger Quadros
2014-11-07 14:49 ` [PATCH v4 1/8] net: can: c_can: Add timeout to c_can_hw_raminit_ti() Roger Quadros
2014-11-07 14:49 ` [PATCH v4 2/8] net: can: c_can: Introduce c_can_driver_data structure Roger Quadros
2014-11-13 10:57 ` Marc Kleine-Budde
2014-11-07 14:49 ` [PATCH v4 3/8] net: can: c_can: Add RAMINIT register information to driver data Roger Quadros
2014-11-13 10:59 ` Marc Kleine-Budde
2014-11-14 17:55 ` Marc Kleine-Budde
2014-11-17 11:17 ` Roger Quadros
2014-11-17 11:22 ` Marc Kleine-Budde
2014-11-17 11:29 ` Roger Quadros
2014-11-07 14:49 ` [PATCH v4 4/8] net: can: c_can: Add syscon/regmap RAMINIT mechanism Roger Quadros
2014-11-13 11:09 ` Marc Kleine-Budde
2014-11-13 12:09 ` Roger Quadros
2014-11-13 12:58 ` Marc Kleine-Budde
2014-11-13 12:44 ` Marc Kleine-Budde
2014-11-13 13:07 ` Roger Quadros
2014-11-14 15:37 ` [PATCH v5 " Roger Quadros
2014-11-14 16:32 ` Marc Kleine-Budde
2014-11-14 16:42 ` Roger Quadros
2014-11-07 14:49 ` [PATCH v4 5/8] net: can: c_can: Add support for START pulse in RAMINIT sequence Roger Quadros
2014-11-07 14:49 ` [PATCH v4 6/8] net: can: c_can: Disable pins when CAN interface is down Roger Quadros
2014-11-07 14:54 ` Marc Kleine-Budde
2014-11-10 9:00 ` Roger Quadros
2014-11-12 14:16 ` [PATCH v5 " Roger Quadros
2014-11-13 12:56 ` Marc Kleine-Budde
2014-11-13 13:04 ` Roger Quadros
2014-11-13 15:23 ` Roger Quadros [this message]
2014-11-13 16:03 ` Marc Kleine-Budde
2014-11-14 13:43 ` Roger Quadros
2014-11-27 13:28 ` Linus Walleij
2014-11-14 15:40 ` [PATCH v7 " Roger Quadros
2014-11-14 15:49 ` Marc Kleine-Budde
2014-11-14 16:04 ` Roger Quadros
2014-11-27 13:26 ` Linus Walleij
2014-11-27 21:19 ` Marc Kleine-Budde
2014-11-28 9:22 ` Roger Quadros
2014-11-07 14:49 ` [PATCH v4 7/8] net: can: c_can: Add support for TI DRA7 DCAN Roger Quadros
2014-11-14 15:56 ` Marc Kleine-Budde
2014-11-07 14:49 ` [PATCH v4 8/8] net: can: c_can: Add support for TI am3352 DCAN Roger Quadros
2014-11-13 16:06 ` Wolfram Sang
2014-11-14 9:25 ` Marc Kleine-Budde
2014-11-14 11:26 ` Wolfram Sang
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=5464CCFF.5010004@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=george.cherian@ti.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=mugunthanvnm@ti.com \
--cc=netdev@vger.kernel.org \
--cc=nm@ti.com \
--cc=nsekhar@ti.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=tglx@linutronix.de \
--cc=tony@atomide.com \
--cc=wg@grandegger.com \
--cc=wsa@the-dreams.de \
/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).