1 files changed, 11 insertions, 5 deletions

diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
index b14cb162f841..ba9322ff858b 100644
--- a/tools/perf/builtin-list.c
+++ b/tools/perf/builtin-list.c
@@ -22,14 +22,17 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
 {
         int i;
         bool raw_dump = false;
+        bool long_desc_flag = false;
         struct option list_options[] = {
                 OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),
                 OPT_BOOLEAN('d', "desc", &desc_flag,
                             "Print extra event descriptions. --no-desc to not print."),
+                OPT_BOOLEAN('v', "long-desc", &long_desc_flag,
+                            "Print longer event descriptions."),
                 OPT_END()
         };
         const char * const list_usage[] = {
-                "perf list [--no-desc] [hw|sw|cache|tracepoint|pmu|sdt|event_glob]",
+                "perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|event_glob]",
                 NULL
         };
 
@@ -44,7 +47,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                 printf("\nList of pre-defined events (to be used in -e):\n\n");
 
         if (argc == 0) {
-                print_events(NULL, raw_dump, !desc_flag);
+                print_events(NULL, raw_dump, !desc_flag, long_desc_flag);
                 return 0;
         }
 
@@ -65,14 +68,16 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                          strcmp(argv[i], "hwcache") == 0)
                         print_hwcache_events(NULL, raw_dump);
                 else if (strcmp(argv[i], "pmu") == 0)
-                        print_pmu_events(NULL, raw_dump, !desc_flag);
+                        print_pmu_events(NULL, raw_dump, !desc_flag,
+                                                long_desc_flag);
                 else if (strcmp(argv[i], "sdt") == 0)
                         print_sdt_events(NULL, NULL, raw_dump);
                 else if ((sep = strchr(argv[i], ':')) != NULL) {
                         int sep_idx;
 
                         if (sep == NULL) {
-                                print_events(argv[i], raw_dump, !desc_flag);
+                                print_events(argv[i], raw_dump, !desc_flag,
+                                                        long_desc_flag);
                                 continue;
                         }
                         sep_idx = sep - argv[i];
@@ -94,7 +99,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)
                         print_symbol_events(s, PERF_TYPE_SOFTWARE,
                                             event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);
                         print_hwcache_events(s, raw_dump);
-                        print_pmu_events(s, raw_dump, !desc_flag);
+                        print_pmu_events(s, raw_dump, !desc_flag,
+                                                long_desc_flag);
                         print_tracepoint_events(NULL, s, raw_dump);
                         print_sdt_events(NULL, s, raw_dump);
                         free(s);