Re: [PATCH] hwmon: (asus-ec-sensors) add CPU core voltage

[Denis Pauk]

On Tue, 08 Feb 2022 17:15:46 +0100
Oleksandr Natalenko <oleksandr@xxxxxxxxxxxxxx> wrote:

> Hello.
> 
> On úterý 8. února 2022 10:42:43 CET Eugene Shalygin wrote:
> > A user discovered [1] the CPU Core voltage sensor, which spans 2
> > registers and provides output in mV. Althroug the discovery was made
> > with a X470 chipset, the sensor is present in X570 (tested with
> > C8H). For now simply add it to each board with the CPU current
> > sensor present.
> > 
> > [1] https://github.com/zeule/asus-ec-sensors/issues/12
> > 
> > Signed-off-by: Eugene Shalygin <eugene.shalygin@xxxxxxxxx>
> > ---
> >  Documentation/hwmon/asus_ec_sensors.rst |  1 +
> >  drivers/hwmon/asus-ec-sensors.c         | 29
> > ++++++++++++++++--------- 2 files changed, 20 insertions(+), 10
> > deletions(-)
> > 
> > diff --git a/Documentation/hwmon/asus_ec_sensors.rst
> > b/Documentation/hwmon/asus_ec_sensors.rst index
> > 22de1b037cfb..e7e8f1640f45 100644 ---
> > a/Documentation/hwmon/asus_ec_sensors.rst +++
> > b/Documentation/hwmon/asus_ec_sensors.rst @@ -39,6 +39,7 @@ The
> > driver is aware of and reads the following sensors: 9. Readings
> > from the "Water flow meter" header (RPM) 10. Readings from the
> > "Water In" and "Water Out" temperature headers 11. CPU current
> > +12. CPU core voltage
> >  
> >  Sensor values are read from EC registers, and to avoid race with
> > the board firmware the driver acquires ACPI mutex, the one used by
> > the WMI when its diff --git a/drivers/hwmon/asus-ec-sensors.c
> > b/drivers/hwmon/asus-ec-sensors.c index dd7b207d062f..bfac08a5dc57
> > 100644 --- a/drivers/hwmon/asus-ec-sensors.c
> > +++ b/drivers/hwmon/asus-ec-sensors.c
> > @@ -18,6 +18,7 @@
> >   * - VRM Heat Sink fan RPM
> >   * - Water Flow fan RPM
> >   * - CPU current
> > + * - CPU core voltage
> >   */
> >  
> >  #include <linux/acpi.h>
> > @@ -100,6 +101,8 @@ enum ec_sensors {
> >  	ec_sensor_temp_t_sensor,
> >  	/* VRM temperature [℃] */
> >  	ec_sensor_temp_vrm,
> > +	/* CPU Core voltage [mV] */
> > +	ec_sensor_in_cpu_core,
> >  	/* CPU_Opt fan [RPM] */
> >  	ec_sensor_fan_cpu_opt,
> >  	/* VRM heat sink fan [RPM] */
> > @@ -121,6 +124,7 @@ enum ec_sensors {
> >  #define SENSOR_TEMP_MB BIT(ec_sensor_temp_mb)
> >  #define SENSOR_TEMP_T_SENSOR BIT(ec_sensor_temp_t_sensor)
> >  #define SENSOR_TEMP_VRM BIT(ec_sensor_temp_vrm)
> > +#define SENSOR_IN_CPU_CORE BIT(ec_sensor_in_cpu_core)
> >  #define SENSOR_FAN_CPU_OPT BIT(ec_sensor_fan_cpu_opt)
> >  #define SENSOR_FAN_VRM_HS BIT(ec_sensor_fan_vrm_hs)
> >  #define SENSOR_FAN_CHIPSET BIT(ec_sensor_fan_chipset)
> > @@ -139,6 +143,8 @@ static const struct ec_sensor_info
> > known_ec_sensors[] = { [ec_sensor_temp_t_sensor] =
> >  		EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x00, 0x3d),
> >  	[ec_sensor_temp_vrm] = EC_SENSOR("VRM", hwmon_temp, 1,
> > 0x00, 0x3e),
> > +	[ec_sensor_in_cpu_core] =
> > +		EC_SENSOR("CPU Core", hwmon_in, 2, 0x00, 0xa2),
> >  	[ec_sensor_fan_cpu_opt] =
> >  		EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0),
> >  	[ec_sensor_fan_vrm_hs] = EC_SENSOR("VRM HS", hwmon_fan, 2,
> > 0x00, 0xb2), @@ -172,32 +178,34 @@ static const struct
> > dmi_system_id asus_ec_dmi_table[] __initconst = {
> > SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CHIPSET),
> > DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "Pro WS X570-ACE",
> > SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM |
> > -		SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU),
> > +		SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |
> > SENSOR_IN_CPU_CORE),  
> 
> Tested-by: Oleksandr Natalenko <oleksandr@xxxxxxxxxxxxxx>
> 
> on Pro WS X570-ACE:
> 
> ```
> asusec-isa-0000
> Adapter: ISA adapter
> CPU Core:      1.47 V
> …
> ```
> 
> Thanks.
> 
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE,
> >  			      "ROG CROSSHAIR VIII DARK HERO",
> >  		SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> > SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
> > -		SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW |
> > SENSOR_CURR_CPU),
> > +		SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW |
> > +		SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE,
> >  			      "ROG CROSSHAIR VIII FORMULA",
> >  		SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> > SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | SENSOR_FAN_CPU_OPT |
> > SENSOR_FAN_CHIPSET |
> > -		SENSOR_CURR_CPU),
> > +		SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG
> > CROSSHAIR VIII HERO", SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> > SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
> >  		SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET |
> > -		SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU),
> > +		SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU |
> > SENSOR_IN_CPU_CORE), DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE,
> >  			      "ROG CROSSHAIR VIII HERO (WI-FI)",
> >  		SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> > SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
> >  		SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET |
> > -		SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU),
> > +		SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU |
> > SENSOR_IN_CPU_CORE), DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE,
> >  			      "ROG CROSSHAIR VIII IMPACT",
> >  		SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> > SENSOR_TEMP_T_SENSOR |
> > -		SENSOR_TEMP_VRM | SENSOR_FAN_CHIPSET |
> > SENSOR_CURR_CPU),
> > +		SENSOR_TEMP_VRM | SENSOR_FAN_CHIPSET |
> > +		SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG STRIX
> > B550-E GAMING", SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> >  		SENSOR_TEMP_T_SENSOR |
> > @@ -205,17 +213,19 @@ static const struct dmi_system_id
> > asus_ec_dmi_table[] __initconst = {
> > DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG STRIX B550-I
> > GAMING", SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_T_SENSOR |
> > -		SENSOR_TEMP_VRM | SENSOR_FAN_VRM_HS |
> > SENSOR_CURR_CPU),
> > +		SENSOR_TEMP_VRM | SENSOR_FAN_VRM_HS |
> > +		SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG STRIX
> > X570-E GAMING", SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> >  		SENSOR_TEMP_T_SENSOR |
> > -		SENSOR_TEMP_VRM | SENSOR_FAN_CHIPSET |
> > SENSOR_CURR_CPU),
> > +		SENSOR_TEMP_VRM | SENSOR_FAN_CHIPSET |
> > +		SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG STRIX
> > X570-F GAMING", SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> >  		SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CHIPSET),
> >  	DMI_EXACT_MATCH_BOARD(VENDOR_ASUS_UPPER_CASE, "ROG STRIX
> > X570-I GAMING", SENSOR_TEMP_T_SENSOR | SENSOR_FAN_VRM_HS |
> > -		SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU),
> > +		SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |
> > SENSOR_IN_CPU_CORE), {}
> >  };
> >  
> > @@ -467,7 +477,6 @@ static long scale_sensor_value(s32 value, int
> > data_type) switch (data_type) {
> >  	case hwmon_curr:
> >  	case hwmon_temp:
> > -	case hwmon_in:
> >  		return value * MILLI;
> >  	default:
> >  		return value;
> >   
> 
> 

Tested-by: Denis Pauk <pauk.denis@xxxxxxxxx>

Best regards,
             Denis.