1 files changed, 79 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0068-perf-x86-Unify-format-of-events-sysfs-show.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0068-perf-x86-Unify-format-of-events-sysfs-show.patch
new file mode 100644
index 00000000..381cf205
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0068-perf-x86-Unify-format-of-events-sysfs-show.patch
@@ -0,0 +1,79 @@
+From 36a6af1e1191c98724f981ef8a4b522191c072a7 Mon Sep 17 00:00:00 2001
+From: Yang Jihong <yangjihong1@huawei.com>
+Date: Thu, 24 Mar 2022 11:19:57 +0800
+Subject: [PATCH 68/86] perf/x86: Unify format of events sysfs show
+
+commit 7bebfe9dd802b80abff5a43e00ab68d98893a22c upstream
+
+Sysfs show formats of files in /sys/devices/cpu/events/ are not unified,
+some end with "\n", and some do not. Modify sysfs show format of events
+defined by EVENT_ATTR_STR to end with "\n".
+
+Before:
+  $ ls /sys/devices/cpu/events/* | xargs -i sh -c 'echo -n "{}: "; cat -A {}; echo'
+  branch-instructions: event=0xc4$
+
+  branch-misses: event=0xc5$
+
+  bus-cycles: event=0x3c,umask=0x01$
+
+  cache-misses: event=0x2e,umask=0x41$
+
+  cache-references: event=0x2e,umask=0x4f$
+
+  cpu-cycles: event=0x3c$
+
+  instructions: event=0xc0$
+
+  ref-cycles: event=0x00,umask=0x03$
+
+  slots: event=0x00,umask=0x4
+  topdown-bad-spec: event=0x00,umask=0x81
+  topdown-be-bound: event=0x00,umask=0x83
+  topdown-fe-bound: event=0x00,umask=0x82
+  topdown-retiring: event=0x00,umask=0x80
+
+After:
+  $ ls /sys/devices/cpu/events/* | xargs -i sh -c 'echo -n "{}: "; cat -A {}; echo'
+  /sys/devices/cpu/events/branch-instructions: event=0xc4$
+
+  /sys/devices/cpu/events/branch-misses: event=0xc5$
+
+  /sys/devices/cpu/events/bus-cycles: event=0x3c,umask=0x01$
+
+  /sys/devices/cpu/events/cache-misses: event=0x2e,umask=0x41$
+
+  /sys/devices/cpu/events/cache-references: event=0x2e,umask=0x4f$
+
+  /sys/devices/cpu/events/cpu-cycles: event=0x3c$
+
+  /sys/devices/cpu/events/instructions: event=0xc0$
+
+  /sys/devices/cpu/events/ref-cycles: event=0x00,umask=0x03$
+
+  /sys/devices/cpu/events/slots: event=0x00,umask=0x4$
+
+Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/20220324031957.135595-1-yangjihong1@huawei.com
+Signed-off-by: Zhaolong Zhang <zhaolong.zhang@windriver.com>
+---
+ arch/x86/events/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
+index 91ed45c98353..fcc25b4783a3 100644
+--- a/arch/x86/events/core.c
++++ b/arch/x86/events/core.c
+@@ -1848,7 +1848,7 @@ ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, cha
+ 
+ 	/* string trumps id */
+ 	if (pmu_attr->event_str)
+-		return sprintf(page, "%s", pmu_attr->event_str);
++		return sprintf(page, "%s\n", pmu_attr->event_str);
+ 
+ 	return x86_pmu.events_sysfs_show(page, config);
+ }
+-- 
+2.37.3
+