| Message ID | 20230724172843.988600888@linutronix.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | x86/cpu: Rework the topology evaluation | expand |
On 7/24/23 10:43, Thomas Gleixner wrote: > Use the provided topology helper function instead of fiddling in cpu_data. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: linux-hwmon@vger.kernel.org > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Huang Rui <ray.huang@amd.com> > Cc: Guenter Roeck <linux@roeck-us.net> Assuming this will be applied as part of the series: Acked-by: Guenter Roeck <linux@roeck-us.net> Please let me know if you want me to apply the patch through the hardware monitoring branch. Thanks, Guenter > --- > drivers/hwmon/fam15h_power.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > --- a/drivers/hwmon/fam15h_power.c > +++ b/drivers/hwmon/fam15h_power.c > @@ -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]); >
--- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -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]);
Use the provided topology helper function instead of fiddling in cpu_data. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: linux-hwmon@vger.kernel.org Cc: Jean Delvare <jdelvare@suse.com> Cc: Huang Rui <ray.huang@amd.com> Cc: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/fam15h_power.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)