linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <davem@davemloft.net>, <robh+dt@kernel.org>,
	<mark.rutland@arm.com>, <f.fainelli@gmail.com>,
	<hkallweit1@gmail.com>, <andrew@lunn.ch>,
	Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH 11/16] net: phy: adin: PHY reset mechanisms
Date: Mon, 5 Aug 2019 19:54:48 +0300	[thread overview]
Message-ID: <20190805165453.3989-12-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20190805165453.3989-1-alexandru.ardelean@analog.com>

The ADIN PHYs supports 4 types of reset:
1. The standard PHY reset via BMCR_RESET bit in MII_BMCR reg
2. Reset via GPIO
3. Reset via reg GeSftRst (0xff0c) & reload previous pin configs
4. Reset via reg GeSftRst (0xff0c) & request new pin configs

Resets 2 & 4 are almost identical, with the exception that the crystal
oscillator is available during reset for 2.

Resetting via GeSftRst or via GPIO is useful when doing a warm reboot. If
doing various settings via phytool or ethtool, the sub-system registers
don't reset just via BMCR_RESET.

This change implements resetting the entire PHY subsystem during probe.
During PHY HW init (phy_hw_init() logic) the PHY core regs will be reset
again via BMCR_RESET. This will also need to happen during a PM resume.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/net/phy/adin.c | 82 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index 3c559a3ba487..476a81ce9341 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -6,12 +6,14 @@
  */
 #include <linux/kernel.h>
 #include <linux/bitfield.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/property.h>
+#include <linux/gpio/consumer.h>
 
 #include <dt-bindings/net/adin.h>
 
@@ -55,6 +57,9 @@
 #define ADIN1300_CLOCK_STOP_REG			0x9400
 #define ADIN1300_LPI_WAKE_ERR_CNT_REG		0xa000
 
+#define ADIN1300_GE_SOFT_RESET_REG		0xff0c
+#define   ADIN1300_GE_SOFT_RESET		BIT(0)
+
 #define ADIN1300_GE_RGMII_CFG_REG		0xff23
 #define   ADIN1300_GE_RGMII_RX_MSK		GENMASK(8, 6)
 #define   ADIN1300_GE_RGMII_RX_SEL(x)		\
@@ -86,6 +91,14 @@ static struct clause22_mmd_map clause22_mmd_map[] = {
 	{ MDIO_MMD_PCS, MDIO_PCS_EEE_WK_ERR,	ADIN1300_LPI_WAKE_ERR_CNT_REG },
 };
 
+/**
+ * struct adin_priv - ADIN PHY driver private data
+ * gpiod_reset		optional reset GPIO, to be used in soft_reset() cb
+ */
+struct adin_priv {
+	struct gpio_desc	*gpiod_reset;
+};
+
 static int adin_get_phy_internal_mode(struct phy_device *phydev)
 {
 	struct device *dev = &phydev->mdio.dev;
@@ -429,6 +442,73 @@ static int adin_read_status(struct phy_device *phydev)
 	return genphy_read_status(phydev);
 }
 
+static int adin_subsytem_soft_reset(struct phy_device *phydev)
+{
+	int reg, rc, i;
+
+	reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_SOFT_RESET_REG);
+	if (reg < 0)
+		return reg;
+
+	reg |= ADIN1300_GE_SOFT_RESET;
+	rc = phy_write_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_SOFT_RESET_REG,
+			   reg);
+	if (rc < 0)
+		return rc;
+
+	for (i = 0; i < 20; i++) {
+		usleep_range(500, 1000);
+		reg = phy_read_mmd(phydev, MDIO_MMD_VEND1,
+				   ADIN1300_GE_SOFT_RESET_REG);
+		if (reg < 0 || (reg & ADIN1300_GE_SOFT_RESET))
+			continue;
+		return 0;
+	}
+
+	return -ETIMEDOUT;
+}
+
+static int adin_reset(struct phy_device *phydev)
+{
+	struct adin_priv *priv = phydev->priv;
+	int ret;
+
+	if (priv->gpiod_reset) {
+		/* GPIO reset requires min 10 uS low,
+		 * 5 msecs max before we know that the interface is up again
+		 */
+		gpiod_set_value(priv->gpiod_reset, 0);
+		usleep_range(10, 15);
+		gpiod_set_value(priv->gpiod_reset, 1);
+		mdelay(5);
+
+		return 0;
+	}
+
+	/* Reset PHY core regs & subsystem regs */
+	return adin_subsytem_soft_reset(phydev);
+}
+
+static int adin_probe(struct phy_device *phydev)
+{
+	struct device *dev = &phydev->mdio.dev;
+	struct gpio_desc *gpiod_reset;
+	struct adin_priv *priv;
+
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
+	if (IS_ERR(gpiod_reset))
+		gpiod_reset = NULL;
+
+	priv->gpiod_reset = gpiod_reset;
+	phydev->priv = priv;
+
+	return adin_reset(phydev);
+}
+
 static struct phy_driver adin_driver[] = {
 	{
 		.phy_id		= PHY_ID_ADIN1200,
@@ -437,6 +517,7 @@ static struct phy_driver adin_driver[] = {
 		.features	= PHY_BASIC_FEATURES,
 		.flags		= PHY_HAS_INTERRUPT,
 		.config_init	= adin_config_init,
+		.probe		= adin_probe,
 		.config_aneg	= adin_config_aneg,
 		.read_status	= adin_read_status,
 		.ack_interrupt	= adin_phy_ack_intr,
@@ -453,6 +534,7 @@ static struct phy_driver adin_driver[] = {
 		.features	= PHY_GBIT_FEATURES,
 		.flags		= PHY_HAS_INTERRUPT,
 		.config_init	= adin_config_init,
+		.probe		= adin_probe,
 		.config_aneg	= adin_config_aneg,
 		.read_status	= adin_read_status,
 		.ack_interrupt	= adin_phy_ack_intr,
-- 
2.20.1


  parent reply	other threads:[~2019-08-05 13:56 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 16:54 [PATCH 00/16] net: phy: adin: add support for Analog Devices PHYs Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 01/16] " Alexandru Ardelean
2019-08-05 14:16   ` Andrew Lunn
2019-08-06  6:32     ` Ardelean, Alexandru
2019-08-05 15:17   ` Andrew Lunn
2019-08-06  6:35     ` Ardelean, Alexandru
2019-08-05 20:54   ` Heiner Kallweit
2019-08-06  6:35     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 02/16] net: phy: adin: hook genphy_{suspend,resume} into the driver Alexandru Ardelean
2019-08-05 14:17   ` Andrew Lunn
2019-08-05 16:54 ` [PATCH 03/16] net: phy: adin: add support for interrupts Alexandru Ardelean
2019-08-05 14:21   ` Andrew Lunn
2019-08-06  6:37     ` Ardelean, Alexandru
2019-08-05 21:02   ` Heiner Kallweit
2019-08-06  6:38     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 04/16] net: phy: adin: add {write,read}_mmd hooks Alexandru Ardelean
2019-08-05 14:25   ` Andrew Lunn
2019-08-06  6:38     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 05/16] net: phy: adin: configure RGMII/RMII/MII modes on config Alexandru Ardelean
2019-08-05 14:39   ` Andrew Lunn
2019-08-06  6:43     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 06/16] net: phy: adin: support PHY mode converters Alexandru Ardelean
2019-08-05 14:51   ` Andrew Lunn
2019-08-06  6:47     ` Ardelean, Alexandru
2019-08-06 15:39       ` Andrew Lunn
2019-08-07  8:00         ` Ardelean, Alexandru
2019-08-07 13:20           ` Andrew Lunn
2019-08-05 16:54 ` [PATCH 07/16] net: phy: adin: make RGMII internal delays configurable Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 08/16] net: phy: adin: make RMII fifo depth configurable Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 09/16] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 10/16] net: phy: adin: add EEE translation layer for Clause 22 Alexandru Ardelean
2019-08-05 22:11   ` Andrew Lunn
2019-08-06  6:47     ` Ardelean, Alexandru
2019-08-05 16:54 ` Alexandru Ardelean [this message]
2019-08-05 15:15   ` [PATCH 11/16] net: phy: adin: PHY reset mechanisms Andrew Lunn
2019-08-06  6:50     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 12/16] net: phy: adin: read EEE setting from device-tree Alexandru Ardelean
2019-08-05 15:19   ` Andrew Lunn
2019-08-06  6:52     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 13/16] net: phy: adin: implement Energy Detect Powerdown mode Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 14/16] net: phy: adin: make sure down-speed auto-neg is enabled Alexandru Ardelean
2019-08-05 15:22   ` Andrew Lunn
2019-08-06  6:53     ` Ardelean, Alexandru
2019-08-06  5:52   ` Heiner Kallweit
2019-08-06  6:53     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 15/16] net: phy: adin: add ethtool get_stats support Alexandru Ardelean
2019-08-05 15:28   ` Andrew Lunn
2019-08-06  7:11     ` Ardelean, Alexandru
2019-08-06 15:46       ` Andrew Lunn
2019-08-07  7:52         ` Ardelean, Alexandru
2019-08-05 15:30   ` Andrew Lunn
2019-08-06  7:18     ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 16/16] dt-bindings: net: add bindings for ADIN PHY driver Alexandru Ardelean
2019-08-05 14:11   ` Andrew Lunn
2019-08-06  7:03     ` Ardelean, Alexandru
2019-08-06 11:47     ` Ardelean, Alexandru
2019-08-05 14:27   ` Andrew Lunn
2019-08-06  6:57     ` Ardelean, Alexandru
2019-08-06 15:04   ` Rob Herring

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=20190805165453.3989-12-alexandru.ardelean@analog.com \
    --to=alexandru.ardelean@analog.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /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).