Skip to content

Commit

Permalink
Removed cpu/realtime_fan_speed % RPM mapping, made it RW. Deprecate…
Browse files Browse the repository at this point in the history
…d `basic_fan_speed` because it was mapped to `gpu/realtime_fan_speed` on supported devices
  • Loading branch information
glpnk committed Oct 28, 2024
1 parent 404858b commit 31c1bc6
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 234 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ This driver exports a few files in its own platform device, msi-ec, and is avail

- `/sys/devices/platform/msi-ec/cpu/realtime_fan_speed`
- Description: This entry reports the current cpu fan speed.
- Access: Read
- Access: Read, Write
- Valid values: 0 - 100 (percent)

- `/sys/devices/platform/msi-ec/cpu/basic_fan_speed`
- Description: This entry allows changing the cpu fan speed.
- Description: [Deprecated, use `{cpu/gpu}/realtime_fan_speed` instead] This entry allows changing the cpu fan speed.
- Access: Read, Write
- Valid values: 0 - 100 (percent)

Expand All @@ -177,7 +177,7 @@ This driver exports a few files in its own platform device, msi-ec, and is avail

- `/sys/devices/platform/msi-ec/gpu/realtime_fan_speed`
- Description: This entry reports the current gpu fan speed.
- Access: Read
- Access: Read, Write
- Valid values: 0 - 100 (percent)

In addition to these platform device attributes the driver registers itself in the Linux power_supply subsystem (Documentation/ABI/testing/sysfs-class-power) and is available to userspace under:
Expand Down
9 changes: 2 additions & 7 deletions ec_memory_configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,12 @@ struct msi_ec_fan_mode_conf {

struct msi_ec_cpu_conf {
int rt_temp_address;
int rt_fan_speed_address; // realtime
int rt_fan_speed_base_min;
int rt_fan_speed_base_max;
int bs_fan_speed_address; // basic
int bs_fan_speed_base_min;
int bs_fan_speed_base_max;
int rt_fan_speed_address; // realtime %
};

struct msi_ec_gpu_conf {
int rt_temp_address;
int rt_fan_speed_address; // realtime
int rt_fan_speed_address; // realtime %
};

struct msi_ec_led_conf {
Expand Down
Loading

0 comments on commit 31c1bc6

Please sign in to comment.