From nobody Wed Apr 30 07:49:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZnTph0lXlz5v33K; Wed, 30 Apr 2025 07:49:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnTpg0438z3G6D; Wed, 30 Apr 2025 07:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745999355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hSBhpvjYK5IEvWMX/S+E6NLAJXlcey25hBz/7zkNU/M=; b=BKCTfugOiP4UCf6qIhlYMtc4ic+2lVfhmNLd0GSRolEGPBnicLzTm7Pb0skl+ONI6lQDL4 TnmyYyGIfoo8bqDISATxslBAQIZILU4qFJKgc5D6NpKS3HItPabuBu34Qm3I9PG8lSBLZ/ P5NyB9IlqDNSo4T+a5geeV0qNVpRuN/LN5ZZa8d6mGXBeuRvp1B33VG1hUn1y1RGNr01Bf 32z2+SEzJ7Qw1iMT12krN+knqvu8W/FDJdoE4Eli7IBoPnHqTl4hOJQLcrWxCzLSFmozTA 4CpiW0nchWbxZidIFLnQcftPR5yGcpYg365mFz9KhdRnRzhtbYymgVmZaDcCjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745999355; a=rsa-sha256; cv=none; b=QhXYSMQZnDAPoQY5BWhervwWsCu9GMXwy0pUYwzIseUng5KViCd3he+nFeLO3XeJr648Ws EL74qP/CavJ026+PhmqWEeehu0EwYdaSr/nNx9pVgMzqQwTmrmPgcES3hDftUjb3LsDgKE YVda5qwqc2RzRdVXpm36hqOYz4mlZwJpqL3mDJ2oX5PVr2BrU5xUda8/FtqsMa+JbNvjst igpt3muJ2zrIld21NOPMlP3QEyi9QTij09zg1Dt09paY9jSl7u+SuS2yVCPvm4Urh00zxd wVldTqGpjr2eFGxZR3JU6hacfpN3OjW8Yqda2d2L1awDY/xeJiWD8BXBku7cWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745999355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hSBhpvjYK5IEvWMX/S+E6NLAJXlcey25hBz/7zkNU/M=; b=j1brbWAWjz6CZN7bQ8JsXQHtilEONL1MtjIOw7UtMhXzILfQbaMtG+ggea+imXrwlJ/bgk 6VMfpGNJBLv5c1ImJuDnx3Q32+tfAxXPOOi56b0CO6sIJRCvw9/UEDa1Xum+s+bgv+Li5/ WIPyPqV0HYqFEuLB7zqvRLJHR5azWCNJ0cy/XPgfuxenZVAXQy6mENFJEn46yclkrwwhjW OtY+UKhNRSFbMYvfX6AcAEXWnpor95rq/qo0HLOojb4PP0qXk4uxywjU0leC+TrIWedGgO 78RaLCHg6wY5bdSHBh2XMyMtyoS4tAIbxhIC+fNWFeESar2gLsgOYnNZ1NJUiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZnTpf6dvczxC6; Wed, 30 Apr 2025 07:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53U7nEJS011200; Wed, 30 Apr 2025 07:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53U7nEMS011197; Wed, 30 Apr 2025 07:49:14 GMT (envelope-from git) Date: Wed, 30 Apr 2025 07:49:14 GMT Message-Id: <202504300749.53U7nEMS011197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: a55479cbfb62 - stable/14 - acpi_asus_wmi(4): Handle TUF-specific hotkeys internally List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a55479cbfb62fb5cbe9eaf59ad01e5685dec593d Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=a55479cbfb62fb5cbe9eaf59ad01e5685dec593d commit a55479cbfb62fb5cbe9eaf59ad01e5685dec593d Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-04-30 07:32:22 +0000 acpi_asus_wmi(4): Handle TUF-specific hotkeys internally - Cycle TUF laptop RGB mode on AURA key press - Switch TUF 'Throttle Thermal Policy' with 'Fan' key Sponsored by: Future Crew LLC MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D48985 (cherry picked from commit 027b93c2f5e1b84d9e4569f127b632c704c53b73) --- sys/dev/acpi_support/acpi_asus_wmi.c | 62 +++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index e3d16b9345ee..0e9c35d42793 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -99,9 +99,11 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DEVID_CARDREADER 0x00080013 #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 +#define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056 #define ASUS_WMI_DEVID_THERMAL_CTRL 0x00110011 #define ASUS_WMI_DEVID_FAN_CTRL 0x00110012 #define ASUS_WMI_DEVID_PROCESSOR_STATE 0x00120012 +#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 /* DSTS masks */ #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001 @@ -129,6 +131,8 @@ struct acpi_asus_wmi_softc { bool event_queue; struct cdev *kbd_bkl; uint32_t kbd_bkl_level; + uint32_t tuf_rgb_mode; + uint32_t ttp_mode; #ifdef EVDEV_SUPPORT struct evdev_dev *evdev; #endif @@ -272,6 +276,12 @@ static struct { .dev_id = ASUS_WMI_DEVID_PROCESSOR_STATE, .flag_rdonly = 1 }, + { + .name = "throttle_thermal_policy", + .dev_id = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + .description = "Throttle Thermal Policy " + "(0 - default, 1 - overboost, 2 - silent)", + }, { NULL, 0, NULL, 0 } }; @@ -365,7 +375,7 @@ static int acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, int oldarg); static int acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id); static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval); + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval); static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 *retval); static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, @@ -528,14 +538,14 @@ next: /* Initialize. */ if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_INIT, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_INIT, 0, 0, 0, &val) && bootverbose) device_printf(dev, "Initialization: %#x\n", val); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SPEC, 0, 0x9, &val) && bootverbose) + ASUS_WMI_METHODID_SPEC, 0, 0x9, 0, &val) && bootverbose) device_printf(dev, "WMI BIOS version: %d.%d\n", val >> 16, val & 0xFF); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SFUN, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_SFUN, 0, 0, 0, &val) && bootverbose) device_printf(dev, "SFUN value: %#x\n", val); ACPI_SERIAL_BEGIN(asus_wmi); @@ -720,6 +730,13 @@ acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id) ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(asus_wmi); + switch(dev_id) { + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + return (sc->ttp_mode); + default: + break; + } + acpi_wpi_asus_get_devstate(sc, dev_id, &val); switch(dev_id) { @@ -758,6 +775,10 @@ acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, in if (arg != 0) arg |= 0x80; break; + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + arg = min(0x2, arg); + sc->ttp_mode = arg; + break; } acpi_wpi_asus_set_devstate(sc, dev_id, arg, NULL); @@ -848,6 +869,31 @@ acpi_asus_wmi_handle_event(struct acpi_asus_wmi_softc *sc, int code) acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_TOUCHPAD, val, NULL); } + /* Throttle thermal policy control. */ + if (code == 0xae) { + sc->ttp_mode++; + if (sc->ttp_mode > 2) + sc->ttp_mode = 0; + acpi_wpi_asus_set_devstate(sc, + ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + sc->ttp_mode, NULL); + } + /* TUF laptop RGB mode control. */ + if (code == 0xb3) { + const uint32_t cmd = 0xb4; /* Save to BIOS */ + const uint32_t r = 0xff, g = 0xff, b = 0xff; + const uint32_t speed = 0xeb; /* Medium */ + if (sc->tuf_rgb_mode < 2) + sc->tuf_rgb_mode++; + else if (sc->tuf_rgb_mode == 2) + sc->tuf_rgb_mode = 10; + else sc->tuf_rgb_mode = 0; + acpi_asus_wmi_evaluate_method(sc->wmi_dev, + ASUS_WMI_METHODID_DEVS, + ASUS_WMI_DEVID_TUF_RGB_MODE, + cmd | (sc->tuf_rgb_mode << 8) | (r << 16) | (g << 24), + b | (speed << 8), NULL); + } } } @@ -882,9 +928,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval) + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval) { - UINT32 params[2] = { arg0, arg1 }; + UINT32 params[3] = { arg0, arg1, arg2 }; UINT32 result; ACPI_OBJECT *obj; ACPI_BUFFER in = { sizeof(params), ¶ms }; @@ -912,7 +958,7 @@ acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - sc->dsts_id, dev_id, 0, retval)); + sc->dsts_id, dev_id, 0, 0, retval)); } static int @@ -921,7 +967,7 @@ acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval)); + ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, 0, retval)); } static int