FAILED: patch "[PATCH] perf/x86/intel/uncore: Fix the scale of IIO free running" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 32c7f1150225694d95a51110a93be25db03bb5db
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025042139-protector-rickety-a72d@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 32c7f1150225694d95a51110a93be25db03bb5db Mon Sep 17 00:00:00 2001
From: Kan Liang <[email protected]>
Date: Wed, 16 Apr 2025 07:24:25 -0700
Subject: [PATCH] perf/x86/intel/uncore: Fix the scale of IIO free running
counters on ICX
There was a mistake in the ICX uncore spec too. The counter increments for every 32 bytes rather than 4 bytes.
The same as SNR, there are 1 ioclk and 8 IIO bandwidth in free running counters. Reuse the snr_uncore_iio_freerunning_events().
arch/x86/events/intel/uncore_snbep.c +1 -32
@@ -5485,37 +5485,6 @@ static struct freerunning_counters icx_iio_freerunning[] = { [ICX_IIO_MSR_BW_IN] = { 0xaa0, 0x1, 0x10, 8, 48, icx_iio_bw_freerunning_box_offsets }, }; -static struct uncore_event_desc icx_uncore_iio_freerunning_events[] = { -/* Free-Running IIO CLOCKS Counter */ -INTEL_UNCORE_EVENT_DESC (ioclk,"event=0xff,umask=0x10" ), -/* Free-Running IIO BANDWIDTH IN Counters */ -INTEL_UNCORE_EVENT_DESC (bw_in_port0,"event=0xff,umask=0x20" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port0.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port0.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port1,"event=0xff,umask=0x21" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port1.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port1.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port2,"event=0xff,umask=0x22" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port2.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port2.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port3,"event=0xff,umask=0x23" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port3.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port3.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port4,"event=0xff,umask=0x24" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port4.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port4.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port5,"event=0xff,umask=0x25" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port5.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port5.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port6,"event=0xff,umask=0x26" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port6.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port6.unit,"MiB" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port7,"event=0xff,umask=0x27" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port7.scale,"3.814697266e-6" ), -INTEL_UNCORE_EVENT_DESC (bw_in_port7.unit,"MiB" ), - {/* end: all zeroes */ }, -}; -static struct intel_uncore_type icx_uncore_iio_free_running = { .name ="iio_free_running" , .num_counters =9 ,
@@ -5523,7 +5492,7 @@ static struct intel_uncore_type icx_uncore_iio_free_running = { .num_freerunning_types = ICX_IIO_FREERUNNING_TYPE_MAX, .freerunning = icx_iio_freerunning, .ops = &skx_uncore_iio_freerunning_ops, - .event_descs = icx_uncore_iio_freerunning_events, + .event_descs = snr_uncore_iio_freerunning_events, .format_group = &skx_uncore_iio_freerunning_format_group, };