|
@@ -245,13 +245,9 @@ static u32 freq_to_shift(u16 freq)
|
|
|
{
|
|
|
u32 freq_khz = freq * 1000;
|
|
|
u64 max_val_cycles = freq_khz * 1000 * MLX4_EN_WRAP_AROUND_SEC;
|
|
|
- u64 tmp_rounded =
|
|
|
- roundup_pow_of_two(max_val_cycles) > max_val_cycles ?
|
|
|
- roundup_pow_of_two(max_val_cycles) - 1 : UINT_MAX;
|
|
|
- u64 max_val_cycles_rounded = is_power_of_2(max_val_cycles + 1) ?
|
|
|
- max_val_cycles : tmp_rounded;
|
|
|
+ u64 max_val_cycles_rounded = 1ULL << fls64(max_val_cycles - 1);
|
|
|
/* calculate max possible multiplier in order to fit in 64bit */
|
|
|
- u64 max_mul = div_u64(0xffffffffffffffffULL, max_val_cycles_rounded);
|
|
|
+ u64 max_mul = div64_u64(ULLONG_MAX, max_val_cycles_rounded);
|
|
|
|
|
|
/* This comes from the reverse of clocksource_khz2mult */
|
|
|
return ilog2(div_u64(max_mul * freq_khz, 1000000));
|