From: Andrew Lunn <andrew@lunn.ch>
To: Heiner Kallweit <hkallweit1@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Realtek linux nic maintainers <nic_swsd@realtek.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH net-next 07/10] r8169: migrate speed_down function to phylib
Date: Mon, 2 Jul 2018 23:20:05 +0200 [thread overview]
Message-ID: <20180702212005.GF12564@lunn.ch> (raw)
In-Reply-To: <5be3d523-bb26-c2d6-71f4-165e9c6e45a9@gmail.com>
On Mon, Jul 02, 2018 at 09:37:08PM +0200, Heiner Kallweit wrote:
> Change rtl_speed_down() to use phylib.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> drivers/net/ethernet/realtek/r8169.c | 33 +++++++++++++---------------
> 1 file changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 311321ee..807fbc75 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -4240,6 +4240,10 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
> rtl_writephy(tp, 0x0b, 0x0000); //w 0x0b 15 0 0
> }
>
> + /* We may have called rtl_speed_down before */
> + dev->phydev->advertising = dev->phydev->supported;
> + genphy_config_aneg(dev->phydev);
> +
> genphy_soft_reset(dev->phydev);
>
> rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
> @@ -4323,28 +4327,21 @@ static void rtl_init_mdio_ops(struct rtl8169_private *tp)
> }
> }
>
> +#define BASET10 (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full)
> +#define BASET100 (ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full)
> +#define BASET1000 (ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full)
> +
> static void rtl_speed_down(struct rtl8169_private *tp)
> {
> - u32 adv;
> - int lpa;
> + struct phy_device *phydev = tp->dev->phydev;
> + u32 adv = phydev->lp_advertising & phydev->supported;
>
> - rtl_writephy(tp, 0x1f, 0x0000);
> - lpa = rtl_readphy(tp, MII_LPA);
> + if (adv & BASET10)
> + phydev->advertising &= ~(BASET100 | BASET1000);
> + else if (adv & BASET100)
> + phydev->advertising &= ~BASET1000;
>
> - if (lpa & (LPA_10HALF | LPA_10FULL))
> - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full;
> - else if (lpa & (LPA_100HALF | LPA_100FULL))
> - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
> - ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full;
> - else
> - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
> - ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
> - (tp->mii.supports_gmii ?
> - ADVERTISED_1000baseT_Half |
> - ADVERTISED_1000baseT_Full : 0);
> -
> - rtl8169_set_speed(tp->dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
> - adv);
> + genphy_config_aneg(phydev);
> }
It probably it is me being too tired, but i don't get what this is
doing? Changing the local advertisement based on what the remote is
advertising. Why?
Andrew
next prev parent reply other threads:[~2018-07-02 21:20 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 19:29 [PATCH net-next 00/10] r8169: add phylib support Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 01/10] r8169: add basic " Heiner Kallweit
2018-07-02 21:02 ` Andrew Lunn
2018-07-02 21:15 ` Heiner Kallweit
2018-07-03 16:42 ` Florian Fainelli
2018-07-03 19:48 ` Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 02/10] r8169: use phy_resume/phy_suspend Heiner Kallweit
2018-07-02 21:06 ` Andrew Lunn
2018-07-02 21:24 ` Heiner Kallweit
2018-07-03 16:44 ` Florian Fainelli
2018-07-03 19:54 ` Heiner Kallweit
2018-07-02 19:36 ` [PATCH net-next 03/10] r8169: replace open-coded PHY soft reset with genphy_soft_reset Heiner Kallweit
2018-07-02 21:08 ` Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 04/10] r8169: use phy_ethtool_(g|s)et_link_ksettings Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 05/10] r8169: use phy_ethtool_nway_reset Heiner Kallweit
2018-07-02 21:11 ` Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 06/10] r8169: use phy_mii_ioctl Heiner Kallweit
2018-07-02 21:13 ` Andrew Lunn
2018-07-02 19:37 ` [PATCH net-next 07/10] r8169: migrate speed_down function to phylib Heiner Kallweit
2018-07-02 21:20 ` Andrew Lunn [this message]
2018-07-02 21:31 ` Heiner Kallweit
2018-07-03 16:48 ` Florian Fainelli
2018-07-09 21:04 ` Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 08/10] r8169: remove rtl8169_set_speed_xmii Heiner Kallweit
2018-07-02 21:21 ` Andrew Lunn
2018-07-02 21:54 ` Heiner Kallweit
2018-07-04 14:46 ` Andrew Lunn
2018-07-04 18:13 ` Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 09/10] r8169: remove mii_if_info member from struct rtl8169_private Heiner Kallweit
2018-07-02 19:37 ` [PATCH net-next 10/10] r8169: don't read chip phy status register Heiner Kallweit
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=20180702212005.GF12564@lunn.ch \
--to=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.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).