Merge Intel IGC and E1000 drivers, and update E1000 base code
Status from this message: Applied to dpdk-next-net-intel.
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest36 patches 5 repliesApplied
- v254 patches 2 repliesSuperseded
- v142 patches 5 repliesSuperseded
Changes in v3 from the cover letter
- Fixes to drivers were separated out as a separate patchset [1]
- Fixed signoffs and authorship
- Fixed check-git-log and check-meson warnings
- Added libabigail ignore for the removed driver
- Added release notes
- Updated MAINTAINERS file
Patches in v3 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/36 | net/e1000/base: copy i225 code into e1000drivers/ drivers/ drivers/ +10 more | +999 | 0 replies | |
| 2/36 | net/igc: merge with net/e1000MAINTAINERS devtools/ doc/ +13 more | +736 | 0 replies | |
| 3/36 | net/igc: remove the driverdrivers/ drivers/ drivers/ +23 more | +0 | 0 replies | |
| 4/36 | net/e1000/base: remove unused parameter workarounddrivers/ drivers/ drivers/ | +25 | 0 replies | |
| 5/36 | net/e1000: add missing i225 devicesdrivers/ drivers/ drivers/ +1 more | +26 | 0 replies | |
| 6/36 | net/e1000: add missing hardware supportdrivers/ drivers/ | +9 | 0 replies | |
| 7/36 | net/e1000: add support for more I219 devicesdrivers/ drivers/ drivers/ +1 more | +112 | 3 replies | |
| 8/36 | net/e1000/base: correct formatting differencesdrivers/ drivers/ drivers/ +8 more | +63 | 0 replies | |
| 9/36 | net/e1000/base: add missing definitionsdrivers/ drivers/ | +9 | 0 replies | |
| 10/36 | net/e1000/base: read PCIe bus info in i225drivers/ | +2 | 0 replies | |
| 11/36 | net/e1000/base: rename VLAN PQF macrosdrivers/ drivers/ | +4 | 0 replies | |
| 12/36 | net/e1000/base: add PHY power management controldrivers/ drivers/ | +17 | 0 replies | |
| 13/36 | net/e1000/base: remove unused functiondrivers/ drivers/ | +1 | 0 replies | |
| 14/36 | net/e1000/base: add LED blink support for i225.mailmap drivers/ drivers/ | +53 | 0 replies | |
| 15/36 | net/e1000/base: add PHY reset support for i225drivers/ | +1 | 0 replies | |
| 16/36 | net/e1000/base: make i225 set LTR non-staticdrivers/ drivers/ | +2 | 0 replies | |
| 17/36 | net/e1000/base: correct disable k1 logicdrivers/ | +12 | 0 replies | |
| 18/36 | net/e1000/base: workaround for packet lossdrivers/ drivers/ | +8 | 0 replies | |
| 19/36 | net/e1000/base: add EEE common API functiondrivers/ drivers/ drivers/ +1 more | +21 | 0 replies | |
| 20/36 | net/e1000/base: add queue select definitionsdrivers/ | +7 | 0 replies | |
| 21/36 | net/e1000/base: add profile information fielddrivers/ | +1 | 0 replies | |
| 22/36 | net/e1000/base: add LPI countersdrivers/ drivers/ | +4 | 0 replies | |
| 23/36 | net/e1000/base: improve code flow in ICH8LANdrivers/ | +43 | 0 replies | |
| 24/36 | net/e1000/base: add definition for EXFWSM registerdrivers/ drivers/ | +3 | 0 replies | |
| 25/36 | net/e1000/base: use longer ULP exit timeout on more HWdrivers/ drivers/ drivers/ | +3 | 0 replies | |
| 26/36 | net/e1000/base: make PHY wakeup access non-staticdrivers/ drivers/ | +4 | 0 replies | |
| 27/36 | net/e1000/base: make debug prints more informativedrivers/ | +10 | 0 replies | |
| 28/36 | net/e1000/base: add WoL definitionsdrivers/ | +4 | 0 replies | |
| 29/36 | net/e1000/base: hardcode bus parameters for ICH8drivers/ | +6 | 0 replies | |
| 30/36 | net/e1000/base: improve NVM checksum handlingdrivers/ | +17 | 0 replies | |
| 31/36 | net/e1000/base: remove redundant access to RO registerdrivers/ | +0 | 0 replies | |
| 32/36 | net/e1000/base: remove non-inclusive languagedrivers/ drivers/ drivers/ +11 more | +81 | 0 replies | |
| 33/36 | net/e1000/base: introduce PHY ID retry mechanismdrivers/ drivers/ drivers/ | +44 | 0 replies | |
| 34/36 | net/e1000/base: add PHY read/write retry mechanismdrivers/ drivers/ drivers/ +1 more | +157 | 0 replies | |
| 35/36 | net/e1000/base: rename NVM version variable.mailmap drivers/ | +8 | 0 replies | |
| 36/36 | net/e1000: update e1000 documentationdoc/ drivers/ | +4 | 1 reply |
Reviews trailers per patch
None of the 36 patches has a Reviewed-by or Acked-by.
| Patch | Bruce Richardson |
|---|---|
| Series | Series-acked-by |
| 1/36 | |
| 2/36 | |
| 3/36 | |
| 4/36 | |
| 5/36 | |
| 6/36 | |
| 7/36 | |
| 8/36 | |
| 9/36 | |
| 10/36 | |
| 11/36 | |
| 12/36 | |
| 13/36 | |
| 14/36 | |
| 15/36 | |
| 16/36 | |
| 17/36 | |
| 18/36 | |
| 19/36 | |
| 20/36 | |
| 21/36 | |
| 22/36 | |
| 23/36 | |
| 24/36 | |
| 25/36 | |
| 26/36 | |
| 27/36 | |
| 28/36 | |
| 29/36 | |
| 30/36 | |
| 31/36 | |
| 32/36 | |
| 33/36 | |
| 34/36 | |
| 35/36 | |
| 36/36 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 00/36] Merge Intel IGC and E1000 drivers, and update E1000 base code
Intel IGC and E1000 drivers are distinct, but they are actually generated from the same base code. This patchset will merge together all e1000-derived drivers into one common base, with three different ethdev driver frontends (EM, IGB, and IGC).
After the merge is done, base code is also updated to latest snapshot.
v2 -> v3:
- Fixes to drivers were separated out as a separate patchset [1]
- Fixed signoffs and authorship
- Fixed check-git-log and check-meson warnings
- Added libabigail ignore for the removed driver
- Added release notes
- Updated MAINTAINERS file
v1 -> v2:
- igc code is now a direct copy from IGC rather than a rebuild-from-source
- i225-related fixes are now separate, not squashed
- removed unused args warning workaround
Adam Ludkiewicz (1):
net/e1000/base: add WoL definitions
Anatoly Burakov (9):
net/e1000/base: copy i225 code into e1000 net/igc: merge with net/e1000
net/igc: remove the driver
net/e1000/base: remove unused parameter workaround net/e1000: add missing i225 devices net/e1000: add missing hardware support net/e1000/base: correct formatting differences net/e1000/base: add missing definitions net/e1000: update e1000 documentation
Dima Ruinskiy (4):
net/e1000/base: read PCIe bus info in i225 net/e1000/base: make PHY wakeup access non-static net/e1000/base: make debug prints more informative net/e1000/base: hardcode bus parameters for ICH8
Evgeny Efimov (2):
net/e1000/base: add PHY reset support for i225
net/e1000/base: add EEE common API function
Marcin Jurczak (1):
net/e1000/base: remove non-inclusive language
Menachem Fogel (1):
net/e1000/base: add LED blink support for i225
Nir Efrati (8):
net/e1000/base: remove unused function net/e1000/base: make i225 set LTR non-static net/e1000/base: workaround for packet loss net/e1000/base: add definition for EXFWSM register net/e1000/base: use longer ULP exit timeout on more HW net/e1000/base: remove redundant access to RO register net/e1000/base: introduce PHY ID retry mechanism net/e1000/base: add PHY read/write retry mechanism
Piotr Kubaj (1):
net/e1000/base: rename NVM version variable
Piotr Pietruszewski (1):
net/e1000/base: improve code flow in ICH8LAN
Sasha Neftin (6):
net/e1000/base: rename VLAN PQF macros net/e1000/base: add PHY power management control net/e1000/base: add queue select definitions net/e1000/base: add profile information field net/e1000/base: add LPI counters net/e1000/base: improve NVM checksum handling
Vitaly Lifshits (2):
net/e1000: add support for more I219 devices
net/e1000/base: correct disable k1 logic
.mailmap | 3 +-
MAINTAINERS | 8 +-
devtools/libabigail.abignore | 1 +
doc/guides/nics/igc.rst | 2 +-
doc/guides/rel_notes/release_25_03.rst | 14 +-
drivers/net/intel/e1000/base/README | 8 +-
.../net/intel/e1000/base/e1000_80003es2lan.c | 8 +-
drivers/net/intel/e1000/base/e1000_82571.c | 4 +-
drivers/net/intel/e1000/base/e1000_82575.c | 16 +-
drivers/net/intel/e1000/base/e1000_82575.h | 29 -
drivers/net/intel/e1000/base/e1000_api.c | 77 +-
drivers/net/intel/e1000/base/e1000_api.h | 4 +-
drivers/net/intel/e1000/base/e1000_base.c | 4 +-
drivers/net/intel/e1000/base/e1000_defines.h | 261 +-
drivers/net/intel/e1000/base/e1000_hw.h | 95 +-
drivers/net/intel/e1000/base/e1000_i210.c | 14 +-
drivers/net/intel/e1000/base/e1000_i210.h | 4 +
drivers/net/intel/e1000/base/e1000_i225.c | 1371 +++++
drivers/net/intel/e1000/base/e1000_i225.h | 117 +
drivers/net/intel/e1000/base/e1000_ich8lan.c | 222 +-
drivers/net/intel/e1000/base/e1000_ich8lan.h | 3 +-
drivers/net/intel/e1000/base/e1000_mac.c | 50 +-
drivers/net/intel/e1000/base/e1000_mac.h | 2 +-
drivers/net/intel/e1000/base/e1000_nvm.c | 8 +-
drivers/net/intel/e1000/base/e1000_osdep.c | 11 +-
drivers/net/intel/e1000/base/e1000_osdep.h | 41 +-
drivers/net/intel/e1000/base/e1000_phy.c | 431 +-
drivers/net/intel/e1000/base/e1000_phy.h | 21 +
drivers/net/intel/e1000/base/e1000_regs.h | 53 +-
drivers/net/intel/e1000/base/e1000_vf.c | 2 +-
drivers/net/intel/e1000/base/meson.build | 13 +-
drivers/net/intel/e1000/em_ethdev.c | 36 +-
drivers/net/intel/e1000/igb_ethdev.c | 1 +
drivers/net/intel/{igc => e1000}/igc_ethdev.c | 914 ++--
drivers/net/intel/{igc => e1000}/igc_ethdev.h | 32 +-
drivers/net/intel/{igc => e1000}/igc_filter.c | 84 +-
drivers/net/intel/{igc => e1000}/igc_filter.h | 0
drivers/net/intel/{igc => e1000}/igc_flow.c | 2 +-
drivers/net/intel/{igc => e1000}/igc_flow.h | 0
drivers/net/intel/{igc => e1000}/igc_logs.c | 2 +-
drivers/net/intel/{igc => e1000}/igc_txrx.c | 376 +-
drivers/net/intel/{igc => e1000}/igc_txrx.h | 6 +-
drivers/net/intel/e1000/meson.build | 11 +
drivers/net/intel/igc/base/README | 29 -
drivers/net/intel/igc/base/igc_82571.h | 36 -
drivers/net/intel/igc/base/igc_82575.h | 351 --
drivers/net/intel/igc/base/igc_api.c | 1853 -------
drivers/net/intel/igc/base/igc_api.h | 111 -
drivers/net/intel/igc/base/igc_base.c | 190 -
drivers/net/intel/igc/base/igc_base.h | 127 -
drivers/net/intel/igc/base/igc_defines.h | 1671 -------
drivers/net/intel/igc/base/igc_hw.h | 1059 ----
drivers/net/intel/igc/base/igc_i225.c | 1380 -----
drivers/net/intel/igc/base/igc_i225.h | 110 -
drivers/net/intel/igc/base/igc_ich8lan.h | 296 --
drivers/net/intel/igc/base/igc_mac.c | 2102 --------
drivers/net/intel/igc/base/igc_mac.h | 64 -
drivers/net/intel/igc/base/igc_manage.c | 547 --
drivers/net/intel/igc/base/igc_manage.h | 65 -
drivers/net/intel/igc/base/igc_nvm.c | 1324 -----
drivers/net/intel/igc/base/igc_nvm.h | 69 -
drivers/net/intel/igc/base/igc_osdep.c | 64 -
drivers/net/intel/igc/base/igc_osdep.h | 163 -
drivers/net/intel/igc/base/igc_phy.c | 4418 -----------------
drivers/net/intel/igc/base/igc_phy.h | 337 --
drivers/net/intel/igc/base/igc_regs.h | 732 ---
drivers/net/intel/igc/base/meson.build | 19 -
drivers/net/intel/igc/igc_logs.h | 43 -
drivers/net/intel/igc/meson.build | 21 -
drivers/net/meson.build | 1 -
70 files changed, 3296 insertions(+), 18247 deletions(-)
create mode 100644 drivers/net/intel/e1000/base/e1000_i225.c
create mode 100644 drivers/net/intel/e1000/base/e1000_i225.h
rename drivers/net/intel/{igc => e1000}/igc_ethdev.c (73%)
rename drivers/net/intel/{igc => e1000}/igc_ethdev.h (91%)
rename drivers/net/intel/{igc => e1000}/igc_filter.c (81%)
rename drivers/net/intel/{igc => e1000}/igc_filter.h (100%)
rename drivers/net/intel/{igc => e1000}/igc_flow.c (99%)
rename drivers/net/intel/{igc => e1000}/igc_flow.h (100%)
rename drivers/net/intel/{igc => e1000}/igc_logs.c (90%)
rename drivers/net/intel/{igc => e1000}/igc_txrx.c (87%)
rename drivers/net/intel/{igc => e1000}/igc_txrx.h (97%)
delete mode 100644 drivers/net/intel/igc/base/README
delete mode 100644 drivers/net/intel/igc/base/igc_82571.h
delete mode 100644 drivers/net/intel/igc/base/igc_82575.h
delete mode 100644 drivers/net/intel/igc/base/igc_api.c
delete mode 100644 drivers/net/intel/igc/base/igc_api.h
delete mode 100644 drivers/net/intel/igc/base/igc_base.c
delete mode 100644 drivers/net/intel/igc/base/igc_base.h
delete mode 100644 drivers/net/intel/igc/base/igc_defines.h
delete mode 100644 drivers/net/intel/igc/base/igc_hw.h
delete mode 100644 drivers/net/intel/igc/base/igc_i225.c
delete mode 100644 drivers/net/intel/igc/base/igc_i225.h
delete mode 100644 drivers/net/intel/igc/base/igc_ich8lan.h
delete mode 100644 drivers/net/intel/igc/base/igc_mac.c
delete mode 100644 drivers/net/intel/igc/base/igc_mac.h
delete mode 100644 drivers/net/intel/igc/base/igc_manage.c
delete mode 100644 drivers/net/intel/igc/base/igc_manage.h
delete mode 100644 drivers/net/intel/igc/base/igc_nvm.c
delete mode 100644 drivers/net/intel/igc/base/igc_nvm.h
delete mode 100644 drivers/net/intel/igc/base/igc_osdep.c
delete mode 100644 drivers/net/intel/igc/base/igc_osdep.h
delete mode 100644 drivers/net/intel/igc/base/igc_phy.c
delete mode 100644 drivers/net/intel/igc/base/igc_phy.h
delete mode 100644 drivers/net/intel/igc/base/igc_regs.h
delete mode 100644 drivers/net/intel/igc/base/meson.build
delete mode 100644 drivers/net/intel/igc/igc_logs.h
delete mode 100644 drivers/net/intel/igc/meson.buildSignature · 1 line
2.43.5