From: Andrew Lunn <andrew@lunn.ch>
To: netdev <netdev@vger.kernel.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Oleksij Rempel <linux@rempel-privat.de>,
Andrew Lunn <andrew@lunn.ch>
Subject: [RFC/RFTv3 21/24] net: phylink: Add MAC_EEE to mac_capabilites
Date: Fri, 31 Mar 2023 02:55:15 +0200 [thread overview]
Message-ID: <20230331005518.2134652-22-andrew@lunn.ch> (raw)
In-Reply-To: <20230331005518.2134652-1-andrew@lunn.ch>
If the MAC supports Energy Efficient Ethernet, it should indicate this
by setting the MAC_EEE bit in the config.mac_capabilities
bitmap. phylink will then enable EEE in the PHY, if it supports it.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v3: Move MAC_EEE to BIT(2) and renumber link modes.
---
drivers/net/phy/phylink.c | 3 +++
include/linux/phylink.h | 39 ++++++++++++++++++++++-----------------
2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 61e4502086c3..191cafd37e62 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1647,6 +1647,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
*/
phy_support_asym_pause(phy);
+ if (pl->config->mac_capabilities & MAC_EEE)
+ phy_support_eee(phy);
+
memset(&config, 0, sizeof(config));
linkmode_copy(supported, phy->supported);
linkmode_copy(config.advertising, phy->advertising);
diff --git a/include/linux/phylink.h b/include/linux/phylink.h
index 52f29b648853..cb5204fb9106 100644
--- a/include/linux/phylink.h
+++ b/include/linux/phylink.h
@@ -52,26 +52,31 @@ enum {
*/
MAC_SYM_PAUSE = BIT(0),
MAC_ASYM_PAUSE = BIT(1),
- MAC_10HD = BIT(2),
- MAC_10FD = BIT(3),
+
+ /* MAC_EEE indicates that the MAC is Energy Efficient capable
+ * and that the PHY should negotiate its use, if possible
+ */
+ MAC_EEE = BIT(2),
+ MAC_10HD = BIT(3),
+ MAC_10FD = BIT(4),
MAC_10 = MAC_10HD | MAC_10FD,
- MAC_100HD = BIT(4),
- MAC_100FD = BIT(5),
+ MAC_100HD = BIT(5),
+ MAC_100FD = BIT(6),
MAC_100 = MAC_100HD | MAC_100FD,
- MAC_1000HD = BIT(6),
- MAC_1000FD = BIT(7),
+ MAC_1000HD = BIT(7),
+ MAC_1000FD = BIT(8),
MAC_1000 = MAC_1000HD | MAC_1000FD,
- MAC_2500FD = BIT(8),
- MAC_5000FD = BIT(9),
- MAC_10000FD = BIT(10),
- MAC_20000FD = BIT(11),
- MAC_25000FD = BIT(12),
- MAC_40000FD = BIT(13),
- MAC_50000FD = BIT(14),
- MAC_56000FD = BIT(15),
- MAC_100000FD = BIT(16),
- MAC_200000FD = BIT(17),
- MAC_400000FD = BIT(18),
+ MAC_2500FD = BIT(9),
+ MAC_5000FD = BIT(10),
+ MAC_10000FD = BIT(11),
+ MAC_20000FD = BIT(12),
+ MAC_25000FD = BIT(13),
+ MAC_40000FD = BIT(14),
+ MAC_50000FD = BIT(15),
+ MAC_56000FD = BIT(16),
+ MAC_100000FD = BIT(17),
+ MAC_200000FD = BIT(18),
+ MAC_400000FD = BIT(19),
};
static inline bool phylink_autoneg_inband(unsigned int mode)
--
2.40.0
next prev parent reply other threads:[~2023-03-31 0:56 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-31 0:54 [RFC/RFTv3 00/24] net: ethernet: Rework EEE Andrew Lunn
2023-03-31 0:54 ` [RFC/RFTv3 01/24] net: phy: Add phydev->eee_active to simplify adjust link callbacks Andrew Lunn
2023-05-30 17:51 ` Florian Fainelli
2023-03-31 0:54 ` [RFC/RFTv3 02/24] net: phylink: Add mac_set_eee() callback Andrew Lunn
2023-03-31 0:54 ` [RFC/RFTv3 03/24] net: phy: Add helper to set EEE Clock stop enable bit Andrew Lunn
2023-03-31 0:54 ` [RFC/RFTv3 04/24] net: phy: Keep track of EEE tx_lpi_enabled Andrew Lunn
2023-05-30 18:11 ` Florian Fainelli
2023-05-30 18:14 ` Russell King (Oracle)
2023-03-31 0:54 ` [RFC/RFTv3 05/24] net: phy: Immediately call adjust_link if only tx_lpi_enabled changes Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 06/24] net: phylink: Handle change in EEE from phylib Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 07/24] net: marvell: mvneta: Simplify EEE configuration Andrew Lunn
2023-05-30 18:03 ` Florian Fainelli
2023-03-31 0:55 ` [RFC/RFTv3 08/24] net: stmmac: Drop usage of phy_init_eee() Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 09/24] net: stmmac: Simplify ethtool get eee Andrew Lunn
2023-05-19 7:11 ` Oleksij Rempel
2023-03-31 0:55 ` [RFC/RFTv3 10/24] net: lan743x: Fixup EEE Andrew Lunn
2023-05-30 18:03 ` Florian Fainelli
2023-03-31 0:55 ` [RFC/RFTv3 11/24] net: fec: Move fec_enet_eee_mode_set() and helper earlier Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 12/24] net: FEC: Fixup EEE Andrew Lunn
2023-05-19 10:27 ` Oleksij Rempel
2023-03-31 0:55 ` [RFC/RFTv3 13/24] net: genet: " Andrew Lunn
2023-05-30 18:01 ` Florian Fainelli
2023-03-31 0:55 ` [RFC/RFTv3 14/24] net: sxgdb: " Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 15/24] net: dsa: mt7530: Swap to using phydev->eee_active Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 16/24] net: dsa: b53: " Andrew Lunn
2023-05-30 18:05 ` Florian Fainelli
2023-03-31 0:55 ` [RFC/RFTv3 17/24] net: phylink: Remove unused phylink_init_eee() Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 18/24] net: phy: remove unused phy_init_eee() Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 19/24] net: usb: lan78xx: Fixup EEE Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 20/24] net: phy: Add phy_support_eee() indicating MAC support EEE Andrew Lunn
2023-05-30 18:16 ` Florian Fainelli
2023-03-31 0:55 ` Andrew Lunn [this message]
2023-05-30 18:18 ` [RFC/RFTv3 21/24] net: phylink: Add MAC_EEE to mac_capabilites Florian Fainelli
2023-03-31 0:55 ` [RFC/RFTv3 22/24] net: phylink: Extend mac_capabilities in MAC drivers which support EEE Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 23/24] net: phylib: call phy_support_eee() " Andrew Lunn
2023-03-31 0:55 ` [RFC/RFTv3 24/24] net: phy: Disable EEE advertisement by default Andrew Lunn
2023-05-26 8:56 ` [RFC/RFTv3 00/24] net: ethernet: Rework EEE Oleksij Rempel
2023-05-26 12:08 ` Andrew Lunn
2023-05-26 16:13 ` Florian Fainelli
2023-05-30 18:31 ` Florian Fainelli
2023-05-30 19:35 ` Russell King (Oracle)
2023-05-30 19:49 ` Russell King (Oracle)
2023-05-31 7:14 ` Oleksij Rempel
2023-05-31 14:41 ` Russell King (Oracle)
2023-05-30 19:48 ` Andrew Lunn
2023-05-30 20:03 ` Florian Fainelli
2023-05-30 20:36 ` Russell King (Oracle)
2023-05-30 20:28 ` Russell King (Oracle)
2023-05-30 23:03 ` Florian Fainelli
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=20230331005518.2134652-22-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux@rempel-privat.de \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
/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).