Commit e7299f96 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/perf: Properly detect mpc7450 family 



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: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/r/202302260657.7dM9Uwev-lkp@intel.com/


Fixes: ec3eb9d9 ("powerpc/perf: Use PVR rather than oprofile field to determine CPU version")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/99ca1da2e5a6cf82a8abf4bc034918e500e31781.1677513277.git.christophe.leroy@csgroup.eu
parent d3cf1662

arch/powerpc/include/asm/reg.h

+5 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/perf/mpc7450-pmu.c

+3 −3
Original line number Diff line number Diff line
@@ -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);