2023-07-24 17:59:32

by Thomas Gleixner

Subject: [patch 05/29] hwmon: (fam15h_power) Use topology_core_id()

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

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: Jean Delvare <[email protected]>
Cc: Huang Rui <[email protected]>
Cc: Guenter Roeck <[email protected]>
---
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]);

2023-07-24 18:29:52

by Guenter Roeck

Subject: Re: [patch 05/29] hwmon: (fam15h_power) Use topology_core_id()

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 <[email protected]>
> Cc: [email protected]
> Cc: Jean Delvare <[email protected]>
> Cc: Huang Rui <[email protected]>
> Cc: Guenter Roeck <[email protected]>

Assuming this will be applied as part of the series:

Acked-by: Guenter Roeck <[email protected]>

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]);
>