From patchwork Tue May 18 15:09:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 442848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6548C433B4 for ; Tue, 18 May 2021 15:09:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A38261042 for ; Tue, 18 May 2021 15:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350010AbhERPLC (ORCPT ); Tue, 18 May 2021 11:11:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:49542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343962AbhERPKa (ORCPT ); Tue, 18 May 2021 11:10:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3526261361; Tue, 18 May 2021 15:09:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621350550; bh=WNd/FZyXWC3bVqUADHT/Lw1l4FiAmrVOx7fhoZ7HJ54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/HtJ/L9SRvPEHCBP4nvU8vDsRytz9haZXplygWzae07Kz3LSxuWanohuNuCV3kjj i6HjcvAFiWrkp2hdkO09yQ+DLkGyxJnFbqsrRupI+xRjn5ecTtVdh7hFDl/A7RFj8F hDc4G+znJuw8BHY1/ysC0djioG+1MoLOSuJB4YXEWP0Cn/WdOT4L0G9escO31kdPEj E7mJCXLnHlpGkSgKxZcf1+Bq8392WHeAYBm5ZrG+Iu1uw01TPqJAvvar5kmJI7LGkP /zschFVjiZ2X5bpKEYi4bd3v4H04/A9j48Rm45oFET7RUrivi3EJYNtJcVvz6h1mcw 1oyZbtBh24dYA== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lj1LI-007HOg-GV; Tue, 18 May 2021 17:09:08 +0200 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 12/17] leds: leds-nuc: implement blink control for NUC6 Date: Tue, 18 May 2021 17:09:01 +0200 Message-Id: <059a46546066cba7e1a41ed9b2afc1d3bf2e5ed5.1621349814.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org The blink control logic for NUC6 API is somewhat messy, as it uses a single register for controlling both the blink type and the frequency, using a random order. Let's use the same API as defined for other versions, splitting this setting on two different properties. Signed-off-by: Mauro Carvalho Chehab --- drivers/leds/leds-nuc.c | 269 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 267 insertions(+), 2 deletions(-) diff --git a/drivers/leds/leds-nuc.c b/drivers/leds/leds-nuc.c index e2517e1a367f..6aa0bf16c8b7 100644 --- a/drivers/leds/leds-nuc.c +++ b/drivers/leds/leds-nuc.c @@ -716,6 +716,247 @@ static ssize_t nuc6_store_color(struct device *dev, return len; } +enum nuc6_blink_mode_freq { + NUC6_BLINK_MODE_BLINK_1HZ = 0x01, + NUC6_BLINK_MODE_BLINK_0_25HZ = 0x02, + NUC6_BLINK_MODE_FADE_1HZ = 0x03, + NUC6_BLINK_MODE_DONT_BLINK = 0x04, + + /* BIOS equal or upper AY0038 or BN0043 */ + NUC6_BLINK_MODE_BLINK_0_5HZ = 0x05, + NUC6_BLINK_MODE_FADE_0_25HZ = 0x06, + NUC6_BLINK_MODE_FADE_0_5HZ = 0x07 +}; + +enum nuc6_blink_mode { + NUC6_BLINK_MODE_SOLID, + NUC6_BLINK_MODE_BLINK, + NUC6_BLINK_MODE_FADE +}; + +static const char * const nuc6_blink_behavior[] = { + "solid", + "blink", + "fade", +}; + +enum nuc6_blink_freq { + NUC6_BLINK_FREQ_1HZ, + NUC6_BLINK_FREQ_0_5HZ, + NUC6_BLINK_FREQ_0_25HZ, +}; + +static const char * const nuc6_blink_frequency[] = { + "1", + "0.5", + "0.25", +}; + +static int nuc_wmi_nuc6_set_blink(struct device *dev, + struct nuc_nmi_led *led, + int freq, enum nuc6_blink_mode mode) +{ + int val; + + switch(mode) { + case NUC6_BLINK_MODE_SOLID: + val = NUC6_BLINK_MODE_DONT_BLINK; + break; + case NUC6_BLINK_MODE_BLINK: + if (freq == NUC6_BLINK_FREQ_0_25HZ) + val = NUC6_BLINK_MODE_BLINK_0_25HZ; + else if (freq == NUC6_BLINK_FREQ_0_5HZ) + val = NUC6_BLINK_MODE_BLINK_0_5HZ; + else + val = NUC6_BLINK_MODE_BLINK_1HZ; + break; + case NUC6_BLINK_MODE_FADE: + if (freq == NUC6_BLINK_FREQ_0_25HZ) + val = NUC6_BLINK_MODE_FADE_0_25HZ; + else if (freq == NUC6_BLINK_FREQ_0_5HZ) + val = NUC6_BLINK_MODE_FADE_0_5HZ; + else + val = NUC6_BLINK_MODE_FADE_1HZ; + break; + default: + return -EINVAL; + } + + return nuc_wmi_nuc6_led_get_set(dev, led, NULL, &val, NULL); +} + +static ssize_t nuc6_show_blink_behavior(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + int val = -1, mode = -1, ret, i, n; + int size = PAGE_SIZE; + char *p = buf; + + ret = nuc_wmi_nuc6_led_get_set(dev, led, NULL, &val, NULL); + if (ret) + return ret; + + switch (val) { + case NUC6_BLINK_MODE_BLINK_1HZ: + case NUC6_BLINK_MODE_BLINK_0_25HZ: + case NUC6_BLINK_MODE_BLINK_0_5HZ: + mode = NUC6_BLINK_MODE_BLINK; + break; + case NUC6_BLINK_MODE_FADE_1HZ: + case NUC6_BLINK_MODE_FADE_0_25HZ: + case NUC6_BLINK_MODE_FADE_0_5HZ: + mode = NUC6_BLINK_MODE_FADE; + break; + case NUC6_BLINK_MODE_DONT_BLINK: + mode = NUC6_BLINK_MODE_SOLID; + break; + } + + for (i = 0; i < ARRAY_SIZE(nuc6_blink_behavior); i++) { + if (i == mode) + n = scnprintf(p, size, "[%s] ", nuc6_blink_behavior[i]); + else + n = scnprintf(p, size, "%s ", nuc6_blink_behavior[i]); + p += n; + size -= n; + } + size -= scnprintf(p, size, "\n"); + + return PAGE_SIZE - size; + +} + +static ssize_t nuc6_store_blink_behavior(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + int ret, val = -1, freq; + const char *tmp; + + tmp = strsep((char **)&buf, "\n"); + + ret = nuc_wmi_nuc6_led_get_set(dev, led, NULL, &val, NULL); + if (ret) + return ret; + + /* Preserve the frequency */ + switch (val) { + case NUC6_BLINK_MODE_BLINK_0_25HZ: + case NUC6_BLINK_MODE_FADE_0_25HZ: + freq = NUC6_BLINK_FREQ_0_25HZ; + break; + case NUC6_BLINK_MODE_BLINK_0_5HZ: + case NUC6_BLINK_MODE_FADE_0_5HZ: + freq = NUC6_BLINK_FREQ_0_5HZ; + break; + default: + freq = NUC6_BLINK_FREQ_1HZ; + break; + } + + for (val = ARRAY_SIZE(nuc6_blink_behavior)+1; val >= 0; val--) + if (!strcasecmp(tmp, nuc6_blink_behavior[val])) + break; + if (val < 0) + return -EINVAL; + + ret = nuc_wmi_nuc6_set_blink(dev, led, val, freq); + if (ret) + return ret; + + return len; +} + +static ssize_t nuc6_show_blink_frequency(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + int val = -1, freq = -1, ret, i, n; + int size = PAGE_SIZE; + char *p = buf; + + ret = nuc_wmi_nuc6_led_get_set(dev, led, NULL, &val, NULL); + if (ret) + return ret; + + switch (val) { + case NUC6_BLINK_MODE_BLINK_0_25HZ: + case NUC6_BLINK_MODE_FADE_0_25HZ: + freq = NUC6_BLINK_FREQ_0_25HZ; + break; + case NUC6_BLINK_MODE_BLINK_0_5HZ: + case NUC6_BLINK_MODE_FADE_0_5HZ: + freq = NUC6_BLINK_FREQ_0_5HZ; + break; + default: + freq = NUC6_BLINK_FREQ_1HZ; + } + + for (i = 0; i < ARRAY_SIZE(nuc6_blink_frequency); i++) { + if (i == freq) + n = scnprintf(p, size, "[%s] ", nuc6_blink_frequency[i]); + else + n = scnprintf(p, size, "%s ", nuc6_blink_frequency[i]); + p += n; + size -= n; + } + size -= scnprintf(p, size, "\n"); + + return PAGE_SIZE - size; +} + +static ssize_t nuc6_store_blink_frequency(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + enum nuc6_blink_mode mode; + int ret, freq, val = -1; + const char *tmp; + + tmp = strsep((char **)&buf, "\n"); + + ret = nuc_wmi_nuc6_led_get_set(dev, led, NULL, &val, NULL); + if (ret) + return ret; + + /* Preserve the blink mode */ + switch (val) { + case NUC6_BLINK_MODE_BLINK_1HZ: + case NUC6_BLINK_MODE_BLINK_0_25HZ: + case NUC6_BLINK_MODE_BLINK_0_5HZ: + mode = NUC6_BLINK_MODE_BLINK; + break; + case NUC6_BLINK_MODE_FADE_1HZ: + case NUC6_BLINK_MODE_FADE_0_25HZ: + case NUC6_BLINK_MODE_FADE_0_5HZ: + mode = NUC6_BLINK_MODE_FADE; + break; + default: /* setting frequency NUC6_BLINK_MODE_SOLID won't make sense */ + return -EINVAL; + } + + for (freq = ARRAY_SIZE(nuc6_blink_frequency)+1; freq >= 0; freq--) + if (!strcasecmp(tmp, nuc6_blink_frequency[freq])) + break; + if (freq < 0) + return -EINVAL; + + ret = nuc_wmi_nuc6_set_blink(dev, led, mode, freq); + if (ret) + return ret; + + return len; +} + /* Show/change the LED indicator */ static const char * const led_indicators[] = { @@ -1217,6 +1458,12 @@ static ssize_t show_blink_behavior(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + + if (led->api_rev == LED_API_NUC6) + return nuc6_show_blink_behavior(dev, attr, buf); + return offset_show_blink_behavior(dev, attr, 0, buf); } @@ -1224,6 +1471,12 @@ static ssize_t store_blink_behavior(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + + if (led->api_rev == LED_API_NUC6) + return nuc6_store_blink_behavior(dev, attr, buf, len); + return offset_store_blink_behavior(dev, attr, 0, buf, len); } @@ -1322,6 +1575,12 @@ static ssize_t show_blink_frequency(struct device *dev, struct device_attribute *attr, char *buf) { + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + + if (led->api_rev == LED_API_NUC6) + return nuc6_show_blink_frequency(dev, attr, buf); + return offset_show_blink_frequency(dev, attr, 0, buf); } @@ -1329,6 +1588,12 @@ static ssize_t store_blink_frequency(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { + struct led_classdev *cdev = dev_get_drvdata(dev); + struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); + + if (led->api_rev == LED_API_NUC6) + return nuc6_store_blink_frequency(dev, attr, buf, len); + return offset_store_blink_frequency(dev, attr, 0, buf, len); } @@ -1340,9 +1605,8 @@ static umode_t nuc_wmi_led_blink_is_visible(struct kobject *kobj, struct nuc_nmi_led *led = container_of(cdev, struct nuc_nmi_led, cdev); umode_t mode = attr->mode; - // TODO: implement for NUC6 API if (led->api_rev == LED_API_NUC6) - return 0; + return mode; if (led->id == LED_IND_SOFTWARE) return mode; @@ -1446,6 +1710,7 @@ static const struct attribute_group *nuc_wmi_led_attribute_groups[] = { static const struct attribute_group *nuc_wmi_nuc6_led_attribute_groups[] = { &nuc_wmi_led_color_attribute_group, + &nuc_wmi_led_blink_attribute_group, NULL };