Skip to content

L
linux
Commit 22051d9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'platform-drivers-x86-v5.3-2' of git://git.infradead.org/linux-platform-drivers-x86 

Pull another x86 platform driver update from Andy Shevchenko:
 "Provide better naming for ABI, i.e. tell that we have fan boost mode.

  It won't break any ABI, but has to be done now to avoid confusion in
  the future"

* tag 'platform-drivers-x86-v5.3-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: asus: Rename "fan mode" to "fan boost mode"
parents aac09ce2 9af93db9
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 60 deletions
Documentation/ABI/testing/sysfs-platform-asus-wmi
View file @ 22051d9c
...@@ -37,9 +37,9 @@ Contact: "AceLan Kao" <acelan.kao@canonical.com> ...@@ -37,9 +37,9 @@ Contact: "AceLan Kao" <acelan.kao@canonical.com>
Description: Description:
Resume on lid open. 1 means on, 0 means off. Resume on lid open. 1 means on, 0 means off.
What: /sys/devices/platform/<platform>/fan_mode What: /sys/devices/platform/<platform>/fan_boost_mode
Date: Apr 2019 Date: Sep 2019
KernelVersion: 5.2 KernelVersion: 5.3
Contact: "Yurii Pavlovskyi" <yurii.pavlovskyi@gmail.com> Contact: "Yurii Pavlovskyi" <yurii.pavlovskyi@gmail.com>
Description: Description:
Fan boost mode: Fan boost mode:
......
drivers/platform/x86/asus-wmi.c
View file @ 22051d9c
...@@ -68,12 +68,12 @@ MODULE_LICENSE("GPL"); ...@@ -68,12 +68,12 @@ MODULE_LICENSE("GPL");
#define ASUS_FAN_CTRL_MANUAL 1 #define ASUS_FAN_CTRL_MANUAL 1
#define ASUS_FAN_CTRL_AUTO 2 #define ASUS_FAN_CTRL_AUTO 2
#define ASUS_FAN_MODE_NORMAL 0 #define ASUS_FAN_BOOST_MODE_NORMAL 0
#define ASUS_FAN_MODE_OVERBOOST 1 #define ASUS_FAN_BOOST_MODE_OVERBOOST 1
#define ASUS_FAN_MODE_OVERBOOST_MASK 0x01 #define ASUS_FAN_BOOST_MODE_OVERBOOST_MASK 0x01
#define ASUS_FAN_MODE_SILENT 2 #define ASUS_FAN_BOOST_MODE_SILENT 2
#define ASUS_FAN_MODE_SILENT_MASK 0x02 #define ASUS_FAN_BOOST_MODE_SILENT_MASK 0x02
#define ASUS_FAN_MODES_MASK 0x03 #define ASUS_FAN_BOOST_MODES_MASK 0x03
#define USB_INTEL_XUSB2PR 0xD0 #define USB_INTEL_XUSB2PR 0xD0
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31
...@@ -182,9 +182,9 @@ struct asus_wmi { ...@@ -182,9 +182,9 @@ struct asus_wmi {
int asus_hwmon_num_fans; int asus_hwmon_num_fans;
int asus_hwmon_pwm; int asus_hwmon_pwm;
bool fan_mode_available; bool fan_boost_mode_available;
u8 fan_mode_mask; u8 fan_boost_mode_mask;
u8 fan_mode; u8 fan_boost_mode;
struct hotplug_slot hotplug_slot; struct hotplug_slot hotplug_slot;
struct mutex hotplug_lock; struct mutex hotplug_lock;
...@@ -1487,14 +1487,15 @@ static int asus_wmi_fan_init(struct asus_wmi *asus) ...@@ -1487,14 +1487,15 @@ static int asus_wmi_fan_init(struct asus_wmi *asus)
/* Fan mode *******************************************************************/ /* Fan mode *******************************************************************/
static int fan_mode_check_present(struct asus_wmi *asus) static int fan_boost_mode_check_present(struct asus_wmi *asus)
{ {
u32 result; u32 result;
int err; int err;
asus->fan_mode_available = false; asus->fan_boost_mode_available = false;
err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_FAN_MODE, &result); err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_FAN_BOOST_MODE,
&result);
if (err) { if (err) {
if (err == -ENODEV) if (err == -ENODEV)
return 0; return 0;
...@@ -1503,72 +1504,77 @@ static int fan_mode_check_present(struct asus_wmi *asus) ...@@ -1503,72 +1504,77 @@ static int fan_mode_check_present(struct asus_wmi *asus)
} }
if ((result & ASUS_WMI_DSTS_PRESENCE_BIT) && if ((result & ASUS_WMI_DSTS_PRESENCE_BIT) &&
(result & ASUS_FAN_MODES_MASK)) { (result & ASUS_FAN_BOOST_MODES_MASK)) {
asus->fan_mode_available = true; asus->fan_boost_mode_available = true;
asus->fan_mode_mask = result & ASUS_FAN_MODES_MASK; asus->fan_boost_mode_mask = result & ASUS_FAN_BOOST_MODES_MASK;
} }
return 0; return 0;
} }
static int fan_mode_write(struct asus_wmi *asus) static int fan_boost_mode_write(struct asus_wmi *asus)
{ {
int err; int err;
u8 value; u8 value;
u32 retval; u32 retval;
value = asus->fan_mode; value = asus->fan_boost_mode;
pr_info("Set fan mode: %u\n", value); pr_info("Set fan boost mode: %u\n", value);
err = asus_wmi_set_devstate(ASUS_WMI_DEVID_FAN_MODE, value, &retval); err = asus_wmi_set_devstate(ASUS_WMI_DEVID_FAN_BOOST_MODE, value,
&retval);
if (err) { if (err) {
pr_warn("Failed to set fan mode: %d\n", err); pr_warn("Failed to set fan boost mode: %d\n", err);
return err; return err;
} }
if (retval != 1) { if (retval != 1) {
pr_warn("Failed to set fan mode (retval): 0x%x\n", retval); pr_warn("Failed to set fan boost mode (retval): 0x%x\n",
retval);
return -EIO; return -EIO;
} }
return 0; return 0;
} }
static int fan_mode_switch_next(struct asus_wmi *asus) static int fan_boost_mode_switch_next(struct asus_wmi *asus)
{ {
if (asus->fan_mode == ASUS_FAN_MODE_NORMAL) { u8 mask = asus->fan_boost_mode_mask;
if (asus->fan_mode_mask & ASUS_FAN_MODE_OVERBOOST_MASK)
asus->fan_mode = ASUS_FAN_MODE_OVERBOOST; if (asus->fan_boost_mode == ASUS_FAN_BOOST_MODE_NORMAL) {
else if (asus->fan_mode_mask & ASUS_FAN_MODE_SILENT_MASK) if (mask & ASUS_FAN_BOOST_MODE_OVERBOOST_MASK)
asus->fan_mode = ASUS_FAN_MODE_SILENT; asus->fan_boost_mode = ASUS_FAN_BOOST_MODE_OVERBOOST;
} else if (asus->fan_mode == ASUS_FAN_MODE_OVERBOOST) { else if (mask & ASUS_FAN_BOOST_MODE_SILENT_MASK)
if (asus->fan_mode_mask & ASUS_FAN_MODE_SILENT_MASK) asus->fan_boost_mode = ASUS_FAN_BOOST_MODE_SILENT;
asus->fan_mode = ASUS_FAN_MODE_SILENT; } else if (asus->fan_boost_mode == ASUS_FAN_BOOST_MODE_OVERBOOST) {
if (mask & ASUS_FAN_BOOST_MODE_SILENT_MASK)
asus->fan_boost_mode = ASUS_FAN_BOOST_MODE_SILENT;
else else
asus->fan_mode = ASUS_FAN_MODE_NORMAL; asus->fan_boost_mode = ASUS_FAN_BOOST_MODE_NORMAL;
} else { } else {
asus->fan_mode = ASUS_FAN_MODE_NORMAL; asus->fan_boost_mode = ASUS_FAN_BOOST_MODE_NORMAL;
} }
return fan_mode_write(asus); return fan_boost_mode_write(asus);
} }
static ssize_t fan_mode_show(struct device *dev, static ssize_t fan_boost_mode_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct asus_wmi *asus = dev_get_drvdata(dev); struct asus_wmi *asus = dev_get_drvdata(dev);
return scnprintf(buf, PAGE_SIZE, "%d\n", asus->fan_mode); return scnprintf(buf, PAGE_SIZE, "%d\n", asus->fan_boost_mode);
} }
static ssize_t fan_mode_store(struct device *dev, struct device_attribute *attr, static ssize_t fan_boost_mode_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int result; int result;
u8 new_mode; u8 new_mode;
struct asus_wmi *asus = dev_get_drvdata(dev); struct asus_wmi *asus = dev_get_drvdata(dev);
u8 mask = asus->fan_boost_mode_mask;
result = kstrtou8(buf, 10, &new_mode); result = kstrtou8(buf, 10, &new_mode);
if (result < 0) { if (result < 0) {
...@@ -1576,24 +1582,24 @@ static ssize_t fan_mode_store(struct device *dev, struct device_attribute *attr, ...@@ -1576,24 +1582,24 @@ static ssize_t fan_mode_store(struct device *dev, struct device_attribute *attr,
return result; return result;
} }
if (new_mode == ASUS_FAN_MODE_OVERBOOST) { if (new_mode == ASUS_FAN_BOOST_MODE_OVERBOOST) {
if (!(asus->fan_mode_mask & ASUS_FAN_MODE_OVERBOOST_MASK)) if (!(mask & ASUS_FAN_BOOST_MODE_OVERBOOST_MASK))
return -EINVAL; return -EINVAL;
} else if (new_mode == ASUS_FAN_MODE_SILENT) { } else if (new_mode == ASUS_FAN_BOOST_MODE_SILENT) {
if (!(asus->fan_mode_mask & ASUS_FAN_MODE_SILENT_MASK)) if (!(mask & ASUS_FAN_BOOST_MODE_SILENT_MASK))
return -EINVAL; return -EINVAL;
} else if (new_mode != ASUS_FAN_MODE_NORMAL) { } else if (new_mode != ASUS_FAN_BOOST_MODE_NORMAL) {
return -EINVAL; return -EINVAL;
} }
asus->fan_mode = new_mode; asus->fan_boost_mode = new_mode;
fan_mode_write(asus); fan_boost_mode_write(asus);
return result; return result;
} }
// Fan mode: 0 - normal, 1 - overboost, 2 - silent // Fan boost mode: 0 - normal, 1 - overboost, 2 - silent
static DEVICE_ATTR_RW(fan_mode); static DEVICE_ATTR_RW(fan_boost_mode);
/* Backlight ******************************************************************/ /* Backlight ******************************************************************/
...@@ -1873,8 +1879,8 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus) ...@@ -1873,8 +1879,8 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
return; return;
} }
if (asus->fan_mode_available && code == NOTIFY_KBD_FBM) { if (asus->fan_boost_mode_available && code == NOTIFY_KBD_FBM) {
fan_mode_switch_next(asus); fan_boost_mode_switch_next(asus);
return; return;
} }
...@@ -2034,7 +2040,7 @@ static struct attribute *platform_attributes[] = { ...@@ -2034,7 +2040,7 @@ static struct attribute *platform_attributes[] = {
&dev_attr_touchpad.attr, &dev_attr_touchpad.attr,
&dev_attr_lid_resume.attr, &dev_attr_lid_resume.attr,
&dev_attr_als_enable.attr, &dev_attr_als_enable.attr,
&dev_attr_fan_mode.attr, &dev_attr_fan_boost_mode.attr,
NULL NULL
}; };
...@@ -2056,8 +2062,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, ...@@ -2056,8 +2062,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
devid = ASUS_WMI_DEVID_LID_RESUME; devid = ASUS_WMI_DEVID_LID_RESUME;
else if (attr == &dev_attr_als_enable.attr) else if (attr == &dev_attr_als_enable.attr)
devid = ASUS_WMI_DEVID_ALS_ENABLE; devid = ASUS_WMI_DEVID_ALS_ENABLE;
else if (attr == &dev_attr_fan_mode.attr) else if (attr == &dev_attr_fan_boost_mode.attr)
ok = asus->fan_mode_available; ok = asus->fan_boost_mode_available;
if (devid != -1) if (devid != -1)
ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0); ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0);
...@@ -2315,9 +2321,9 @@ static int asus_wmi_add(struct platform_device *pdev) ...@@ -2315,9 +2321,9 @@ static int asus_wmi_add(struct platform_device *pdev)
if (err) if (err)
goto fail_platform; goto fail_platform;
err = fan_mode_check_present(asus); err = fan_boost_mode_check_present(asus);
if (err) if (err)
goto fail_fan_mode; goto fail_fan_boost_mode;
err = asus_wmi_sysfs_init(asus->platform_device); err = asus_wmi_sysfs_init(asus->platform_device);
if (err) if (err)
...@@ -2402,7 +2408,7 @@ static int asus_wmi_add(struct platform_device *pdev) ...@@ -2402,7 +2408,7 @@ static int asus_wmi_add(struct platform_device *pdev)
fail_input: fail_input:
asus_wmi_sysfs_exit(asus->platform_device); asus_wmi_sysfs_exit(asus->platform_device);
fail_sysfs: fail_sysfs:
fail_fan_mode: fail_fan_boost_mode:
fail_platform: fail_platform:
kfree(asus); kfree(asus);
return err; return err;
......
include/linux/platform_data/x86/asus-wmi.h
View file @ 22051d9c
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#define ASUS_WMI_DEVID_KBD_BACKLIGHT 0x00050021 #define ASUS_WMI_DEVID_KBD_BACKLIGHT 0x00050021
#define ASUS_WMI_DEVID_LIGHT_SENSOR 0x00050022 /* ?? */ #define ASUS_WMI_DEVID_LIGHT_SENSOR 0x00050022 /* ?? */
#define ASUS_WMI_DEVID_LIGHTBAR 0x00050025 #define ASUS_WMI_DEVID_LIGHTBAR 0x00050025
#define ASUS_WMI_DEVID_FAN_MODE 0x00110018 #define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018
/* Misc */ /* Misc */
#define ASUS_WMI_DEVID_CAMERA 0x00060013 #define ASUS_WMI_DEVID_CAMERA 0x00060013
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7