From nobody Tue Dec 2 02:05:00 2025 Received: from relay10.grserver.gr (relay10.grserver.gr [37.27.248.198]) (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 2397230594D; Thu, 20 Nov 2025 09:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.27.248.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631998; cv=none; b=FSxN0jK/sNml4LKA3t7IUY2GYQoHygmOR+zL6Qkw7cAr+BLeB6B6VbiXldMXCIdJsL5R5l4/tYNcwVp4957jPg/sekIMwB81oHfKOtRAttQX0Cj1Eqg6zrKvYqTCOXkb/8vG7x/j0IN0j5GDebi7w58h/870FAWUAnexgP/iJP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631998; c=relaxed/simple; bh=2AXIZwdc7plLsOCkaMrekljgkEW3JVHklkGOD0G+UyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZE3T5HDC4t8cJe/U96IexyMejyr03CMB+/o4zIsxrw09eU/9ItMR1S38I4WqYz8EpHEqY6S2qAJ5vI6DGXC7sz1CDPwzaBxkszc1PLao7j0tpTQ+jMC7V1VEaOaXND81bg/Ta1ukYjCrH8jeX6NyXMbpgMX9qrxCFkC6Rby7fJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=BJ0vDXNO; arc=none smtp.client-ip=37.27.248.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="BJ0vDXNO" Received: from relay10 (localhost.localdomain [127.0.0.1]) by relay10.grserver.gr (Proxmox) with ESMTP id 775083F42A; Thu, 20 Nov 2025 11:46:29 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay10.grserver.gr (Proxmox) with ESMTPS id DC6E23F3BE; Thu, 20 Nov 2025 11:46:28 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id D938A1FE446; Thu, 20 Nov 2025 11:46:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631988; bh=10K1hKB6G6AiiFKaatF2s3GyVUYrrYIE5HLJigP9UxI=; h=From:To:Subject; b=BJ0vDXNOULaCZrAeD2TdihIPq4foRx8IpzYYS75Zez6JP2itlhMyLB9lWI//DTBY9 KhV8ZZBMfeArlMFQL4KE83xIbwdlaKHAb/TyBu6r3wiVhsA/R5IMZ/SnDxcj5yxw1j Xse6xhOrf+vkGEH01jAwHpl375NIk5Wu+5SdWHWmzu7Qdda4f+ha1Cl6IFeZG5JBKn zXkWulfdkHjsvqeptEStEDgrvAlAijSZpf95r2JatXEaLFenhDdyjSUCp+E82vUtdn bSc0fbjN4gtHw4QHH6e8qr6UsRDh3f4dSKJuIOD7bL8ib7ccMQjXvpN2iqxAhNEzxI 8S7FpNliq/ZNw== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 01/11] HID: asus: simplify RGB init sequence Date: Thu, 20 Nov 2025 10:46:07 +0100 Message-ID: <20251120094617.11672-2-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363198842.1474894.7474358314988941052@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Currently, RGB initialization forks depending on whether a device is NKEY. However, in reality both initialization forks are the same, other than the NKEY initialization initializing the LED_REPORT_ID1, LED_REPORT_ID2 endpoints, and the non-NKEY initialization having a functionality check which is skipped for the NKEY path. Therefore, merge the if blocks, gate the ID1/ID2 initializations behind the NKEY quirk instead, and introduce the functionality check for NKEY devices (it is supported by them). There should be no functional change with this patch. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 52 ++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index a444d41e53b6..415d067938e3 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -638,13 +638,20 @@ static int asus_kbd_register_leds(struct hid_device *= hdev) unsigned char kbd_func; int ret; =20 - if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { - /* Initialize keyboard */ - ret =3D asus_kbd_init(hdev, FEATURE_KBD_REPORT_ID); - if (ret < 0) - return ret; + ret =3D asus_kbd_init(hdev, FEATURE_KBD_REPORT_ID); + if (ret < 0) + return ret; =20 - /* The LED endpoint is initialised in two HID */ + /* Get keyboard functions */ + ret =3D asus_kbd_get_functions(hdev, &kbd_func, FEATURE_KBD_REPORT_ID); + if (ret < 0) + return ret; + + /* Check for backlight support */ + if (!(kbd_func & SUPPORT_KBD_BACKLIGHT)) + return -ENODEV; + + if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { ret =3D asus_kbd_init(hdev, FEATURE_KBD_LED_REPORT_ID1); if (ret < 0) return ret; @@ -652,34 +659,19 @@ static int asus_kbd_register_leds(struct hid_device *= hdev) ret =3D asus_kbd_init(hdev, FEATURE_KBD_LED_REPORT_ID2); if (ret < 0) return ret; + } =20 - if (dmi_match(DMI_PRODUCT_FAMILY, "ProArt P16")) { - ret =3D asus_kbd_disable_oobe(hdev); - if (ret < 0) - return ret; - } - - if (drvdata->quirks & QUIRK_ROG_ALLY_XPAD) { - intf =3D to_usb_interface(hdev->dev.parent); - udev =3D interface_to_usbdev(intf); - validate_mcu_fw_version(hdev, - le16_to_cpu(udev->descriptor.idProduct)); - } - - } else { - /* Initialize keyboard */ - ret =3D asus_kbd_init(hdev, FEATURE_KBD_REPORT_ID); - if (ret < 0) - return ret; - - /* Get keyboard functions */ - ret =3D asus_kbd_get_functions(hdev, &kbd_func, FEATURE_KBD_REPORT_ID); + if (dmi_match(DMI_PRODUCT_FAMILY, "ProArt P16")) { + ret =3D asus_kbd_disable_oobe(hdev); if (ret < 0) return ret; + } =20 - /* Check for backlight support */ - if (!(kbd_func & SUPPORT_KBD_BACKLIGHT)) - return -ENODEV; + if (drvdata->quirks & QUIRK_ROG_ALLY_XPAD) { + intf =3D to_usb_interface(hdev->dev.parent); + udev =3D interface_to_usbdev(intf); + validate_mcu_fw_version( + hdev, le16_to_cpu(udev->descriptor.idProduct)); } =20 drvdata->kbd_backlight =3D devm_kzalloc(&hdev->dev, --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay10.grserver.gr (relay10.grserver.gr [37.27.248.198]) (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 A07B830DD14; Thu, 20 Nov 2025 09:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.27.248.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631999; cv=none; b=bJLl4768y9+pYwPhymk6piiBGlt+Dy8seZALmCPGVwWuMY34wnhnq8AqccHaaFbi5AeTK1NIF5C4E3hTS6UOFFIHdAK2zP22dWgufqpmkIIKtjGsrW56OqXJ1GFiOaR8otWAZRc+9LeV81pBbupgxk4uDzVq8wjgjlxMO3CKc9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631999; c=relaxed/simple; bh=XczMuwY2PG08xrTAUAcEUtH2Au/kzFoR+YRNMCgIAK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nHVkwLdh41SzEC6z13uICWCBwn3vZJY1LlBwXiD+MIXoXvDQvCkmSPPDNbJorWrRq9wZ/wc87LXEXYtpI+dosj8LKFWUlJwbfjjWT7iKrNT5wRA9scVvnfg2DfL5wToAKjt6FoOsozZG3LpEtqnd8G57BkiUnZUzpIl2j8ThATQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=TrC8ffgY; arc=none smtp.client-ip=37.27.248.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="TrC8ffgY" Received: from relay10 (localhost.localdomain [127.0.0.1]) by relay10.grserver.gr (Proxmox) with ESMTP id 4E4473F3F6; Thu, 20 Nov 2025 11:46:30 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay10.grserver.gr (Proxmox) with ESMTPS id BBC933F382; Thu, 20 Nov 2025 11:46:29 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id A94FB1FE2E1; Thu, 20 Nov 2025 11:46:28 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631989; bh=HuBQqL+gPfeZK1b8cClnia9IRPHgXIRQ8d5AjKJGJqs=; h=From:To:Subject; b=TrC8ffgY5Cx0vxzCYTNUnK9BS0ZO2xQX/73k53OQUnkCOD1TGQsyJA/uxakD4WG60 sbRurbiueUEqX82JTHRUW+Ks7mbw9StDYfeVQ3Mc25GfAbZpajz9Zy26QjAs16RPoX z8B7QS7YM4coBmpYDYuUcnkY4/ogfkRME7Jqe8ftW8o9XkTthxcSLMpk53D3hP47zs yTjy5rYHIA3qp4hHdHlA/TlbsMru1E1pUBD3cYnbSwFelZw+VtraLowflwMesYemqH f8ZEMVlJ4sg1bF5+c9hcCvfld2bnaMtYe996C/4EjbJbukF0qkf/Y7fi2sZbVfivR0 km9t1gjhuG/eg== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 02/11] HID: asus: initialize additional endpoints only for legacy devices Date: Thu, 20 Nov 2025 10:46:08 +0100 Message-ID: <20251120094617.11672-3-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363198926.1474935.11492040414026245180@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Currently, ID1/ID2 initializations are performed for all NKEY devices. However, ID1 initializations are only required for RGB control and are only supported for RGB capable devices. ID2 initializations are only required for initializing the Anime display endpoint which is only supported on devices with an Anime display. Both of these initializations are out of scope for this driver (this is a brightness control and keyboard shortcut driver) and they should not be performed for devices that do not support them in any case. At the same time, there are older NKEY devices that have only been tested with these initializations in the kernel and it is not possible to recheck them. There is a possibility that especially with the ID1 initialization, certain laptop models might have their shortcuts stop working (currently unproven). For an abundance of caution, only initialize ID1/ID2 for those older NKEY devices by introducing a quirk for them and replacing the NKEY quirk in the block that performs the inits with that. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 415d067938e3..db2cc9922447 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -89,6 +89,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define QUIRK_ROG_NKEY_KEYBOARD BIT(11) #define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12) #define QUIRK_ROG_ALLY_XPAD BIT(13) +#define QUIRK_ROG_NKEY_LEGACY BIT(14) =20 #define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \ @@ -651,7 +652,7 @@ static int asus_kbd_register_leds(struct hid_device *hd= ev) if (!(kbd_func & SUPPORT_KBD_BACKLIGHT)) return -ENODEV; =20 - if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { + if (drvdata->quirks & QUIRK_ROG_NKEY_LEGACY) { ret =3D asus_kbd_init(hdev, FEATURE_KBD_LED_REPORT_ID1); if (ret < 0) return ret; @@ -1375,10 +1376,10 @@ static const struct hid_device_id asus_devices[] = =3D { QUIRK_USE_KBD_BACKLIGHT }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_LEGA= CY }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_LEGA= CY }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay10.grserver.gr (relay10.grserver.gr [37.27.248.198]) (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 A2EDA2EFD8A; Thu, 20 Nov 2025 09:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.27.248.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632000; cv=none; b=lbjDyHhUXBfLMkSRyoKIQiWLSf76NZA4dDn3HdMNv8D0E+LhgmhjjJdK3ZlTH5/kLXfHcpPaaenkBnz07kB6ZAGfFUDz+rRh41cq0jN4iakw/tWl4jiLoMoqBulaep9D+4BORQ+wcL66DydRdjRvsHq6kwz2CUrWmwLuH59s5V4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632000; c=relaxed/simple; bh=5r7hDakSQCJENF1GyKBSr0/Mz8svpuqVDk08dKedAgQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UvPJ4l4XMPyAoVzBNZhWRNo24GNAL8Nshky2jYnwWv+MLwnQhldpUpB3BE7nBrbEOJcAaoo2XiSb2MNjYD9TfblTUedHSoSQ57JBSxT9wAJeBsrLuimo+i+/bMQ+XbtVDkq61X/HzFzMEeliNwM7aor07KHf0kpq6eB6Wtqmgus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=BCQZEkhT; arc=none smtp.client-ip=37.27.248.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="BCQZEkhT" Received: from relay10 (localhost.localdomain [127.0.0.1]) by relay10.grserver.gr (Proxmox) with ESMTP id 6968C3F460; Thu, 20 Nov 2025 11:46:31 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay10.grserver.gr (Proxmox) with ESMTPS id E9D1D3F467; Thu, 20 Nov 2025 11:46:30 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 96DE21FE32D; Thu, 20 Nov 2025 11:46:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631990; bh=QavA98H7eQdNhmPGYR4OwTP8sJAhXlqcgC3jWDfuuLY=; h=From:To:Subject; b=BCQZEkhTlNcRDwE85t4+bPulj4PofdJ8X3FkAD0tgKYBGXPfuMppk7aKH+VyD73bP RLPWXhHb8V0IYeZJllkr7eqXuUYig9ri1sPPthuSeBQHAYfDgAWxXKaLHDSJHS1i6+ 9A74AiA2+FL8zz/x1yVH0T+pfYJoVRyarVg/lcfkwyExJPZ7QA7kLOWVPZP7bU4aZj zR438OrTJsO7m/RbXqcz7EYlgBwdTb1DP5rFR+hx6SHjWPYITxlY6gKnvd27CCBOlZ 2/2zPTyYOaQio63W6NNtO7jvgsHmkASimv+9Jf65YRFXyGcCebNvFV8GYeeXnwbp9G UN01PuTSowfTg== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 03/11] HID: asus: use same report_id in response Date: Thu, 20 Nov 2025 10:46:09 +0100 Message-ID: <20251120094617.11672-4-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199044.1474992.611343128970856896@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Currently, asus_kbd_get_functions prods the device using feature report report_id, but then is hardcoded to check the response through FEATURE_KBD_REPORT_ID. This only works if report_id is that value (currently true). So, use report_id in the response as well to maintain functionality if that value changes in the future. Reviewed-by: Denis Benato Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index db2cc9922447..6de402d215d0 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -423,7 +423,7 @@ static int asus_kbd_get_functions(struct hid_device *hd= ev, if (!readbuf) return -ENOMEM; =20 - ret =3D hid_hw_raw_request(hdev, FEATURE_KBD_REPORT_ID, readbuf, + ret =3D hid_hw_raw_request(hdev, report_id, readbuf, FEATURE_KBD_REPORT_SIZE, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret < 0) { --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay13.grserver.gr (relay13.grserver.gr [178.156.171.147]) (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 DAC9827A93C; Thu, 20 Nov 2025 09:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.156.171.147 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631997; cv=none; b=lOl5GuVm0bM7o1L862Gl2LJcQu2cqw50N0vT+Vb3iU+lKCmICeE3E5AXIg4mo3Xd/iNm+yOsTphYm/Y5JscbyPnL0PzoVvS5QdF9hj6aKp2HIzdtF0Yb16gFJbs1TamGrKFt5BNWR1BmIxdoTKCJD/4rWAdMs+c3VmkOx/jeMWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631997; c=relaxed/simple; bh=CgGemqdrEFX0fCobHeAikO6gj72kpNIrSxh4ZmKnhls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mPNTF2rMgsPJ/+hCM8hQclNO/hb2jMgpXvTe95/hFsXNeUJ/rReyBKB55/9n4FpN+unTskVBcpmPoyJ0JtFkrbvqbZEZEcxMXLhIIyTYs+r+sUP18xqFBCqKnMSDG2oo2/mv91RQAymvo3vth7gPTXIk2pOxuzhhGwJnS3QNkI8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=TafPh4Lt; arc=none smtp.client-ip=178.156.171.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="TafPh4Lt" Received: from relay13 (localhost [127.0.0.1]) by relay13.grserver.gr (Proxmox) with ESMTP id D8A8E5E61E; Thu, 20 Nov 2025 11:46:32 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay13.grserver.gr (Proxmox) with ESMTPS id 4C39F5E5EC; Thu, 20 Nov 2025 11:46:32 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id B55D51FE2E1; Thu, 20 Nov 2025 11:46:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631991; bh=+/eOd+/32V6nu9WynOaEVZ4m9WyGKr6zjXw8fRaHFZ0=; h=From:To:Subject; b=TafPh4LtAPFzrndeLvtJ/tZjbI16JQdTqf+BtE2Vxb4Bpg6N7H22k7Lmt0TiYX+ql 5iwC4zyxXsZbJUcwfPuzFcdA9EkHW5IQ+5ydMOYVFAZvBj4Blj++NnR5aG+QRqMoLT 8fL5d2YBjVsPY83rK3twdKMMfRAGKA6Ag+B7bIxe6+wtX/uwYzEInUOCCSBiLj4etO +XM1BKpDCC+TkA0Bopav03GBfFe0y0WbKdT2VbJqJXEL3D+zC7mshbQSl2hRxynZBm 6MlySkbdOShmWyVbDHFTG1Fij9BP6rF9N+3Dxr7Fvg7fdrFzSvf+lDww4McHmKKuJ0 /Gl1/0RUwBVPw== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 04/11] HID: asus: fortify keyboard handshake Date: Thu, 20 Nov 2025 10:46:10 +0100 Message-ID: <20251120094617.11672-5-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199140.1475065.12025952639067331988@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Handshaking with an Asus device involves sending it a feature report with the string "ASUS Tech.Inc." and then reading it back to verify the handshake was successful, under the feature ID the interaction will take place. Currently, the driver only does the first part. Add the readback to verify the handshake was successful. As this could cause breakages, allow the verification to fail with a dmesg error until we verify all devices work with it (they seem to). Since the response is more than 16 bytes, increase the buffer size to 64 as well to avoid overflow errors. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 6de402d215d0..5149dc7edfc5 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -48,7 +48,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define FEATURE_REPORT_ID 0x0d #define INPUT_REPORT_ID 0x5d #define FEATURE_KBD_REPORT_ID 0x5a -#define FEATURE_KBD_REPORT_SIZE 16 +#define FEATURE_KBD_REPORT_SIZE 64 #define FEATURE_KBD_LED_REPORT_ID1 0x5d #define FEATURE_KBD_LED_REPORT_ID2 0x5e =20 @@ -394,14 +394,40 @@ static int asus_kbd_set_report(struct hid_device *hde= v, const u8 *buf, size_t bu =20 static int asus_kbd_init(struct hid_device *hdev, u8 report_id) { + /* + * The handshake is first sent as a set_report, then retrieved + * from a get_report. They should be equal. + */ const u8 buf[] =3D { report_id, 0x41, 0x53, 0x55, 0x53, 0x20, 0x54, 0x65, 0x63, 0x68, 0x2e, 0x49, 0x6e, 0x63, 0x2e, 0x00 }; + u8 *readbuf; int ret; =20 ret =3D asus_kbd_set_report(hdev, buf, sizeof(buf)); - if (ret < 0) - hid_err(hdev, "Asus failed to send init command: %d\n", ret); + if (ret < 0) { + hid_err(hdev, "Asus failed to send handshake: %d\n", ret); + return ret; + } + + readbuf =3D kzalloc(FEATURE_KBD_REPORT_SIZE, GFP_KERNEL); + if (!readbuf) + return -ENOMEM; + + ret =3D hid_hw_raw_request(hdev, report_id, readbuf, + FEATURE_KBD_REPORT_SIZE, HID_FEATURE_REPORT, + HID_REQ_GET_REPORT); + if (ret < 0) { + hid_err(hdev, "Asus failed to receive handshake ack: %d\n", ret); + } else if (memcmp(readbuf, buf, sizeof(buf)) !=3D 0) { + hid_warn(hdev, "Asus handshake returned invalid response: %*ph\n", + FEATURE_KBD_REPORT_SIZE, readbuf); + /* + * Do not return error if handshake is wrong until this is + * verified to work for all devices. + */ + } =20 + kfree(readbuf); return ret; } =20 --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay15.grserver.gr (relay15.grserver.gr [46.62.234.254]) (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 92A9E31ED75; Thu, 20 Nov 2025 09:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.62.234.254 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632004; cv=none; b=gdXfTYtuBiqiKCiCn+pUhQOijeSaNNeKd7ZdI9fk5j/jbkftAYhSgICgwoNQWoIFu7lCOLEdjKltEs90yXATI+E8Jcp1/8z3PxQdQPFFhulDtXdtmzcR3AS3U33HBZk6np8JpuPu/gQnDuMWHR5tYcSg3KIAIAk+Za5LJlLOy60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632004; c=relaxed/simple; bh=PXY8Ijk4LqnDj8rD8OJlFkL+PdzysTHGHHyRHgkerfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T90bW97qbQlrGNGUy6C0Lp7bfMtdRxD+h48FSS7vkuiCfWcnyYDH8IxPcgx/jKEXQKJOiZnA4kDOPHZdbOg5ePQg+cInV17NvPqeWZyrYedUmqRFNWWKG7pYLjPESV0m5Bx8JbxsDlqNyCg10SbwW34LyYWIjiBikH1vkvXZOr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=GGGNhas0; arc=none smtp.client-ip=46.62.234.254 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="GGGNhas0" Received: from relay15 (localhost [127.0.0.1]) by relay15.grserver.gr (Proxmox) with ESMTP id C10B543ED5; Thu, 20 Nov 2025 09:46:33 +0000 (UTC) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay15.grserver.gr (Proxmox) with ESMTPS id F0D0343F77; Thu, 20 Nov 2025 09:46:32 +0000 (UTC) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id AB1921FE32D; Thu, 20 Nov 2025 11:46:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631992; bh=3sfmN9T6gZRv6Jg2Cdddzudl3Go6cKhi4VQLLLakOwo=; h=From:To:Subject; b=GGGNhas0KoGYJuDbAQxRDy6ErUZ6NV3Nkot8Ohj2m5zTQbk+FHrDsIod50rkYqlJm +Hb+b7L9Q1ne9wU1DZ7om6zxEwVeHEt7KB5zpO1SGEiqFpGFCInOObk6c9ESQVXLin uo4YPlQoCYtXlJFbwfg+Z1YVGPQI2081Q9YLeZO+uv7WP1CY8lvFasiVnisrydEZwI qTQJg33SSQMhFGZ+JlS6ZCFxf8VQ0d0CN5x+IuP/ByMaggal4maTkciibAdzcbaZMs thlnlKmWm6jm+mmfGO1HgfZT1f2KRKTAUkLmoxW4KmKJbNm2ZQJt/oVLTqSeX6N8D/ 8MC9SS42+8axA== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 05/11] HID: asus: move vendor initialization to probe Date: Thu, 20 Nov 2025 10:46:11 +0100 Message-ID: <20251120094617.11672-6-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199247.1475103.4032960527034339917@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" ROG NKEY devices have multiple HID endpoints, around 3-4. One of those endpoints has a usage page of 0xff31, and is the one that emits keyboard shortcuts and controls RGB/backlight. Currently, this driver places the usage page check under asus_input_mapping and then inits backlight in asus_input_configured which is unnecessarily complicated and prevents probe from performing customizations on the vendor endpoint. Simplify the logic by introducing an is_vendor variable into probe that checks for usage page 0xff31. Then, use this variable to move backlight initialization into probe instead of asus_input_configured, and remove the backlight check from asus_input_mapping. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 5149dc7edfc5..3047bc54bf2e 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -47,6 +47,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define T100CHI_MOUSE_REPORT_ID 0x06 #define FEATURE_REPORT_ID 0x0d #define INPUT_REPORT_ID 0x5d +#define HID_USAGE_PAGE_VENDOR 0xff310000 #define FEATURE_KBD_REPORT_ID 0x5a #define FEATURE_KBD_REPORT_SIZE 64 #define FEATURE_KBD_LED_REPORT_ID1 0x5d @@ -126,7 +127,6 @@ struct asus_drvdata { struct input_dev *tp_kbd_input; struct asus_kbd_leds *kbd_backlight; const struct asus_touchpad_info *tp; - bool enable_backlight; struct power_supply *battery; struct power_supply_desc battery_desc; int battery_capacity; @@ -317,7 +317,7 @@ static int asus_e1239t_event(struct asus_drvdata *drvda= t, u8 *data, int size) static int asus_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { - if ((usage->hid & HID_USAGE_PAGE) =3D=3D 0xff310000 && + if ((usage->hid & HID_USAGE_PAGE) =3D=3D HID_USAGE_PAGE_VENDOR && (usage->hid & HID_USAGE) !=3D 0x00 && (usage->hid & HID_USAGE) !=3D 0xff && !usage->type) { hid_warn(hdev, "Unmapped Asus vendor usagepage code 0x%02x\n", @@ -942,11 +942,6 @@ static int asus_input_configured(struct hid_device *hd= ev, struct hid_input *hi) =20 drvdata->input =3D input; =20 - if (drvdata->enable_backlight && - !asus_kbd_wmi_led_control_present(hdev) && - asus_kbd_register_leds(hdev)) - hid_warn(hdev, "Failed to initialize backlight.\n"); - return 0; } =20 @@ -1019,15 +1014,6 @@ static int asus_input_mapping(struct hid_device *hde= v, return -1; } =20 - /* - * Check and enable backlight only on devices with UsagePage =3D=3D - * 0xff31 to avoid initializing the keyboard firmware multiple - * times on devices with multiple HID descriptors but same - * PID/VID. - */ - if (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) - drvdata->enable_backlight =3D true; - set_bit(EV_REP, hi->input->evbit); return 1; } @@ -1144,8 +1130,11 @@ static int __maybe_unused asus_reset_resume(struct h= id_device *hdev) =20 static int asus_probe(struct hid_device *hdev, const struct hid_device_id = *id) { - int ret; + struct hid_report_enum *rep_enum; struct asus_drvdata *drvdata; + struct hid_report *rep; + bool is_vendor =3D false; + int ret; =20 drvdata =3D devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL); if (drvdata =3D=3D NULL) { @@ -1229,12 +1218,24 @@ static int asus_probe(struct hid_device *hdev, cons= t struct hid_device_id *id) return ret; } =20 + /* Check for vendor for RGB init and handle generic devices properly. */ + rep_enum =3D &hdev->report_enum[HID_INPUT_REPORT]; + list_for_each_entry(rep, &rep_enum->report_list, list) { + if ((rep->application & HID_USAGE_PAGE) =3D=3D HID_USAGE_PAGE_VENDOR) + is_vendor =3D true; + } + ret =3D hid_hw_start(hdev, HID_CONNECT_DEFAULT); if (ret) { hid_err(hdev, "Asus hw start failed: %d\n", ret); return ret; } =20 + if (is_vendor && (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) && + !asus_kbd_wmi_led_control_present(hdev) && + asus_kbd_register_leds(hdev)) + hid_warn(hdev, "Failed to initialize backlight.\n"); + /* * Check that input registration succeeded. Checking that * HID_CLAIMED_INPUT is set prevents a UAF when all input devices --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay13.grserver.gr (relay13.grserver.gr [178.156.171.147]) (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 9E70C2F0C7D; Thu, 20 Nov 2025 09:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.156.171.147 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631997; cv=none; b=FDeYHGqARWXLyZjA0t6cYYjbEUcGJmixx8CwUL48jVxQJST2iJ1Em1ZJ+0R+g8jE0wUyGjFDmuImXRE4TP2DKshOkc898kr31Xg3mv2ZvQvoHJ9AWqsR7xOIb/M83tL7bo0rUM6iqGmF79R6al7DtFYYz4gay8MM7s3O5U3+6YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631997; c=relaxed/simple; bh=wWg8QNr0FyH7xFsLomv4FjvFmb3WDim7ZRLGcEqJhqE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AyFuy5I1mLfGrVGfluHbhBfq5vrq/UY6mcVsIB+U4G/AaloqxjGfTDfJR13WQTd0zMQs8CsqMEVpD4Mt6IwAeYXno5TU8hIN7z1AVNEXSp8JSOF4d9OtY9a6XW/Fl0k5JK4Kf94jQx+YeRPLYgab/pX9GnN1DnmtiN+24gruqTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=TrmQBBit; arc=none smtp.client-ip=178.156.171.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="TrmQBBit" Received: from relay13 (localhost [127.0.0.1]) by relay13.grserver.gr (Proxmox) with ESMTP id AC8DE5E5F2; Thu, 20 Nov 2025 11:46:34 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay13.grserver.gr (Proxmox) with ESMTPS id 38AC05E567; Thu, 20 Nov 2025 11:46:34 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id BD6DA1FE2E1; Thu, 20 Nov 2025 11:46:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631993; bh=PE0/ftMO6HMWnVP4uB//u99l0xua7PGR+qAAsD061oU=; h=From:To:Subject; b=TrmQBBits5+RcyqMDrOMbSZWCNcKZ7NEvuBUxRSPxGe6/JMmoXWe6LDIPDXwQ7ATq cw1NnTRtJyMcsqFCa2maOsSAXnSjStbtLf4qutJyL7q6EBk7H6dpAt97e5GbqIHY3/ 0lxIWwo4Vw1YpZrh5EIJFBvW6dzlKpEuHCz/1hM8lSZKfzPv+R/p6wUHpcFqeBUDhO IAnOSCbfNCQyr8LZ2EaGzDwA5iAgIWaWO8BoCbTnIt7NnZqAkvMq5FGpXebs2VGBIy J78zraYXcJkMEtSp+qVqrOqDLhBA4ekU0EpYCzt2QwrNSGhxR0ciIVDYkSQHZvVKjv b+23UXzMAOEkQ== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 06/11] HID: asus: early return for ROG devices Date: Thu, 20 Nov 2025 10:46:12 +0100 Message-ID: <20251120094617.11672-7-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199334.1475148.7340417949826744481@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Some ROG devices have a new dynamic backlight interface for control by Windows. This interface does not create an ->input device, causing the kernel to print an error message and to eject it. In addition, ROG devices have proper HID names in their descriptors so renaming them is not necessary. Therefore, if a device is identified as ROG, early return from probe to skip renaming and ->input checks. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 3047bc54bf2e..6193c9483bec 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1236,6 +1236,13 @@ static int asus_probe(struct hid_device *hdev, const= struct hid_device_id *id) asus_kbd_register_leds(hdev)) hid_warn(hdev, "Failed to initialize backlight.\n"); =20 + /* + * For ROG keyboards, skip rename for consistency and ->input check as + * some devices do not have inputs. + */ + if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) + return 0; + /* * Check that input registration succeeded. Checking that * HID_CLAIMED_INPUT is set prevents a UAF when all input devices --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay15.grserver.gr (relay15.grserver.gr [46.62.234.254]) (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 96C3B325706; Thu, 20 Nov 2025 09:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.62.234.254 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632005; cv=none; b=p1ieKryCbF/pzWDbJ+mnQscL7iDqO+jj0kilPJ3j0Z29nCRDcQ4zgYHVgY1V9DHClvU6a8YHZhRzqIdR/8FXsoZjgjFVaYLkQemrJ1VRFC8Q+gJnwT1C/OibgtHn6BRmJePEAS6telFbGBfSvQ8IJmsp7xFuqJvD1Y8qHfH1SvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632005; c=relaxed/simple; bh=q7SnLotfA3OAN+uNLTeLoIDsEoMgnMLTlTZmPh5/dHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ij86uUBeM3YjvMuQEvqZ9RAh7mtChHC8Bzc0SwjKMgx648NKo7bC4uMTcO6eSEoAazTaePmlDwSShHRZVvmvyH29zvICJiB5xZDfyVhauUCm/6FysQVTdcoTfIG1wscaQTVLx1S5rc3LIitD70Gru2OVFutrOIAHGm9PNVMscKU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=Dk1yzfFn; arc=none smtp.client-ip=46.62.234.254 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="Dk1yzfFn" Received: from relay15 (localhost [127.0.0.1]) by relay15.grserver.gr (Proxmox) with ESMTP id 0F55243F67; Thu, 20 Nov 2025 09:46:36 +0000 (UTC) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay15.grserver.gr (Proxmox) with ESMTPS id B6FEA43F8A; Thu, 20 Nov 2025 09:46:34 +0000 (UTC) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 9EBB91FE32D; Thu, 20 Nov 2025 11:46:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631994; bh=K+2FuPgptvtYl0BddS0n7S4STPulspbgqEsSEFKxzks=; h=From:To:Subject; b=Dk1yzfFnVrFoFcliVbmK+X8+ESzzoeoq2D29N2fcWNRjgpgfkZjeBmTROe4MJ9yas qKC/JHRuMsXV8quDFAy2lhveii/FU9ndER4gXe68/g2IdGIhVLxLDa8k7G7jO9xsnE Zbv9JW5VUGzYA8xkzecQU/2/HKvavCGhSQWh5FJFozI04lJJUhWuE8RpjlRuaqooZT imZbXEB2e0t/2CCH1uuTZRviNRDcSq202MeOWN0Q15QdoVEEJzGlH3PLMar38CLNjF s/3J2A9ZR+QzjE95ZBB6fzB7+78aW/SFOJ8hYsSP2aX0SIIDVlHqfmc+uljbF5M1aL N4GwEqNIJwJ7w== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 07/11] platform/x86: asus-wmi: Add support for multiple kbd led handlers Date: Thu, 20 Nov 2025 10:46:13 +0100 Message-ID: <20251120094617.11672-8-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199422.1475190.11199381847615435621@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Some devices, such as the Z13 have multiple Aura devices connected to them by USB. In addition, they might have a WMI interface for RGB. In Windows, Armoury Crate exposes a unified brightness slider for all of them, with 3 brightness levels. Therefore, to be synergistic in Linux, and support existing tooling such as UPower, allow adding listeners to the RGB device of the WMI interface. If WMI does not exist, lazy initialize the interface. Since hid-asus and asus-wmi can both interact with the led objects including from an atomic context, protect the brightness access with a spinlock and update the values from a workqueue. Use this workqueue to also process WMI keyboard events, so they are handled asynchronously. Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/asus-wmi.c | 174 ++++++++++++++++++--- include/linux/platform_data/x86/asus-wmi.h | 17 ++ 2 files changed, 167 insertions(+), 24 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index e72a2b5d158e..5f23aedbf34f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include =20 @@ -258,6 +259,9 @@ struct asus_wmi { int tpd_led_wk; struct led_classdev kbd_led; int kbd_led_wk; + bool kbd_led_notify; + bool kbd_led_avail; + bool kbd_led_registered; struct led_classdev lightbar_led; int lightbar_led_wk; struct led_classdev micmute_led; @@ -266,6 +270,7 @@ struct asus_wmi { struct work_struct tpd_led_work; struct work_struct wlan_led_work; struct work_struct lightbar_led_work; + struct work_struct kbd_led_work; =20 struct asus_rfkill wlan; struct asus_rfkill bluetooth; @@ -1530,6 +1535,99 @@ static void asus_wmi_battery_exit(struct asus_wmi *a= sus) =20 /* LEDs ******************************************************************= *****/ =20 +struct asus_hid_ref { + struct list_head listeners; + struct asus_wmi *asus; + /* Protects concurrent access from hid-asus and asus-wmi to leds */ + spinlock_t lock; +}; + +static struct asus_hid_ref asus_ref =3D { + .listeners =3D LIST_HEAD_INIT(asus_ref.listeners), + .asus =3D NULL, + /* + * Protects .asus, .asus.kbd_led_{wk,notify}, and .listener refs. Other + * asus variables are read-only after .asus is set. Except the led cdev + * device if not kbd_led_avail. That becomes read-only after the + * first hid-asus listener registers and triggers the work queue. It is + * then not referenced again until unregistering, which happens after + * .asus ref is dropped. Since .asus needs to be accessed by hid-asus + * IRQs to check if forwarding events is possible, a spinlock is used. + */ + .lock =3D __SPIN_LOCK_UNLOCKED(asus_ref.lock), +}; + +/* + * Allows registering hid-asus listeners that want to be notified of + * keyboard backlight changes. + */ +int asus_hid_register_listener(struct asus_hid_listener *bdev) +{ + struct asus_wmi *asus; + + guard(spinlock_irqsave)(&asus_ref.lock); + list_add_tail(&bdev->list, &asus_ref.listeners); + asus =3D asus_ref.asus; + if (asus) + queue_work(asus->led_workqueue, &asus->kbd_led_work); + return 0; +} +EXPORT_SYMBOL_GPL(asus_hid_register_listener); + +/* + * Allows unregistering hid-asus listeners that were added with + * asus_hid_register_listener(). + */ +void asus_hid_unregister_listener(struct asus_hid_listener *bdev) +{ + guard(spinlock_irqsave)(&asus_ref.lock); + list_del(&bdev->list); +} +EXPORT_SYMBOL_GPL(asus_hid_unregister_listener); + +static void do_kbd_led_set(struct led_classdev *led_cdev, int value); + +static void kbd_led_update_all(struct work_struct *work) +{ + struct asus_wmi *asus; + bool registered, notify; + int ret, value; + + asus =3D container_of(work, struct asus_wmi, kbd_led_work); + + scoped_guard(spinlock_irqsave, &asus_ref.lock) { + registered =3D asus->kbd_led_registered; + value =3D asus->kbd_led_wk; + notify =3D asus->kbd_led_notify; + } + + if (!registered) { + /* + * This workqueue runs under asus-wmi, which means probe has + * completed and asus-wmi will keep running until it finishes. + * Therefore, we can safely register the LED without holding + * a spinlock. + */ + ret =3D devm_led_classdev_register(&asus->platform_device->dev, + &asus->kbd_led); + if (!ret) { + scoped_guard(spinlock_irqsave, &asus_ref.lock) + asus->kbd_led_registered =3D true; + } else { + pr_warn("Failed to register keyboard backlight LED: %d\n", ret); + return; + } + } + + if (value >=3D 0) + do_kbd_led_set(&asus->kbd_led, value); + if (notify) { + scoped_guard(spinlock_irqsave, &asus_ref.lock) + asus->kbd_led_notify =3D false; + led_classdev_notify_brightness_hw_changed(&asus->kbd_led, value); + } +} + /* * These functions actually update the LED's, and are called from a * workqueue. By doing this as separate work rather than when the LED @@ -1576,7 +1674,8 @@ static void kbd_led_update(struct asus_wmi *asus) { int ctrl_param =3D 0; =20 - ctrl_param =3D 0x80 | (asus->kbd_led_wk & 0x7F); + scoped_guard(spinlock_irqsave, &asus_ref.lock) + ctrl_param =3D 0x80 | (asus->kbd_led_wk & 0x7F); asus_wmi_set_devstate(ASUS_WMI_DEVID_KBD_BACKLIGHT, ctrl_param, NULL); } =20 @@ -1609,14 +1708,23 @@ static int kbd_led_read(struct asus_wmi *asus, int = *level, int *env) =20 static void do_kbd_led_set(struct led_classdev *led_cdev, int value) { + struct asus_hid_listener *listener; struct asus_wmi *asus; int max_level; =20 asus =3D container_of(led_cdev, struct asus_wmi, kbd_led); max_level =3D asus->kbd_led.max_brightness; =20 - asus->kbd_led_wk =3D clamp_val(value, 0, max_level); - kbd_led_update(asus); + scoped_guard(spinlock_irqsave, &asus_ref.lock) + asus->kbd_led_wk =3D clamp_val(value, 0, max_level); + + if (asus->kbd_led_avail) + kbd_led_update(asus); + + scoped_guard(spinlock_irqsave, &asus_ref.lock) { + list_for_each_entry(listener, &asus_ref.listeners, list) + listener->brightness_set(listener, asus->kbd_led_wk); + } } =20 static void kbd_led_set(struct led_classdev *led_cdev, @@ -1631,10 +1739,11 @@ static void kbd_led_set(struct led_classdev *led_cd= ev, =20 static void kbd_led_set_by_kbd(struct asus_wmi *asus, enum led_brightness = value) { - struct led_classdev *led_cdev =3D &asus->kbd_led; - - do_kbd_led_set(led_cdev, value); - led_classdev_notify_brightness_hw_changed(led_cdev, asus->kbd_led_wk); + scoped_guard(spinlock_irqsave, &asus_ref.lock) { + asus->kbd_led_wk =3D value; + asus->kbd_led_notify =3D true; + } + queue_work(asus->led_workqueue, &asus->kbd_led_work); } =20 static enum led_brightness kbd_led_get(struct led_classdev *led_cdev) @@ -1644,10 +1753,18 @@ static enum led_brightness kbd_led_get(struct led_c= lassdev *led_cdev) =20 asus =3D container_of(led_cdev, struct asus_wmi, kbd_led); =20 + scoped_guard(spinlock_irqsave, &asus_ref.lock) { + if (!asus->kbd_led_avail) + return asus->kbd_led_wk; + } + retval =3D kbd_led_read(asus, &value, NULL); if (retval < 0) return retval; =20 + scoped_guard(spinlock_irqsave, &asus_ref.lock) + asus->kbd_led_wk =3D value; + return value; } =20 @@ -1759,7 +1876,9 @@ static int camera_led_set(struct led_classdev *led_cd= ev, =20 static void asus_wmi_led_exit(struct asus_wmi *asus) { - led_classdev_unregister(&asus->kbd_led); + scoped_guard(spinlock_irqsave, &asus_ref.lock) + asus_ref.asus =3D NULL; + led_classdev_unregister(&asus->tpd_led); led_classdev_unregister(&asus->wlan_led); led_classdev_unregister(&asus->lightbar_led); @@ -1797,22 +1916,25 @@ static int asus_wmi_led_init(struct asus_wmi *asus) goto error; } =20 - if (!kbd_led_read(asus, &led_val, NULL) && !dmi_check_system(asus_use_hid= _led_dmi_ids)) { - pr_info("using asus-wmi for asus::kbd_backlight\n"); - asus->kbd_led_wk =3D led_val; - asus->kbd_led.name =3D "asus::kbd_backlight"; - asus->kbd_led.flags =3D LED_BRIGHT_HW_CHANGED; - asus->kbd_led.brightness_set =3D kbd_led_set; - asus->kbd_led.brightness_get =3D kbd_led_get; - asus->kbd_led.max_brightness =3D 3; + asus->kbd_led.name =3D "asus::kbd_backlight"; + asus->kbd_led.flags =3D LED_BRIGHT_HW_CHANGED; + asus->kbd_led.brightness_set =3D kbd_led_set; + asus->kbd_led.brightness_get =3D kbd_led_get; + asus->kbd_led.max_brightness =3D 3; + asus->kbd_led_avail =3D !kbd_led_read(asus, &led_val, NULL); + INIT_WORK(&asus->kbd_led_work, kbd_led_update_all); =20 + if (asus->kbd_led_avail) { + asus->kbd_led_wk =3D led_val; if (num_rgb_groups !=3D 0) asus->kbd_led.groups =3D kbd_rgb_mode_groups; + } else + asus->kbd_led_wk =3D -1; =20 - rv =3D led_classdev_register(&asus->platform_device->dev, - &asus->kbd_led); - if (rv) - goto error; + scoped_guard(spinlock_irqsave, &asus_ref.lock) { + asus_ref.asus =3D asus; + if (asus->kbd_led_avail || !list_empty(&asus_ref.listeners)) + queue_work(asus->led_workqueue, &asus->kbd_led_work); } =20 if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_WIRELESS_LED) @@ -4272,6 +4394,7 @@ static int asus_wmi_get_event_code(union acpi_object = *obj) =20 static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus) { + enum led_brightness led_value; unsigned int key_value =3D 1; bool autorelease =3D 1; =20 @@ -4288,19 +4411,22 @@ static void asus_wmi_handle_event_code(int code, st= ruct asus_wmi *asus) return; } =20 + scoped_guard(spinlock_irqsave, &asus_ref.lock) + led_value =3D asus->kbd_led_wk; + if (code =3D=3D NOTIFY_KBD_BRTUP) { - kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1); + kbd_led_set_by_kbd(asus, led_value + 1); return; } if (code =3D=3D NOTIFY_KBD_BRTDWN) { - kbd_led_set_by_kbd(asus, asus->kbd_led_wk - 1); + kbd_led_set_by_kbd(asus, led_value - 1); return; } if (code =3D=3D NOTIFY_KBD_BRTTOGGLE) { - if (asus->kbd_led_wk =3D=3D asus->kbd_led.max_brightness) + if (led_value =3D=3D asus->kbd_led.max_brightness) kbd_led_set_by_kbd(asus, 0); else - kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1); + kbd_led_set_by_kbd(asus, led_value + 1); return; } =20 diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 8a515179113d..1165039013b1 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -163,11 +163,20 @@ enum asus_ally_mcu_hack { ASUS_WMI_ALLY_MCU_HACK_DISABLED, }; =20 +/* Used to notify hid-asus when asus-wmi changes keyboard backlight */ +struct asus_hid_listener { + struct list_head list; + void (*brightness_set)(struct asus_hid_listener *listener, int brightness= ); +}; + #if IS_REACHABLE(CONFIG_ASUS_WMI) void set_ally_mcu_hack(enum asus_ally_mcu_hack status); void set_ally_mcu_powersave(bool enabled); int asus_wmi_set_devstate(u32 dev_id, u32 ctrl_param, u32 *retval); int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retva= l); + +int asus_hid_register_listener(struct asus_hid_listener *cdev); +void asus_hid_unregister_listener(struct asus_hid_listener *cdev); #else static inline void set_ally_mcu_hack(enum asus_ally_mcu_hack status) { @@ -184,6 +193,14 @@ static inline int asus_wmi_evaluate_method(u32 method_= id, u32 arg0, u32 arg1, { return -ENODEV; } + +static inline int asus_hid_register_listener(struct asus_hid_listener *bde= v) +{ + return -ENODEV; +} +static inline void asus_hid_unregister_listener(struct asus_hid_listener *= bdev) +{ +} #endif =20 /* To be used by both hid-asus and asus-wmi to determine which controls kb= d_brightness */ --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay13.grserver.gr (relay13.grserver.gr [178.156.171.147]) (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 96FE02ECE85; Thu, 20 Nov 2025 09:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.156.171.147 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631999; cv=none; b=ApW/S+jP7uNdBJo0qi54w2RNF3ifarAcfez6onvfksdhS3fbnslvG6TNQg+mbMvvxGe0pP/2bocD2H1ExHI4nzmAmSNbMwo3Na90dkEzyWeDt05wTgYhyEv9Ib4JBmwo42DTwYnB//lDaS11uZhJyb4PKEmKgi1+dTZS68tISPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763631999; c=relaxed/simple; bh=jxlMT6BahZI4UcK0eh7O8oc/emwtGbYIdQCxJqfsOqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=STWsO6LWpaDW58LLTUdBRhBoH/I+zjfcmGjPFSxo5sQVtCWO/De4b8yV+fkgC5lRA6ahG1LUHb0tahbbVy7GQtG3Ep1gQ9yqtUbk1GWAJJfrPkTtEm9nUBXWDa7inxwG+hA0qHAHGVD3qHcgAOc20SuAuRWRD6hTzFU/IG5ghyw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=cc4NhvkN; arc=none smtp.client-ip=178.156.171.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="cc4NhvkN" Received: from relay13 (localhost [127.0.0.1]) by relay13.grserver.gr (Proxmox) with ESMTP id C1D4A5E567; Thu, 20 Nov 2025 11:46:36 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay13.grserver.gr (Proxmox) with ESMTPS id 1D9DF5E49A; Thu, 20 Nov 2025 11:46:36 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 985201FE2E1; Thu, 20 Nov 2025 11:46:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631995; bh=6BOCiaWvgyMTImsRms0o+GGj4vbJ5ImmF1N0y4ZEv0U=; h=From:To:Subject; b=cc4NhvkNsXxMU24MCteYUmbGSSOpf4wu9Pm0E6HWRgTrAvwSy8xzEHn4urYwv1fZ4 +O64/KwOkT8/KXVtPb52grAVzPB3ZwuZBcO097qTIFUscSmwdsHJn7B/Ts7Hz7LJB/ x5zwFCBbI7BR77SAnK3ZYAOs84YnsMzYpnV7hjPdFdCKDE1Ni7XGI38MG0Q2Sj4R1z mUeKmYzEmYtNgNvAQutvcm0baY6oyCgMOLLt4T3Y2v6jqEc3sS1R7Bu/DN/gX3tip7 fG1/mDTyR4nKfCiU3zM+/Vldn7u73XTTk+p1maVY2Ms+U0mwm0E23At6r1b4rTX6V/ moemsi1QmWu4Q== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 08/11] HID: asus: listen to the asus-wmi brightness device instead of creating one Date: Thu, 20 Nov 2025 10:46:14 +0100 Message-ID: <20251120094617.11672-9-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199522.1475236.12339258885327459506@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Some ROG laptops expose multiple interfaces for controlling the keyboard/RGB brightness. This creates a name conflict under asus::kbd_brightness, where the second device ends up being named asus::kbd_brightness_1 and they are both broken. Therefore, register a listener to the asus-wmi brightness device instead of creating a new one. Reviewed-by: Luke D. Jones Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 64 +++++++----------------------------------- 1 file changed, 10 insertions(+), 54 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 6193c9483bec..6a355c174f29 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -102,7 +102,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define TRKID_SGN ((TRKID_MAX + 1) >> 1) =20 struct asus_kbd_leds { - struct led_classdev cdev; + struct asus_hid_listener listener; struct hid_device *hdev; struct work_struct work; unsigned int brightness; @@ -494,11 +494,11 @@ static void asus_schedule_work(struct asus_kbd_leds *= led) spin_unlock_irqrestore(&led->lock, flags); } =20 -static void asus_kbd_backlight_set(struct led_classdev *led_cdev, - enum led_brightness brightness) +static void asus_kbd_backlight_set(struct asus_hid_listener *listener, + int brightness) { - struct asus_kbd_leds *led =3D container_of(led_cdev, struct asus_kbd_leds, - cdev); + struct asus_kbd_leds *led =3D container_of(listener, struct asus_kbd_leds, + listener); unsigned long flags; =20 spin_lock_irqsave(&led->lock, flags); @@ -508,20 +508,6 @@ static void asus_kbd_backlight_set(struct led_classdev= *led_cdev, asus_schedule_work(led); } =20 -static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led= _cdev) -{ - struct asus_kbd_leds *led =3D container_of(led_cdev, struct asus_kbd_leds, - cdev); - enum led_brightness brightness; - unsigned long flags; - - spin_lock_irqsave(&led->lock, flags); - brightness =3D led->brightness; - spin_unlock_irqrestore(&led->lock, flags); - - return brightness; -} - static void asus_kbd_backlight_work(struct work_struct *work) { struct asus_kbd_leds *led =3D container_of(work, struct asus_kbd_leds, wo= rk); @@ -538,34 +524,6 @@ static void asus_kbd_backlight_work(struct work_struct= *work) hid_err(led->hdev, "Asus failed to set keyboard backlight: %d\n", ret); } =20 -/* WMI-based keyboard backlight LED control (via asus-wmi driver) takes - * precedence. We only activate HID-based backlight control when the - * WMI control is not available. - */ -static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) -{ - struct asus_drvdata *drvdata =3D hid_get_drvdata(hdev); - u32 value; - int ret; - - if (!IS_ENABLED(CONFIG_ASUS_WMI)) - return false; - - if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD && - dmi_check_system(asus_use_hid_led_dmi_ids)) { - hid_info(hdev, "using HID for asus::kbd_backlight\n"); - return false; - } - - ret =3D asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS, - ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, &value); - hid_dbg(hdev, "WMI backlight check: rc %d value %x", ret, value); - if (ret) - return false; - - return !!(value & ASUS_WMI_DSTS_PRESENCE_BIT); -} - /* * We don't care about any other part of the string except the version sec= tion. * Example strings: FGA80100.RC72LA.312_T01, FGA80100.RC71LS.318_T01 @@ -710,14 +668,11 @@ static int asus_kbd_register_leds(struct hid_device *= hdev) drvdata->kbd_backlight->removed =3D false; drvdata->kbd_backlight->brightness =3D 0; drvdata->kbd_backlight->hdev =3D hdev; - drvdata->kbd_backlight->cdev.name =3D "asus::kbd_backlight"; - drvdata->kbd_backlight->cdev.max_brightness =3D 3; - drvdata->kbd_backlight->cdev.brightness_set =3D asus_kbd_backlight_set; - drvdata->kbd_backlight->cdev.brightness_get =3D asus_kbd_backlight_get; + drvdata->kbd_backlight->listener.brightness_set =3D asus_kbd_backlight_se= t; INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work); spin_lock_init(&drvdata->kbd_backlight->lock); =20 - ret =3D devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->c= dev); + ret =3D asus_hid_register_listener(&drvdata->kbd_backlight->listener); if (ret < 0) { /* No need to have this still around */ devm_kfree(&hdev->dev, drvdata->kbd_backlight); @@ -1106,7 +1061,7 @@ static int __maybe_unused asus_resume(struct hid_devi= ce *hdev) { =20 if (drvdata->kbd_backlight) { const u8 buf[] =3D { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, - drvdata->kbd_backlight->cdev.brightness }; + drvdata->kbd_backlight->brightness }; ret =3D asus_kbd_set_report(hdev, buf, sizeof(buf)); if (ret < 0) { hid_err(hdev, "Asus failed to set keyboard backlight: %d\n", ret); @@ -1232,7 +1187,6 @@ static int asus_probe(struct hid_device *hdev, const = struct hid_device_id *id) } =20 if (is_vendor && (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) && - !asus_kbd_wmi_led_control_present(hdev) && asus_kbd_register_leds(hdev)) hid_warn(hdev, "Failed to initialize backlight.\n"); =20 @@ -1279,6 +1233,8 @@ static void asus_remove(struct hid_device *hdev) unsigned long flags; =20 if (drvdata->kbd_backlight) { + asus_hid_unregister_listener(&drvdata->kbd_backlight->listener); + spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags); drvdata->kbd_backlight->removed =3D true; spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags); --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay10.grserver.gr (relay10.grserver.gr [37.27.248.198]) (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 E02F12ED873; Thu, 20 Nov 2025 09:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=37.27.248.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632000; cv=none; b=pGULZSIfyDUl+xX+DRqXVOYta7IgOvkPGjMHU4hXPernxaKa88v+0+DFSG3bhztWClhscp77GzYgE0chfu8LDW8C+B4tIBEMlZQ1UEkgi/v/4gfq6xnoZKgEZV+q8OEpfKXuEq3Z+KcwHxvPNTltcrNm7o72bwyAJVn2LdCROGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632000; c=relaxed/simple; bh=iWnWvviKiIoAUOfZH6UPzU3/CNr2UQ4mFnfhOxas+4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jf37FknHJevbO6BbqEeHu3WbsSUCFVCkMJ29VkVCZRWzhw2pbWmHYTY5R8W1pXZuyincKNh6cIdEzsuHKiwnaW+jXa0LvXrLzxl+wLXapW6kesRiz1PLF2IvCGnYP7+Bdn300J2WVsQNIXP93czm1vSB5Bw8cCrAhIy8g1byYP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=gLkwuTsw; arc=none smtp.client-ip=37.27.248.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="gLkwuTsw" Received: from relay10 (localhost.localdomain [127.0.0.1]) by relay10.grserver.gr (Proxmox) with ESMTP id 072343EBA3; Thu, 20 Nov 2025 11:46:37 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay10.grserver.gr (Proxmox) with ESMTPS id 8DFC63F3CD; Thu, 20 Nov 2025 11:46:36 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 854C01FE32D; Thu, 20 Nov 2025 11:46:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631996; bh=xkzVu4h2e+bbZw80GlBBOx18WyIenF0/Wqcf6kNO1hQ=; h=From:To:Subject; b=gLkwuTswiw2vDtP2kDR2FIoudeJNF20588+JB+ICQ8TCgbYWT33Gw8vio7WFshfQ0 Pw62geoIlywt3A72gxeP785AfaJ2s+GYP63bheCKE6/xNwUdNyar61reieG5swtyCp BZDxGsADrfqeJsVY5dqF+TGAxHyUHRuLzpJX+6KBZvMz7cF/iUHb10pel+180UefKN rJ6zMxDO+JE4VkR38Fy0xeeynr9ySfGsviC6d31kVCNIc/AaNkw1ccwlRG4lwEGxXF Iko7yxvYFINtf1I0KxeAmpUxz60K+mO9RJe/kCnYCc/sEDkpTXjtX4GRDRsr0rfTcn AfbkREbnYkuOA== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 09/11] platform/x86: asus-wmi: remove unused keyboard backlight quirk Date: Thu, 20 Nov 2025 10:46:15 +0100 Message-ID: <20251120094617.11672-10-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199606.1475271.3848844171609248545@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" The quirk for selecting whether keyboard backlight should be controlled by HID or WMI is not needed anymore, so remove it. Reviewed-by: Luke D. Jones Signed-off-by: Antheas Kapenekakis --- include/linux/platform_data/x86/asus-wmi.h | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index 1165039013b1..d8c5269854b0 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -203,44 +203,4 @@ static inline void asus_hid_unregister_listener(struct= asus_hid_listener *bdev) } #endif =20 -/* To be used by both hid-asus and asus-wmi to determine which controls kb= d_brightness */ -static const struct dmi_system_id asus_use_hid_led_dmi_ids[] =3D { - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Zephyrus"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Strix"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "GA403U"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "GU605M"), - }, - }, - { - .matches =3D { - DMI_MATCH(DMI_BOARD_NAME, "RC71L"), - }, - }, - { }, -}; - #endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */ --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay11.grserver.gr (relay11.grserver.gr [78.46.171.57]) (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 14F3B3195E2; Thu, 20 Nov 2025 09:46:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.46.171.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632002; cv=none; b=oBMl+vS57rZa987ISbdf1H4OU7mVE716XhfFRHiOwNc4uijLztor45AbPHQr2PcRLMYoSG+F3xThlbZ22Nk4aSpvtCahVApJAP3Gkvy33ph5AAQo922pMWZlGleJZdfD37zbd1oq8FiFxvB7x0wcu6dZEhzUfkiypUtEIyGcw7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632002; c=relaxed/simple; bh=srVtS9T3D2L8mcfvKrT50+aESdXVYtmA4NA/KpDHllo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pvnRkD3lQD2h3j0qzTIDD+qj1OrZwVtxXquDSBw8w5rRlpyTsYjuUFPIJba2hQhiodpad0H2LtlbhEYODY0LI8EhBKkcigR2bjSLnoCj4xsCvV3TYC3FSeJPkqegCl6j5UlKlB8pzROuIrLRYAwQVtQ7xkJUrwowby3jN5BT+uA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=hviNx/+B; arc=none smtp.client-ip=78.46.171.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="hviNx/+B" Received: from relay11 (localhost.localdomain [127.0.0.1]) by relay11.grserver.gr (Proxmox) with ESMTP id 0C77EC2629; Thu, 20 Nov 2025 11:46:38 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay11.grserver.gr (Proxmox) with ESMTPS id 6AE1FC22D6; Thu, 20 Nov 2025 11:46:37 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 5CC5E1FE2E1; Thu, 20 Nov 2025 11:46:36 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631997; bh=RpJRazAuVLKJ4CPTPFJOlE689eMbR3VbNbnmH+jPBCA=; h=From:To:Subject; b=hviNx/+Bs2/RHoNx1F+vSCI4LFuCD0BLmbmNfRLCo6+9ZQnzgWL2JE8bm2tfVBKKY l0Wla+b3Jt8Llnenz0E1h0fPfgyzzvdcHHdQSyFvBm3ODA3o1Vatd2H2LdoiNdmK9z YaAiHCIhp/VgyRnMJfYHsi9ad5OXhe20crn7x7/M+3icSK47Jo1UT30/Bvfg4fGm9p iKR2zrWbviVLS/I+L3jEStHBrVb526p+BY5qh9QPprvMmDvBTg/Aq7lA4scfprc6b4 +F3pnPhVmvww+WJyawUkV9vstxNiIc2m9wI6lnPOIS87fzKXeVhiRYv7d062cN8We4 8n8Pic9nSJ9HQ== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 10/11] platform/x86: asus-wmi: add keyboard brightness event handler Date: Thu, 20 Nov 2025 10:46:16 +0100 Message-ID: <20251120094617.11672-11-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199692.1475330.16923485772314759582@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" The keyboard brightness control of Asus WMI keyboards is handled in kernel, which leads to the shortcut going from brightness 0, to 1, to 2, and 3. However, for HID keyboards it is exposed as a key and handled by the user's desktop environment. For the toggle button, this means that brightness control becomes on/off. In addition, in the absence of a DE, the keyboard brightness does not work. Therefore, expose an event handler for the keyboard brightness control which can then be used by hid-asus. Since this handler is called from an interrupt context, defer the actual work to a workqueue. In the process, introduce ASUS_EV_MAX_BRIGHTNESS to hold the constant for maximum brightness since it is shared between hid-asus/asus-wmi. Reviewed-by: Luke D. Jones Tested-by: Luke D. Jones Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/asus-wmi.c | 46 +++++++++++++++++++--- include/linux/platform_data/x86/asus-wmi.h | 13 ++++++ 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wm= i.c index 5f23aedbf34f..a7482c97cc5b 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -1628,6 +1628,44 @@ static void kbd_led_update_all(struct work_struct *w= ork) } } =20 +/* + * This function is called from hid-asus to inform asus-wmi of brightness + * changes initiated by the keyboard backlight keys. + */ +int asus_hid_event(enum asus_hid_event event) +{ + struct asus_wmi *asus; + int brightness; + + guard(spinlock_irqsave)(&asus_ref.lock); + asus =3D asus_ref.asus; + if (!asus || !asus->kbd_led_registered) + return -EBUSY; + + brightness =3D asus->kbd_led_wk; + + switch (event) { + case ASUS_EV_BRTUP: + brightness +=3D 1; + break; + case ASUS_EV_BRTDOWN: + brightness -=3D 1; + break; + case ASUS_EV_BRTTOGGLE: + if (brightness >=3D ASUS_EV_MAX_BRIGHTNESS) + brightness =3D 0; + else + brightness +=3D 1; + break; + } + + asus->kbd_led_wk =3D clamp_val(brightness, 0, ASUS_EV_MAX_BRIGHTNESS); + asus->kbd_led_notify =3D true; + queue_work(asus->led_workqueue, &asus->kbd_led_work); + return 0; +} +EXPORT_SYMBOL_GPL(asus_hid_event); + /* * These functions actually update the LED's, and are called from a * workqueue. By doing this as separate work rather than when the LED @@ -1710,13 +1748,11 @@ static void do_kbd_led_set(struct led_classdev *led= _cdev, int value) { struct asus_hid_listener *listener; struct asus_wmi *asus; - int max_level; =20 asus =3D container_of(led_cdev, struct asus_wmi, kbd_led); - max_level =3D asus->kbd_led.max_brightness; =20 scoped_guard(spinlock_irqsave, &asus_ref.lock) - asus->kbd_led_wk =3D clamp_val(value, 0, max_level); + asus->kbd_led_wk =3D clamp_val(value, 0, ASUS_EV_MAX_BRIGHTNESS); =20 if (asus->kbd_led_avail) kbd_led_update(asus); @@ -1920,7 +1956,7 @@ static int asus_wmi_led_init(struct asus_wmi *asus) asus->kbd_led.flags =3D LED_BRIGHT_HW_CHANGED; asus->kbd_led.brightness_set =3D kbd_led_set; asus->kbd_led.brightness_get =3D kbd_led_get; - asus->kbd_led.max_brightness =3D 3; + asus->kbd_led.max_brightness =3D ASUS_EV_MAX_BRIGHTNESS; asus->kbd_led_avail =3D !kbd_led_read(asus, &led_val, NULL); INIT_WORK(&asus->kbd_led_work, kbd_led_update_all); =20 @@ -4423,7 +4459,7 @@ static void asus_wmi_handle_event_code(int code, stru= ct asus_wmi *asus) return; } if (code =3D=3D NOTIFY_KBD_BRTTOGGLE) { - if (led_value =3D=3D asus->kbd_led.max_brightness) + if (led_value =3D=3D ASUS_EV_MAX_BRIGHTNESS) kbd_led_set_by_kbd(asus, 0); else kbd_led_set_by_kbd(asus, led_value + 1); diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/pla= tform_data/x86/asus-wmi.h index d8c5269854b0..3f679598b629 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -169,6 +169,14 @@ struct asus_hid_listener { void (*brightness_set)(struct asus_hid_listener *listener, int brightness= ); }; =20 +enum asus_hid_event { + ASUS_EV_BRTUP, + ASUS_EV_BRTDOWN, + ASUS_EV_BRTTOGGLE, +}; + +#define ASUS_EV_MAX_BRIGHTNESS 3 + #if IS_REACHABLE(CONFIG_ASUS_WMI) void set_ally_mcu_hack(enum asus_ally_mcu_hack status); void set_ally_mcu_powersave(bool enabled); @@ -177,6 +185,7 @@ int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u= 32 arg1, u32 *retval); =20 int asus_hid_register_listener(struct asus_hid_listener *cdev); void asus_hid_unregister_listener(struct asus_hid_listener *cdev); +int asus_hid_event(enum asus_hid_event event); #else static inline void set_ally_mcu_hack(enum asus_ally_mcu_hack status) { @@ -201,6 +210,10 @@ static inline int asus_hid_register_listener(struct as= us_hid_listener *bdev) static inline void asus_hid_unregister_listener(struct asus_hid_listener *= bdev) { } +static inline int asus_hid_event(enum asus_hid_event event) +{ + return -ENODEV; +} #endif =20 #endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */ --=20 2.52.0 From nobody Tue Dec 2 02:05:00 2025 Received: from relay12.grserver.gr (relay12.grserver.gr [88.99.38.195]) (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 5CBB5327BEA; Thu, 20 Nov 2025 09:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=88.99.38.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632009; cv=none; b=oZc13JdCTzXDZSJTGv2Iuq3f6aPtITQemaG1xOq077oEz4MtnhgRRwhOdnATzAEZTv0cfPO9tZEZfn0jpB6yBzui1dKqYpVz9Pf1WYzl9a79uZ0WG44ArpdxDaT+vmBbRsUNTzgy9Yvc90Y6c1eySj5Uwpb/EYiyyzYvW1F4o6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763632009; c=relaxed/simple; bh=QQtD3Cv2cW5rLsv0KJHjqHmPm9educrewaVznpT2Hio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sHNA59cyIi1VsHM2iJrB9UdU/3n+g3VEEnVuLAnbfQQ+HUDK1VEBOQ4yqwPHe4DBFlYY5txBaiycv0Ey86S241vpbRS28e8bVR4rBHo6DLCKjGiUf2dfof/kQrhKBBinynxL17uguSL9bD2YNvsHn0rAKdtEG2a6WOPN4WIWT5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=eqm4tbMh; arc=none smtp.client-ip=88.99.38.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="eqm4tbMh" Received: from relay12 (localhost [127.0.0.1]) by relay12.grserver.gr (Proxmox) with ESMTP id 9A469BCF43; Thu, 20 Nov 2025 11:46:39 +0200 (EET) Received: from linux3247.grserver.gr (linux3247.grserver.gr [213.158.90.240]) (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) (No client certificate requested) by relay12.grserver.gr (Proxmox) with ESMTPS id 209D1BDB97; Thu, 20 Nov 2025 11:46:39 +0200 (EET) Received: from antheas-z13 (unknown [IPv6:2a05:f6c2:511b:0:8d8a:5967:d692:ea4e]) by linux3247.grserver.gr (Postfix) with ESMTPSA id 5EA941FDAE9; Thu, 20 Nov 2025 11:46:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1763631998; bh=BbEO7TIDqF6Jws19m/+tMemkBSpiN4a08/2K4HIthXg=; h=From:To:Subject; b=eqm4tbMh1Ae49N2CILHihMnQm6pGjHqZ8pUiKsOhXgnPN+hA8c7XZZYx1FS0Yi7Sk jqzHnSIya1mQ7loEC2z8jmcVpVltdItz026+lF/+46q6vw0EjVqF2PqZL7jDbPUS8I ja+Uz1X0f4jCWEwAo1n74HXq3rXATLP4IE8Oq/wcGn1uDgB4/p3JCz8+Y4yi+BY//q drRjqb9m/3fYF9ZmtHjDONYpiInMoLqKPsxasXqKSYYpti48Q21H/rG8JtzaC4ijP3 LdWcWW1T0V5RQT8x/sv3uUvFu0e50OWKWpNViXC7LQdrHd+0Yi2Kpr4WEMxgd5aptX HmsY2bP2FGEOQ== Authentication-Results: linux3247.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:8d8a:5967:d692:ea4e) smtp.mailfrom=lkml@antheas.dev smtp.helo=antheas-z13 Received-SPF: pass (linux3247.grserver.gr: connection is authenticated) From: Antheas Kapenekakis To: platform-driver-x86@vger.kernel.org, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Corentin Chary , "Luke D . Jones" , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Denis Benato , Antheas Kapenekakis Subject: [PATCH v9 11/11] HID: asus: add support for the asus-wmi brightness handler Date: Thu, 20 Nov 2025 10:46:17 +0100 Message-ID: <20251120094617.11672-12-lkml@antheas.dev> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251120094617.11672-1-lkml@antheas.dev> References: <20251120094617.11672-1-lkml@antheas.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 X-PPP-Message-ID: <176363199831.1475413.8614376731915365312@linux3247.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 1.4.3 at linux3247.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" If the asus-wmi brightness handler is available, send the keyboard brightness events to it instead of passing them to userspace. If it is not, fall back to sending them to it. Reviewed-by: Luke D. Jones Tested-by: Luke D. Jones Signed-off-by: Antheas Kapenekakis Reviewed-by: Denis Benato --- drivers/hid/hid-asus.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 6a355c174f29..ff5aaebc38e3 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -324,6 +324,17 @@ static int asus_event(struct hid_device *hdev, struct = hid_field *field, usage->hid & HID_USAGE); } =20 + if (usage->type =3D=3D EV_KEY && value) { + switch (usage->code) { + case KEY_KBDILLUMUP: + return !asus_hid_event(ASUS_EV_BRTUP); + case KEY_KBDILLUMDOWN: + return !asus_hid_event(ASUS_EV_BRTDOWN); + case KEY_KBDILLUMTOGGLE: + return !asus_hid_event(ASUS_EV_BRTTOGGLE); + } + } + return 0; } =20 --=20 2.52.0