perf/amd/uncore: Inform the user how many counters each uncore PMU has

Previously, the uncore driver would say "NB counters detected" on F17h
machines, which don't have NorthBridge (NB) counters.  They have Data
Fabric (DF) counters.  Just use the pmu.name to inform users which pmu
to use and its associated counter count.

F17h dmesg BEFORE:

amd_uncore: AMD NB counters detected
amd_uncore: AMD LLC counters detected

F17h dmesg AFTER:

amd_uncore: 4 amd_df counters detected
amd_uncore: 6 amd_l3 counters detected

Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200921144330.6331-5-kim.phillips@amd.com

diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index f026715a39d2781379ae2b5de888a911f8a84bf5..7f014d450bc28caf08be42129f74d595b1ac1ef6 100644 (file)
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -595,9 +595,10 @@ static int __init amd_uncore_init(void)
                if (ret)
                        goto fail_nb;
 
-               pr_info("%s NB counters detected\n",
-                       boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?
-                               "HYGON" : "AMD");
+               pr_info("%d %s %s counters detected\n", num_counters_nb,
+                       boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?  "HYGON" : "",
+                       amd_nb_pmu.name);
+
                ret = 0;
        }
 
@@ -626,9 +627,9 @@ static int __init amd_uncore_init(void)
                if (ret)
                        goto fail_llc;
 
-               pr_info("%s LLC counters detected\n",
-                       boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?
-                               "HYGON" : "AMD");
+               pr_info("%d %s %s counters detected\n", num_counters_llc,
+                       boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?  "HYGON" : "",
+                       amd_llc_pmu.name);
                ret = 0;
        }