diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_main.c | 12 | 
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 6607fa6fe556..fb9c93f37e84 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -7401,15 +7401,6 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)  		goto err_vsi_rebuild;  	} -	/* configure PTP timestamping after VSI rebuild */ -	if (test_bit(ICE_FLAG_PTP_SUPPORTED, pf->flags)) { -		if (pf->ptp.tx_interrupt_mode == ICE_PTP_TX_INTERRUPT_SELF) -			ice_ptp_cfg_timestamp(pf, false); -		else if (pf->ptp.tx_interrupt_mode == ICE_PTP_TX_INTERRUPT_ALL) -			/* for E82x PHC owner always need to have interrupts */ -			ice_ptp_cfg_timestamp(pf, true); -	} -  	err = ice_vsi_rebuild_by_type(pf, ICE_VSI_SWITCHDEV_CTRL);  	if (err) {  		dev_err(dev, "Switchdev CTRL VSI rebuild failed: %d\n", err); @@ -7461,6 +7452,9 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)  	ice_plug_aux_dev(pf);  	if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))  		ice_lag_rebuild(pf); + +	/* Restore timestamp mode settings after VSI rebuild */ +	ice_ptp_restore_timestamp_mode(pf);  	return;  err_vsi_rebuild:  | 
