When tick values are large, the multiplication by NSEC_PER_SEC is larger than 64 bits and results in bad conversions. Fix it by scaling the factor used to do the conversion. Add the same fix for reverse conversion as well.
The issue is seen in PMU busyness counters that look like they have wrapped around due to bad conversion. This results in zero delta returned from the i915 PMU implementation and causes random failures. Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14955 Signed-off-by: Umesh Nerlige Ramappa <[email protected]> --- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 24 +++++++++++++------ drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c index 88b147fa5cb1..a621ea0e6dfc 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c @@ -3,6 +3,8 @@ * Copyright © 2020 Intel Corporation */ +#include <linux/gcd.h> + #include "i915_drv.h" #include "i915_reg.h" #include "intel_gt.h" @@ -171,20 +173,26 @@ static u32 read_clock_frequency(struct intel_uncore *uncore) void intel_gt_init_clock_frequency(struct intel_gt *gt) { + unsigned long clock_period_scale; + gt->clock_frequency = read_clock_frequency(gt->uncore); /* Icelake appears to use another fixed frequency for CTX_TIMESTAMP */ - if (GRAPHICS_VER(gt->i915) == 11) + if (GRAPHICS_VER(gt->i915) == 11) { gt->clock_period_ns = NSEC_PER_SEC / 13750000; - else if (gt->clock_frequency) + } else if (gt->clock_frequency) { + clock_period_scale = gcd(NSEC_PER_SEC, gt->clock_frequency); + gt->clock_nsec_scaled = NSEC_PER_SEC / clock_period_scale; + gt->clock_freq_scaled = gt->clock_frequency / clock_period_scale; gt->clock_period_ns = intel_gt_clock_interval_to_ns(gt, 1); + } GT_TRACE(gt, - "Using clock frequency: %dkHz, period: %dns, wrap: %lldms\n", + "Using clock frequency: %dkHz, period: %dns, wrap: %lldms, scale %lu\n", gt->clock_frequency / 1000, gt->clock_period_ns, - div_u64(mul_u32_u32(gt->clock_period_ns, S32_MAX), - USEC_PER_SEC)); + div_u64(mul_u32_u32(gt->clock_period_ns, S32_MAX), USEC_PER_SEC), + clock_period_scale); } #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) @@ -205,7 +213,8 @@ static u64 div_u64_roundup(u64 nom, u32 den) u64 intel_gt_clock_interval_to_ns(const struct intel_gt *gt, u64 count) { - return div_u64_roundup(count * NSEC_PER_SEC, gt->clock_frequency); + return div_u64_roundup(count * gt->clock_nsec_scaled, + gt->clock_freq_scaled); } u64 intel_gt_pm_interval_to_ns(const struct intel_gt *gt, u64 count) @@ -215,7 +224,8 @@ u64 intel_gt_pm_interval_to_ns(const struct intel_gt *gt, u64 count) u64 intel_gt_ns_to_clock_interval(const struct intel_gt *gt, u64 ns) { - return div_u64_roundup(gt->clock_frequency * ns, NSEC_PER_SEC); + return div_u64_roundup(gt->clock_freq_scaled * ns, + gt->clock_nsec_scaled); } u64 intel_gt_ns_to_pm_interval(const struct intel_gt *gt, u64 ns) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h index bcee084b1f27..a19c568fcdc0 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h @@ -166,6 +166,8 @@ struct intel_gt { u32 clock_frequency; u32 clock_period_ns; + u32 clock_freq_scaled; + u32 clock_nsec_scaled; struct intel_llc llc; struct intel_rc6 rc6; -- 2.43.0
