mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
Attempt to get multi-static working
This commit is contained in:
220
wireshark_data/asus-fan-p1.patch
Normal file
220
wireshark_data/asus-fan-p1.patch
Normal file
@@ -0,0 +1,220 @@
|
||||
---
|
||||
.../ABI/testing/sysfs-platform-asus-wmi | 10 ++
|
||||
drivers/platform/x86/asus-wmi.c | 113 ++++++++++++++++++
|
||||
include/linux/platform_data/x86/asus-wmi.h | 1 +
|
||||
3 files changed, 124 insertions(+)
|
||||
|
||||
diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/ABI/testing/sysfs-platform-asus-wmi
|
||||
index 9e99f2909612..1efac0ddb417 100644
|
||||
--- a/Documentation/ABI/testing/sysfs-platform-asus-wmi
|
||||
+++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi
|
||||
@@ -46,3 +46,13 @@ Description:
|
||||
* 0 - normal,
|
||||
* 1 - overboost,
|
||||
* 2 - silent
|
||||
+
|
||||
+What: /sys/devices/platform/<platform>/throttle_thermal_policy
|
||||
+Date: Dec 2019
|
||||
+KernelVersion: 5.6
|
||||
+Contact: "Leonid Maksymchuk" <leonmaxx@gmail.com>
|
||||
+Description:
|
||||
+ Throttle thermal policy mode:
|
||||
+ * 0 - default,
|
||||
+ * 1 - overboost,
|
||||
+ * 2 - silent
|
||||
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
|
||||
index 821b08e01635..f10ec9d745e5 100644
|
||||
--- a/drivers/platform/x86/asus-wmi.c
|
||||
+++ b/drivers/platform/x86/asus-wmi.c
|
||||
@@ -61,6 +61,7 @@ MODULE_LICENSE("GPL");
|
||||
#define NOTIFY_KBD_BRTDWN 0xc5
|
||||
#define NOTIFY_KBD_BRTTOGGLE 0xc7
|
||||
#define NOTIFY_KBD_FBM 0x99
|
||||
+#define NOTIFY_KBD_TTP 0xae
|
||||
|
||||
#define ASUS_WMI_FNLOCK_BIOS_DISABLED BIT(0)
|
||||
|
||||
@@ -81,6 +82,10 @@ MODULE_LICENSE("GPL");
|
||||
#define ASUS_FAN_BOOST_MODE_SILENT_MASK 0x02
|
||||
#define ASUS_FAN_BOOST_MODES_MASK 0x03
|
||||
|
||||
+#define ASUS_THROTTLE_THERMAL_POLICY_DEFAULT 0
|
||||
+#define ASUS_THROTTLE_THERMAL_POLICY_OVERBOOST 1
|
||||
+#define ASUS_THROTTLE_THERMAL_POLICY_SILENT 2
|
||||
+
|
||||
#define USB_INTEL_XUSB2PR 0xD0
|
||||
#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31
|
||||
|
||||
@@ -198,6 +203,9 @@ struct asus_wmi {
|
||||
u8 fan_boost_mode_mask;
|
||||
u8 fan_boost_mode;
|
||||
|
||||
+ bool throttle_thermal_policy_available;
|
||||
+ u8 throttle_thermal_policy_mode;
|
||||
+
|
||||
// The RSOC controls the maximum charging percentage.
|
||||
bool battery_rsoc_available;
|
||||
|
||||
@@ -1724,6 +1732,98 @@ static ssize_t fan_boost_mode_store(struct device *dev,
|
||||
// Fan boost mode: 0 - normal, 1 - overboost, 2 - silent
|
||||
static DEVICE_ATTR_RW(fan_boost_mode);
|
||||
|
||||
+/* Throttle thermal policy ****************************************************/
|
||||
+
|
||||
+static int throttle_thermal_policy_check_present(struct asus_wmi *asus)
|
||||
+{
|
||||
+ u32 result;
|
||||
+ int err;
|
||||
+
|
||||
+ asus->throttle_thermal_policy_available = false;
|
||||
+
|
||||
+ err = asus_wmi_get_devstate(asus,
|
||||
+ ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY,
|
||||
+ &result);
|
||||
+ if (err) {
|
||||
+ if (err == -ENODEV)
|
||||
+ return 0;
|
||||
+ return err;
|
||||
+ }
|
||||
+
|
||||
+ if (result & ASUS_WMI_DSTS_PRESENCE_BIT)
|
||||
+ asus->throttle_thermal_policy_available = true;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int throttle_thermal_policy_write(struct asus_wmi *asus)
|
||||
+{
|
||||
+ int err;
|
||||
+ u8 value;
|
||||
+ u32 retval;
|
||||
+
|
||||
+ value = asus->throttle_thermal_policy_mode;
|
||||
+
|
||||
+ err = asus_wmi_set_devstate(ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY,
|
||||
+ value, &retval);
|
||||
+ if (err) {
|
||||
+ pr_warn("Failed to set throttle thermal policy: %d\n", err);
|
||||
+ return err;
|
||||
+ }
|
||||
+
|
||||
+ if (retval != 1) {
|
||||
+ pr_warn("Failed to set throttle thermal policy (retval): 0x%x\n",
|
||||
+ retval);
|
||||
+ return -EIO;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int throttle_thermal_policy_switch_next(struct asus_wmi *asus)
|
||||
+{
|
||||
+ u8 new_mode = asus->throttle_thermal_policy_mode + 1;
|
||||
+
|
||||
+ if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT)
|
||||
+ new_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT;
|
||||
+
|
||||
+ asus->throttle_thermal_policy_mode = new_mode;
|
||||
+ return throttle_thermal_policy_write(asus);
|
||||
+}
|
||||
+
|
||||
+static ssize_t throttle_thermal_policy_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct asus_wmi *asus = dev_get_drvdata(dev);
|
||||
+ u8 mode = asus->throttle_thermal_policy_mode;
|
||||
+
|
||||
+ return scnprintf(buf, PAGE_SIZE, "%d\n", mode);
|
||||
+}
|
||||
+
|
||||
+static ssize_t throttle_thermal_policy_store(struct device *dev,
|
||||
+ struct device_attribute *attr,
|
||||
+ const char *buf, size_t count)
|
||||
+{
|
||||
+ int result;
|
||||
+ u8 new_mode;
|
||||
+ struct asus_wmi *asus = dev_get_drvdata(dev);
|
||||
+
|
||||
+ result = kstrtou8(buf, 10, &new_mode);
|
||||
+ if (result < 0)
|
||||
+ return result;
|
||||
+
|
||||
+ if (new_mode > ASUS_THROTTLE_THERMAL_POLICY_SILENT)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ asus->throttle_thermal_policy_mode = new_mode;
|
||||
+ throttle_thermal_policy_write(asus);
|
||||
+
|
||||
+ return count;
|
||||
+}
|
||||
+
|
||||
+// Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent
|
||||
+static DEVICE_ATTR_RW(throttle_thermal_policy);
|
||||
+
|
||||
/* Backlight ******************************************************************/
|
||||
|
||||
static int read_backlight_power(struct asus_wmi *asus)
|
||||
@@ -2005,6 +2105,11 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)
|
||||
return;
|
||||
}
|
||||
|
||||
+ if (asus->throttle_thermal_policy_available && code == NOTIFY_KBD_TTP) {
|
||||
+ throttle_thermal_policy_switch_next(asus);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (is_display_toggle(code) && asus->driver->quirks->no_display_toggle)
|
||||
return;
|
||||
|
||||
@@ -2155,6 +2260,7 @@ static struct attribute *platform_attributes[] = {
|
||||
&dev_attr_lid_resume.attr,
|
||||
&dev_attr_als_enable.attr,
|
||||
&dev_attr_fan_boost_mode.attr,
|
||||
+ &dev_attr_throttle_thermal_policy.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -2178,6 +2284,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
|
||||
devid = ASUS_WMI_DEVID_ALS_ENABLE;
|
||||
else if (attr == &dev_attr_fan_boost_mode.attr)
|
||||
ok = asus->fan_boost_mode_available;
|
||||
+ else if (attr == &dev_attr_throttle_thermal_policy.attr)
|
||||
+ ok = asus->throttle_thermal_policy_available;
|
||||
|
||||
if (devid != -1)
|
||||
ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0);
|
||||
@@ -2437,6 +2545,10 @@ static int asus_wmi_add(struct platform_device *pdev)
|
||||
if (err)
|
||||
goto fail_fan_boost_mode;
|
||||
|
||||
+ err = throttle_thermal_policy_check_present(asus);
|
||||
+ if (err)
|
||||
+ goto fail_throttle_thermal_policy;
|
||||
+
|
||||
err = asus_wmi_sysfs_init(asus->platform_device);
|
||||
if (err)
|
||||
goto fail_sysfs;
|
||||
@@ -2521,6 +2633,7 @@ static int asus_wmi_add(struct platform_device *pdev)
|
||||
fail_input:
|
||||
asus_wmi_sysfs_exit(asus->platform_device);
|
||||
fail_sysfs:
|
||||
+fail_throttle_thermal_policy:
|
||||
fail_fan_boost_mode:
|
||||
fail_platform:
|
||||
kfree(asus);
|
||||
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h
|
||||
index 60249e22e844..d39fc658c320 100644
|
||||
--- a/include/linux/platform_data/x86/asus-wmi.h
|
||||
+++ b/include/linux/platform_data/x86/asus-wmi.h
|
||||
@@ -58,6 +58,7 @@
|
||||
#define ASUS_WMI_DEVID_LIGHT_SENSOR 0x00050022 /* ?? */
|
||||
#define ASUS_WMI_DEVID_LIGHTBAR 0x00050025
|
||||
#define ASUS_WMI_DEVID_FAN_BOOST_MODE 0x00110018
|
||||
+#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075
|
||||
|
||||
/* Misc */
|
||||
#define ASUS_WMI_DEVID_CAMERA 0x00060013
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
||||
37
wireshark_data/asus-fan-p2.patch
Normal file
37
wireshark_data/asus-fan-p2.patch
Normal file
@@ -0,0 +1,37 @@
|
||||
---
|
||||
drivers/platform/x86/asus-wmi.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
|
||||
index f10ec9d745e5..469f1a852719 100644
|
||||
--- a/drivers/platform/x86/asus-wmi.c
|
||||
+++ b/drivers/platform/x86/asus-wmi.c
|
||||
@@ -1780,6 +1780,15 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int throttle_thermal_policy_set_default(struct asus_wmi *asus)
|
||||
+{
|
||||
+ if (!asus->throttle_thermal_policy_available)
|
||||
+ return 0;
|
||||
+
|
||||
+ asus->throttle_thermal_policy_mode = ASUS_THROTTLE_THERMAL_POLICY_DEFAULT;
|
||||
+ return throttle_thermal_policy_write(asus);
|
||||
+}
|
||||
+
|
||||
static int throttle_thermal_policy_switch_next(struct asus_wmi *asus)
|
||||
{
|
||||
u8 new_mode = asus->throttle_thermal_policy_mode + 1;
|
||||
@@ -2548,6 +2557,8 @@ static int asus_wmi_add(struct platform_device *pdev)
|
||||
err = throttle_thermal_policy_check_present(asus);
|
||||
if (err)
|
||||
goto fail_throttle_thermal_policy;
|
||||
+ else
|
||||
+ throttle_thermal_policy_set_default(asus);
|
||||
|
||||
err = asus_wmi_sysfs_init(asus->platform_device);
|
||||
if (err)
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
||||
12
wireshark_data/gm501/lsusbinfo.sysclassname.txt
Normal file
12
wireshark_data/gm501/lsusbinfo.sysclassname.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
(base) will@zephyrusm:~$ lsusb | grep 0b05
|
||||
Bus 001 Device 003: ID 0b05:1866 ASUSTek Computer, Inc. N-KEY Device
|
||||
(base) will@zephyrusm:~$
|
||||
|
||||
(base) will@zephyrusm:~$ cat /sys/class/dmi/id/product_name
|
||||
Zephyrus M GM501GM
|
||||
(base) will@zephyrusm:~$ cat /sys/class/dmi/id/product_family
|
||||
Zephyrus M
|
||||
(base) will@zephyrusm:~$ cat /sys/class/dmi/id/board_name
|
||||
GM501GM
|
||||
(base) will@zephyrusm:~$
|
||||
|
||||
27
wireshark_data/gm501/usb-hid-dump.txt
Normal file
27
wireshark_data/gm501/usb-hid-dump.txt
Normal file
@@ -0,0 +1,27 @@
|
||||
001:003:002:DESCRIPTOR 1588963579.696552
|
||||
06 31 FF 09 76 A1 01 85 5A 19 00 2A FF 00 15 00
|
||||
26 FF 00 75 08 95 05 81 00 19 00 2A FF 00 15 00
|
||||
26 FF 00 75 08 95 3F B1 00 C0 05 0C 09 01 A1 01
|
||||
85 02 19 00 2A 3C 02 15 00 26 3C 02 75 10 95 02
|
||||
81 00 C0 06 31 FF 09 79 A1 01 85 5D 19 00 2A FF
|
||||
00 15 00 26 FF 00 75 08 95 1F 81 00 19 00 2A FF
|
||||
00 15 00 26 FF 00 75 08 95 3F 91 00 19 00 2A FF
|
||||
00 15 00 26 FF 00 75 08 95 3F B1 00 C0 06 31 FF
|
||||
09 80 A1 01 85 5E 19 00 2A FF 00 15 00 26 FF 00
|
||||
75 08 95 05 81 00 19 00 2A FF 00 15 00 26 FF 00
|
||||
75 08 95 3F B1 00 C0
|
||||
|
||||
001:003:001:DESCRIPTOR 1588963579.697560
|
||||
05 01 09 06 A1 01 85 09 75 01 95 08 05 07 19 E0
|
||||
29 E7 15 00 25 01 81 02 95 08 75 01 81 03 95 05
|
||||
75 01 05 08 19 01 29 05 91 02 95 01 75 03 91 03
|
||||
95 F0 75 01 05 07 19 00 29 EF 15 00 25 01 81 02
|
||||
C0
|
||||
|
||||
001:003:000:DESCRIPTOR 1588963579.698493
|
||||
05 01 09 06 A1 01 85 01 75 01 95 08 05 07 19 E0
|
||||
29 E7 15 00 25 01 81 02 95 01 75 08 81 03 95 05
|
||||
75 01 05 08 19 01 29 05 91 02 95 01 75 03 91 03
|
||||
95 1E 75 08 15 00 26 FF 00 05 07 19 00 2A FF 00
|
||||
81 00 C0
|
||||
|
||||
130
wireshark_data/gm501/zephyrusgm501_info.txt
Normal file
130
wireshark_data/gm501/zephyrusgm501_info.txt
Normal file
@@ -0,0 +1,130 @@
|
||||
|
||||
Bus 001 Device 003: ID 0b05:1866 ASUSTek Computer, Inc. N-KEY Device
|
||||
Device Descriptor:
|
||||
bLength 18
|
||||
bDescriptorType 1
|
||||
bcdUSB 2.00
|
||||
bDeviceClass 0
|
||||
bDeviceSubClass 0
|
||||
bDeviceProtocol 0
|
||||
bMaxPacketSize0 64
|
||||
idVendor 0x0b05 ASUSTek Computer, Inc.
|
||||
idProduct 0x1866
|
||||
bcdDevice 0.02
|
||||
iManufacturer 1 ASUSTeK Computer Inc.
|
||||
iProduct 2 N-KEY Device
|
||||
iSerial 0
|
||||
bNumConfigurations 1
|
||||
Configuration Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 2
|
||||
wTotalLength 0x005b
|
||||
bNumInterfaces 3
|
||||
bConfigurationValue 1
|
||||
iConfiguration 0
|
||||
bmAttributes 0xe0
|
||||
Self Powered
|
||||
Remote Wakeup
|
||||
MaxPower 100mA
|
||||
Interface Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 4
|
||||
bInterfaceNumber 0
|
||||
bAlternateSetting 0
|
||||
bNumEndpoints 1
|
||||
bInterfaceClass 3 Human Interface Device
|
||||
bInterfaceSubClass 1 Boot Interface Subclass
|
||||
bInterfaceProtocol 1 Keyboard
|
||||
iInterface 3 (error)
|
||||
HID Device Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 33
|
||||
bcdHID 1.10
|
||||
bCountryCode 0 Not supported
|
||||
bNumDescriptors 1
|
||||
bDescriptorType 34 Report
|
||||
wDescriptorLength 67
|
||||
Report Descriptors:
|
||||
** UNAVAILABLE **
|
||||
Endpoint Descriptor:
|
||||
bLength 7
|
||||
bDescriptorType 5
|
||||
bEndpointAddress 0x81 EP 1 IN
|
||||
bmAttributes 3
|
||||
Transfer Type Interrupt
|
||||
Synch Type None
|
||||
Usage Type Data
|
||||
wMaxPacketSize 0x0040 1x 64 bytes
|
||||
bInterval 1
|
||||
Interface Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 4
|
||||
bInterfaceNumber 1
|
||||
bAlternateSetting 0
|
||||
bNumEndpoints 1
|
||||
bInterfaceClass 3 Human Interface Device
|
||||
bInterfaceSubClass 1 Boot Interface Subclass
|
||||
bInterfaceProtocol 1 Keyboard
|
||||
iInterface 1 ASUSTeK Computer Inc.
|
||||
HID Device Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 33
|
||||
bcdHID 1.10
|
||||
bCountryCode 0 Not supported
|
||||
bNumDescriptors 1
|
||||
bDescriptorType 34 Report
|
||||
wDescriptorLength 65
|
||||
Report Descriptors:
|
||||
** UNAVAILABLE **
|
||||
Endpoint Descriptor:
|
||||
bLength 7
|
||||
bDescriptorType 5
|
||||
bEndpointAddress 0x82 EP 2 IN
|
||||
bmAttributes 3
|
||||
Transfer Type Interrupt
|
||||
Synch Type None
|
||||
Usage Type Data
|
||||
wMaxPacketSize 0x0040 1x 64 bytes
|
||||
bInterval 1
|
||||
Interface Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 4
|
||||
bInterfaceNumber 2
|
||||
bAlternateSetting 0
|
||||
bNumEndpoints 2
|
||||
bInterfaceClass 3 Human Interface Device
|
||||
bInterfaceSubClass 1 Boot Interface Subclass
|
||||
bInterfaceProtocol 1 Keyboard
|
||||
iInterface 1 ASUSTeK Computer Inc.
|
||||
HID Device Descriptor:
|
||||
bLength 9
|
||||
bDescriptorType 33
|
||||
bcdHID 1.10
|
||||
bCountryCode 0 Not supported
|
||||
bNumDescriptors 1
|
||||
bDescriptorType 34 Report
|
||||
wDescriptorLength 167
|
||||
Report Descriptors:
|
||||
** UNAVAILABLE **
|
||||
Endpoint Descriptor:
|
||||
bLength 7
|
||||
bDescriptorType 5
|
||||
bEndpointAddress 0x83 EP 3 IN
|
||||
bmAttributes 3
|
||||
Transfer Type Interrupt
|
||||
Synch Type None
|
||||
Usage Type Data
|
||||
wMaxPacketSize 0x0040 1x 64 bytes
|
||||
bInterval 1
|
||||
Endpoint Descriptor:
|
||||
bLength 7
|
||||
bDescriptorType 5
|
||||
bEndpointAddress 0x04 EP 4 OUT
|
||||
bmAttributes 3
|
||||
Transfer Type Interrupt
|
||||
Synch Type None
|
||||
Usage Type Data
|
||||
wMaxPacketSize 0x0040 1x 64 bytes
|
||||
bInterval 1
|
||||
Device Status: 0x0001
|
||||
Self Powered
|
||||
BIN
wireshark_data/hut1_12v2.pdf
Normal file
BIN
wireshark_data/hut1_12v2.pdf
Normal file
Binary file not shown.
Reference in New Issue
Block a user