| Message ID | 20180214032706.6242-1-cyrilbur@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c134f0d57a47b7f8704dee1cefc246f9471f3e80 |
| Headers | show |
| Series | powerpc: Expose TSCR via sysfs only on powernv | expand |
On Wed, 2018-02-14 at 03:27:06 UTC, Cyril Bur wrote: > The TSCR can only be accessed in hypervisor mode. > > Fixes: 88b5e12eeb11 ("powerpc: Expose TSCR via sysfs") > Signed-off-by: Cyril Bur <cyrilbur@gmail.com> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/c134f0d57a47b7f8704dee1cefc246 cheers
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 5a8bfee6e187..04d0bbd7a1dd 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -788,7 +788,8 @@ static int register_cpu_online(unsigned int cpu) if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2)) device_create_file(s, &dev_attr_pir); - if (cpu_has_feature(CPU_FTR_ARCH_206)) + if (cpu_has_feature(CPU_FTR_ARCH_206) && + !firmware_has_feature(FW_FEATURE_LPAR)) device_create_file(s, &dev_attr_tscr); #endif /* CONFIG_PPC64 */ @@ -873,7 +874,8 @@ static int unregister_cpu_online(unsigned int cpu) if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2)) device_remove_file(s, &dev_attr_pir); - if (cpu_has_feature(CPU_FTR_ARCH_206)) + if (cpu_has_feature(CPU_FTR_ARCH_206) && + !firmware_has_feature(FW_FEATURE_LPAR)) device_remove_file(s, &dev_attr_tscr); #endif /* CONFIG_PPC64 */
The TSCR can only be accessed in hypervisor mode. Fixes: 88b5e12eeb11 ("powerpc: Expose TSCR via sysfs") Signed-off-by: Cyril Bur <cyrilbur@gmail.com> --- arch/powerpc/kernel/sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)