From: Daniel Golle <daniel@makrotopia.org>
To: linux-mediatek@lists.infradead.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Felix Fietkau <nbd@nbd.name>, John Crispin <john@phrozen.org>,
Sean Wang <sean.wang@mediatek.com>,
Mark Lee <Mark-MC.Lee@mediatek.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH v6 1/2] net: ethernet: mtk_eth_soc: fix return value of MDIO ops
Date: Tue, 28 Dec 2021 00:08:58 +0000 [thread overview]
Message-ID: <YcpVmlb1jFavCBpS@makrotopia.org> (raw)
In-Reply-To: <YcnoAscVe+2YILT8@shell.armlinux.org.uk> <YcnlMtninjjjPhjI@makrotopia.org>
Instead of returning -1 (-EPERM) when MDIO bus is stuck busy
while writing or 0xffff if it happens while reading, return the
appropriate -EBUSY. Also fix return type to int instead of u32.
Fixes: 656e705243fd0 ("net-next: mediatek: add support for MT7623 ethernet")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 +++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index bcb91b01e69f5..72b3ae7b5ff8d 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -94,31 +94,29 @@ static int mtk_mdio_busy_wait(struct mtk_eth *eth)
return -1;
}
-static u32 _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr,
- u32 phy_register, u32 write_data)
+static int _mtk_mdio_write(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg,
+ u32 write_data)
{
if (mtk_mdio_busy_wait(eth))
- return -1;
+ return -EBUSY;
write_data &= 0xffff;
mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_WRITE |
- (phy_register << PHY_IAC_REG_SHIFT) |
+ (phy_reg << PHY_IAC_REG_SHIFT) |
(phy_addr << PHY_IAC_ADDR_SHIFT) | write_data,
MTK_PHY_IAC);
if (mtk_mdio_busy_wait(eth))
- return -1;
+ return -EBUSY;
return 0;
}
-static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg)
+static int _mtk_mdio_read(struct mtk_eth *eth, u32 phy_addr, u32 phy_reg)
{
- u32 d;
-
if (mtk_mdio_busy_wait(eth))
- return 0xffff;
+ return -EBUSY;
mtk_w32(eth, PHY_IAC_ACCESS | PHY_IAC_START | PHY_IAC_READ |
(phy_reg << PHY_IAC_REG_SHIFT) |
@@ -126,11 +124,9 @@ static u32 _mtk_mdio_read(struct mtk_eth *eth, int phy_addr, int phy_reg)
MTK_PHY_IAC);
if (mtk_mdio_busy_wait(eth))
- return 0xffff;
-
- d = mtk_r32(eth, MTK_PHY_IAC) & 0xffff;
+ return -EBUSY;
- return d;
+ return mtk_r32(eth, MTK_PHY_IAC) & 0xffff;
}
static int mtk_mdio_write(struct mii_bus *bus, int phy_addr,
--
2.34.1
next prev parent reply other threads:[~2021-12-28 0:09 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-26 21:29 [PATCH] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-26 21:51 ` Andrew Lunn
2021-12-26 21:57 ` Russell King (Oracle)
2021-12-26 22:26 ` Andrew Lunn
2021-12-26 23:23 ` [PATCH v2] " Daniel Golle
2021-12-27 16:09 ` [PATCH v3] " Daniel Golle
2021-12-27 16:21 ` Russell King (Oracle)
2021-12-27 17:51 ` [PATCH v4 0/2] net: mtk_soc_eth: " Daniel Golle
2021-12-27 17:51 ` [PATCH v4 1/2] net: mtk_eth_soc: fix return value of MDIO operations Daniel Golle
2021-12-27 17:52 ` [PATCH v4 2/2] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-27 18:30 ` [PATCH v5 0/2] " Daniel Golle
2021-12-27 18:31 ` [PATCH v5 1/2] net: ethernet: mtk_eth_soc: fix return value of MDIO ops Daniel Golle
2021-12-27 18:31 ` [PATCH v5 2/2] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-28 0:07 ` [PATCH v6 0/2] " Daniel Golle
2021-12-28 0:08 ` Daniel Golle [this message]
2021-12-28 0:09 ` [PATCH v6 2/2] net: " Daniel Golle
2021-12-28 1:10 ` [PATCH v7 0/2] net: ethernet: mtk_soc_eth: " Daniel Golle
2021-12-28 1:43 ` Jakub Kicinski
2021-12-28 1:10 ` [PATCH v7 1/2] net: ethernet: mtk_eth_soc: fix return value of MDIO ops Daniel Golle
2021-12-28 1:11 ` [PATCH v7 2/2] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-28 11:46 ` Russell King (Oracle)
2021-12-28 21:03 ` [PATCH v8 0/3] net: ethernet: mtk_eth_soc: refactoring and Clause 45 Daniel Golle
2021-12-28 21:05 ` [PATCH v8 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields Daniel Golle
2021-12-28 21:05 ` [PATCH v8 2/3] net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops Daniel Golle
2021-12-28 21:05 ` [PATCH v8 3/3] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-31 20:52 ` [PATCH v9 0/3] net: ethernet: mtk_eth_soc: refactoring and Clause 45 Daniel Golle
2021-12-31 20:54 ` [PATCH v9 2/3] net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops Daniel Golle
2021-12-31 20:54 ` [PATCH v9 3/3] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
2021-12-31 20:57 ` [PATCH v9 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields Daniel Golle
2022-01-01 17:20 ` Andrew Lunn
2022-01-02 15:47 ` [PATCH v10 0/3] net: ethernet: mtk_eth_soc: refactoring and Clause 45 Daniel Golle
2022-01-02 15:51 ` Russell King (Oracle)
2022-01-02 15:48 ` [PATCH v10 1/3] net: ethernet: mtk_eth_soc: fix return value and refactor MDIO ops Daniel Golle
2022-01-02 16:43 ` Andrew Lunn
2022-01-02 15:48 ` [PATCH v10 2/3] net: mdio: add helpers to extract clause 45 regad and devad fields Daniel Golle
2022-01-02 16:44 ` Andrew Lunn
2022-01-02 15:49 ` [PATCH v10 3/3] net: ethernet: mtk_eth_soc: implement Clause 45 MDIO access Daniel Golle
[not found] ` <Yc9tk6IZ0ldqHx4Y@makrotopia.org>
2022-01-01 17:18 ` [PATCH v9 1/3] net: mdio: add helpers to extract clause 45 regad and devad fields Andrew Lunn
2022-01-01 17:41 ` Daniel Golle
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=YcpVmlb1jFavCBpS@makrotopia.org \
--to=daniel@makrotopia.org \
--cc=Mark-MC.Lee@mediatek.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=john@phrozen.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=sean.wang@mediatek.com \
/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).