summaryrefslogtreecommitdiffstats
path: root/drivers/perf
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-09-08 12:48:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-09-08 12:48:37 -0700
commitca9c7abf9502e108fae0e34181e01b1a20bc439f (patch)
treead68f2d66c9de7b923b5fff3b5afab1678d30b0c /drivers/perf
parent12952b6bbd36b372345f179f1a85576c5924d425 (diff)
parent8bd795fedb8450ecbef18eeadbd23ed8fc7630f5 (diff)
downloadlinux-stable-ca9c7abf9502e108fae0e34181e01b1a20bc439f.tar.gz
linux-stable-ca9c7abf9502e108fae0e34181e01b1a20bc439f.tar.bz2
linux-stable-ca9c7abf9502e108fae0e34181e01b1a20bc439f.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon: "The main one is a fix for a broken strscpy() conversion that landed in the merge window and broke early parsing of the kernel command line. - Fix an incorrect mask in the CXL PMU driver - Fix a regression in early parsing of the kernel command line - Fix an IP checksum OoB access reported by syzbot" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: csum: Fix OoB access in IP checksum code for negative lengths arm64/sysreg: Fix broken strncpy() -> strscpy() conversion perf: CXL: fix mismatched number of counters mask
Diffstat (limited to 'drivers/perf')
-rw-r--r--drivers/perf/cxl_pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/cxl_pmu.c b/drivers/perf/cxl_pmu.c
index 0a8f597e695b..365d964b0f6a 100644
--- a/drivers/perf/cxl_pmu.c
+++ b/drivers/perf/cxl_pmu.c
@@ -25,7 +25,7 @@
#include "../cxl/pmu.h"
#define CXL_PMU_CAP_REG 0x0
-#define CXL_PMU_CAP_NUM_COUNTERS_MSK GENMASK_ULL(4, 0)
+#define CXL_PMU_CAP_NUM_COUNTERS_MSK GENMASK_ULL(5, 0)
#define CXL_PMU_CAP_COUNTER_WIDTH_MSK GENMASK_ULL(15, 8)
#define CXL_PMU_CAP_NUM_EVN_CAP_REG_SUP_MSK GENMASK_ULL(24, 20)
#define CXL_PMU_CAP_FILTERS_SUP_MSK GENMASK_ULL(39, 32)