* [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed
@ 2019-08-15 11:15 Heiner Kallweit
2019-08-15 12:37 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Heiner Kallweit @ 2019-08-15 11:15 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, David Miller; +Cc: netdev
Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
Therefore move reading this register.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/phy/phy_device.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 54f80af31..4f4ddc05c 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1794,7 +1794,7 @@ EXPORT_SYMBOL(genphy_update_link);
*/
int genphy_read_status(struct phy_device *phydev)
{
- int adv, lpa, lpagb, err, old_link = phydev->link;
+ int lpa, lpagb, err, old_link = phydev->link;
/* Update the link, but return if there was an error */
err = genphy_update_link(phydev);
@@ -1816,11 +1816,12 @@ int genphy_read_status(struct phy_device *phydev)
if (lpagb < 0)
return lpagb;
- adv = phy_read(phydev, MII_CTRL1000);
- if (adv < 0)
- return adv;
-
if (lpagb & LPA_1000MSFAIL) {
+ int adv = phy_read(phydev, MII_CTRL1000);
+
+ if (adv < 0)
+ return adv;
+
if (adv & CTL1000_ENABLE_MASTER)
phydev_err(phydev, "Master/Slave resolution failed, maybe conflicting manual settings?\n");
else
--
2.22.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed
2019-08-15 11:15 [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed Heiner Kallweit
@ 2019-08-15 12:37 ` Andrew Lunn
2019-08-15 15:38 ` Florian Fainelli
2019-08-15 18:42 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2019-08-15 12:37 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: Florian Fainelli, David Miller, netdev
On Thu, Aug 15, 2019 at 01:15:19PM +0200, Heiner Kallweit wrote:
> Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
> Therefore move reading this register.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed
2019-08-15 11:15 [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed Heiner Kallweit
2019-08-15 12:37 ` Andrew Lunn
@ 2019-08-15 15:38 ` Florian Fainelli
2019-08-15 18:42 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2019-08-15 15:38 UTC (permalink / raw)
To: Heiner Kallweit, Andrew Lunn, David Miller; +Cc: netdev
On 8/15/2019 4:15 AM, Heiner Kallweit wrote:
> Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
> Therefore move reading this register.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed
2019-08-15 11:15 [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed Heiner Kallweit
2019-08-15 12:37 ` Andrew Lunn
2019-08-15 15:38 ` Florian Fainelli
@ 2019-08-15 18:42 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-08-15 18:42 UTC (permalink / raw)
To: hkallweit1; +Cc: andrew, f.fainelli, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 15 Aug 2019 13:15:19 +0200
> Value of MII_CTRL1000 is needed only if LPA_1000MSFAIL is set.
> Therefore move reading this register.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-15 18:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-15 11:15 [PATCH net-next] net: phy: read MII_CTRL1000 in genphy_read_status only if needed Heiner Kallweit
2019-08-15 12:37 ` Andrew Lunn
2019-08-15 15:38 ` Florian Fainelli
2019-08-15 18:42 ` David Miller
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).