netdev - [PATCH net-next 2/2] net: phy: mxl-gpy: Add mode for 2 leds

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 20 Sep 2022 17:14:11 +0200
From:   Marcus Carlberg <marcus.carlberg@...s.com>
To:     <lxu@...linear.com>, <andrew@...n.ch>
CC:     <linux-kernel@...r.kernel.org>, <kernel@...s.com>,
        Marcus Carlberg <marcus.carlberg@...s.com>,
        Heiner Kallweit <hkallweit1@...il.com>,
        <devicetree@...r.kernel.org>, Russell King <linux@...linux.org.uk>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        "Jakub Kicinski" <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>, <netdev@...r.kernel.org>
Subject: [PATCH net-next 2/2] net: phy: mxl-gpy: Add mode for 2 leds

GPY211 phy default to using all four led pins.
Hardwares using only two leds where led0 is used as the high
network speed led and led1 the low network speed led will not
get the correct behaviour since 1Gbit and 2.5Gbit will not be
represented at all in the existing leds.

This patch adds a property for switching to a two led mode as specified
above.

Signed-off-by: Marcus Carlberg <marcus.carlberg@...s.com>
---
 drivers/net/phy/mxl-gpy.c | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c
index 24bae27eedef..0886fa21c4ff 100644
--- a/drivers/net/phy/mxl-gpy.c
+++ b/drivers/net/phy/mxl-gpy.c
@@ -12,6 +12,7 @@
 #include <linux/phy.h>
 #include <linux/polynomial.h>
 #include <linux/netdevice.h>
+#include <linux/of_platform.h>

 /* PHY ID */
 #define PHY_ID_GPYx15B_MASK	0xFFFFFFFC
@@ -32,6 +33,7 @@
 #define PHY_MIISTAT		0x18	/* MII state */
 #define PHY_IMASK		0x19	/* interrupt mask */
 #define PHY_ISTAT		0x1A	/* interrupt status */
+#define PHY_LED			0x1B	/* LED control */
 #define PHY_FWV			0x1E	/* firmware version */

 #define PHY_MIISTAT_SPD_MASK	GENMASK(2, 0)
@@ -59,6 +61,16 @@
 #define PHY_FWV_MAJOR_MASK	GENMASK(11, 8)
 #define PHY_FWV_MINOR_MASK	GENMASK(7, 0)

+/* LED */
+#define VSPEC1_LED0_CTRL	0x01
+#define VSPEC1_LED1_CTRL	0x02
+#define VSPEC1_LED2_CTRL	0x03
+#define VSPEC1_LED3_CTRL	0x04
+#define TWO_LED_CONFIG				0x0300
+#define LED_BLINK_2500MBIT			0x0380
+#define LED_BLINK_1000MBIT_100MBIT_10_MBIT	0x0370
+#define LED_DUAL_MODE	2
+
 /* SGMII */
 #define VSPEC1_SGMII_CTRL	0x08
 #define VSPEC1_SGMII_CTRL_ANEN	BIT(12)		/* Aneg enable */
@@ -201,9 +213,34 @@ static int gpy_config_init(struct phy_device *phydev)
 	return ret < 0 ? ret : 0;
 }

+static int gpy_override_led_mode(struct phy_device
+				*phydev, u32 led_mode)
+{
+	int ret;
+
+	if (led_mode == LED_DUAL_MODE) {
+		ret = phy_write(phydev, PHY_LED, TWO_LED_CONFIG);
+		if (ret < 0)
+			return ret;
+		ret = phy_write_mmd(phydev, MDIO_MMD_VEND1,
+				    VSPEC1_LED0_CTRL,
+				    LED_BLINK_2500MBIT);
+		if (ret < 0)
+			return ret;
+		ret = phy_write_mmd(phydev, MDIO_MMD_VEND1,
+				    VSPEC1_LED1_CTRL,
+				    LED_BLINK_1000MBIT_100MBIT_10_MBIT);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
 static int gpy_probe(struct phy_device *phydev)
 {
 	struct device *dev = &phydev->mdio.dev;
+	struct device_node *np = dev->of_node;
 	struct gpy_priv *priv;
 	int fw_version;
 	int ret;
@@ -234,6 +271,14 @@ static int gpy_probe(struct phy_device *phydev)
 		    priv->fw_major, priv->fw_minor, fw_version,
 		    fw_version & PHY_FWV_REL_MASK ? "" : " test version");

+	/* Override led mode */
+	ret  = of_property_read_bool(np, "mxl,dual-led-mode");
+	if (ret) {
+		ret = gpy_override_led_mode(phydev, LED_DUAL_MODE);
+		if (ret < 0)
+			return ret;
+	}
+
 	return 0;
 }

--
2.20.1