Backport a5a441ae283d ("ice/ptp: fix crosstimestamp reporting")

Backport a5a441ae283d ("ice/ptp: fix crosstimestamp reporting")

[Markus Blöchl]

Hi Greg,

please consider backporting

    a5a441ae283d ("ice/ptp: fix crosstimestamp reporting")

into linux-6.12.y

It fixes a regression from the series around
d4bea547ebb57 ("ice/ptp: Remove convert_art_to_tsc()")
which affected multiple drivers and occasionally
caused phc2sys to fail on ioctl(fd, PTP_SYS_OFFSET_PRECISE, ...).

This was the initial fix for ice but apparently tagging it
for stable was forgotten during submission.

A similar fix for e1000e can be found here:

Link: https://lore.kernel.org/lkml/20250709-e1000e_crossts-v2-1-2aae94384c59@blochl.de/

The hunk was moved around slightly in the upstream commit 
92456e795ac6 ("ice: Add unified ice_capture_crosststamp").
Let me know if you therefore want a separate patch,
I just didn't want to to steal the credits here.

Thanks a lot!

Markus

-- 

Re: Backport a5a441ae283d ("ice/ptp: fix crosstimestamp reporting")

[Greg KH]

On Wed, Jul 16, 2025 at 11:08:58PM +0200, Markus Blöchl wrote:
> Hi Greg,
> 
> please consider backporting
> 
>     a5a441ae283d ("ice/ptp: fix crosstimestamp reporting")
> 
> into linux-6.12.y
> 
> It fixes a regression from the series around
> d4bea547ebb57 ("ice/ptp: Remove convert_art_to_tsc()")
> which affected multiple drivers and occasionally
> caused phc2sys to fail on ioctl(fd, PTP_SYS_OFFSET_PRECISE, ...).
> 
> This was the initial fix for ice but apparently tagging it
> for stable was forgotten during submission.
> 
> A similar fix for e1000e can be found here:
> 
> Link: https://lore.kernel.org/lkml/20250709-e1000e_crossts-v2-1-2aae94384c59@blochl.de/
> 
> The hunk was moved around slightly in the upstream commit 
> 92456e795ac6 ("ice: Add unified ice_capture_crosststamp").
> Let me know if you therefore want a separate patch,
> I just didn't want to to steal the credits here.

Please send a properly backported patch and we will be glad to queue it
up that way.  As-is, it does not apply cleanly.

thanks,

greg k-h