From nobody Sun Dec 14 11:42:04 2025 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.168]) (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 DAE821EFF9C; Fri, 11 Apr 2025 06:27:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=81.169.146.168 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744352866; cv=pass; b=nsoIpIscURmzf6Dj3cJZNJ5pSc0Ye0lpqWE2gDIU06/nT/V3VBDP0I+G7aZ4jqmQMkVwHduFXxkjjO3XVXLX+xZDi1vB+EgmdfgjKu4riY9A9/x1sg2Hd0KjN6SYsYzxKo5suM4NmHBJqR4K1FZer6PWe2J4PVG3kPh0d8VHe6U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744352866; c=relaxed/simple; bh=+K6YHjvkbari11VbJs9ues3NAMomaotXfMS3OiznqhU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=nb6nxim/zeCdclIzNN4PiaFJLMq5718wJHgxNr9VyDh+McA7srSHjKfdLbmZEj4voOXzqzm6l/vcyZb9SOmzppOrgqm9NpK+wSZLf3Od96znUVZryX1tL8PiY+3A4fdX8jt4mBHhntB2ghlb1yO7mVRP/MIji5QrvKVpaCUhJks= 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=QEwNlC26; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b=/xucxOZu; arc=pass smtp.client-ip=81.169.146.168 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="QEwNlC26"; dkim=permerror (0-bit key) header.d=fossekall.de header.i=@fossekall.de header.b="/xucxOZu" ARC-Seal: i=1; a=rsa-sha256; t=1744352674; cv=none; d=strato.com; s=strato-dkim-0002; b=ZUqjoEZoRVuDdO4CH+VYQhF44yj6oUJwtjOn2fxRDdAlJ+FyHTlnxgVEZLGsh4L4W0 1npNxGuBJraNYCkiH5IHNNb0HgF3aJtsFL8VsD4kKFXb/84LvIYy8qWgVjO25yVSRj5w 7tQfMy2OiEAoVak/N9GcN80+WdkZWxE0fdvHQZfSSKP0p1lyiBcO/CZ/i0XNW2UEKqek WE5IOnP0HouhxQTFmJsTxRAUuCtdE4WXKtu2c0tMpDXfyEhU08S7tzHHSzxRDUCkky+u yTl2xOik9VsDL+egEP1e9QaZKkwCtcOHMB+dC/Dj+CtsqmpQMZynKEpq+uy61WA69o+B AYEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1744352674; 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=tkaNobdjZa50PTheeyfzhzE2mQpO9JIwD7JBFoLI1z8=; b=fm0NSHno1URXn6JhgeZogoMhHRdRktFJoLr4YqXrS1O+UlHHaRkL9OpV1MCOpcahfA xSDT8P9jmYAbi6x+QeZeDDD/8D+kXIOYwjY7QJz2GNdntaaFp7+VAbIg222k+K4R5kTN 3Jk/Lhl4UfmYl3BG5JzZpiqMYd5s5zRNqevym2Xmbk2wf/bmw86/HfCF/7CwpkdJCiWX bdZkbV+axB7Bj60tIS/SCZltMnr7EJirHrMTWFoEOXcZYygtWxvt4jBZpvZUp50x9CNw L0r6vgNu+fSf9xee5Gois71oNdKBMG9RUjRsax2D+816bQN1selbXHHWrKc+dBwAGoR3 yaKA== 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=1744352674; 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=tkaNobdjZa50PTheeyfzhzE2mQpO9JIwD7JBFoLI1z8=; b=QEwNlC26dexDFcinM5eIx4sk3ny/ke2/0Vr/01zj2nmQ2N05KV+onJkVF56WcdiO3x /iYue5KwOhmpa+Rn0VKMOs5UFl/Du9DwlZs2eRm9g33XITuHVcCjtLl8fyPZNSDGp2an eDLIiWwqblxWmfVBrWmDXBim5eQ7NF0VEWOOpSjZoJgt/8uzpa8TfkRHj7r9MOtkA6ZH D5YrvkzVap0qatdElLNCiIr85U+T7QfmkmMY1Tb1HqYztohopSc4kWw0Lg7Oz/UY2xV4 ++uCqplTMD6gc1hdsvIAk6vfh2bz2QgVppTs4XcZa8D48FtilIRup1XPUFUy0C8p/Wf3 iNXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1744352674; 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=tkaNobdjZa50PTheeyfzhzE2mQpO9JIwD7JBFoLI1z8=; b=/xucxOZu4EGrd/cHu1M/QGUcQTA5kI4gngiOloo+JMFTotsIIdeQXjlIDbEZ98VE++ CDTy80Xa+BJHWK7ggsCQ== X-RZG-AUTH: ":O2kGeEG7b/pS1EzgE2y7nF0STYsSLflpbjNKxx7cGrBdao6FTL4AJcMdm+lap4JEHkzok9eyEg==" Received: from aerfugl by smtp.strato.de (RZmta 51.3.0 AUTH) with ESMTPSA id f28b3513B6OYHab (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 11 Apr 2025 08:24:34 +0200 (CEST) Received: from koltrast.home ([192.168.1.27] helo=a98shuttle.de) by aerfugl with smtp (Exim 4.96) (envelope-from ) id 1u37oX-0000NC-00; Fri, 11 Apr 2025 08:24:33 +0200 Received: (nullmailer pid 8883 invoked by uid 502); Fri, 11 Apr 2025 06:24:32 -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 v6 2/4] net: phy: realtek: Clean up RTL8211E ExtPage access Date: Fri, 11 Apr 2025 08:24:24 +0200 Message-Id: <20250411062426.8820-3-michael@fossekall.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250411062426.8820-1-michael@fossekall.de> References: <20250411062426.8820-1-michael@fossekall.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" - Factor out RTL8211E extension page access code to rtl8211e_modify_ext_page() and clean up rtl8211e_config_init() Signed-off-by: Michael Klein --- drivers/net/phy/realtek/realtek_main.c | 40 +++++++++++++++----------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realt= ek/realtek_main.c index f6e402bf78bf..b06d53867b99 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -38,12 +38,17 @@ =20 #define RTL821x_INSR 0x13 =20 -#define RTL821x_EXT_PAGE_SELECT 0x1e #define RTL821x_PAGE_SELECT 0x1f =20 +#define RTL8211E_EXT_PAGE_SELECT 0x1e +#define RTL8211E_SET_EXT_PAGE 0x07 + +#define RTL8211E_RGMII_EXT_PAGE 0xa4 +#define RTL8211E_RGMII_DELAY 0x1c #define RTL8211E_CTRL_DELAY BIT(13) #define RTL8211E_TX_DELAY BIT(12) #define RTL8211E_RX_DELAY BIT(11) +#define RTL8211E_DELAY_MASK GENMASK(13, 11) =20 #define RTL8211F_PHYCR1 0x18 #define RTL8211F_PHYCR2 0x19 @@ -136,6 +141,21 @@ static int rtl821x_write_page(struct phy_device *phyde= v, int page) return __phy_write(phydev, RTL821x_PAGE_SELECT, page); } =20 +static int rtl8211e_modify_ext_page(struct phy_device *phydev, u16 ext_pag= e, + u32 regnum, u16 mask, u16 set) +{ + int oldpage, ret =3D 0; + + oldpage =3D phy_select_page(phydev, RTL8211E_SET_EXT_PAGE); + if (oldpage >=3D 0) { + ret =3D __phy_write(phydev, RTL8211E_EXT_PAGE_SELECT, ext_page); + if (ret =3D=3D 0) + ret =3D __phy_modify(phydev, regnum, mask, set); + } + + return phy_restore_page(phydev, oldpage, ret); +} + static int rtl821x_probe(struct phy_device *phydev) { struct device *dev =3D &phydev->mdio.dev; @@ -608,7 +628,6 @@ static int rtl8211f_led_hw_control_set(struct phy_devic= e *phydev, u8 index, =20 static int rtl8211e_config_init(struct phy_device *phydev) { - int ret =3D 0, oldpage; u16 val; =20 /* enable TX/RX delay for rgmii-* modes, and disable them for rgmii. */ @@ -638,20 +657,9 @@ static int rtl8211e_config_init(struct phy_device *phy= dev) * 12 =3D RX Delay, 11 =3D TX Delay * 10:0 =3D Test && debug settings reserved by realtek */ - oldpage =3D phy_select_page(phydev, 0x7); - if (oldpage < 0) - goto err_restore_page; - - ret =3D __phy_write(phydev, RTL821x_EXT_PAGE_SELECT, 0xa4); - if (ret) - goto err_restore_page; - - ret =3D __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, RTL8211E_RGMII_EXT_PAGE, + RTL8211E_RGMII_DELAY, + RTL8211E_DELAY_MASK, val); } =20 static int rtl8211b_suspend(struct phy_device *phydev) --=20 2.39.5