[PATCH] perf/x86: Work around boot time warning on ICL

[Petri Latvala]

<3>[    1.474118] hw perf events fixed 4 > max(3), clipping!
<4>[    1.474127] WARNING: CPU: 0 PID: 1 at arch/x86/events/intel/core.c:4558 intel_pmu_init+0x11bf/0x13ca
<4>[    1.474176] Modules linked in:
<4>[    1.474194] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.20.0-rc2-CI-CI_DRM_5134+ #1
<4>[    1.474222] Hardware name: Intel Corporation Ice Lake Client Platform/IceLake U DDR4 SODIMM PD RVP, BIOS ICLSFWR1.R00.2402.AD3.1810170014 10/17/2018
<4>[    1.474268] RIP: 0010:intel_pmu_init+0x11bf/0x13ca
<4>[    1.474289] Code: c5 ff b8 01 00 00 00 48 d3 e0 48 ff c8 83 fe 03 48 89 05 89 13 c5 ff 7e 1d ba 03 00 00 00 48 c7 c7 40 a0 07 82 e8 a6 3d 9a fe <0f> 0b c7 05 82 12 c5 ff 03 00 00 00 8b 0d 7c 12 c5 ff b8 01 00 00
<4>[    1.474351] RSP: 0000:ffffc9000004fdd0 EFLAGS: 00010282
<4>[    1.474372] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
<4>[    1.474398] RDX: 0000000000000046 RSI: ffffffff8212883a RDI: ffffffff820d6d87
<4>[    1.474424] RBP: ffffc9000004fe20 R08: 0000000000000001 R09: 0000000000000000
<4>[    1.474450] R10: ffffffff8100b380 R11: 0000000000000000 R12: 0000000000000000
<4>[    1.474476] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
<4>[    1.474503] FS:  0000000000000000(0000) GS:ffff8884afe00000(0000) knlGS:0000000000000000
<4>[    1.474533] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4>[    1.474555] CR2: ffff8884c03ff000 CR3: 0000000005210001 CR4: 0000000000760ef0
<4>[    1.474581] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
<4>[    1.474608] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
<4>[    1.474633] PKRU: 00000000
<4>[    1.474646] Call Trace:
<4>[    1.474665]  ? printk+0x4d/0x69
<4>[    1.474685]  ? merge_attr+0xa8/0xa8
<4>[    1.474701]  ? init_hw_perf_events+0x31/0x6d8
<4>[    1.474721]  init_hw_perf_events+0x31/0x6d8
<4>[    1.474742]  ? merge_attr+0xa8/0xa8
<4>[    1.474760]  do_one_initcall+0x58/0x2e0
<4>[    1.474783]  kernel_init_freeable+0x135/0x352
<4>[    1.474804]  ? rest_init+0x250/0x250
<4>[    1.474822]  kernel_init+0x5/0x100
<4>[    1.474839]  ret_from_fork+0x3a/0x50
<4>[    1.474863] irq event stamp: 402
<4>[    1.474879] hardirqs last  enabled at (401): [<ffffffff810fbb34>] vprintk_emit+0x124/0x320
<4>[    1.474911] hardirqs last disabled at (402): [<ffffffff810019b0>] trace_hardirqs_off_thunk+0x1a/0x1c
<4>[    1.474945] softirqs last  enabled at (0): [<ffffffff81083644>] copy_process.part.6+0x504/0x2250
<4>[    1.474977] softirqs last disabled at (0): [<0000000000000000>]           (null)
<4>[    1.475004] WARNING: CPU: 0 PID: 1 at arch/x86/events/intel/core.c:4558 intel_pmu_init+0x11bf/0x13ca
<4>[    1.475004] ---[ end trace 773ed3d834eb37a9 ]---

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
---
 arch/x86/include/asm/perf_event.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index 8bdf74902293..ab4cf7c12c40 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -7,7 +7,7 @@
  */
 
 #define INTEL_PMC_MAX_GENERIC				       32
-#define INTEL_PMC_MAX_FIXED					3
+#define INTEL_PMC_MAX_FIXED					4
 #define INTEL_PMC_IDX_FIXED				       32
 
 #define X86_PMC_IDX_MAX					       64
-- 
2.18.0