hwmon: (asus-ec-sensors) add PRIME X470-PRO board
authorEugene Shalygin <eugene.shalygin@gmail.com>
Wed, 27 Apr 2022 14:30:01 +0000 (16:30 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 20 May 2022 17:57:06 +0000 (10:57 -0700)
This board is supposed to be handled by the asus-wmi-sensors driver,
but due to a buggy WMI implementation the driver and the official ASUS
software make the BIOS hang together with fan controls [1, 2].

This driver complements values provided by the SIO chip and does not
freeze the BIOS, as tested by a user [2].

[1] https://github.com/electrified/asus-wmi-sensors/blob/master/README.md
[2] https://github.com/zeule/asus-ec-sensors/issues/12

Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
Link: https://lore.kernel.org/r/20220427143001.1443605-5-eugene.shalygin@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/asus-ec-sensors.c

index 109c3920d77ca6958bad7966131a6b0216e4e566..998d49d6b799877fb530ee4f83ac9346815091cd 100644 (file)
@@ -137,10 +137,41 @@ enum ec_sensors {
 
 enum board_family {
        family_unknown,
+       family_amd_400_series,
        family_amd_500_series,
 };
 
 /* All the known sensors for ASUS EC controllers */
+static const struct ec_sensor_info sensors_family_amd_400[] = {
+       [ec_sensor_temp_chipset] =
+               EC_SENSOR("Chipset", hwmon_temp, 1, 0x00, 0x3a),
+       [ec_sensor_temp_cpu] =
+               EC_SENSOR("CPU", hwmon_temp, 1, 0x00, 0x3b),
+       [ec_sensor_temp_mb] =
+               EC_SENSOR("Motherboard", hwmon_temp, 1, 0x00, 0x3c),
+       [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, 0xbc),
+       [ec_sensor_fan_vrm_hs] =
+               EC_SENSOR("VRM HS", hwmon_fan, 2, 0x00, 0xb2),
+       [ec_sensor_fan_chipset] =
+               /* no chipset fans in this generation */
+               EC_SENSOR("Chipset", hwmon_fan, 0, 0x00, 0x00),
+       [ec_sensor_fan_water_flow] =
+               EC_SENSOR("Water_Flow", hwmon_fan, 2, 0x00, 0xb4),
+       [ec_sensor_curr_cpu] =
+               EC_SENSOR("CPU", hwmon_curr, 1, 0x00, 0xf4),
+       [ec_sensor_temp_water_in] =
+               EC_SENSOR("Water_In", hwmon_temp, 1, 0x01, 0x0d),
+       [ec_sensor_temp_water_out] =
+               EC_SENSOR("Water_Out", hwmon_temp, 1, 0x01, 0x0b),
+};
+
 static const struct ec_sensor_info sensors_family_amd_500[] = {
        [ec_sensor_temp_chipset] =
                EC_SENSOR("Chipset", hwmon_temp, 1, 0x00, 0x3a),
@@ -186,6 +217,15 @@ struct ec_board_info {
 };
 
 static const struct ec_board_info board_info[] = {
+       {
+               .board_names = {"PRIME X470-PRO"},
+               .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+                       SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
+                       SENSOR_FAN_CPU_OPT |
+                       SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE,
+               .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
+               .family = family_amd_400_series,
+       },
        {
                .board_names = {"PRIME X570-PRO"},
                .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM |
@@ -753,6 +793,9 @@ static int __init asus_ec_probe(struct platform_device *pdev)
        ec_data->board_info = pboard_info;
 
        switch (ec_data->board_info->family) {
+       case family_amd_400_series:
+               ec_data->sensors_info = sensors_family_amd_400;
+               break;
        case family_amd_500_series:
                ec_data->sensors_info = sensors_family_amd_500;
                break;