]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: arm64: selftests: Track width of timer counter as "int", not "uint64_t"
authorSean Christopherson <seanjc@google.com>
Fri, 26 Sep 2025 15:58:38 +0000 (08:58 -0700)
committerMarc Zyngier <maz@kernel.org>
Mon, 13 Oct 2025 13:17:03 +0000 (14:17 +0100)
Store the width of arm64's timer counter as an "int", not a "uint64_t".
ilog2() returns an "int", and more importantly using what is an "unsigned
long" under the hood makes clang unhappy due to a type mismatch when
clamping the width to a sane value.

  arm64/arch_timer_edge_cases.c:1032:10: error: comparison of distinct pointer types
     ('typeof (width) *' (aka 'unsigned long *') and 'typeof (56) *' (aka 'int *'))
     [-Werror,-Wcompare-distinct-pointer-types]
   1032 |         width = clamp(width, 56, 64);
        |                 ^~~~~~~~~~~~~~~~~~~~
  tools/include/linux/kernel.h:47:45: note: expanded from macro 'clamp'
     47 | #define clamp(val, lo, hi)      min((typeof(val))max(val, lo), hi)
        |                                                  ^~~~~~~~~~~~
  tools/include/linux/kernel.h:33:17: note: expanded from macro 'max'
     33 |         (void) (&_max1 == &_max2);              \
        |                 ~~~~~~ ^  ~~~~~~
  tools/include/linux/kernel.h:39:9: note: expanded from macro 'min'
     39 |         typeof(x) _min1 = (x);                  \
        |                ^

Fixes: fad4cf944839 ("KVM: arm64: selftests: Determine effective counter width in arch_timer_edge_cases")
Cc: Sebastian Ott <sebott@redhat.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Signed-off-by: Marc Zyngier <maz@kernel.org>
tools/testing/selftests/kvm/arm64/arch_timer_edge_cases.c

index 91906414a474949c495eeb8b759b200bb5cd32b2..993c9e38e729d58167bbbbdd907d0f018efe7c2c 100644 (file)
@@ -1020,7 +1020,7 @@ static void set_counter_defaults(void)
 {
        const uint64_t MIN_ROLLOVER_SECS = 40ULL * 365 * 24 * 3600;
        uint64_t freq = read_sysreg(CNTFRQ_EL0);
-       uint64_t width = ilog2(MIN_ROLLOVER_SECS * freq);
+       int width = ilog2(MIN_ROLLOVER_SECS * freq);
 
        width = clamp(width, 56, 64);
        CVAL_MAX = GENMASK_ULL(width - 1, 0);