From patchwork Sat Feb 22 18:38:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 13986810 X-Patchwork-Delegate: kuba@kernel.org Received: from mx4.wp.pl (mx4.wp.pl [212.77.101.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FA9920C46B for ; Sat, 22 Feb 2025 18:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.77.101.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740249902; cv=none; b=F7D/CIT4DQDGzBJw2F6TFGWSzjmuJeHT1NDZ5WOOvV16q6CzZAWlG5iixzGfCR/FipB0JUjRACracrBd3X5A2e+ecOigxLT1uMB9nSpNceWU0tqWjo+e7rGVlxU/pvozu4bD4AZAChsKjfNyBjhJ7GfByCeb6jD/LIzo4nlsC7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740249902; c=relaxed/simple; bh=bJwz0Ulxy/4MRJjnoRaz8nlgEfTr5vN1BUc5gHeAHEs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=apnp1N98PeVicRoTo6bmjwe9yVZ80Tc8buueXXIAUuqxyFlVBaIx/rdfF/Zf2yRmePBaid+z69a01VYVdrEiCsFqP98r+A5/Rb+f+EPfdtIN4WL4vZ4/Vrq/zpJHwIwaqMorlVaiEjs8SJxz+6jOCNFq6siCP9hgCPZ7dRi3p7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wp.pl; spf=pass smtp.mailfrom=wp.pl; dkim=pass (2048-bit key) header.d=wp.pl header.i=@wp.pl header.b=WctiwARz; arc=none smtp.client-ip=212.77.101.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wp.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wp.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wp.pl header.i=@wp.pl header.b="WctiwARz" Received: (wp-smtpd smtp.wp.pl 47211 invoked from network); 22 Feb 2025 19:38:16 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=20241105; t=1740249496; bh=i2RkCP+0CD/CKqcMDclhiyW4ZjR3USyzMiy1CqfKjro=; h=From:To:Cc:Subject; b=WctiwARzWh/JjZB+vvs/IY/R7mPGGXSRQ5Z+1FiAbjueomObR7tmo7DuV/DxYuuyc fRZsJEwu9qpbFJva2JD+9uY2WAFwiVrnBKZyTu9ewi7h5T7tiii6VNEuBo9rDq5WNo Xu3d85Hx9FTasG1lCnqNtE18qFiqF0vMw6x0ZDflKuv0Ka3e1CjrDVe2IxFincQHQ9 7dYrnwoycjMLo+PSbCwAb8CRlCKJ6oTV+QSY34qaTtTpJlP2/rosq40PxVqQLhyE9v Y8hnGDxJWtvvJMUKovZcfjuAytvIvMiMlrb8T/DIn5A5vLb+z/qeFl38h66BAfbRTT IJTj51PbDuiRw== Received: from 83.6.114.178.ipv4.supernova.orange.pl (HELO laptop-olek.home) (olek2@wp.pl@[83.6.114.178]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 22 Feb 2025 19:38:16 +0100 From: Aleksander Jan Bajkowski To: lxu@maxlinear.com, andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aleksander Jan Bajkowski , Daniel Golle Subject: [PATCH net-next 1/2] net: phy: add LED dimming support Date: Sat, 22 Feb 2025 19:38:13 +0100 Message-Id: <20250222183814.3315-1-olek2@wp.pl> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-WP-MailID: dc5426013d86a711e844cf2620b6b218 X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 000000B [YUOk] X-Patchwork-Delegate: kuba@kernel.org Some PHYs support LED dimming. The use case is a router that dims LEDs at night. PHYs from different manufacturers support a different number of brightness levels, so it was necessary to extend the API with the led_max_brightness() function. If this function is omitted, a default value is used, assuming that only two levels are supported. Signed-off-by: Aleksander Jan Bajkowski Reviewed-by: Daniel Golle --- drivers/net/phy/phy_device.c | 7 ++++++- include/linux/phy.h | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 46713d27412b..f9631f093baa 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -3351,7 +3351,12 @@ static int of_phy_led(struct phy_device *phydev, cdev->hw_control_get_device = phy_led_hw_control_get_device; #endif - cdev->max_brightness = 1; + if (phydev->drv->led_max_brightness) + cdev->max_brightness = + phydev->drv->led_max_brightness(phydev, index); + else + cdev->max_brightness = 1; + init_data.devicename = dev_name(&phydev->mdio.dev); init_data.fwnode = of_fwnode_handle(led); init_data.devname_mandatory = true; diff --git a/include/linux/phy.h b/include/linux/phy.h index 19f076a71f94..248a47c8817b 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1216,6 +1216,13 @@ struct phy_driver { int (*led_brightness_set)(struct phy_device *dev, u8 index, enum led_brightness value); + /** + * &led_max_brightness: Maximum number of brightness levels + * supported by hardware. When only two levels are supported + * i.e. LED_ON and LED_OFF the function can be omitted. + */ + int (*led_max_brightness)(struct phy_device *dev, u8 index); + /** * @led_blink_set: Set a PHY LED blinking. Index indicates * which of the PHYs led should be configured to blink. Delays From patchwork Sat Feb 22 18:38:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 13986811 X-Patchwork-Delegate: kuba@kernel.org Received: from mx4.wp.pl (mx4.wp.pl [212.77.101.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C2D820ADC7 for ; Sat, 22 Feb 2025 18:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.77.101.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740249940; cv=none; b=Wv2BeIhtBqshumR6qa0Mu+hHTq4C0aG0+w0ETSm4m+nargLQc7FVNCjdEy6oKgb537GYyq2fWOJQ/r8HWrSyHfm9xXgnADLEAySVTSgETvYuzmm7b1RpfvolcIFGrok686tzTLXu11L9CfwNqxDB6chgAi0tUjF254pNYVeJqoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740249940; c=relaxed/simple; bh=UY0FyJRMlomFXpdsqS5bq5DVioEPyygV8zmW/gG88kQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TWxhLiW+nZtBgnFex3nH8cDABwbfdV0ZxhXufRRIFMZx7U3XCKBouFGswjIQ40Lh624MCB2xNR/0OWZTC2smUHTKpCMj2HjXwQnntGxp5qkn7wnVV0RKpk9p22U86dQexHnOFDOLI8WrEa7NW+fkM6xY1A1QUsxt5a6DddDMho8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wp.pl; spf=pass smtp.mailfrom=wp.pl; dkim=pass (2048-bit key) header.d=wp.pl header.i=@wp.pl header.b=Aotv2cac; arc=none smtp.client-ip=212.77.101.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=wp.pl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wp.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wp.pl header.i=@wp.pl header.b="Aotv2cac" Received: (wp-smtpd smtp.wp.pl 602 invoked from network); 22 Feb 2025 19:38:20 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=20241105; t=1740249534; bh=Gwr+idDjxQN3SNHVjwp8VdoQWjpx57hgt/rGSMwb5ic=; h=From:To:Cc:Subject; b=Aotv2cacfNr/eGllgU40PGE8fuGxtDEvEiVsLaJVscCZHSO6BYY3FQVD4UzV5CAyS xwDjYMOKMFcXCZ/qz5+8+ZBslkysgPk/DlEdxuyqjCYYffi2qeB3SnoPUwguDgspgX nTrZSK29m0pMY/BtXb3h3EKTDrYNC9tSxZ567yigX8pjEIw/WIVWpixONtyr3EbBId CdYZwnhugYDjb4L5C+2QCpoAOX/fvM9aH9IWNUU02+nnA/cdQqiyTRacro9hwoZW7K 5kNVji9/M1G7AtkyRdlb/jAL3uayxEWp/M46aApmdQuwNp0wWnIjKrPuLjhLQetxGs DGwFkvGACEcRg== Received: from 83.6.114.178.ipv4.supernova.orange.pl (HELO laptop-olek.home) (olek2@wp.pl@[83.6.114.178]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 22 Feb 2025 19:38:20 +0100 From: Aleksander Jan Bajkowski To: lxu@maxlinear.com, andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Aleksander Jan Bajkowski , Daniel Golle Subject: [PATCH net-next 2/2] net: phy: mxl-gpy: add LED dimming support Date: Sat, 22 Feb 2025 19:38:14 +0100 Message-Id: <20250222183814.3315-2-olek2@wp.pl> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250222183814.3315-1-olek2@wp.pl> References: <20250222183814.3315-1-olek2@wp.pl> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-WP-MailID: f029fd9ffb273f107fb38f4eb8b3f943 X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 0000000 [scME] X-Patchwork-Delegate: kuba@kernel.org Some PHYs support LED dimming. The use case is a router that dims LEDs at night. In the GPY2xx series, the PWM control register is common to all LEDs. To avoid confusing users, only the first LED used has brightness control enabled. In many routers only one LED is connected to PHY. When the minimum or maximum value is set, the PWM is turned off. As of now, only Maxlinear PHYs support dimming. In the future, support may be extended to other PHYs such as the Realtek RTL8221B. Signed-off-by: Aleksander Jan Bajkowski Reviewed-by: Daniel Golle --- drivers/net/phy/mxl-gpy.c | 100 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index 94d9cb727121..321f2b5c260c 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -110,9 +110,11 @@ #define VSPEC1_MBOX_DATA 0x5 #define VSPEC1_MBOX_ADDRLO 0x6 #define VSPEC1_MBOX_CMD 0x7 -#define VSPEC1_MBOX_CMD_ADDRHI GENMASK(7, 0) -#define VSPEC1_MBOX_CMD_RD (0 << 8) #define VSPEC1_MBOX_CMD_READY BIT(15) +#define VSPEC1_MBOX_CMD_MASK GENMASK(11, 8) +#define VSPEC1_MBOX_CMD_WR 0x1 +#define VSPEC1_MBOX_CMD_RD 0x0 +#define VSPEC1_MBOX_CMD_ADDRHI GENMASK(7, 0) /* WoL */ #define VPSPEC2_WOL_CTL 0x0E06 @@ -124,6 +126,15 @@ /* Internal registers, access via mbox */ #define REG_GPIO0_OUT 0xd3ce00 +/* LED Brightness registers, access via mbox */ +#define LED_BRT_CTRL 0xd3cf84 +#define LED_BRT_CTRL_LVLMAX GENMASK(15, 12) +#define LED_BRT_CTRL_LVLMIN GENMASK(11, 8) +#define LED_BRT_CTRL_EN BIT(5) +#define LED_BRT_CTRL_TSEN BIT(4) + +#define GPY_MAX_BRIGHTNESS 15 + struct gpy_priv { /* serialize mailbox acesses */ struct mutex mbox_lock; @@ -138,6 +149,9 @@ struct gpy_priv { * is enabled. */ u64 lb_dis_to; + + /* LED index with brightness control enabled */ + int br_led_index; }; static const struct { @@ -267,7 +281,7 @@ static int gpy_mbox_read(struct phy_device *phydev, u32 addr) if (ret) goto out; - cmd = VSPEC1_MBOX_CMD_RD; + cmd = FIELD_PREP(VSPEC1_MBOX_CMD_MASK, VSPEC1_MBOX_CMD_RD); cmd |= FIELD_PREP(VSPEC1_MBOX_CMD_ADDRHI, addr >> 16); ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, VSPEC1_MBOX_CMD, cmd); @@ -293,6 +307,46 @@ static int gpy_mbox_read(struct phy_device *phydev, u32 addr) return ret; } +static int gpy_mbox_write(struct phy_device *phydev, u32 addr, u16 data) +{ + struct gpy_priv *priv = phydev->priv; + int val, ret; + u16 cmd; + + mutex_lock(&priv->mbox_lock); + + ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, VSPEC1_MBOX_DATA, + data); + if (ret) + goto out; + + ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, VSPEC1_MBOX_ADDRLO, + addr); + if (ret) + goto out; + + cmd = FIELD_PREP(VSPEC1_MBOX_CMD_MASK, VSPEC1_MBOX_CMD_WR); + cmd |= FIELD_PREP(VSPEC1_MBOX_CMD_ADDRHI, addr >> 16); + + ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, VSPEC1_MBOX_CMD, cmd); + if (ret) + goto out; + + /* The mbox read is used in the interrupt workaround. It was observed + * that a read might take up to 2.5ms. This is also the time for which + * the interrupt line is stuck low. To be on the safe side, poll the + * ready bit for 10ms. + */ + ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, + VSPEC1_MBOX_CMD, val, + (val & VSPEC1_MBOX_CMD_READY), + 500, 10000, false); + +out: + mutex_unlock(&priv->mbox_lock); + return ret; +} + static int gpy_config_init(struct phy_device *phydev) { /* Nothing to configure. Configuration Requirement Placeholder */ @@ -323,6 +377,7 @@ static int gpy_probe(struct phy_device *phydev) priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; + priv->br_led_index = -1; phydev->priv = priv; mutex_init(&priv->mbox_lock); @@ -861,7 +916,8 @@ static int gpy115_loopback(struct phy_device *phydev, bool enable) static int gpy_led_brightness_set(struct phy_device *phydev, u8 index, enum led_brightness value) { - int ret; + struct gpy_priv *priv = phydev->priv; + int ret, reg; if (index >= GPY_MAX_LEDS) return -EINVAL; @@ -874,7 +930,21 @@ static int gpy_led_brightness_set(struct phy_device *phydev, if (ret) return ret; - /* ToDo: set PWM brightness */ + /* Set PWM brightness */ + if (index == priv->br_led_index) { + if (value > LED_OFF && value < GPY_MAX_BRIGHTNESS) { + reg = LED_BRT_CTRL_EN; + + reg |= FIELD_PREP(LED_BRT_CTRL_LVLMIN, 0x4); + reg |= FIELD_PREP(LED_BRT_CTRL_LVLMAX, value); + } else { + reg = LED_BRT_CTRL_TSEN; + } + + ret = gpy_mbox_write(phydev, LED_BRT_CTRL, reg); + if (ret < 0) + return ret; + } /* clear HW LED setup */ if (value == LED_OFF) @@ -883,6 +953,17 @@ static int gpy_led_brightness_set(struct phy_device *phydev, return 0; } +static int gpy_led_max_brightness(struct phy_device *phydev, u8 index) +{ + struct gpy_priv *priv = phydev->priv; + + if (priv->br_led_index < 0) { + priv->br_led_index = index; + return GPY_MAX_BRIGHTNESS; + } + + return 1; +} static const unsigned long supported_triggers = (BIT(TRIGGER_NETDEV_LINK) | BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_100) | @@ -1035,6 +1116,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1058,6 +1140,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy115_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1080,6 +1163,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy115_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1103,6 +1187,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1125,6 +1210,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1148,6 +1234,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1170,6 +1257,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1193,6 +1281,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set, @@ -1215,6 +1304,7 @@ static struct phy_driver gpy_drivers[] = { .get_wol = gpy_get_wol, .set_loopback = gpy_loopback, .led_brightness_set = gpy_led_brightness_set, + .led_max_brightness = gpy_led_max_brightness, .led_hw_is_supported = gpy_led_hw_is_supported, .led_hw_control_get = gpy_led_hw_control_get, .led_hw_control_set = gpy_led_hw_control_set,