From patchwork Mon Mar 17 20:05:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Klein X-Patchwork-Id: 14019933 X-Patchwork-Delegate: kuba@kernel.org Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.164]) (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 21C1579E1; Mon, 17 Mar 2025 20:05:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.164 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742241944; cv=pass; b=M+JdsfHsgkb4U1sR8EBT2SXpAaX403jttp1VvdJFXB/yHIYuNBo/plLePlW+xE8PzxouEkZBtf1uZ7FhTsiFQ6nX25dczFWlYRnzUarl632ZIbBZH6s9iyrn0ai1MUyu06N3fjAiSPXYd0xUzeML5AUCWaWfV1uQkY/77axfA6o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742241944; c=relaxed/simple; bh=U6GrnPSi2yFmpgTKSdcqG84giw5n2Hxx/Ub9Os6ddrU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=tCH5L9mUROQdYhjZL8iY3+twlrww5i1oDMuHdO0Mt0ebxVOlgv85v0ghbgxJGtzXKqaPLZkBht0v6DAuOYu2Qohj0BRoYfo0WpUi278VwV2ChZQL5hxcA/C2QGojMwX4nJaD6VdX/wXLd6qA6D+8+/csHN5R3j1Oza8qluH4eGI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de; spf=pass smtp.mailfrom=a98shuttle.de; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=Cac2+CLl; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=7iLd6Nzb; arc=pass smtp.client-ip=81.169.146.164 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=a98shuttle.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="Cac2+CLl"; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="7iLd6Nzb" ARC-Seal: i=1; a=rsa-sha256; t=1742241939; cv=none; d=strato.com; s=strato-dkim-0002; b=iMaN/0r9fiKsQjO4zTbmKe41l7f7uYypplty658bV7ICObCTk765thwPK3NarMsrvU gm+wzAUVxhZqNwcH6R0PQ8F4CuWtnszhSWFyspZ33TShFOCQLsjsTAV23BmCD5g1Jj7m IC31BMIe/orZZ0M7NaVc78AAlDbls78DKb4gnUCtMLCxdK/GzQFQ+3SAtPFNJFtuLI8q /KGPt+sGC20aMHo3KD6FqrsextiVDxKoarGQ+vibDtYArNTjJYs4ercUTHVsE1IObf+x P5k8BdJmHPT1WFJVta0sWWvGmtNP5G0yy4Hk9JKdOHN5ET+umnVhG5GxUO6yOtNa5KZV mpZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241939; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=3kkBE2FADa1BSfO/iHOVTvgNaF7Wi7L3lOA9hYb6Sxg=; b=LAmQMt9GD2imJ5RQRFZ6hErwewcLTxQmgc6FYojsj2A/5wmrAuCBfv3H/OIMAzKQRr VpqgSguT9ZgC+GvhoA3Mqn7u36vXOPx0FgGUIGs3HkPMvlTCwkP1OAsoFzPDlEwonDj2 o032h/btULbxojf6DxECckCZKVCi7bCGr6gLUqUfJEFRqiJBLdpHjcDzFQL9jTGQmR5R 8eF40EcxX8gXdxSOIg/2mawHakCf/9KZR4s9W4Dhqns/4iwFYlAqurzfPKoZ3QEHHG6t h2GXQtpbhpMOz5iG6/ct+REL3EqriJ2s1StzygdFDIpZsHnrotid+tIMxGwUzNOFeSMf tFqg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241939; s=strato-dkim-0002; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=3kkBE2FADa1BSfO/iHOVTvgNaF7Wi7L3lOA9hYb6Sxg=; b=Cac2+CLlV+INs33cHUh4EGOzAZyXQgxW5ea5i1pFGu4zsQKM1sVVHb1f7NUimHeoIy UqcbRi0kuzQWjY6/LkrrCE6XorXe6aGfeRFFt19lF5r3//jrzu5yn+3mUk8spZ80lNvc Rg1TIXPptcdDMZQqSMeZKa8Rf6Wz6dAPIwbeSy5ZTdKyBjyoeKgCXxEoDmcwuuQYAbOh VJaIeHyJfJ47wiO9EciALFrocRZ1H5kxOq7SKlTgqJ+Ko7zPonT8t4tf1HefGMHxNIBw naZVP4x2R3AwcgB0o+ANGlBSmftvNT5bPyQzVdZnJk3gC8OFK01t/LG0P15IWvyek4hg wREg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1742241939; s=strato-dkim-0003; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=3kkBE2FADa1BSfO/iHOVTvgNaF7Wi7L3lOA9hYb6Sxg=; b=7iLd6Nzb9gOrTv5iwwKfJoTyI5Lsunwwxt+GZUC6WeHSOv7k6zQPDpUMrjef+IujnL BpVNJIupFdVgYQ5+0/Aw== X-RZG-AUTH: ":O2kGeEG7b/pS1EzgE2y7nF0STYsSLflpbjNKxx7cGrBdao6FTL4AJcMdm+lap4JEHkzok9eyEg==" Received: from aerfugl by smtp.strato.de (RZmta 51.3.0 AUTH) with ESMTPSA id f28b3512HK5cFzz (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 17 Mar 2025 21:05:38 +0100 (CET) Received: from koltrast.home ([192.168.1.27] helo=a98shuttle.de) by aerfugl with smtp (Exim 4.96) (envelope-from ) id 1tuGiN-00085O-1C; Mon, 17 Mar 2025 21:05:35 +0100 Received: (nullmailer pid 93665 invoked by uid 502); Mon, 17 Mar 2025 20:05:35 -0000 From: Michael Klein To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Michael Klein , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 1/3] net: phy: realtek: Clean up RTL8211E ExtPage access Date: Mon, 17 Mar 2025 21:05:30 +0100 Message-Id: <20250317200532.93620-2-michael@fossekall.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317200532.93620-1-michael@fossekall.de> References: <20250317200532.93620-1-michael@fossekall.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org - Factor out RTL8211E extension page access code to rtl8211e_modify_ext_page()/rtl8211e_read_ext_page() and add some related #define:s - Group RTL8211E_* and RTL8211F_* #define:s - Clean up rtl8211e_config_init() Signed-off-by: Michael Klein --- drivers/net/phy/realtek/realtek_main.c | 49 ++++++++++++++------------ 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c index 7a0b19d66aca..58ec16cc8061 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -28,13 +28,21 @@ #define RTL821x_INSR 0x13 -#define RTL821x_EXT_PAGE_SELECT 0x1e +#define RTL8211E_EXT_PAGE_SELECT 0x1e #define RTL821x_PAGE_SELECT 0x1f +#define RTL8211E_SET_EXT_PAGE 0x07 + +#define RTL8211E_CTRL_DELAY BIT(13) +#define RTL8211E_TX_DELAY BIT(12) +#define RTL8211E_RX_DELAY BIT(11) + #define RTL8211F_PHYCR1 0x18 #define RTL8211F_PHYCR2 0x19 #define RTL8211F_INSR 0x1d +#define RTL8211F_CLKOUT_EN BIT(0) + #define RTL8211F_LEDCR 0x10 #define RTL8211F_LEDCR_MODE BIT(15) #define RTL8211F_LEDCR_ACT_TXRX BIT(4) @@ -51,12 +59,6 @@ #define RTL8211F_ALDPS_ENABLE BIT(2) #define RTL8211F_ALDPS_XTAL_OFF BIT(12) -#define RTL8211E_CTRL_DELAY BIT(13) -#define RTL8211E_TX_DELAY BIT(12) -#define RTL8211E_RX_DELAY BIT(11) - -#define RTL8211F_CLKOUT_EN BIT(0) - #define RTL8201F_ISR 0x1e #define RTL8201F_ISR_ANERR BIT(15) #define RTL8201F_ISR_DUPLEX BIT(13) @@ -134,6 +136,21 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) return __phy_write(phydev, RTL821x_PAGE_SELECT, page); } +static int rtl8211e_modify_ext_page(struct phy_device *phydev, u16 ext_page, + u32 regnum, u16 mask, u16 set) +{ + int oldpage, ret = 0; + + oldpage = phy_select_page(phydev, RTL8211E_SET_EXT_PAGE); + if (oldpage >= 0) { + ret = __phy_write(phydev, RTL8211E_EXT_PAGE_SELECT, ext_page); + if (ret == 0) + ret = __phy_modify(phydev, regnum, mask, set); + } + + return phy_restore_page(phydev, oldpage, ret); +} + static int rtl821x_probe(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; @@ -600,7 +617,8 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, static int rtl8211e_config_init(struct phy_device *phydev) { - int ret = 0, oldpage; + const u16 delay_mask = RTL8211E_CTRL_DELAY | + RTL8211E_TX_DELAY | RTL8211E_RX_DELAY; u16 val; /* enable TX/RX delay for rgmii-* modes, and disable them for rgmii. */ @@ -630,20 +648,7 @@ static int rtl8211e_config_init(struct phy_device *phydev) * 12 = RX Delay, 11 = TX Delay * 10:0 = Test && debug settings reserved by realtek */ - oldpage = phy_select_page(phydev, 0x7); - if (oldpage < 0) - goto err_restore_page; - - ret = __phy_write(phydev, RTL821x_EXT_PAGE_SELECT, 0xa4); - if (ret) - goto err_restore_page; - - ret = __phy_modify(phydev, 0x1c, RTL8211E_CTRL_DELAY - | RTL8211E_TX_DELAY | RTL8211E_RX_DELAY, - val); - -err_restore_page: - return phy_restore_page(phydev, oldpage, ret); + return rtl8211e_modify_ext_page(phydev, 0xa4, 0x1c, delay_mask, val); } static int rtl8211b_suspend(struct phy_device *phydev) From patchwork Mon Mar 17 20:05:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Klein X-Patchwork-Id: 14019944 X-Patchwork-Delegate: kuba@kernel.org Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.82]) (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 2A2D679D0; Mon, 17 Mar 2025 20:11:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742242317; cv=pass; b=PKClAmdLAZVLZSE2dZdoKygigf4AGeZhHFNjKDvBvFvt73Kj1szMaleYEjxCn8azwmcJFO+X7FX7sT8XwnCL5G6gwKHl64qX4PdVKv4tSkFeA/xUzNdogBtRrNQm12MQDB33fs2wz4iq4rzHu7ipRzFIw4anHOJGuYWEphln77E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742242317; c=relaxed/simple; bh=9NVjqnYgCsBmMDzDcrvPyoQHqImXvWPH7qg2UlpgFEo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=k5mt+XZB8wajTv40WV3F4uI+6jsNXkvWDjjIDxKJM6H/ibKepJsgSNvOs42lGOt1yOv/X8CGn4zMBRPhxk7e9WpaD6K5ows36U8LSKAn7F0CaHUXVFa+fsNfe2Wv9a0BMK7b+KSnWCwMBTbBmHJbKDBoIY61YjANjKlne0TFKvg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de; spf=pass smtp.mailfrom=a98shuttle.de; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=RVNd4JTS; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=OqoapmT1; arc=pass smtp.client-ip=85.215.255.82 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=a98shuttle.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="RVNd4JTS"; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="OqoapmT1" ARC-Seal: i=1; a=rsa-sha256; t=1742241940; cv=none; d=strato.com; s=strato-dkim-0002; b=ZU9nCznBL4BGjTOQQnS1iDd9RBbj1EAKhVzM8Ej7apTiSEuA9zTTcjRLRdfim2+tX6 XDqyi60FsXNopppOoTAG7kInKxDqEm1UjtazwzskwIHV7Q1GL11odkvWZgxSMAMiSgZX 3rCZ0Z45JVVnCwG81v56VrvmqAK84ssJN07MceIFrLnaDmLSXehkhq9R7zj3lIDb8Yka 3Q/3FVS9aoVDlcpyW2gA0AaO5EBP/M1Noi7/FVTXhgj90yzyTBo/4B4h8KGfWuQpLrel XO3laV91A1dWWay+y+NLRH6pQpymSzSIxC3Ah4ubzZbxp4PW9R7E/azMhsD7/L6YnRDd HZ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=X41sAXwx4dq+mleJddWvcwMFzvvjwQW2qCXvir84Qzw=; b=qufXWoYJr4waMziggK5NjKUPSUk/35atBEGxT5C6+E8ak5izc4FqM5sU2CUqx5xzcU 79vUFouD4TlgItEJ/U4x19E/dVib09Nxv7HRmgFytVASrWEdoj+4yQdAgQ8hwukxGLTS 2oUneYezCMv0iqlA+iWClTYcvqz32AvJxWfSLDsK+kG7p/tPtlenZSlWWD7k17WyRZjU +WMHH28QNRMY5eI2iVv05IhMfRg5jxQOzeNxbwGOU9b964blzsu7Fblz3PSKPRNuzyai gKj0vpk9rRpVgOYjmBeIp/XqKF1tYU4IC2IjF+gJAw2IWv18MdRlOgDzLQdyfU1zIm5i Z6Hg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0002; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=X41sAXwx4dq+mleJddWvcwMFzvvjwQW2qCXvir84Qzw=; b=RVNd4JTS8T4HPThBPqQ+fVdtvp6sF3C1v+IMpMJa3LBQP0YaktiAVYG5/rkCMmk6I9 Q2fiiEdwq8nGT5+fRmNtB4/RS1pM84IKrhc6W9BXlk2zuKh1SL72J4+7QoNpxLjeXr0Z QoeB0a+G53/eCT/0LMC2NtJXewTORsZgOtc1jNOd0aVyRvYXuftMtFSpbTHArloOOc4f 3VnvNYm3d/0zNRNc4Ih1QaUr1Lhv8Utc1L/v0NSJ1Az8cfGfc6QMmNk4Wd2nMLSMO8pP WDwMIVPfQGRm8F1eVFeE+vr/xCzpbUfrYwZnSPNZqx7JyCZOc95qcPhX3RluM9NSSpi/ 38ww== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0003; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=X41sAXwx4dq+mleJddWvcwMFzvvjwQW2qCXvir84Qzw=; b=OqoapmT1M6lpr+0JO050nYZ99p96deV4s/sh5ZDI+BHV2rsBmk0MVHAI9lX6qX0eDn JVdaef/JMah+7X821QBQ== X-RZG-AUTH: ":O2kGeEG7b/pS1EzgE2y7nF0STYsSLflpbjNKxx7cGrBdao6FTL4AJcMdm+lap4JEHkzok9eyEg==" Received: from aerfugl by smtp.strato.de (RZmta 51.3.0 AUTH) with ESMTPSA id f28b3512HK5eG00 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 17 Mar 2025 21:05:40 +0100 (CET) Received: from koltrast.home ([192.168.1.27] helo=a98shuttle.de) by aerfugl with smtp (Exim 4.96) (envelope-from ) id 1tuGiO-00085g-1i; Mon, 17 Mar 2025 21:05:36 +0100 Received: (nullmailer pid 93679 invoked by uid 502); Mon, 17 Mar 2025 20:05:36 -0000 From: Michael Klein To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Michael Klein , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 2/3] net: phy: realtek: use __set_bit() in rtl8211f_led_hw_control_get() Date: Mon, 17 Mar 2025 21:05:31 +0100 Message-Id: <20250317200532.93620-3-michael@fossekall.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317200532.93620-1-michael@fossekall.de> References: <20250317200532.93620-1-michael@fossekall.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org rtl8211f_led_hw_control_get() does not need atomic bit operations, replace set_bit() by __set_bit(). Signed-off-by: Michael Klein --- drivers/net/phy/realtek/realtek_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c index 58ec16cc8061..ccef7c01ccc4 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -570,17 +570,17 @@ static int rtl8211f_led_hw_control_get(struct phy_device *phydev, u8 index, val &= RTL8211F_LEDCR_MASK; if (val & RTL8211F_LEDCR_LINK_10) - set_bit(TRIGGER_NETDEV_LINK_10, rules); + __set_bit(TRIGGER_NETDEV_LINK_10, rules); if (val & RTL8211F_LEDCR_LINK_100) - set_bit(TRIGGER_NETDEV_LINK_100, rules); + __set_bit(TRIGGER_NETDEV_LINK_100, rules); if (val & RTL8211F_LEDCR_LINK_1000) - set_bit(TRIGGER_NETDEV_LINK_1000, rules); + __set_bit(TRIGGER_NETDEV_LINK_1000, rules); if (val & RTL8211F_LEDCR_ACT_TXRX) { - set_bit(TRIGGER_NETDEV_RX, rules); - set_bit(TRIGGER_NETDEV_TX, rules); + __set_bit(TRIGGER_NETDEV_RX, rules); + __set_bit(TRIGGER_NETDEV_TX, rules); } return 0; From patchwork Mon Mar 17 20:05:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Klein X-Patchwork-Id: 14019935 X-Patchwork-Delegate: kuba@kernel.org Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) (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 E1D721F583E; Mon, 17 Mar 2025 20:05:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742241951; cv=pass; b=laOZ4HCB9soEVf4tSsF6Xwm1k/E1Ou87Wj5ATUgl3ALGifPKaaTPWxsAQ4NbD2RnwOJZhBRhUl/6hxYC5Pvnv4mKOEAEBCgIBM214AmCCRG81vtbkugCrlkj/XLABAb6nGZ5RJruVaFKSNM/9z/EfOW6fhoxY1yjK8K/2s/58Jo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742241951; c=relaxed/simple; bh=j7KP1PHA4NUdJk5rdZIR8Mmf4Wtmm5IuG6EQoFm9cQc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=YGeX/biNIc0V7xRc78vfVZfK5aZKouDUSY7lt/Pt4TFJOFXuP+3cS8NQF9Z6ENOtlxIbW3E0A68SwF1o9e3cTm3M8L3oLPicYGuLs76gOoqyV48LeJqMJbWkLk198UydojuiEN3/hZ3h6chupOi4hyP/zXamwdhGTD57qkUZKXk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de; spf=pass smtp.mailfrom=a98shuttle.de; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=EQHBC3db; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=iXfLs/m6; arc=pass smtp.client-ip=85.215.255.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fossekall.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=a98shuttle.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="EQHBC3db"; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="iXfLs/m6" ARC-Seal: i=1; a=rsa-sha256; t=1742241940; cv=none; d=strato.com; s=strato-dkim-0002; b=Jtc6m1y8W/RdTLYTgDqN5SkmTijOAe9ZyevzL8tnDvQOMUwLjqEa8ehNu6BSzkFQNN YqbCLU8VCwSS0vzYv/94ebUUAki8pI0nZDULRdQxwgOcizQQjagPltAktdmUgC7n7EhM qmWsxvrCQlpbqK5wh0IivHCgXRu8r2chTn4UF6art/Pe52g9BjUinmrrzd5cUPvMzhKO qdQQquHbta/YoEr09eUOK9N0q6V6t81naciZh+l+20bl2Q654i5KyVHR2o/sHlruOky4 gKrxqqvylFp0/QYD3iN9EQI3wDxnh4JEHIidvLaqBsCgBeyPKQtn7s8KF+iKGdrvLzg2 Qtkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=hWqgTBaP+ZomcWG8WO+zlFwfylXLSfH6hkDPg0uRmuw=; b=DmxO8Xx7jj1fCsg9SC2kqcs/Rxvc6Z+jPwXTdj4LbAikkHPu6leWMiWKj3WepgFZEe pwi7hja30kv4FPHVx6OZGtAWYRHijRUDuYF2IKLnImK5oOnF9cCPPRVyqHpIxyyBvHp9 7keAHRb9RF4SGImwUbb/o75hBzdZs+CYcgyBqmSGAmIAEudyEJ3n5aDxDFPC1E/l5BWD bWVdiicqWDIO52ho2g34/Vk7MRl9tJAGcy7vh3g/dNYhbb1RvjRWadCAAxUr0JooxVD3 rPqBA1efqhCxLNiMYFB0pSgJpMMJPTLEha3NSPi1slx5XzQWFgAm42J2zUteQVGTilY6 gIhA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0002; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=hWqgTBaP+ZomcWG8WO+zlFwfylXLSfH6hkDPg0uRmuw=; b=EQHBC3dbz9IaVGQmwRMAVuN1Z08GBcei9t4nxUyVlQ8Pq9SPEg9i6JLcO/KrW4ZZz/ ZdEvG6jnrWIstIXgKJHnjKOjRkbp6GRlmrO8XuEbqr4GdXb2jV4jIMc4ONRrPt3lLhhk 2FGa+bZkra6yJkmmY5Etn66jDYHe2ltuXF91E+rQ2sdtOKJPhLvEAfZqQXb20LQZA0Jk 6jlGHs2cfDN27koET6ttXQGM3S8Dla0fkCjS/QhsLqCTDd9j/lOSEXd+IGSAql8wwahf Dr4NkGn9dOqvQT7skJ5TdC46YYTgfqeljV/NvGst/U/apyE6sdxZUlUSLqx4Mkuq82Yp wlmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1742241940; s=strato-dkim-0003; d=fossekall.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=hWqgTBaP+ZomcWG8WO+zlFwfylXLSfH6hkDPg0uRmuw=; b=iXfLs/m6PXHvkqXO6p2dG1WmYkcj/HLc4XQXneVPAEh3x1P2NB55xSVf3lc82ttTTp mHthIOqgivTWgdwYEYBw== X-RZG-AUTH: ":O2kGeEG7b/pS1EzgE2y7nF0STYsSLflpbjNKxx7cGrBdao6FTL4AJcMdm+lap4JEHkzok9eyEg==" Received: from aerfugl by smtp.strato.de (RZmta 51.3.0 AUTH) with ESMTPSA id f28b3512HK5eG01 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 17 Mar 2025 21:05:40 +0100 (CET) Received: from koltrast.home ([192.168.1.27] helo=a98shuttle.de) by aerfugl with smtp (Exim 4.96) (envelope-from ) id 1tuGiP-000862-32; Mon, 17 Mar 2025 21:05:37 +0100 Received: (nullmailer pid 93694 invoked by uid 502); Mon, 17 Mar 2025 20:05:37 -0000 From: Michael Klein To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Michael Klein , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next v4 3/3] net: phy: realtek: Add support for PHY LEDs on RTL8211E Date: Mon, 17 Mar 2025 21:05:32 +0100 Message-Id: <20250317200532.93620-4-michael@fossekall.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317200532.93620-1-michael@fossekall.de> References: <20250317200532.93620-1-michael@fossekall.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Like the RTL8211F, the RTL8211E PHY supports up to three LEDs. Add netdev trigger support for them, too. Signed-off-by: Michael Klein --- drivers/net/phy/realtek/realtek_main.c | 125 +++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c index ccef7c01ccc4..86dd3e17317b 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -37,6 +37,20 @@ #define RTL8211E_TX_DELAY BIT(12) #define RTL8211E_RX_DELAY BIT(11) +#define RTL8211E_LEDCR_EXT_PAGE 0x2c + +#define RTL8211E_LEDCR1 0x1a +#define RTL8211E_LEDCR1_ACT_TXRX BIT(4) +#define RTL8211E_LEDCR1_MASK BIT(4) +#define RTL8211E_LEDCR1_SHIFT 1 + +#define RTL8211E_LEDCR2 0x1c +#define RTL8211E_LEDCR2_LINK_1000 BIT(2) +#define RTL8211E_LEDCR2_LINK_100 BIT(1) +#define RTL8211E_LEDCR2_LINK_10 BIT(0) +#define RTL8211E_LEDCR2_MASK GENMASK(2, 0) +#define RTL8211E_LEDCR2_SHIFT 4 + #define RTL8211F_PHYCR1 0x18 #define RTL8211F_PHYCR2 0x19 #define RTL8211F_INSR 0x1d @@ -113,7 +127,8 @@ #define RTL_8221B_VN_CG 0x001cc84a #define RTL_8251B 0x001cc862 -#define RTL8211F_LED_COUNT 3 +/* RTL8211E and RTL8211F support up to three LEDs */ +#define RTL8211x_LED_COUNT 3 MODULE_DESCRIPTION("Realtek PHY driver"); MODULE_AUTHOR("Johnson Leung"); @@ -136,6 +151,21 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) return __phy_write(phydev, RTL821x_PAGE_SELECT, page); } +static int rtl8211e_read_ext_page(struct phy_device *phydev, u16 ext_page, + u32 regnum) +{ + int oldpage, ret = 0; + + oldpage = phy_select_page(phydev, RTL8211E_SET_EXT_PAGE); + if (oldpage >= 0) { + ret = __phy_write(phydev, RTL8211E_EXT_PAGE_SELECT, ext_page); + if (ret == 0) + ret = __phy_read(phydev, regnum); + } + + return phy_restore_page(phydev, oldpage, ret); +} + static int rtl8211e_modify_ext_page(struct phy_device *phydev, u16 ext_page, u32 regnum, u16 mask, u16 set) { @@ -519,7 +549,7 @@ static int rtl821x_resume(struct phy_device *phydev) return 0; } -static int rtl8211f_led_hw_is_supported(struct phy_device *phydev, u8 index, +static int rtl8211x_led_hw_is_supported(struct phy_device *phydev, u8 index, unsigned long rules) { const unsigned long mask = BIT(TRIGGER_NETDEV_LINK_10) | @@ -538,9 +568,11 @@ static int rtl8211f_led_hw_is_supported(struct phy_device *phydev, u8 index, * rates and Active indication always at all three 10+100+1000 * link rates. * This code currently uses mode B only. + * + * RTL8211E PHY LED has one mode, which works like RTL8211F mode B. */ - if (index >= RTL8211F_LED_COUNT) + if (index >= RTL8211x_LED_COUNT) return -EINVAL; /* Filter out any other unsupported triggers. */ @@ -559,7 +591,7 @@ static int rtl8211f_led_hw_control_get(struct phy_device *phydev, u8 index, { int val; - if (index >= RTL8211F_LED_COUNT) + if (index >= RTL8211x_LED_COUNT) return -EINVAL; val = phy_read_paged(phydev, 0xd04, RTL8211F_LEDCR); @@ -592,7 +624,7 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, const u16 mask = RTL8211F_LEDCR_MASK << (RTL8211F_LEDCR_SHIFT * index); u16 reg = 0; - if (index >= RTL8211F_LED_COUNT) + if (index >= RTL8211x_LED_COUNT) return -EINVAL; if (test_bit(TRIGGER_NETDEV_LINK_10, &rules)) @@ -615,6 +647,84 @@ static int rtl8211f_led_hw_control_set(struct phy_device *phydev, u8 index, return phy_modify_paged(phydev, 0xd04, RTL8211F_LEDCR, mask, reg); } +static int rtl8211e_led_hw_control_get(struct phy_device *phydev, u8 index, + unsigned long *rules) +{ + int ret; + u16 cr1, cr2; + + if (index >= RTL8211x_LED_COUNT) + return -EINVAL; + + ret = rtl8211e_read_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE, + RTL8211E_LEDCR1); + if (ret < 0) + return ret; + + cr1 = ret >> RTL8211E_LEDCR1_SHIFT * index; + if (cr1 & RTL8211E_LEDCR1_ACT_TXRX) { + __set_bit(TRIGGER_NETDEV_RX, rules); + __set_bit(TRIGGER_NETDEV_TX, rules); + } + + ret = rtl8211e_read_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE, + RTL8211E_LEDCR2); + if (ret < 0) + return ret; + + cr2 = ret >> RTL8211E_LEDCR2_SHIFT * index; + if (cr2 & RTL8211E_LEDCR2_LINK_10) + __set_bit(TRIGGER_NETDEV_LINK_10, rules); + + if (cr2 & RTL8211E_LEDCR2_LINK_100) + __set_bit(TRIGGER_NETDEV_LINK_100, rules); + + if (cr2 & RTL8211E_LEDCR2_LINK_1000) + __set_bit(TRIGGER_NETDEV_LINK_1000, rules); + + return ret; +} + +static int rtl8211e_led_hw_control_set(struct phy_device *phydev, u8 index, + unsigned long rules) +{ + const u16 cr1mask = + RTL8211E_LEDCR1_MASK << (RTL8211E_LEDCR1_SHIFT * index); + const u16 cr2mask = + RTL8211E_LEDCR2_MASK << (RTL8211E_LEDCR2_SHIFT * index); + u16 cr1 = 0, cr2 = 0; + int ret; + + if (index >= RTL8211x_LED_COUNT) + return -EINVAL; + + if (test_bit(TRIGGER_NETDEV_RX, &rules) || + test_bit(TRIGGER_NETDEV_TX, &rules)) { + cr1 |= RTL8211E_LEDCR1_ACT_TXRX; + } + + cr1 <<= RTL8211E_LEDCR1_SHIFT * index; + ret = rtl8211e_modify_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE, + RTL8211E_LEDCR1, cr1mask, cr1); + if (ret < 0) + return ret; + + if (test_bit(TRIGGER_NETDEV_LINK_10, &rules)) + cr2 |= RTL8211E_LEDCR2_LINK_10; + + if (test_bit(TRIGGER_NETDEV_LINK_100, &rules)) + cr2 |= RTL8211E_LEDCR2_LINK_100; + + if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules)) + cr2 |= RTL8211E_LEDCR2_LINK_1000; + + cr2 <<= RTL8211E_LEDCR2_SHIFT * index; + ret = rtl8211e_modify_ext_page(phydev, RTL8211E_LEDCR_EXT_PAGE, + RTL8211E_LEDCR2, cr2mask, cr2); + + return ret; +} + static int rtl8211e_config_init(struct phy_device *phydev) { const u16 delay_mask = RTL8211E_CTRL_DELAY | @@ -1390,6 +1500,9 @@ static struct phy_driver realtek_drvs[] = { .resume = genphy_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, + .led_hw_is_supported = rtl8211x_led_hw_is_supported, + .led_hw_control_get = rtl8211e_led_hw_control_get, + .led_hw_control_set = rtl8211e_led_hw_control_set, }, { PHY_ID_MATCH_EXACT(0x001cc916), .name = "RTL8211F Gigabit Ethernet", @@ -1403,7 +1516,7 @@ static struct phy_driver realtek_drvs[] = { .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, .flags = PHY_ALWAYS_CALL_SUSPEND, - .led_hw_is_supported = rtl8211f_led_hw_is_supported, + .led_hw_is_supported = rtl8211x_led_hw_is_supported, .led_hw_control_get = rtl8211f_led_hw_control_get, .led_hw_control_set = rtl8211f_led_hw_control_set, }, {