Commit 94f0b397 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

hwmon: (fam15h_power) Use topology_core_id() 



Use the provided topology helper function instead of fiddling in cpu_data.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230814085112.506988471@linutronix.de
parent 09253672

drivers/hwmon/fam15h_power.c

+3 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/cpumask.h>

#include <linux/time.h>

#include <linux/sched.h>

#include <linux/topology.h>

#include <asm/processor.h>

#include <asm/msr.h>
@@ -134,15 +135,13 @@ static DEVICE_ATTR_RO(power1_crit); 
static void do_read_registers_on_cu(void *_data)

{

	struct fam15h_power_data *data = _data;

	int cpu, cu;



	cpu = smp_processor_id();

	int cu;



	/*

	 * With the new x86 topology modelling, cpu core id actually

	 * is compute unit id.

	 */

	cu = cpu_data(cpu).cpu_core_id;

	cu = topology_core_id(smp_processor_id());



	rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu]);

	rdmsrl_safe(MSR_F15H_PTSC, &data->cpu_sw_pwr_ptsc[cu]);