ice: Use div64_u64 instead of div_u64 in adjfine
authorKarol Kolacinski <karol.kolacinski@intel.com>
Thu, 4 Nov 2021 13:52:11 +0000 (14:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Dec 2021 08:32:42 +0000 (09:32 +0100)
[ Upstream commit 0013881c1145d36bf26165bb70fdd7560a5507a3 ]

Change the division in ice_ptp_adjfine from div_u64 to div64_u64.
div_u64 is used when the divisor is 32 bit but in this case incval is
64 bit and it caused incorrect calculations and incval adjustments.

Fixes: 06c16d89d2cb ("ice: register 1588 PTP clock device object for E810 devices")
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/ice/ice_ptp.c

index d1ef3d4..9df5469 100644 (file)
@@ -459,7 +459,7 @@ static int ice_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm)
                scaled_ppm = -scaled_ppm;
        }
 
-       while ((u64)scaled_ppm > div_u64(U64_MAX, incval)) {
+       while ((u64)scaled_ppm > div64_u64(U64_MAX, incval)) {
                /* handle overflow by scaling down the scaled_ppm and
                 * the divisor, losing some precision
                 */