Skip to content

ethtool: switch EEE netlink interface to use EEE linkmode bitmaps

Heiner Kallweit netdev 3 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest6 patches 7 repliesApplied 6/6
  2. v36 patches 2 repliesSuperseded
  3. v2 RFC5 patches 6 repliesSuperseded

Changes in v4 from the cover letter

- fix missing replacement in patch 4

Patches in v4 All 6 applied

#Subject and filesSizeRepliesApplied
1/6ethtool: replace struct ethtool_eee with a new struct ethtool_keee on kernel sidedrivers/net/dsa/b53/b53_common.c drivers/net/dsa/b53/b53_priv.h drivers/net/dsa/bcm_sf2.c +51 more+159 -1471 replyApplied
2/6ethtool: switch back from ethtool_keee to ethtool_eee for ioctlnet/ethtool/ioctl.c+39 -91 replyApplied
3/6ethtool: adjust struct ethtool_keee to kernel needsinclude/linux/ethtool.h net/ethtool/eee.c+9 -110 repliesApplied
4/6ethtool: add suffix _u32 to legacy bitmap members of struct ethtool_keeedrivers/net/ethernet/aquantia/atlantic/aq_ethtool.c drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c drivers/net/ethernet/broadcom/bnxt/bnxt.c +14 more+116 -1161 replyApplied
5/6ethtool: add linkmode bitmap support to struct ethtool_keeeinclude/linux/ethtool.h net/ethtool/common.c net/ethtool/common.h +2 more+68 -171 replyApplied
6/6net: phy: c45: change genphy_c45_ethtool_[get|set]_eee to use EEE linkmode bitmapsdrivers/net/phy/phy-c45.c+13 -231 replyApplied

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchAndrew Lunn
1/6R-b
2/6R-b
3/6R-b
4/6R-b
5/6R-b
6/6R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH net-next v4 0/6] ethtool: switch EEE netlink interface to use EEE linkmode bitmaps

So far only 32bit legacy bitmaps are passed to userspace. This makes it impossible to manage EEE linkmodes beyond bit 32, e.g. manage EEE for 2500BaseT and 5000BaseT. This series adds support for passing full linkmode bitmaps between kernel and userspace.

Fortunately the netlink-based part of ethtool is quite smart and no changes are needed in ethtool. However this applies to the netlink interface only, the ioctl interface for now remains restricted to legacy bitmaps.

Next step will be adding support for the c45 EEE2 standard registers (3.21, 7.62, 7.63) to the genphy_c45 functions dealing with EEE. I have a follow-up series for this ready to be submitted.

v2:
- now as RFC
- adopt suggestion from Andrew to start with struct ethtool_keee being an identical copy of ethtool_eee, and switch all users
v3:
- switch from RFC to net-next
- add patch 4, and reuse old names in patch 5
- rebase patch 1
v4:
- fix missing replacement in patch 4

Heiner Kallweit (6):
ethtool: replace struct ethtool_eee with a new struct ethtool_keee on
kernel side
ethtool: switch back from ethtool_keee to ethtool_eee for ioctl
ethtool: adjust struct ethtool_keee to kernel needs
ethtool: add suffix _u32 to legacy bitmap members of struct
ethtool_keee
ethtool: add linkmode bitmap support to struct ethtool_keee
net: phy: c45: change genphy_c45_ethtool_[get|set]_eee to use EEE
linkmode bitmaps

 drivers/net/dsa/b53/b53_common.c              | 10 +--
 drivers/net/dsa/b53/b53_priv.h                |  6 +-
 drivers/net/dsa/bcm_sf2.c                     |  2 +-
 drivers/net/dsa/microchip/ksz_common.c        |  4 +-
 drivers/net/dsa/mt7530.c                      |  4 +-
 drivers/net/dsa/mv88e6xxx/chip.c              |  4 +-
 drivers/net/dsa/qca/qca8k-common.c            |  4 +-
 drivers/net/dsa/qca/qca8k.h                   |  4 +-
 .../ethernet/aquantia/atlantic/aq_ethtool.c   | 12 +--
 drivers/net/ethernet/broadcom/asp2/bcmasp.h   |  2 +-
 .../ethernet/broadcom/asp2/bcmasp_ethtool.c   |  8 +-
 .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c   | 12 +--
 drivers/net/ethernet/broadcom/bnxt/bnxt.c     | 20 ++---
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  2 +-
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 20 ++---
 .../net/ethernet/broadcom/genet/bcmgenet.c    |  8 +-
 .../net/ethernet/broadcom/genet/bcmgenet.h    |  2 +-
 drivers/net/ethernet/broadcom/tg3.c           | 32 ++++----
 drivers/net/ethernet/broadcom/tg3.h           |  2 +-
 drivers/net/ethernet/engleder/tsnep_main.c    |  6 +-
 drivers/net/ethernet/freescale/enetc/enetc.c  |  4 +-
 drivers/net/ethernet/freescale/fec.h          |  2 +-
 drivers/net/ethernet/freescale/fec_main.c     | 10 +--
 drivers/net/ethernet/freescale/gianfar.c      |  4 +-
 drivers/net/ethernet/intel/e1000e/ethtool.c   | 16 ++--
 .../net/ethernet/intel/i40e/i40e_ethtool.c    | 16 ++--
 drivers/net/ethernet/intel/igb/igb_ethtool.c  | 28 +++----
 drivers/net/ethernet/intel/igc/igc.h          |  2 +-
 drivers/net/ethernet/intel/igc/igc_ethtool.c  | 20 ++---
 .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c  | 28 +++----
 drivers/net/ethernet/marvell/mvneta.c         |  4 +-
 .../net/ethernet/microchip/lan743x_ethtool.c  |  4 +-
 .../net/ethernet/qlogic/qede/qede_ethtool.c   | 32 ++++----
 drivers/net/ethernet/realtek/r8169_main.c     |  4 +-
 .../ethernet/samsung/sxgbe/sxgbe_ethtool.c    |  4 +-
 .../ethernet/stmicro/stmmac/stmmac_ethtool.c  |  4 +-
 drivers/net/ethernet/ti/am65-cpsw-ethtool.c   |  4 +-
 drivers/net/ethernet/ti/cpsw_ethtool.c        |  4 +-
 drivers/net/ethernet/ti/cpsw_priv.h           |  4 +-
 drivers/net/ethernet/ti/icssg/icssg_ethtool.c |  4 +-
 drivers/net/phy/marvell.c                     |  2 +-
 drivers/net/phy/phy-c45.c                     | 44 +++++------
 drivers/net/phy/phy.c                         |  8 +-
 drivers/net/phy/phylink.c                     |  8 +-
 drivers/net/usb/ax88179_178a.c                | 20 ++---
 drivers/net/usb/lan78xx.c                     |  4 +-
 drivers/net/usb/r8152.c                       | 28 +++----
 include/linux/ethtool.h                       | 17 ++++-
 include/linux/phy.h                           |  8 +-
 include/linux/phylink.h                       |  4 +-
 include/net/dsa.h                             |  4 +-
 net/dsa/user.c                                |  4 +-
 net/ethtool/common.c                          |  5 ++
 net/ethtool/common.h                          |  1 +
 net/ethtool/eee.c                             | 75 ++++++++++++-------
 net/ethtool/ioctl.c                           | 69 ++++++++++++++---
 56 files changed, 372 insertions(+), 291 deletions(-)
Signature · 1 line
2.43.0