]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
perf/x86/intel/uncore: Fix missing marker for snr_uncore_imc_freerunning_events
authorKan Liang <kan.liang@linux.intel.com>
Thu, 16 Jan 2020 20:02:09 +0000 (12:02 -0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 06:00:53 +0000 (01:00 -0500)
BugLink: https://bugs.launchpad.net/bugs/1862429
commit fa694ae532836bd2f4cd659e9b4032abaf9fa9e5 upstream.

An Oops during the boot is found on some SNR machines.  It turns out
this is because the snr_uncore_imc_freerunning_events[] array was
missing an end-marker.

Fixes: ee49532b38dd ("perf/x86/intel/uncore: Add IMC uncore support for Snow Ridge")
Reported-by: Like Xu <like.xu@linux.intel.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Like Xu <like.xu@linux.intel.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20200116200210.18937-1-kan.liang@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/x86/events/intel/uncore_snbep.c

index b10a5ec79e48aac1af8d9edb1396e22449dd8d14..011644802ce78b819d09af7b63766a1fce28a8b8 100644 (file)
@@ -4536,6 +4536,7 @@ static struct uncore_event_desc snr_uncore_imc_freerunning_events[] = {
        INTEL_UNCORE_EVENT_DESC(write,          "event=0xff,umask=0x21"),
        INTEL_UNCORE_EVENT_DESC(write.scale,    "3.814697266e-6"),
        INTEL_UNCORE_EVENT_DESC(write.unit,     "MiB"),
+       { /* end: all zeroes */ },
 };
 
 static struct intel_uncore_ops snr_uncore_imc_freerunning_ops = {