powerpc/perf: Properly detect mpc7450 family

[ Upstream commit e7299f961fe5e4496db0bfaa9e819f5e97f3846b ]

Unlike PVR_POWER8, etc ...., PVR_7450 represents a full PVR
value and not a family value.

To avoid confusion, do like E500 family and define the relevant
PVR_VER_xxxx values for the 7450 family:
  0x8000 ==> 7450
  0x8001 ==> 7455
  0x8002 ==> 7447
  0x8003 ==> 7447A
  0x8004 ==> 7448

And use them to detect 7450 family for perf events.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/r/202302260657.7dM9Uwev-lkp@intel.com/
Fixes: ec3eb9d941a9 ("powerpc/perf: Use PVR rather than oprofile field to determine CPU version")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/99ca1da2e5a6cf82a8abf4bc034918e500e31781.1677513277.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 1e8b2e04e626a125e48e60d5d4ac4c7758670cdf..8fda87af2fa5e95b826217aebc022c028eb24202 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -1310,6 +1310,11 @@
 #define PVR_VER_E500MC 0x8023
 #define PVR_VER_E5500  0x8024
 #define PVR_VER_E6500  0x8040
+#define PVR_VER_7450   0x8000
+#define PVR_VER_7455   0x8001
+#define PVR_VER_7447   0x8002
+#define PVR_VER_7447A  0x8003
+#define PVR_VER_7448   0x8004
 
 /*
  * For the 8xx processors, all of them report the same PVR family for

diff --git a/arch/powerpc/perf/mpc7450-pmu.c b/arch/powerpc/perf/mpc7450-pmu.c
index 552d51a925d3761d61cc85fc9699bcc9260bc2d7..db451b9aac35e131c125fb62df6baaa86f373cad 100644 (file)
--- a/arch/powerpc/perf/mpc7450-pmu.c
+++ b/arch/powerpc/perf/mpc7450-pmu.c
@@ -417,9 +417,9 @@ struct power_pmu mpc7450_pmu = {
 
 static int __init init_mpc7450_pmu(void)
 {
-       unsigned int pvr = mfspr(SPRN_PVR);
-
-       if (PVR_VER(pvr) != PVR_7450)
+       if (!pvr_version_is(PVR_VER_7450) && !pvr_version_is(PVR_VER_7455) &&
+           !pvr_version_is(PVR_VER_7447) && !pvr_version_is(PVR_VER_7447A) &&
+           !pvr_version_is(PVR_VER_7448))
                return -ENODEV;
 
        return register_power_pmu(&mpc7450_pmu);