| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230217081943.GA9065@pengutronix.de>
Date: Fri, 17 Feb 2023 09:19:43 +0100
From: Oleksij Rempel <o.rempel@...gutronix.de>
To: Andrew Lunn <andrew@...n.ch>
Cc: netdev <netdev@...r.kernel.org>,
Florian Fainelli <f.fainelli@...il.com>,
Vladimir Oltean <vladimir.oltean@....com>,
Sean Wang <sean.wang@...iatek.com>,
Landen Chao <Landen.Chao@...iatek.com>,
DENG Qingfang <dqfext@...il.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>,
Doug Berger <opendmb@...il.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@...adcom.com>,
Wei Fang <wei.fang@....com>,
Shenwei Wang <shenwei.wang@....com>,
Clark Wang <xiaoning.wang@....com>,
NXP Linux Team <linux-imx@....com>,
UNGLinuxDriver@...rochip.com, Byungho An <bh74.an@...sung.com>,
Giuseppe Cavallaro <peppe.cavallaro@...com>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Jose Abreu <joabreu@...opsys.com>,
Maxime Coquelin <mcoquelin.stm32@...il.com>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <rmk+kernel@...linux.org.uk>,
Woojung Huh <woojung.huh@...rochip.com>,
Oleksij Rempel <linux@...pel-privat.de>
Subject: Re: [PATCH RFC 08/18] net: FEC: Fixup EEE
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@...n.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 |
Powered by blists - more mailing lists