From patchwork Mon Mar 24 21:01:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antheas Kapenekakis X-Patchwork-Id: 14027823 X-Patchwork-Delegate: jikos@jikos.cz Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90D441FBCBE; Mon, 24 Mar 2025 21:02:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742850145; cv=none; b=IOp1p8nh8GuVjKy0tHXy5N+NTPN59qflpsCDeIkeMyFTEHVs9TcZDzKee2VXi/87GrYGzcjH8dH0gKE7Ea1+WISJJxNWxIFlI+m9rhwDnlQM4emreymarcbd+Tmo4dHfYqhwVWqWu3l76Ha4qW+3TBY/WHMbv5KcGsX/uFZOOT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742850145; c=relaxed/simple; bh=80AMC/MdMPNV26TPU2ViGuGPfWjEzrfZSYzOzIBDj4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cDcGH1t499IEzPMQkctp8no1PTrxV2+NNkBHRtiNXJrkMQ4dAqzhOdnBw/ycRf1/6Goj6gm/dTDlvJhOJDMKGEw1yV4YcO3B05Waox6oI3y1m052jQvvqx6I+dh5VrDIz2EOuDzDLfLrFQLOIlRZik73Is3Uq5OxP/ZdkV9/eQI= 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 (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=mxm28IHd; arc=none smtp.client-ip=185.138.42.100 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 (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="mxm28IHd" Received: from localhost.localdomain (unknown [IPv6:2a05:f6c2:511b:0:cbc0:999f:73ad:33bd]) by linux1587.grserver.gr (Postfix) with ESMTPSA id C12EB2E09DB4; Mon, 24 Mar 2025 23:02:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1742850141; bh=ecifywgImJtlI3Uhko0hRniziBwOA51f0dWdU30UhfU=; h=From:To:Subject; b=mxm28IHdHGUtkAlkmfhVs22hE81RclMDCE9K8O+ItfW6DkaAXQ7v0L9KQyubb4dMV gH+LxH/YJbER+fnrZ43qBYbta6QzoXheU9gYo7yTNpS+QZUuRTg7lvOOzmNE8YnIDm GAa5EuV3eqg8ARWwUKbEQ5B6mIIIX26nia42B/Hs= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a05:f6c2:511b:0:cbc0:999f:73ad:33bd) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.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_J=C3=A4rvinen?= , Antheas Kapenekakis Subject: [PATCH v4 11/11] HID: asus: initialize LED endpoint early for old NKEY keyboards Date: Mon, 24 Mar 2025 22:01:51 +0100 Message-ID: <20250324210151.6042-12-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250324210151.6042-1-lkml@antheas.dev> References: <20250324210151.6042-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-PPP-Message-ID: <174285014084.23923.6068794649821692150@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean These keyboards have always had initialization in the kernel for 0x5d. At this point, it is hard to verify again and we risk regressions by removing this. Therefore, initialize with 0x5d, and skip RGB initialization if that is enabled. Signed-off-by: Antheas Kapenekakis --- drivers/hid/hid-asus.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 7025c6971431d..8da47483272c0 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -87,6 +87,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12) #define QUIRK_HANDLE_GENERIC BIT(13) #define QUIRK_ROG_NKEY_RGB BIT(14) +#define QUIRK_ROG_NKEY_LEGACY BIT(15) #define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \ @@ -648,13 +649,25 @@ static int asus_kbd_register_leds(struct hid_device *hdev) struct asus_drvdata *drvdata = hid_get_drvdata(hdev); unsigned char kbd_func; struct asus_kbd_leds *leds; - bool no_led; + bool no_led, rgb_init = true; int ret; ret = asus_kbd_init(hdev, FEATURE_KBD_REPORT_ID); if (ret < 0) return ret; + if (drvdata->quirks & QUIRK_ROG_NKEY_LEGACY) { + /* + * These keyboards might need 0x5d for shortcuts to work. + * As it has been more than 5 years, it is hard to verify. + */ + ret = asus_kbd_init(hdev, FEATURE_KBD_LED_REPORT_ID1); + if (ret < 0) + return ret; + + rgb_init = false; + } + /* Get keyboard functions */ ret = asus_kbd_get_functions(hdev, &kbd_func, FEATURE_KBD_REPORT_ID); if (ret < 0) @@ -685,7 +698,7 @@ static int asus_kbd_register_leds(struct hid_device *hdev) leds->rgb_colors[0] = 0; leds->rgb_colors[1] = 0; leds->rgb_colors[2] = 0; - leds->rgb_init = true; + leds->rgb_init = rgb_init; leds->rgb_set = false; leds->mc_led.led_cdev.name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "asus-%s:rgb:peripheral", @@ -1424,10 +1437,10 @@ static const struct hid_device_id asus_devices[] = { 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_LEGACY }, { 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_LEGACY }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR), QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_NKEY_RGB },