From: Matthias Kaehlcke <mka@chromium.org>
To: "David S . Miller" <davem@davemloft.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>
Subject: [PATCH v2 4/7] net: phy: realtek: Enable accessing RTL8211E extension pages
Date: Wed, 3 Jul 2019 12:37:21 -0700 [thread overview]
Message-ID: <20190703193724.246854-4-mka@chromium.org> (raw)
In-Reply-To: <20190703193724.246854-1-mka@chromium.org>
The RTL8211E has extension pages, which can be accessed after
selecting a page through a custom method. Add a function to
modify bits in a register of an extension page and a helper for
selecting an ext page.
rtl8211e_modify_ext_paged() is inspired by its counterpart
phy_modify_paged().
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
Changes in v2:
- assign .read/write_page handlers for RTL8211E
- use phy_select_page() and phy_restore_page(), get rid of
rtl8211e_restore_page()
- s/rtl821e_select_ext_page/rtl8211e_select_ext_page/
- updated commit message
---
drivers/net/phy/realtek.c | 42 +++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index eb815cbe1e72..9cd6241e2a6d 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -27,6 +27,9 @@
#define RTL821x_EXT_PAGE_SELECT 0x1e
#define RTL821x_PAGE_SELECT 0x1f
+#define RTL8211E_EXT_PAGE 7
+#define RTL8211E_EPAGSR 0x1e
+
/* RTL8211E page 5 */
#define RTL8211E_EEE_LED_MODE1 0x05
#define RTL8211E_EEE_LED_MODE2 0x06
@@ -58,6 +61,44 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)
return __phy_write(phydev, RTL821x_PAGE_SELECT, page);
}
+static int rtl8211e_select_ext_page(struct phy_device *phydev, int page)
+{
+ int ret, oldpage;
+
+ oldpage = phy_select_page(phydev, RTL8211E_EXT_PAGE);
+ if (oldpage < 0)
+ return oldpage;
+
+ ret = __phy_write(phydev, RTL8211E_EPAGSR, page);
+ if (ret)
+ return phy_restore_page(phydev, page, ret);
+
+ return 0;
+}
+
+static int __maybe_unused rtl8211e_modify_ext_paged(struct phy_device *phydev,
+ int page, u32 regnum, u16 mask, u16 set)
+{
+ int ret = 0;
+ int oldpage;
+ int new;
+
+ oldpage = rtl8211e_select_ext_page(phydev, page);
+ if (oldpage < 0)
+ goto out;
+
+ ret = __phy_read(phydev, regnum);
+ if (ret < 0)
+ goto out;
+
+ new = (ret & ~mask) | set;
+ if (new != ret)
+ ret = __phy_write(phydev, regnum, new);
+
+out:
+ return phy_restore_page(phydev, oldpage, ret);
+}
+
static int rtl8211e_disable_eee_led_mode(struct phy_device *phydev)
{
int ret = 0;
@@ -87,6 +128,7 @@ static int rtl8211e_config_init(struct phy_device *phydev)
return 0;
}
+
static int rtl8201_ack_interrupt(struct phy_device *phydev)
{
int err;
--
2.22.0.410.gd8fdbe21b5-goog
next prev parent reply other threads:[~2019-07-03 19:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 19:37 [PATCH v2 1/7] dt-bindings: net: Add bindings for Realtek PHYs Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 2/7] net: phy: realtek: Allow disabling RTL8211E EEE LED mode Matthias Kaehlcke
2019-07-03 20:09 ` Heiner Kallweit
2019-07-03 20:32 ` Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 3/7] dt-bindings: net: realtek: Add property to enable SSC Matthias Kaehlcke
2019-07-03 19:37 ` Matthias Kaehlcke [this message]
2019-07-03 20:12 ` [PATCH v2 4/7] net: phy: realtek: Enable accessing RTL8211E extension pages Heiner Kallweit
2019-07-03 20:36 ` Matthias Kaehlcke
2019-07-03 21:01 ` Heiner Kallweit
2019-07-03 21:24 ` Matthias Kaehlcke
2019-07-03 21:27 ` Heiner Kallweit
2019-07-03 22:56 ` Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 5/7] net: phy: realtek: Support SSC for the RTL8211E Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 6/7] dt-bindings: net: realtek: Add property to configure LED mode Matthias Kaehlcke
2019-07-03 20:07 ` Andrew Lunn
2019-07-03 20:13 ` Heiner Kallweit
2019-07-03 20:22 ` Heiner Kallweit
2019-07-03 21:37 ` Florian Fainelli
2019-07-03 23:23 ` Matthias Kaehlcke
2019-07-10 15:55 ` Rob Herring
2019-07-10 16:28 ` Florian Fainelli
2019-07-12 17:28 ` Matthias Kaehlcke
2019-07-12 17:20 ` Matthias Kaehlcke
2019-07-22 17:14 ` Matthias Kaehlcke
2019-07-22 19:01 ` Andrew Lunn
2019-07-22 19:14 ` Matthias Kaehlcke
2019-07-22 19:38 ` Andrew Lunn
2019-07-03 19:37 ` [PATCH v2 7/7] net: phy: realtek: configure RTL8211E LEDs Matthias Kaehlcke
2019-07-03 20:10 ` Andrew Lunn
2019-07-03 20:43 ` Matthias Kaehlcke
2019-07-03 20:28 ` Heiner Kallweit
2019-07-03 20:45 ` Matthias Kaehlcke
2019-07-03 20:21 ` [PATCH v2 1/7] dt-bindings: net: Add bindings for Realtek PHYs David Miller
2019-07-03 21:11 ` Rob Herring
2019-07-03 21:33 ` Andrew Lunn
2019-07-03 22:08 ` Matthias Kaehlcke
2019-07-05 16:18 ` Rob Herring
2019-07-05 16:17 ` Rob Herring
2019-07-05 16:29 ` Andrew Lunn
2019-07-05 17:07 ` 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=20190703193724.246854-4-mka@chromium.org \
--to=mka@chromium.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.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).