diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-10 19:52:50 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-10 19:52:50 -0700 |
| commit | bb678f01804ccaa861b012b2b9426d69673d8a84 (patch) | |
| tree | 5d763fdb470bbab021a86e6d0b4c5735ca5ad123 /drivers/net/ethernet/intel/ice/ice_ptp.c | |
| parent | 2ebb87f45b3c6adc97b29291102ecb97274f913f (diff) | |
| parent | dee55767dc8ca3fc6127a792e2a8b69c5e03fdd2 (diff) | |
| download | linux-bb678f01804ccaa861b012b2b9426d69673d8a84.tar.gz linux-bb678f01804ccaa861b012b2b9426d69673d8a84.tar.bz2 linux-bb678f01804ccaa861b012b2b9426d69673d8a84.zip | |
Merge branch 'intel-wired-lan-driver-updates-2024-06-03'
Jacob Keller says:
====================
Intel Wired LAN Driver Updates 2024-06-03
This series includes miscellaneous improvements for the ice as well as a
cleanup to the Makefiles for all Intel net drivers.
Andy fixes all of the Intel net driver Makefiles to use the documented
'*-y' syntax for specifying object files to link into kernel driver
modules, rather than the '*-objs' syntax which works but is documented as
reserved for user-space host programs.
Jacob has a cleanup to refactor rounding logic in the ice driver into a
common roundup_u64 helper function.
Michal Schmidt replaces irq_set_affinity_hint() to use
irq_update_affinity_hint() which behaves better with user-applied affinity
settings.
v2: https://lore.kernel.org/r/20240605-next-2024-06-03-intel-next-batch-v2-0-39c23963fa78@intel.com
v1: https://lore.kernel.org/r/20240603-next-2024-06-03-intel-next-batch-v1-0-e0523b28f325@intel.com
====================
Link: https://lore.kernel.org/r/20240607-next-2024-06-03-intel-next-batch-v3-0-d1470cee3347@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ptp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index adbb9cffe20c..b7ab6fdf710d 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -1773,8 +1773,7 @@ static int ice_ptp_cfg_clkout(struct ice_pf *pf, unsigned int chan, * maintaining phase */ if (start_time < current_time) - start_time = div64_u64(current_time + NSEC_PER_SEC - 1, - NSEC_PER_SEC) * NSEC_PER_SEC + phase; + start_time = roundup_u64(current_time, NSEC_PER_SEC) + phase; if (ice_is_e810(hw)) start_time -= E810_OUT_PROP_DELAY_NS; |