From nobody Tue Feb 10 03:51:07 2026 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1621350899; cv=none; d=zohomail.com; s=zohoarc; b=d3McDQCKQPRGb1UIdCcNIzTqtUUtcpJkwPk3XRbB1xMbWfnZaLVgH6aWOSI4I/atXKLNyBAOB0kgrtQtAZyGGmoothIAYETdjJV3o4GJL6dz48na0WYJETDTitpjltKKSPacRBuKGVqO2ivxr4Rr3u6s7EQ8IX2emyVqBNLebOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621350899; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eZis3uEDTdqidw0jifwVbf2/3b2PwRYfR2BjL4C8mZ0=; b=Wo9WswGokm9P3Pys1dhSychMGSYrOTS5FP3Q56LBsiC7hSZt1e9HtaYeQoJYlFFlgUw+i8InHvAo3D/V9+tlTLAcf5k0g7hM5XhYbZO1XJxFOZWOBcozr8zm92+lLFPWPGXMvWewrkNiTaZJ+NzLRvtDeMD1P+a4MlvL3k2DdLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1621350899970583.1493992237662; Tue, 18 May 2021 08:14:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350094AbhERPML (ORCPT ); Tue, 18 May 2021 11:12:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:49524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343506AbhERPK3 (ORCPT ); Tue, 18 May 2021 11:10:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26C536135C; Tue, 18 May 2021 15:09:10 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lj1LI-007HOI-6d; Tue, 18 May 2021 17:09:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621350550; bh=0tES3bdt7Dfa21iZsJYbWnuV6/yUytq3HPpPGDOjRv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hs46N4bQAY7ZbnQVgpgngh5EM1mhlWEFqutwHEtsW9UDx0nGkbmP5r830gV39wgUs 2B1VOEbazklk+VgHzys2eA/Aj7SDHaTzf6oxlMVCxmwHQ/ZM9boCHKCB1F9oPbDYFH 8DHFsvmkW58Ge/6JnZwU5c8pkdWV/NnYCiOoEmRZ7j1RMrOJV3grFS0P1IGdPaCBof msVhokcehbDeg1d05yCSpCz8BOXcvhAJobsKlHmZPEQMHbzBYPgAexD5vz4vzNqgvn HzyGWy+Rp4PV/fmLdGXDBgI2xaLCxmY9f2GFplYZ1EjKAMndxOsvqS4Uc/6s1RDBf1 vdUDt28s+kgiw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Pavel Machek , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org Subject: [PATCH v2 06/17] leds: leds-nuc: allow changing the LED colors Date: Tue, 18 May 2021 17:08:55 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add routines to allow seeing and changing the LED colors. Signed-off-by: Mauro Carvalho Chehab --- drivers/leds/leds-nuc.c | 244 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 228 insertions(+), 16 deletions(-) diff --git a/drivers/leds/leds-nuc.c b/drivers/leds/leds-nuc.c index df65bf17e0e6..415031d344c6 100644 --- a/drivers/leds/leds-nuc.c +++ b/drivers/leds/leds-nuc.c @@ -58,8 +58,6 @@ enum led_new_get_subcmd { enum led_function { LED_FUNC_BRIGHTNESS, LED_FUNC_COLOR1, - LED_FUNC_COLOR_GREEN, - LED_FUNC_COLOR_BLUE, =20 LED_FUNC_BLINK_BEHAVIOR, LED_FUNC_BLINK_FREQ, @@ -92,43 +90,31 @@ static const u8 led_func_rev_0_64[MAX_IND][MAX_LED_FUNC= ] =3D { [LED_FUNC_BLINK_BEHAVIOR] =3D 0x01, [LED_FUNC_BLINK_FREQ] =3D 0x02, [LED_FUNC_COLOR1] =3D 0x03, - [LED_FUNC_COLOR_GREEN] =3D 0x04, - [LED_FUNC_COLOR_BLUE] =3D 0x05 }, [LED_IND_HDD_ACTIVITY] =3D { [LED_FUNC_BRIGHTNESS] =3D 0x00, [LED_FUNC_COLOR1] =3D 0x01, - [LED_FUNC_COLOR_GREEN] =3D 0x02, - [LED_FUNC_COLOR_BLUE] =3D 0x03, [LED_FUNC_HDD_BEHAVIOR] =3D 0x04 }, [LED_IND_ETHERNET] =3D { [LED_FUNC_ETH_TYPE] =3D 0x00, [LED_FUNC_BRIGHTNESS] =3D 0x01, [LED_FUNC_COLOR1] =3D 0x02, - [LED_FUNC_COLOR_GREEN] =3D 0x03, - [LED_FUNC_COLOR_BLUE] =3D 0x04 }, [LED_IND_WIFI] =3D { [LED_FUNC_BRIGHTNESS] =3D 0x00, [LED_FUNC_COLOR1] =3D 0x01, - [LED_FUNC_COLOR_GREEN] =3D 0x02, - [LED_FUNC_COLOR_BLUE] =3D 0x03 }, [LED_IND_SOFTWARE] =3D { [LED_FUNC_BRIGHTNESS] =3D 0x00, [LED_FUNC_BLINK_BEHAVIOR] =3D 0x01, [LED_FUNC_BLINK_FREQ] =3D 0x02, [LED_FUNC_COLOR1] =3D 0x03, - [LED_FUNC_COLOR_GREEN] =3D 0x04, - [LED_FUNC_COLOR_BLUE] =3D 0x05 }, [LED_IND_POWER_LIMIT] =3D { [LED_FUNC_POWER_LIMIT_SCHEME] =3D 0x00, [LED_FUNC_BRIGHTNESS] =3D 0x01, [LED_FUNC_COLOR1] =3D 0x02, - [LED_FUNC_COLOR_GREEN] =3D 0x03, - [LED_FUNC_COLOR_BLUE] =3D 0x04 }, }; =20 @@ -462,6 +448,8 @@ static ssize_t nuc_wmi_set_brightness_offset(struct dev= ice *dev, } \ static DEVICE_ATTR(_name, 0644, show_##_name, store_##_name) =20 +/* Show/change the LED indicator */ + static const char * const led_indicators[] =3D { "Power State", "HDD Activity", @@ -534,7 +522,220 @@ static ssize_t store_indicator(struct device *dev, return -EINVAL; } =20 -/* Get brightness */ +/* Show/change the LED color */ + +enum led_colors { + LED_COLOR_BLUE, + LED_COLOR_AMBER, + LED_COLOR_WHITE +}; + +struct led_color_name { + const char *name; + u8 r, g, b; +}; + +static const struct led_color_name led_colors[] =3D { + /* The first colors should match the dual-LED colorset */ + [LED_COLOR_BLUE] =3D { "blue", 0, 0, 0xff }, + [LED_COLOR_AMBER] =3D { "amber", 0xff, 0xbf, 0 }, + [LED_COLOR_WHITE] =3D { "white", 0xff, 0xff, 0xff }, + + /* Let's add a couple of common color names as well */ + { "red", 0xff, 0, 0 }, + { "green", 0, 0xff, 0 }, + { "yellow", 0xff, 0xff, 0 }, + { "cyan", 0, 0xff, 0xff }, + { "magenta", 0xff, 0, 0xff }, +}; + +static ssize_t show_color(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct led_classdev *cdev =3D dev_get_drvdata(dev); + struct nuc_nmi_led *led =3D container_of(cdev, struct nuc_nmi_led, cdev); + u8 input[NUM_INPUT_ARGS]; + u8 output[NUM_OUTPUT_ARGS]; + int ret, ctrl; + int size =3D PAGE_SIZE; + char *p =3D buf; + int color, r, g, b; + + if (led->indicator =3D=3D LED_IND_DISABLE) + return -ENODEV; + + ctrl =3D led_func_rev_0_64[led->indicator][LED_FUNC_COLOR1]; + + if (!nuc_wmi_test_control(dev, led, ctrl)) + return -ENODEV; + + input[0] =3D LED_NEW_GET_CONTROL_ITEM; + input[1] =3D led->id; + input[2] =3D led->indicator; + input[3] =3D ctrl; + + ret =3D nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + if (led->color_type & LED_RGB) { + r =3D output[0]; + + input[3]++; + ret =3D nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + g =3D output[0]; + + input[3]++; + ret =3D nuc_nmi_cmd(dev, LED_NEW_GET_STATUS, input, output); + if (ret) + return ret; + + b =3D output[0]; + + for (color =3D 0; color < ARRAY_SIZE(led_colors); color++) + if (led_colors[color].r =3D=3D r && + led_colors[color].g =3D=3D g && + led_colors[color].b =3D=3D b) + return scnprintf(p, size, "%s\n", + led_colors[color].name); + + return scnprintf(p, size, "%d,%d,%d\n", r, g, b); + } + + if (!output[0]) + return scnprintf(p, size, "%s\n", + led_colors[LED_COLOR_BLUE].name); + + if (led->color_type & LED_BLUE_AMBER) + return scnprintf(p, size, "%s\n", + led_colors[LED_COLOR_AMBER].name); + + return scnprintf(p, size, "%s\n", led_colors[LED_COLOR_WHITE].name); +} + +static ssize_t store_color(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct led_classdev *cdev =3D dev_get_drvdata(dev); + struct nuc_nmi_led *led =3D container_of(cdev, struct nuc_nmi_led, cdev); + u8 input[NUM_INPUT_ARGS] =3D { 0 }; + int ret, ctrl, color; + const char *tmp; + u8 r, g, b, val; + + if (led->indicator =3D=3D LED_IND_DISABLE) + return -ENODEV; + + tmp =3D strsep((char **)&buf, ",\n"); + + for (color =3D 0; color < ARRAY_SIZE(led_colors); color++) + if (!strcasecmp(tmp, led_colors[color].name)) + break; + + if (color < ARRAY_SIZE(led_colors)) { + r =3D led_colors[color].r; + g =3D led_colors[color].g; + b =3D led_colors[color].b; + } else { + if (kstrtou8(tmp, 0, &r) || r > 255) + return -EINVAL; + + tmp =3D strsep((char **)&buf, ",\n"); + if (kstrtou8(tmp, 0, &g) || g > 255) + return -EINVAL; + + tmp =3D strsep((char **)&buf, " \n"); + if (kstrtou8(tmp, 0, &b) || b > 255) + return -EINVAL; + + if (led->color_type & LED_SINGLE_COLOR) { + for (color =3D 0; color <=3D LED_COLOR_WHITE; color++) + if (led_colors[color].r =3D=3D r && + led_colors[color].g =3D=3D g && + led_colors[color].b =3D=3D b) + break; + } + } + + ctrl =3D led_func_rev_0_64[led->indicator][LED_FUNC_COLOR1]; + + /* Dual color LEDs */ + if (!(led->color_type & LED_RGB)) { + if (color =3D=3D LED_COLOR_BLUE) + val =3D 0; + else { + if (led->color_type & LED_BLUE_AMBER && + color !=3D LED_COLOR_AMBER) + return -EINVAL; + else if (color !=3D LED_COLOR_WHITE) + return -EINVAL; + val =3D1; + } + + input[0] =3D led->id; + input[1] =3D led->indicator; + input[2] =3D ctrl; + input[3] =3D val; + + ret =3D nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + return len; + } + + /* RGB LEDs */ + input[0] =3D led->id; + input[1] =3D led->indicator; + input[2] =3D ctrl; + input[3] =3D r; + + ret =3D nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + input[0] =3D led->id; + input[1] =3D led->indicator; + input[2]++; + input[3] =3D g; + + ret =3D nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + input[0] =3D led->id; + input[1] =3D led->indicator; + input[2]++; + input[3] =3D b; + + ret =3D nuc_nmi_cmd(dev, LED_SET_VALUE, input, NULL); + if (ret) + return ret; + + return len; + + return -EINVAL; +} + +static umode_t nuc_wmi_led_color_is_visible(struct kobject *kobj, + struct attribute *attr, int idx) +{ + struct device *dev =3D kobj_to_dev(kobj); + struct led_classdev *cdev =3D dev_get_drvdata(dev); + struct nuc_nmi_led *led =3D container_of(cdev, struct nuc_nmi_led, cdev); + umode_t mode =3D attr->mode; + + if (led->color_type & LED_SINGLE_COLOR) + return 0; + + return mode; +} + +/* Show/store brightness */ static ssize_t show_brightness_offset(struct device *dev, struct device_attribute *attr, u8 offset, @@ -554,7 +755,6 @@ static ssize_t show_brightness_offset(struct device *de= v, return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } =20 -/* Change brightness */ static ssize_t store_brightness_offset(struct device *dev, struct device_attribute *attr, u8 offset, @@ -600,6 +800,7 @@ static int nuc_wmi_set_brightness(struct led_classdev *= cdev, } =20 static LED_ATTR_RW(indicator); +static LED_ATTR_RW(color); =20 LED_ATTR_POWER_STATE_RW(s0_brightness, 0x00); LED_ATTR_POWER_STATE_RW(s3_brightness, 0x06); @@ -623,8 +824,19 @@ static const struct attribute_group nuc_wmi_led_attrib= ute_group =3D { .attrs =3D nuc_wmi_led_attr, }; =20 +static struct attribute *nuc_wmi_led_color_attr[] =3D { + &dev_attr_color.attr, + NULL, +}; + +static const struct attribute_group nuc_wmi_led_color_attribute_group =3D { + .is_visible =3D nuc_wmi_led_color_is_visible, + .attrs =3D nuc_wmi_led_color_attr, +}; + static const struct attribute_group *nuc_wmi_led_attribute_groups[] =3D { &nuc_wmi_led_attribute_group, + &nuc_wmi_led_color_attribute_group, NULL }; =20 --=20 2.31.1