From nobody Mon Feb 9 12:01:14 2026 Received: from wfhigh3-smtp.messagingengine.com (wfhigh3-smtp.messagingengine.com [64.147.123.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B58DAD2F0; Tue, 2 Apr 2024 01:35:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712021711; cv=none; b=KRcq0xgKdsHc2+hQ3I/3Ngi6WeViB788GzfVsGh/JMBaZNGpkr5cO1ASUT1LqvzCmvLAFswazVIC68v3aPXTduVUgKvW+mgvmOsJXq0cI+I/yhNB0U56ckmca01nfgJs7UwgRhAv7Hb15SDLmWu7Kkp0JxXVviySBud0jELiHyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712021711; c=relaxed/simple; bh=U/5HX71yMtXLmeg1iJt3uuic/UkcY76yM6g877qjXmk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GR26Sc8Mz5OfaORnlUF2ziWqPr5WDcpo+WxsaYX7cifvIibUaucDbvGQ+4t4XKsMnEM0xLYIxLghjDwcdoSLhpPiEzOsrLGrFKe6AmVrl2ZhmV4eLEGdV7q+P1fY8YDu2SaT+Qm+r8rX2ryhZlTQbP8nlhLRxUPPk8g7/nqol78= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev; spf=none smtp.mailfrom=ljones.dev; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b=ADyaeMRQ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=hElgFkt2; arc=none smtp.client-ip=64.147.123.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ljones.dev Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ljones.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ljones.dev header.i=@ljones.dev header.b="ADyaeMRQ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="hElgFkt2" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.west.internal (Postfix) with ESMTP id 4B9A318000D8; Mon, 1 Apr 2024 21:35:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 01 Apr 2024 21:35:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ljones.dev; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1712021707; x= 1712108107; bh=0JQOwz8rf0pum+ZqVXBwCd1NCtFvIMp1akk1TfIHeXM=; b=A DyaeMRQ3pGV0sX7sf0cj5cX9eDFU+P+ay5tJdNfE6AIPUZ35Fx8GxndTtj+8sBut m6jNWWsfsV/lU2CxUq3y8fnsPbr/kAQ5LG9tXOWjIplWGU7rQVVCcfCHa62lTW8B Yblk+JXgDorx+LsnxM1umn1tk+DUQ3t0FfCoUHdxazBZRkhKpao/yQyGnsY6K2XJ G+JhCtjREc5G9vnEtsAnlG+Ht8hSH3I6pr8JyIs/VrGUdtkWL42X6BS0OZtEt5cL jKqTdL/R67YjH6H7nkB5UBzfl6u52vUcb44zNeDRhcoYgFhvUR8Eegvac1I0HyjM ouZsuNu4p2Z1/t/FGmt9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1712021707; x= 1712108107; bh=0JQOwz8rf0pum+ZqVXBwCd1NCtFvIMp1akk1TfIHeXM=; b=h ElgFkt22MVd/RUfIGyv8xa7RlWvZiL3FjRQmzWR2QJlkKCkzMLHGr9PCf8qglGnH PAI/VfzKIM06AExTQSHVGmu21bJ8yU5zHvYR05EeVZfNVsEmMYtMiPZpS154G4Sh MsgfdG6FCmgn3KtTJ22CD5gkRyqWLjL8e9qS63kbbQ/NaG9W/FFabNUASDvRfOm3 /dePoLyskZ83OrPMIs/fX2ErpIXgxWcUSktm4Qo3ymq3SIrkmB3mePL4+Au+nCnq wP+MOyj8fOND0ge4u2hbfcuXP91qjDXWuOGnHxKsVV0CNjOXAhboIbbQ2RrMDU8m NR/a5ju3KPSvNMOaewglQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefuddggeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpedfnfhukhgvucffrdculfhonhgvshdfuceolhhukhgvsehl jhhonhgvshdruggvvheqnecuggftrfgrthhtvghrnhepgfetfedugfetudeuheetjefhue fggfelleetvdevtefhueeujeefvdegleevhefgnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomheplhhukhgvsehljhhonhgvshdruggvvh X-ME-Proxy: Feedback-ID: i5ec1447f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 1 Apr 2024 21:35:04 -0400 (EDT) From: "Luke D. Jones" To: hdegoede@redhat.com Cc: corentin.chary@gmail.com, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, "Luke D. Jones" Subject: [PATCH v1 1/9] platform/x86: asus-wmi: add support for 2024 ROG Mini-LED Date: Tue, 2 Apr 2024 14:34:45 +1300 Message-ID: <20240402013453.18205-2-luke@ljones.dev> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402013453.18205-1-luke@ljones.dev> References: <20240402013453.18205-1-luke@ljones.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Support the 2024 mini-led backlight and adjust the related functions to select the relevant dev-id. Also add `available_mini_led_mode` to the platform sysfs since the available mini-led levels can be different. Signed-off-by: Luke D. Jones --- .../ABI/testing/sysfs-platform-asus-wmi | 8 ++ drivers/platform/x86/asus-wmi.c | 81 ++++++++++++++++--- include/linux/platform_data/x86/asus-wmi.h | 1 + 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentat= ion/ABI/testing/sysfs-platform-asus-wmi index 8a7e25bde085..ef1ac1a20a71 100644 --- a/Documentation/ABI/testing/sysfs-platform-asus-wmi +++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi @@ -126,6 +126,14 @@ Description: Change the mini-LED mode: * 0 - Single-zone, * 1 - Multi-zone + * 2 - Multi-zone strong (available on newer generation mini-led) + +What: /sys/devices/platform//available_mini_led_mode +Date: Apr 2024 +KernelVersion: 6.10 +Contact: "Luke Jones" +Description: + List the available mini-led modes. =20 What: /sys/devices/platform//ppt_pl1_spl Date: Jun 2023 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index 3f07bbf809ef..646f70c65097 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -288,7 +288,7 @@ struct asus_wmi { bool battery_rsoc_available; =20 bool panel_overdrive_available; - bool mini_led_mode_available; + u32 mini_led_dev_id; =20 struct hotplug_slot hotplug_slot; struct mutex hotplug_lock; @@ -2108,13 +2108,30 @@ static ssize_t mini_led_mode_show(struct device *de= v, struct device_attribute *attr, char *buf) { struct asus_wmi *asus =3D dev_get_drvdata(dev); - int result; + u32 value; =20 - result =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_MINI_LED_MOD= E); - if (result < 0) - return result; + asus_wmi_get_devstate(asus, asus->mini_led_dev_id, &value); + value =3D value & 0x03; // only 3 modes on 2024 version =20 - return sysfs_emit(buf, "%d\n", result); + /* Remap the mode values to match previous generation mini-led. + * Some BIOSes return -19 instead of 2, which is "mini-LED off", this + * appears to be a BIOS bug. + */ + if (asus->mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (value) { + case 0: + value =3D 1; + break; + case 1: + value =3D 2; + break; + case 2: + value =3D 0; + } + } else if (value < 0) { + return value; + } + return sysfs_emit(buf, "%d\n", value); } =20 static ssize_t mini_led_mode_store(struct device *dev, @@ -2130,11 +2147,28 @@ static ssize_t mini_led_mode_store(struct device *d= ev, if (result) return result; =20 - if (mode > 1) + if (mode > 1 && asus->mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE) return -EINVAL; + if (mode > 2 && asus->mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE= 2) + return -EINVAL; + /* + * Remap the mode values so expected behaviour is the same as the last + * generation of mini-LED + */ + if (asus->mini_led_dev_id =3D=3D ASUS_WMI_DEVID_MINI_LED_MODE2) { + switch (mode) { + case 0: + mode =3D 2; + break; + case 1: + mode =3D 0; + break; + case 2: + mode =3D 1; + } + } =20 - err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_MINI_LED_MODE, mode, &result= ); - + err =3D asus_wmi_set_devstate(asus->mini_led_dev_id, mode, &result); if (err) { pr_warn("Failed to set mini-LED: %d\n", err); return err; @@ -2151,6 +2185,23 @@ static ssize_t mini_led_mode_store(struct device *de= v, } static DEVICE_ATTR_RW(mini_led_mode); =20 +static ssize_t available_mini_led_mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct asus_wmi *asus =3D dev_get_drvdata(dev); + + switch (asus->mini_led_dev_id) { + case ASUS_WMI_DEVID_MINI_LED_MODE: + return sysfs_emit(buf, "0 1\n"); + case ASUS_WMI_DEVID_MINI_LED_MODE2: + return sysfs_emit(buf, "0 1 2\n"); + } + + return sysfs_emit(buf, "0\n"); +} + +static DEVICE_ATTR_RO(available_mini_led_mode); + /* Quirks ****************************************************************= *****/ =20 static void asus_wmi_set_xusb2pr(struct asus_wmi *asus) @@ -4139,6 +4190,7 @@ static struct attribute *platform_attributes[] =3D { &dev_attr_nv_temp_target.attr, &dev_attr_panel_od.attr, &dev_attr_mini_led_mode.attr, + &dev_attr_available_mini_led_mode.attr, NULL }; =20 @@ -4191,7 +4243,9 @@ static umode_t asus_sysfs_is_visible(struct kobject *= kobj, else if (attr =3D=3D &dev_attr_panel_od.attr) ok =3D asus->panel_overdrive_available; else if (attr =3D=3D &dev_attr_mini_led_mode.attr) - ok =3D asus->mini_led_mode_available; + ok =3D asus->mini_led_dev_id !=3D 0; + else if (attr =3D=3D &dev_attr_available_mini_led_mode.attr) + ok =3D asus->mini_led_dev_id !=3D 0; =20 if (devid !=3D -1) ok =3D !(asus_wmi_get_devstate_simple(asus, devid) < 0); @@ -4444,10 +4498,15 @@ static int asus_wmi_add(struct platform_device *pde= v) asus->nv_dyn_boost_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_D= EVID_NV_DYN_BOOST); asus->nv_temp_tgt_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_DE= VID_NV_THERM_TARGET); asus->panel_overdrive_available =3D asus_wmi_dev_is_present(asus, ASUS_WM= I_DEVID_PANEL_OD); - asus->mini_led_mode_available =3D asus_wmi_dev_is_present(asus, ASUS_WMI_= DEVID_MINI_LED_MODE); asus->ally_mcu_usb_switch =3D acpi_has_method(NULL, ASUS_USB0_PWR_EC0_CSE= E) && dmi_match(DMI_BOARD_NAME, "RC71L"); =20 + if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE)) { + asus->mini_led_dev_id =3D ASUS_WMI_DEVID_MINI_LED_MODE; + } else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE2)) { + asus->mini_led_dev_id =3D ASUS_WMI_DEVID_MINI_LED_MODE2; + } + err =3D fan_boost_mode_check_present(asus); if (err) goto fail_fan_boost_mode; diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index ab1c7deff118..9cadce10ad9a 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -71,6 +71,7 @@ #define ASUS_WMI_DEVID_LID_FLIP 0x00060062 #define ASUS_WMI_DEVID_LID_FLIP_ROG 0x00060077 #define ASUS_WMI_DEVID_MINI_LED_MODE 0x0005001E +#define ASUS_WMI_DEVID_MINI_LED_MODE2 0x0005002E =20 /* Storage */ #define ASUS_WMI_DEVID_CARDREADER 0x00080013 --=20 2.44.0