* [PATCH net-next] net: sgi: ioc3-eth: Remove phy workaround
@ 2020-03-09 12:32 Thomas Bogendoerfer
2020-03-09 17:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Bogendoerfer @ 2020-03-09 12:32 UTC (permalink / raw)
To: David S. Miller; +Cc: Ralf Baechle, linux-mips, netdev, linux-kernel
Commit a8d0f11ee50d ("MIPS: SGI-IP27: Enable ethernet phy on second
Origin 200 module") fixes the root cause of not detected PHYs.
Therefore the workaround can go away now.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index db6b2988e632..7305e8e86c51 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -582,40 +582,23 @@ static void ioc3_timer(struct timer_list *t)
/* Try to find a PHY. There is no apparent relation between the MII addresses
* in the SGI documentation and what we find in reality, so we simply probe
- * for the PHY. It seems IOC3 PHYs usually live on address 31. One of my
- * onboard IOC3s has the special oddity that probing doesn't seem to find it
- * yet the interface seems to work fine, so if probing fails we for now will
- * simply default to PHY 31 instead of bailing out.
+ * for the PHY.
*/
static int ioc3_mii_init(struct ioc3_private *ip)
{
- int ioc3_phy_workaround = 1;
- int i, found = 0, res = 0;
u16 word;
+ int i;
for (i = 0; i < 32; i++) {
word = ioc3_mdio_read(ip->mii.dev, i, MII_PHYSID1);
if (word != 0xffff && word != 0x0000) {
- found = 1;
- break; /* Found a PHY */
+ ip->mii.phy_id = i;
+ return 0;
}
}
-
- if (!found) {
- if (ioc3_phy_workaround) {
- i = 31;
- } else {
- ip->mii.phy_id = -1;
- res = -ENODEV;
- goto out;
- }
- }
-
- ip->mii.phy_id = i;
-
-out:
- return res;
+ ip->mii.phy_id = -1;
+ return -ENODEV;
}
static void ioc3_mii_start(struct ioc3_private *ip)
--
2.25.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: sgi: ioc3-eth: Remove phy workaround
2020-03-09 12:32 [PATCH net-next] net: sgi: ioc3-eth: Remove phy workaround Thomas Bogendoerfer
@ 2020-03-09 17:10 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-03-09 17:10 UTC (permalink / raw)
To: tsbogend; +Cc: ralf, linux-mips, netdev, linux-kernel
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Mon, 9 Mar 2020 13:32:40 +0100
> Commit a8d0f11ee50d ("MIPS: SGI-IP27: Enable ethernet phy on second
> Origin 200 module") fixes the root cause of not detected PHYs.
> Therefore the workaround can go away now.
>
> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-09 17:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-09 12:32 [PATCH net-next] net: sgi: ioc3-eth: Remove phy workaround Thomas Bogendoerfer
2020-03-09 17:10 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.