From: Oleksij Rempel <o.rempel@pengutronix•de>
To: Andrew Lunn <andrew@lunn•ch>
Cc: netdev <netdev@vger•kernel.org>,
Florian Fainelli <f.fainelli@gmail•com>,
Vladimir Oltean <vladimir.oltean@nxp•com>,
Sean Wang <sean.wang@mediatek•com>,
Landen Chao <Landen.Chao@mediatek•com>,
DENG Qingfang <dqfext@gmail•com>,
Matthias Brugger <matthias.bgg@gmail•com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora•com>,
Doug Berger <opendmb@gmail•com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom•com>,
Wei Fang <wei.fang@nxp•com>, Shenwei Wang <shenwei.wang@nxp•com>,
Clark Wang <xiaoning.wang@nxp•com>,
NXP Linux Team <linux-imx@nxp•com>,
UNGLinuxDriver@microchip•com, Byungho An <bh74.an@samsung•com>,
Giuseppe Cavallaro <peppe.cavallaro@st•com>,
Alexandre Torgue <alexandre.torgue@foss•st.com>,
Jose Abreu <joabreu@synopsys•com>,
Maxime Coquelin <mcoquelin.stm32@gmail•com>,
Heiner Kallweit <hkallweit1@gmail•com>,
Russell King <rmk+kernel@armlinux•org.uk>,
Woojung Huh <woojung.huh@microchip•com>,
Oleksij Rempel <linux@rempel-privat•de>
Subject: Re: [PATCH RFC 08/18] net: FEC: Fixup EEE
Date: Fri, 17 Feb 2023 09:19:43 +0100 [thread overview]
Message-ID: <20230217081943.GA9065@pengutronix.de> (raw)
In-Reply-To: <20230217034230.1249661-9-andrew@lunn.ch>
On Fri, Feb 17, 2023 at 04:42:20AM +0100, Andrew Lunn wrote:
> The enabling/disabling of EEE in the MAC should happen as a result of
> auto negotiation. So move the enable/disable into
> fec_enet_adjust_link() which gets called by phylib when there is a
> change in link status.
>
> fec_enet_set_eee() now just stores away the LTI timer value and if TX
> LPI should be enabled. Everything else is passed to phylib, so it can
> correctly setup the PHY.
>
> fec_enet_get_eee() relies on phylib doing most of the work,
> the MAC driver just adds the LTI timer value and the stored tx_lpi_enabled.
>
> Signed-off-by: Andrew Lunn <andrew@lunn•ch>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 27 ++++-------------------
> 1 file changed, 4 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 195df75ee614..5aca705876fe 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1930,18 +1930,13 @@ static int fec_enet_us_to_tx_cycle(struct net_device *ndev, int us)
> return us * (fep->clk_ref_rate / 1000) / 1000;
> }
>
> -static int fec_enet_eee_mode_set(struct net_device *ndev, bool enable)
> +static int fec_enet_eee_mode_set(struct net_device *ndev, bool eee_active)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> struct ethtool_eee *p = &fep->eee;
> unsigned int sleep_cycle, wake_cycle;
> - int ret = 0;
> -
> - if (enable) {
> - ret = phy_init_eee(ndev->phydev, false);
> - if (ret)
> - return ret;
>
> + if (eee_active && p->tx_lpi_enabled) {
> sleep_cycle = fec_enet_us_to_tx_cycle(ndev, p->tx_lpi_timer);
> wake_cycle = sleep_cycle;
> } else {
> @@ -1949,10 +1944,6 @@ static int fec_enet_eee_mode_set(struct net_device *ndev, bool enable)
> wake_cycle = 0;
> }
>
> - p->tx_lpi_enabled = enable;
> - p->eee_enabled = enable;
> - p->eee_active = enable;
> -
> writel(sleep_cycle, fep->hwp + FEC_LPI_SLEEP);
> writel(wake_cycle, fep->hwp + FEC_LPI_WAKE);
>
> @@ -1997,6 +1988,7 @@ static void fec_enet_adjust_link(struct net_device *ndev)
> netif_tx_unlock_bh(ndev);
> napi_enable(&fep->napi);
> }
> + fec_enet_eee_mode_set(ndev, phy_dev->eee_active);
Most of iMX variants do not support EEE. It should be something like this:
if (fep->quirks & FEC_QUIRK_HAS_EEE)
fec_enet_eee_mode_set(ndev, phy_dev->eee_active);
> } else {
> if (fep->link) {
> napi_disable(&fep->napi);
> @@ -3109,8 +3101,6 @@ fec_enet_get_eee(struct net_device *ndev, struct ethtool_eee *edata)
> if (!netif_running(ndev))
> return -ENETDOWN;
>
> - edata->eee_enabled = p->eee_enabled;
> - edata->eee_active = p->eee_active;
> edata->tx_lpi_timer = p->tx_lpi_timer;
> edata->tx_lpi_enabled = p->tx_lpi_enabled;
>
> @@ -3122,7 +3112,6 @@ fec_enet_set_eee(struct net_device *ndev, struct ethtool_eee *edata)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> struct ethtool_eee *p = &fep->eee;
> - int ret = 0;
>
> if (!(fep->quirks & FEC_QUIRK_HAS_EEE))
> return -EOPNOTSUPP;
> @@ -3131,15 +3120,7 @@ fec_enet_set_eee(struct net_device *ndev, struct ethtool_eee *edata)
> return -ENETDOWN;
>
> p->tx_lpi_timer = edata->tx_lpi_timer;
> -
> - if (!edata->eee_enabled || !edata->tx_lpi_enabled ||
> - !edata->tx_lpi_timer)
> - ret = fec_enet_eee_mode_set(ndev, false);
> - else
> - ret = fec_enet_eee_mode_set(ndev, true);
> -
> - if (ret)
> - return ret;
> + p->tx_lpi_enabled = edata->tx_lpi_enabled;
Hm.. this change have effect only after link restart. Should we do
something like this?
if (phydev->link)
fec_enet_eee_mode_set(ndev, phydev->eee_active);
or, execute phy_ethtool_set_eee() first and some how detect if link
changed? Or restart link by phylib on every change?
>
> return phy_ethtool_set_eee(ndev->phydev, edata);
> }
> --
> 2.39.1
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2023-02-17 8:19 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 3:42 [PATCH RFC 00/18] Rework MAC drivers EEE support Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 01/18] net: phy: Add phydev->eee_active to simplify adjust link callbacks Andrew Lunn
2023-02-17 9:09 ` Oleksij Rempel
2023-02-17 13:35 ` Andrew Lunn
2023-02-17 11:36 ` Russell King (Oracle)
2023-02-17 13:37 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 02/18] net: phy: Add helper to set EEE Clock stop enable bit Andrew Lunn
2023-02-17 13:33 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 03/18] net: marvell: mvneta: Simplify EEE configuration Andrew Lunn
2023-02-17 11:35 ` Russell King (Oracle)
2023-02-17 11:59 ` Russell King (Oracle)
2023-02-17 13:13 ` Russell King (Oracle)
2023-02-17 13:45 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 04/18] net: stmmac: Drop usage of phy_init_eee() Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 05/18] net: stmmac: Simplify ethtool get eee Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 06/18] net: lan743x: Fixup EEE Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 07/18] net: fec: Move fec_enet_eee_mode_set() and helper earlier Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 08/18] net: FEC: Fixup EEE Andrew Lunn
2023-02-17 8:19 ` Oleksij Rempel [this message]
2023-02-17 12:32 ` Russell King (Oracle)
2023-02-17 13:58 ` Andrew Lunn
2023-02-18 2:00 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 09/18] net: genet: " Andrew Lunn
2023-02-17 3:48 ` Florian Fainelli
2023-02-17 14:00 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 10/18] net: sxgdb: " Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 11/18] net: dsa: mt7530: Swap to using phydev->eee_active Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 12/18] net: dsa: mt7530: Call phylib for set_eee and get_eee Andrew Lunn
2023-02-17 11:48 ` Russell King (Oracle)
2023-02-17 14:10 ` Andrew Lunn
2023-02-18 2:10 ` Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 13/18] net: dsa: b53: Swap to using phydev->eee_active Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 14/18] net: dsa: b53: Call phylib for set_eee and get_eee Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 15/18] net: phylink: Remove unused phylink_init_eee() Andrew Lunn
2023-02-17 11:42 ` Russell King (Oracle)
2023-02-17 3:42 ` [PATCH RFC 16/18] net: phylink: Update comment about configuring EEE in mac_link_up() Andrew Lunn
2023-02-17 11:43 ` Russell King (Oracle)
2023-02-17 3:42 ` [PATCH RFC 17/18] net: phy: remove unused phy_init_eee() Andrew Lunn
2023-02-17 3:42 ` [PATCH RFC 18/18] net: usb: lan78xx: Fixup EEE Andrew Lunn
2023-02-17 11:42 ` [PATCH RFC 00/18] Rework MAC drivers EEE support Russell King (Oracle)
2023-02-17 14:17 ` Andrew Lunn
2023-02-17 14:25 ` Russell King (Oracle)
2023-02-18 12:25 ` Oleksij Rempel
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=20230217081943.GA9065@pengutronix.de \
--to=o.rempel@pengutronix$(echo .)de \
--cc=Landen.Chao@mediatek$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=alexandre.torgue@foss$(echo .)st.com \
--cc=andrew@lunn$(echo .)ch \
--cc=angelogioacchino.delregno@collabora$(echo .)com \
--cc=bcm-kernel-feedback-list@broadcom$(echo .)com \
--cc=bh74.an@samsung$(echo .)com \
--cc=dqfext@gmail$(echo .)com \
--cc=f.fainelli@gmail$(echo .)com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=joabreu@synopsys$(echo .)com \
--cc=linux-imx@nxp$(echo .)com \
--cc=linux@rempel-privat$(echo .)de \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=mcoquelin.stm32@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=opendmb@gmail$(echo .)com \
--cc=peppe.cavallaro@st$(echo .)com \
--cc=rmk+kernel@armlinux$(echo .)org.uk \
--cc=sean.wang@mediatek$(echo .)com \
--cc=shenwei.wang@nxp$(echo .)com \
--cc=vladimir.oltean@nxp$(echo .)com \
--cc=wei.fang@nxp$(echo .)com \
--cc=woojung.huh@microchip$(echo .)com \
--cc=xiaoning.wang@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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