1 files changed, 14 insertions, 4 deletions

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index bb22238debfe..6f842af4550b 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4367,10 +4367,20 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s
                                         switch (*ptr) {
                                         case 's':
                                         case 'S':
-                                        case 'f':
-                                        case 'F':
                                         case 'x':
                                                 break;
+                                        case 'f':
+                                        case 'F':
+                                                /*
+                                                 * Pre-5.5 kernels use %pf and
+                                                 * %pF for printing symbols
+                                                 * while kernels since 5.5 use
+                                                 * %pfw for fwnodes. So check
+                                                 * %p[fF] isn't followed by 'w'.
+                                                 */
+                                                if (ptr[1] != 'w')
+                                                        break;
+                                                /* fall through */
                                         default:
                                                 /*
                                                  * Older kernels do not process
@@ -4487,12 +4497,12 @@ get_bprint_format(void *data, int size __maybe_unused,
 
         printk = find_printk(tep, addr);
         if (!printk) {
-                if (asprintf(&format, "%%pf: (NO FORMAT FOUND at %llx)\n", addr) < 0)
+                if (asprintf(&format, "%%ps: (NO FORMAT FOUND at %llx)\n", addr) < 0)
                         return NULL;
                 return format;
         }
 
-        if (asprintf(&format, "%s: %s", "%pf", printk->printk) < 0)
+        if (asprintf(&format, "%s: %s", "%ps", printk->printk) < 0)
                 return NULL;
 
         return format;