> Continue Lorenzo Bianconi's EST replay series with v4 of the unmerged work: > https://lore.kernel.org/r/20260902-stmmac-est-reapply-after-open-v3-0-e72a6df5a7ef@oss.qualcomm.com Hi James, My plan is to continue working on this series (the code is available in [0]), I am just waiting other patches to be merged upstream before reposting in order to avoid any conflict. I guess it is correct to publicly ask before posting other people patches. Moreover, this is thecnically a fix so this seires should targed net tree. Regards, Lorenzo [0] https://github.com/LorenzoBianconi/net-next/tree/b4/stmmac-est-reapply-after-open > > The PTP initialization fix from that series is already in the base. > Carry the remaining embedded-state and explicit-enable preparations, > and restore the installed schedule after open and resume reset. > > Build TAPRIO replacements separately so rejected updates cannot > corrupt the installed schedule. Rebase the previous schedule against > the current PHC when rolling back a failed hardware update, and keep > DMA stopped until replay succeeds. These changes do not depend on > the later datapath recovery series. > > Changes in v4: > - Omit the merged PTP initialization patch and adapt the remaining > changes to probe-time PTP locking and current TAPRIO error handling. > - Separate schedule validation/rollback from open and resume replay. > - Reuse the base-time helper for replacement, PHC adjustment and > rollback; propagate errors while preserving the installed cache. > - Start DMA only after the installed schedule has been restored. > - Link to v3: https://lore.kernel.org/r/20260902-stmmac-est-reapply-after-open-v3-0-e72a6df5a7ef@oss.qualcomm.com > > Changes in v3: > - Guard priv->est.enable update using est_lock mutex. > - Embed stmmac_est in stmmac_priv struct. > - Rework locking in tc_taprio_configure(). > - Fix possible divided by zero crash in tc_taprio_configure(). > - Add missing reconfiguration during stmmac_resume(). > - Honor ptp error code in __stmmac_open() and stmmac_resume(). > - Link to v2: https://lore.kernel.org/r/20260829-stmmac-est-reapply-after-open-v2-1-5e5ccb185e92@oss.qualcomm.com > > Changes in v2: > - Rename stmmac_est_reconfigure() in stmmac_setup_est(). > - Rely on stmmac_setup_est() in tc_taprio_configure(). > - Link to v1: https://lore.kernel.org/r/20260825-stmmac-est-reapply-after-open-v1-1-dfa80735e0a1@oss.qualcomm.com > > Assisted-by: Codex:gpt-6-astra > Signed-off-by: James Hilliard > > --- > James Hilliard (1): > net: stmmac: preserve the installed EST schedule on errors > > Lorenzo Bianconi (3): > net: stmmac: embed struct stmmac_est in stmmac_priv struct > net: stmmac: pass the desired EST enable state to est_configure() > net: stmmac: restore EST before starting DMA on open and resume > > drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- > drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- > drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 47 ++++++- > drivers/net/ethernet/stmicro/stmmac/stmmac_est.h | 13 ++ > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 38 ++++-- > drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 59 ++++----- > drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 142 +++++++++++----------- > 7 files changed, 176 insertions(+), 127 deletions(-) > --- > base-commit: 1631d79ae57dce2c5f88ad278307028638a8b4d9 > change-id: 20260824-stmmac-est-reapply-after-open-181d70a15eb6 > > Best regards, > -- > James Hilliard >