ACK: [j:intel-iotg][PULL][SRU][v2] Integrated TSN controller (stmmac) driver updates

Wed Apr 19 16:13:29 UTC 2023

On 4/19/23 9:12 AM, Philip Cox wrote:
> 
> BugLink:https://bugs.launchpad.net/bugs/2006706 
> <https://bugs.launchpad.net/bugs/2006706>
> 
> [Impact]
> Update the TSN  controller (stmmac) driver.
> 
> [Fix]
> This is pulling in a set of patches to update the stmmac driver in the 
> intel-iotg kernel.  The original patch set consisted of 100+ patches, 
> but many of the changes have already made it in to the kernel via the 
> SRU process.  This is pulling in the required missing patches.  The end 
> result is 38 patches.
> 
> [Test Case]
> I've tested the kernel, and didn't hit any regressions, and it will be 
> thoroughly tested by QA once it is available in the PPA.
> 
> [Where Problems Could Occur]
> Some of the changes needed to be back ported rather than cherry-picked, 
> and the logic, or the underlying data structures may be different.  Some 
> of the structs involved had conflicting definitions between upstream, 
> the Intel IOTG kernel, and patch set provided in the LP bug.  I tried to 
> resolve these changes and keep the intended logic intact.
> 
> [v2]
> - Corrected authorship on some commits
> - Fixed a couple typos in commit messages
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 1ef87b213719a62bb370278e1880a53f306d6ae8:
> 
> UBUNTU: Ubuntu-intel-iotg-5.15.0-1028.33 (2023-04-05 13:53:29 -0400)
> 
> are available in the Git repository at:
> 
> git://git.launchpad.net/~philcox/+git/lp2006706 
> <http://git.launchpad.net/~philcox/+git/lp2006706> philcox/lp2006706v2
> or
> https://git.launchpad.net/~philcox/+git/lp2006706 
> <https://git.launchpad.net/~philcox/+git/lp2006706> philcox/lp2006706v2
> 
> for you to fetch changes up to 213964175de847f2bd73519ff8b055108b1e3b2c:
> 
> igc: Add support for Frame Preemption verification (2023-04-19 09:52:22 
> -0400)
> 
> BugLink:https://bugs.launchpad.net/bugs/2006706 
> <https://bugs.launchpad.net/bugs/2006706>
> 
> [Impact]
> Update the TSN  controller (stmmac) driver.
> 
> [Fix]
> This is pulling in a set of patches to update the stmmac driver in the 
> intel-iotg kernel.  The original patch set consisted of 100+ patches, 
> but many of the changes have already made it in to the kernel via the 
> SRU process.  This is pulling in the required missing patches.  The end 
> result is 38 patches.
> 
> [Test Case]
> I've tested the kernel, and didn't hit any regressions, and it will be 
> thoroughly tested by QA once it is available in the PPA.
> 
> [Where Problems Could Occur]
> Some of the changes needed to be back ported rather than cherry-picked, 
> and the logic, or the underlying data structures may be different.  Some 
> of the structs involved had conflicting definitions between upstream, 
> the Intel IOTG kernel, and patch set provided in the LP bug.  I tried to 
> resolve these changes and keep the intended logic intact.
> 
> [v2]
> - Corrected authorship on some commits
> - Fixed a couple typos in commit messages
> 
> ----------------------------------------------------------------
> 
> The following changes since commit 1ef87b213719a62bb370278e1880a53f306d6ae8:
> 
> UBUNTU: Ubuntu-intel-iotg-5.15.0-1028.33 (2023-04-05 13:53:29 -0400)
> 
> are available in the Git repository at:
> 
> git://git.launchpad.net/~philcox/+git/lp2006706 
> <http://git.launchpad.net/~philcox/+git/lp2006706> philcox/lp2006706v2
> or
> https://git.launchpad.net/~philcox/+git/lp2006706 
> <https://git.launchpad.net/~philcox/+git/lp2006706>philcox/lp2006706v2
> 
> for you to fetch changes up to 213964175de847f2bd73519ff8b055108b1e3b2c:
> 
> igc: Add support for Frame Preemption verification (2023-04-19 09:52:22 
> -0400)
> 
> 
> ----------------------------------------------------------------
> Aminuddin Jamaluddin (1):
> net: phy: add wrapper function for setup master slave setup
> 
> Gan Yi Fang (3):
> net: stmmac: Add check for supported EEE advertisement
> net: stmmac: Check and exit when coalesce rx-usecs is equal to 0
> net: phy: dp83867: perform restart AN after modifying AN setting
> 
> Goh, Wei Sheng (1):
> net: stmmac: fix deadlock caused by taking RTNL in RPM resume path
> 
> Lai Peter Jun Ann (1):
> taprio: Fix no error return when entering invalid gatemask value
> 
> Michael Sit (1):
> fixup! net: phy: marvell10g: Add WAKE_PHY support to WOL event
> 
> Michael Sit Wei Hong (6):
> net: stmmac: update EEE status when mac link goes down
> net: stmmac: check CBS input values before configuration
> stmmac: intel: Separate ADL-N device ID from TGL
> net: stmmac: Add check for taprio basetime configuration
> taprio: Add boundary check for sched-entry values
> stmmac: intel: PCH MSI arbitration WA for HW bug
> 
> Muhammad Husaini Zulkifli (6):
> taprio: Add bitmask checking based on the traffic class
> igc: Enable HW RX Timestamp for AF_XDP ZC
> net/core: XDP metadata BTF netlink API
> rtnetlink: Fix unchecked return value of dev_xdp_query_md_btf()
> rtnetlink: Add return value check
> ethtool: Add support for configuring frame preemption
> 
> Noor Azura Ahmad Tarmizi (2):
> net: stmmac: add check for supported mode before speed/advertising change
> net: stmmac: add check for advertising linkmode request for set-eee
> 
> Philip Cox (6):
> Revert "igc: Add support for enabling frame preemption via ethtool"
> Revert "igc: Add support for Frame Preemption verification"
> Revert "ethtool: Add support for configuring frame preemption"
> Revert "ethtool: Add support for configuring and verifying frame preemption"
> Revert "ethtool: Add support for configuring frame preemption via ioctl"
> Revert "net: tc: Add index of FPE QMASK"
> 
> Song Yoong Siang (3):
> net: stmmac: Adjust mac_capabilities for Intel mGbE 2.5G mode
> net: phy: dp83867: perform phy reset after modifying auto-neg setting
> net: stmmac: Fix 'no previous prototype' build warning
> 
> Tan Tee Min (1):
> net: phy: dp83867: add TI PHY loopback
> 
> Vedang Patel (1):
> igc: Add BTF based metadata for XDP
> 
> Vinicius Costa Gomes (3):
> ethtool: Add support for Frame Preemption verification
> igc: Add support for enabling frame preemption via ethtool
> igc: Add support for Frame Preemption verification
> 
> Vladimir Oltean (1):
> Revert "net/sched: taprio: make qdisc_leaf() see the per-netdev-queue 
> pfifo child qdiscs"
> 
> Wong Vee Khee (2):
> Revert "net: stmmac: trigger PCS EEE to turn off on link down"
> ptp: Fixed read issue on PHC with zero n_pins
> 
> Documentation/networking/ethtool-netlink.rst | 43 +++++---
> drivers/net/ethernet/intel/igc/igc.h | 4 +-
> drivers/net/ethernet/intel/igc/igc_ethtool.c | 8 +-
> drivers/net/ethernet/intel/igc/igc_main.c | 21 ++++
> drivers/net/ethernet/intel/igc/igc_xdp.c | 114 +++++++++++++++++++++
> drivers/net/ethernet/intel/igc/igc_xdp.h | 11 ++
> drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 41 +++++++-
> drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 +-
> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 +
> .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 50 +++++++--
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 41 ++++++--
> drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 8 ++
> drivers/net/phy/dp83867.c | 23 +++++
> drivers/net/phy/marvell10g.c | 2 +
> drivers/net/phy/phy_device.c | 6 ++
> drivers/ptp/ptp_clock.c | 4 +
> include/linux/ethtool.h | 33 ++++--
> include/linux/netdevice.h | 15 ++-
> include/linux/phy.h | 1 +
> include/linux/stmmac.h | 1 +
> include/uapi/linux/ethtool.h | 19 ----
> include/uapi/linux/ethtool_netlink.h | 13 ++-
> include/uapi/linux/if_link.h | 2 +
> include/uapi/linux/pkt_sched.h | 1 -
> net/core/dev.c | 53 ++++++++++
> net/core/rtnetlink.c | 25 ++++-
> net/ethtool/Makefile | 2 +-
> net/ethtool/common.c | 23 +++++
> net/ethtool/ioctl.c | 61 -----------
> net/ethtool/preempt.c | 49 +++++++--
> net/sched/sch_taprio.c | 54 ++++++----
> 31 files changed, 569 insertions(+), 168 deletions(-)
> 
Acked-by: Tim Gardner <tim.gardner at canonical.com>
-- 
-----------
Tim Gardner
Canonical, Inc