mbox series

[iwl-next,00/10] ice: fix timestamping in reset process

Message ID 20231025121330.216300-1-karol.kolacinski@intel.com
Headers show
Series ice: fix timestamping in reset process | expand

Message

Karol Kolacinski Oct. 25, 2023, 12:13 p.m. UTC
PTP reset process has multiple places where timestamping can end up in
an incorrect state.

This series introduces a proper state machine for PTP and refactors
a large part of the code to ensure that timestamping does not break.

Jacob Keller (9):
  ice: pass reset type to PTP reset functions
  ice: rename verify_cached to has_ready_bitmap
  ice: rename ice_ptp_configure_tx_tstamp
  ice: rename ice_ptp_tx_cfg_intr
  ice: factor out ice_ptp_rebuild_owner()
  ice: remove ptp_tx ring parameter flag
  ice: modify tstamp_config only during TS mode set
  ice: restore timestamp configuration after reset
  ice: stop destroying and reinitalizing Tx tracker during reset

Karol Kolacinski (1):
  ice: introduce PTP state machine

 drivers/net/ethernet/intel/ice/ice.h         |   1 -
 drivers/net/ethernet/intel/ice/ice_ethtool.c |   2 +-
 drivers/net/ethernet/intel/ice/ice_main.c    |  14 +-
 drivers/net/ethernet/intel/ice/ice_ptp.c     | 312 +++++++++++--------
 drivers/net/ethernet/intel/ice/ice_ptp.h     |  38 ++-
 drivers/net/ethernet/intel/ice/ice_txrx.c    |   3 -
 drivers/net/ethernet/intel/ice/ice_txrx.h    |   1 -
 7 files changed, 222 insertions(+), 149 deletions(-)


base-commit: c7ee7435210df79c6f08ae8bf045933478b6a118

Comments

Tony Nguyen Nov. 7, 2023, 7:08 p.m. UTC | #1
On 10/25/2023 5:13 AM, Karol Kolacinski wrote:
> PTP reset process has multiple places where timestamping can end up in
> an incorrect state.
> 
> This series introduces a proper state machine for PTP and refactors
> a large part of the code to ensure that timestamping does not break.

This series has quite a few conflicts now after taking Jake's reset fixes:

https://lore.kernel.org/intel-wired-lan/20231103234658.511859-1-jacob.e.keller@intel.com/T/#m8ecb1403ca012e506215ee798a455f90256a8a14

Can you rebase, resolve, and resend this series?

Thanks,
Tony

> Jacob Keller (9):
>    ice: pass reset type to PTP reset functions
>    ice: rename verify_cached to has_ready_bitmap
>    ice: rename ice_ptp_configure_tx_tstamp
>    ice: rename ice_ptp_tx_cfg_intr
>    ice: factor out ice_ptp_rebuild_owner()
>    ice: remove ptp_tx ring parameter flag
>    ice: modify tstamp_config only during TS mode set
>    ice: restore timestamp configuration after reset
>    ice: stop destroying and reinitalizing Tx tracker during reset
> 
> Karol Kolacinski (1):
>    ice: introduce PTP state machine
> 
>   drivers/net/ethernet/intel/ice/ice.h         |   1 -
>   drivers/net/ethernet/intel/ice/ice_ethtool.c |   2 +-
>   drivers/net/ethernet/intel/ice/ice_main.c    |  14 +-
>   drivers/net/ethernet/intel/ice/ice_ptp.c     | 312 +++++++++++--------
>   drivers/net/ethernet/intel/ice/ice_ptp.h     |  38 ++-
>   drivers/net/ethernet/intel/ice/ice_txrx.c    |   3 -
>   drivers/net/ethernet/intel/ice/ice_txrx.h    |   1 -
>   7 files changed, 222 insertions(+), 149 deletions(-)
> 
> 
> base-commit: c7ee7435210df79c6f08ae8bf045933478b6a118