* [patch v3 0/1] Introduce support for mlxreg LED driver @ 2017-07-31 16:21 Vadim Pasternak 2017-07-31 16:21 ` [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC Vadim Pasternak 0 siblings, 1 reply; 6+ messages in thread From: Vadim Pasternak @ 2017-07-31 16:21 UTC (permalink / raw) To: j.anaszewski, rpurdie Cc: linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski, pavel, Vadim Pasternak This patch introduces LED driver, based on regmap interface. This patch depends on previously sent: [patch v2 1/2] mfd: Add Mellanox regmap core driver because it includes include/linux/platform_data/mlxreg.h from this patch. Vadim Pasternak (1): leds: add driver for support Mellanox regmap LEDs for BMC MAINTAINERS | 1 + drivers/leds/Kconfig | 10 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-mlxreg.c | 299 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 311 insertions(+) create mode 100644 drivers/leds/leds-mlxreg.c -- 2.1.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC 2017-07-31 16:21 [patch v3 0/1] Introduce support for mlxreg LED driver Vadim Pasternak @ 2017-07-31 16:21 ` Vadim Pasternak 2017-08-02 8:38 ` Pavel Machek 2017-08-02 18:13 ` Jacek Anaszewski 0 siblings, 2 replies; 6+ messages in thread From: Vadim Pasternak @ 2017-07-31 16:21 UTC (permalink / raw) To: j.anaszewski, rpurdie Cc: linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski, pavel, Vadim Pasternak Driver obtains LED devices according to system configuration and creates devices in form: "devicename:color:function", like The full path is to be: /sys/class/leds/mlxreg\:status\:amber/brightness After timer trigger activation: echo timer > /sys/class/leds/mlxreg\:status\:amber/trigger Attributes for LED blinking will appaer in sysfs infrastructure: /sys/class/leds/mlxreg\:status\:amber/delay_off /sys/class/leds/mlxreg\:status\:amber/delay_on LED setting is controlled through the on-board programmable devices, which exports its register map. This device could be attached to any bus type, for which register mapping is supported. Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> --- v2->v3: Comments pointed out by Jacek: - fix order in includes; - add declaration pdata in mlxreg_led_store_hw and mlxreg_led_get_hw; - add declaration of led_data in mlxreg_led_config; - use LED_ON in assignment instead of 1; - fix mutex call in mlxreg_led_remove; v1->v2: Comments pointed out by Jacek: - remove macros MLXREG_MAP and MLXREG_CDEV; - brightness_set_blocking insteaf of brightness_set, this fix allows removing of context validation and workqueue and also three fields from struct mlxreg_core_led_data in mlxreg.h; - remove MLXREG_LED_NAME; - extend Kconfig description; Changes added by Vadim: - remove unnecessary includes after dropping workqueue; --- MAINTAINERS | 1 + drivers/leds/Kconfig | 10 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-mlxreg.c | 299 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 311 insertions(+) create mode 100644 drivers/leds/leds-mlxreg.c diff --git a/MAINTAINERS b/MAINTAINERS index 205d397..ac6b0d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8566,6 +8566,7 @@ M: Vadim Pasternak <vadimp@mellanox.com> L: linux-leds@vger.kernel.org S: Supported F: drivers/leds/leds-mlxcpld.c +F: drivers/leds/leds-mlxreg.c F: Documentation/leds/leds-mlxcpld.txt MELLANOX PLATFORM DRIVER diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 594b24d..1c6563d 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -657,6 +657,16 @@ config LEDS_MLXCPLD This option enabled support for the LEDs on the Mellanox boards. Say Y to enabled these. +config LEDS_MLXREG + tristate "LED support for the Mellanox BMC cards" + depends on LEDS_CLASS + help + This option enabled support for the LEDs on the Mellanox BMC cards. + The driver can be activated from the device tree or by the direct + platform device add call. Say Y to enabled these. To compile this + driver as a module, choose 'M' here: the module will be called + leds-mlxreg. + config LEDS_USER tristate "Userspace LED support" depends on LEDS_CLASS diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 909dae6..3eb76e5 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -69,6 +69,7 @@ obj-$(CONFIG_LEDS_IS31FL319X) += leds-is31fl319x.o obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o obj-$(CONFIG_LEDS_PM8058) += leds-pm8058.o obj-$(CONFIG_LEDS_MLXCPLD) += leds-mlxcpld.o +obj-$(CONFIG_LEDS_MLXREG) += leds-mlxreg.o obj-$(CONFIG_LEDS_NIC78BX) += leds-nic78bx.o obj-$(CONFIG_LEDS_MT6323) += leds-mt6323.o diff --git a/drivers/leds/leds-mlxreg.c b/drivers/leds/leds-mlxreg.c new file mode 100644 index 0000000..6a424d9 --- /dev/null +++ b/drivers/leds/leds-mlxreg.c @@ -0,0 +1,299 @@ +/* + * Copyright (c) 2017 Mellanox Technologies. All rights reserved. + * Copyright (c) 2017 Vadim Pasternak <vadimp@mellanox.com> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the names of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <linux/bitops.h> +#include <linux/device.h> +#include <linux/io.h> +#include <linux/leds.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_data/mlxreg.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +/* Codes for LEDs. */ +#define MLXREG_LED_OFFSET_HALF 0x01 /* Offset from solid: 3Hz blink */ +#define MLXREG_LED_OFFSET_FULL 0x02 /* Offset from solid: 6Hz blink */ +#define MLXREG_LED_IS_OFF 0x00 /* Off */ +#define MLXREG_LED_RED_SOLID 0x05 /* Solid red */ +#define MLXREG_LED_GREEN_SOLID 0x0D /* Solid green */ +#define MLXREG_LED_AMBER_SOLID 0x09 /* Solid amber */ +#define MLXREG_LED_BLINK_3HZ 167 /* ~167 msec off/on - HW support */ +#define MLXREG_LED_BLINK_6HZ 83 /* ~83 msec off/on - HW support */ + +#define cdev_to_priv(c) container_of(c, struct mlxreg_core_led_data, led_cdev) + +/** + * struct mlxreg_led_priv_data - platform private data: + * + * @pdev: platform device; + * @pdata: platform data; + * @access_lock: mutex for attribute IO access; + */ +struct mlxreg_led_priv_data { + struct platform_device *pdev; + struct mlxreg_core_led_platform_data *pdata; + struct mutex access_lock; /* protect IO operations */ +}; + +static int +mlxreg_led_store_hw(struct mlxreg_core_led_data *led_pdata, u8 vset) +{ + struct mlxreg_led_priv_data *priv = led_pdata->data_parent; + struct mlxreg_core_led_platform_data *pdata = priv->pdata; + u32 regval; + u32 nib; + int ret; + + /* + * Each LED is controlled through low or high nibble of the relevant + * register byte. Register offset is specified by off parameter. + * Parameter vset provides color code: 0x0 for off, 0x5 for solid red, + * 0x6 for 3Hz blink red, 0xd for solid green, 0xe for 3Hz blink + * green. + * Parameter mask specifies which nibble is used for specific LED: mask + * 0xf0 - lower nibble is to be used (bits from 0 to 3), mask 0x0f - + * higher nibble (bits from 4 to 7). + */ + mutex_lock(&priv->access_lock); + + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); + if (ret) + goto access_error; + + nib = (ror32(led_pdata->led->mask, led_pdata->led->bit) == 0xf0) ? + rol32(vset, led_pdata->led->bit) : + rol32(vset, led_pdata->led->bit + 4); + regval = (regval & led_pdata->led->mask) | nib; + + ret = regmap_write(pdata->regmap, led_pdata->led->reg, regval); + +access_error: + mutex_unlock(&priv->access_lock); + + return ret; +} + +static enum led_brightness +mlxreg_led_get_hw(struct mlxreg_core_led_data *led_pdata) +{ + struct mlxreg_led_priv_data *priv = led_pdata->data_parent; + struct mlxreg_core_led_platform_data *pdata = priv->pdata; + u32 regval; + int ret; + + /* + * Each LED is controlled through low or high nibble of the relevant + * register byte. Register offset is specified by off parameter. + * Parameter vset provides color code: 0x0 for off, 0x5 for solid red, + * 0x6 for 3Hz blink red, 0xd for solid green, 0xe for 3Hz blink + * green. + * Parameter mask specifies which nibble is used for specific LED: mask + * 0xf0 - lower nibble is to be used (bits from 0 to 3), mask 0x0f - + * higher nibble (bits from 4 to 7). + */ + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); + if (ret < 0) { + dev_warn(led_pdata->led_cdev.dev, "Failed to get current brightness, error: %d\n", + ret); + /* Assume the LED is OFF */ + ret = LED_OFF; + goto access_error; + } + + regval = regval & ~led_pdata->led->mask; + regval = (ror32(led_pdata->led->mask, led_pdata->led->bit) == 0xf0) ? + ror32(regval, led_pdata->led->bit) : + ror32(regval, led_pdata->led->bit + 4); + if (regval >= led_pdata->base_color && + regval <= (led_pdata->base_color + MLXREG_LED_OFFSET_FULL)) + ret = LED_FULL; + else + ret = LED_OFF; + +access_error: + + return ret; +} + +static int +mlxreg_led_brightness_set(struct led_classdev *cled, enum led_brightness value) +{ + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); + + if (value) + return mlxreg_led_store_hw(led_pdata, led_pdata->base_color); + else + return mlxreg_led_store_hw(led_pdata, MLXREG_LED_IS_OFF); +} + +static enum led_brightness +mlxreg_led_brightness_get(struct led_classdev *cled) +{ + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); + + return mlxreg_led_get_hw(led_pdata); +} + +static int +mlxreg_led_blink_set(struct led_classdev *cled, unsigned long *delay_on, + unsigned long *delay_off) +{ + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); + int err; + + /* + * HW supports two types of blinking: full (6Hz) and half (3Hz). + * For delay on/off zero LED is setting to solid color. For others + * combination blinking is to be controlled by the software timer. + */ + if (!(*delay_on == 0 && *delay_off == 0) && + !(*delay_on == MLXREG_LED_BLINK_3HZ && + *delay_off == MLXREG_LED_BLINK_3HZ) && + !(*delay_on == MLXREG_LED_BLINK_6HZ && + *delay_off == MLXREG_LED_BLINK_6HZ)) + return -EINVAL; + + if (*delay_on == MLXREG_LED_BLINK_6HZ) + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color + + MLXREG_LED_OFFSET_FULL); + else if (*delay_on == MLXREG_LED_BLINK_3HZ) + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color + + MLXREG_LED_OFFSET_HALF); + else + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color); + + return err; +} + +static int mlxreg_led_config(struct mlxreg_led_priv_data *priv) +{ + struct mlxreg_core_led_platform_data *pdata = priv->pdata; + struct mlxreg_core_data *data = pdata->data->led; + struct mlxreg_core_led_data *led_data; + struct led_classdev *led_cdev; + int brightness; + int i; + int err; + + for (i = 0; i < pdata->counter; i++, data++) { + led_data = &pdata->data[i]; + led_cdev = &led_data->led_cdev; + led_data->data_parent = priv; + if (strstr(data->label, "red")) { + brightness = LED_OFF; + led_data->base_color = MLXREG_LED_RED_SOLID; + } else if (strstr(data->label, "amber")) { + brightness = LED_OFF; + led_data->base_color = MLXREG_LED_AMBER_SOLID; + } else { + brightness = LED_OFF; + led_data->base_color = MLXREG_LED_GREEN_SOLID; + } + sprintf(led_data->led_cdev_name, "%s:%s", "mlxreg", + data->label); + led_cdev->name = led_data->led_cdev_name; + led_cdev->brightness = brightness; + led_cdev->max_brightness = LED_ON; + led_cdev->brightness_set_blocking = + mlxreg_led_brightness_set; + led_cdev->brightness_get = mlxreg_led_brightness_get; + led_cdev->blink_set = mlxreg_led_blink_set; + led_cdev->flags = LED_CORE_SUSPENDRESUME; + led_data->led = data; + err = devm_led_classdev_register(&priv->pdev->dev, led_cdev); + if (err) + return err; + + if (led_cdev->brightness) + mlxreg_led_brightness_set(led_cdev, + led_cdev->brightness); + dev_info(led_cdev->dev, "label: %s, mask: 0x%02x, offset:0x%02x\n", + data->label, data->mask, data->reg); + } + + return 0; +} + +static int mlxreg_led_probe(struct platform_device *pdev) +{ + struct mlxreg_core_led_platform_data *pdata; + struct mlxreg_led_priv_data *priv; + + pdata = dev_get_platdata(&pdev->dev); + if (!pdata) { + dev_err(&pdev->dev, "Failed to get platform data.\n"); + return -EINVAL; + } + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + mutex_init(&priv->access_lock); + priv->pdev = pdev; + priv->pdata = pdata; + + return mlxreg_led_config(priv); +} + +static int mlxreg_led_remove(struct platform_device *pdev) +{ + struct mlxreg_led_priv_data *priv = dev_get_drvdata(&pdev->dev); + + mutex_destroy(&priv->access_lock); + + return 0; +} + +static const struct of_device_id mlxreg_led_dt_match[] = { + { .compatible = "mellanox,leds-mlxreg" }, + { }, +}; +MODULE_DEVICE_TABLE(of, mlxreg_dt_match); + +static struct platform_driver mlxreg_led_driver = { + .driver = { + .name = "leds-mlxreg", + .of_match_table = of_match_ptr(mlxreg_led_dt_match), + }, + .probe = mlxreg_led_probe, + .remove = mlxreg_led_remove, +}; + +module_platform_driver(mlxreg_led_driver); + +MODULE_AUTHOR("Vadim Pasternak <vadimp@mellanox.com>"); +MODULE_DESCRIPTION("Mellanox LED regmap driver"); +MODULE_LICENSE("Dual BSD/GPL"); +MODULE_ALIAS("platform:leds-mlxreg"); -- 2.1.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC 2017-07-31 16:21 ` [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC Vadim Pasternak @ 2017-08-02 8:38 ` Pavel Machek 2017-08-02 9:16 ` Vadim Pasternak 2017-08-02 18:13 ` Jacek Anaszewski 1 sibling, 1 reply; 6+ messages in thread From: Pavel Machek @ 2017-08-02 8:38 UTC (permalink / raw) To: Vadim Pasternak Cc: j.anaszewski, rpurdie, linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski [-- Attachment #1: Type: text/plain, Size: 2278 bytes --] Hi! > Driver obtains LED devices according to system configuration and creates > devices in form: "devicename:color:function", like > The full path is to be: > /sys/class/leds/mlxreg\:status\:amber/brightness > After timer trigger activation: > echo timer > /sys/class/leds/mlxreg\:status\:amber/trigger > Attributes for LED blinking will appaer in sysfs infrastructure: > /sys/class/leds/mlxreg\:status\:amber/delay_off > /sys/class/leds/mlxreg\:status\:amber/delay_on > > LED setting is controlled through the on-board programmable devices, > which exports its register map. This device could be attached to any > bus type, for which register mapping is supported. > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> ... > +/* Codes for LEDs. */ > +#define MLXREG_LED_OFFSET_HALF 0x01 /* Offset from solid: 3Hz blink */ > +#define MLXREG_LED_OFFSET_FULL 0x02 /* Offset from solid: 6Hz Can it do half brightness? > + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); > + if (ret < 0) { > + dev_warn(led_pdata->led_cdev.dev, "Failed to get current brightness, error: %d\n", > + ret); > + /* Assume the LED is OFF */ > + ret = LED_OFF; > + goto access_error; Just "return LED_OFF;". > + if (regval >= led_pdata->base_color && > + regval <= (led_pdata->base_color + MLXREG_LED_OFFSET_FULL)) > + ret = LED_FULL; > + else > + ret = LED_OFF; Because it does not seem so here. > + for (i = 0; i < pdata->counter; i++, data++) { > + led_data = &pdata->data[i]; > + led_cdev = &led_data->led_cdev; > + led_data->data_parent = priv; > + if (strstr(data->label, "red")) { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_RED_SOLID; > + } else if (strstr(data->label, "amber")) { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_AMBER_SOLID; > + } else { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_GREEN_SOLID; > + } i don't know about the future, but you may check for "green" substring, too? (Besides the fact that substring search is "interesting"...) Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC 2017-08-02 8:38 ` Pavel Machek @ 2017-08-02 9:16 ` Vadim Pasternak 2017-08-02 11:11 ` Pavel Machek 0 siblings, 1 reply; 6+ messages in thread From: Vadim Pasternak @ 2017-08-02 9:16 UTC (permalink / raw) To: Pavel Machek Cc: j.anaszewski, rpurdie, linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski > -----Original Message----- > From: Pavel Machek [mailto:pavel@ucw.cz] > Sent: Wednesday, August 02, 2017 11:39 AM > To: Vadim Pasternak <vadimp@mellanox.com> > Cc: j.anaszewski@samsung.com; rpurdie@rpsys.net; linux- > leds@vger.kernel.org; lee.jones@linaro.org; robh+dt@kernel.org; > jiri@resnulli.us; =jacek.anaszewski@gmail.com > Subject: Re: [patch v3 1/1] leds: add driver for support Mellanox regmap > LEDs for BMC > > Hi! Hi Pavel, Thank you for review. Would it be possible to review alos [patch v2 1/2] mfd: Add Mellanox regmap core driver , which is after applying you comments for v1? > > > Driver obtains LED devices according to system configuration and > > creates devices in form: "devicename:color:function", like The full > > path is to be: > > /sys/class/leds/mlxreg\:status\:amber/brightness > > After timer trigger activation: > > echo timer > /sys/class/leds/mlxreg\:status\:amber/trigger > > Attributes for LED blinking will appaer in sysfs infrastructure: > > /sys/class/leds/mlxreg\:status\:amber/delay_off > > /sys/class/leds/mlxreg\:status\:amber/delay_on > > > > LED setting is controlled through the on-board programmable devices, > > which exports its register map. This device could be attached to any > > bus type, for which register mapping is supported. > > > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > > ... > > > +/* Codes for LEDs. */ > > +#define MLXREG_LED_OFFSET_HALF 0x01 /* Offset from solid: > 3Hz blink */ > > +#define MLXREG_LED_OFFSET_FULL 0x02 /* Offset from solid: > 6Hz > > Can it do half brightness? This is about blinking frequency. Hardware support 6 hz blinking mode and 3hz blinking mode. If solid orange f.e. has bit mask 1100, setting 1101 or 1110 will blink orange with 3 or 6 KHz. > > > + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); > > + if (ret < 0) { > > + dev_warn(led_pdata->led_cdev.dev, "Failed to get current > brightness, error: %d\n", > > + ret); > > + /* Assume the LED is OFF */ > > + ret = LED_OFF; > > + goto access_error; > > Just "return LED_OFF;". ACK > > > + if (regval >= led_pdata->base_color && > > + regval <= (led_pdata->base_color + MLXREG_LED_OFFSET_FULL)) > > + ret = LED_FULL; > > + else > > + ret = LED_OFF; > > Because it does not seem so here. > > > + for (i = 0; i < pdata->counter; i++, data++) { > > + led_data = &pdata->data[i]; > > + led_cdev = &led_data->led_cdev; > > + led_data->data_parent = priv; > > + if (strstr(data->label, "red")) { > > + brightness = LED_OFF; > > + led_data->base_color = MLXREG_LED_RED_SOLID; > > + } else if (strstr(data->label, "amber")) { > > + brightness = LED_OFF; > > + led_data->base_color = > MLXREG_LED_AMBER_SOLID; > > + } else { > > + brightness = LED_OFF; > > + led_data->base_color = > MLXREG_LED_GREEN_SOLID; > > + } > > i don't know about the future, but you may check for "green" > substring, too? (Besides the fact that substring search is > "interesting"...) OK > > Pavel > -- > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) > http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC 2017-08-02 9:16 ` Vadim Pasternak @ 2017-08-02 11:11 ` Pavel Machek 0 siblings, 0 replies; 6+ messages in thread From: Pavel Machek @ 2017-08-02 11:11 UTC (permalink / raw) To: Vadim Pasternak Cc: j.anaszewski, rpurdie, linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski [-- Attachment #1: Type: text/plain, Size: 767 bytes --] Hi! > > =jacek.anaszewski@gmail.com That email address looks funny. > > > +/* Codes for LEDs. */ > > > +#define MLXREG_LED_OFFSET_HALF 0x01 /* Offset from solid: > > 3Hz blink */ > > > +#define MLXREG_LED_OFFSET_FULL 0x02 /* Offset from solid: > > 6Hz > > > > Can it do half brightness? > > > This is about blinking frequency. Hardware support 6 hz blinking mode and 3hz blinking mode. > If solid orange f.e. has bit mask 1100, setting 1101 or 1110 will blink orange with 3 or 6 KHz. OFFSET_HALF -> OFFSET_BLINK_3HZ? Otherwise looks good, Acked-by: Pavel Machek <pavel@ucw.cz> Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC 2017-07-31 16:21 ` [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC Vadim Pasternak 2017-08-02 8:38 ` Pavel Machek @ 2017-08-02 18:13 ` Jacek Anaszewski 1 sibling, 0 replies; 6+ messages in thread From: Jacek Anaszewski @ 2017-08-02 18:13 UTC (permalink / raw) To: Vadim Pasternak, j.anaszewski, rpurdie Cc: linux-leds, lee.jones, robh+dt, jiri, =jacek.anaszewski, pavel Hi Vadim, On 07/31/2017 06:21 PM, Vadim Pasternak wrote: > Driver obtains LED devices according to system configuration and creates > devices in form: "devicename:color:function", like > The full path is to be: > /sys/class/leds/mlxreg\:status\:amber/brightness > After timer trigger activation: > echo timer > /sys/class/leds/mlxreg\:status\:amber/trigger > Attributes for LED blinking will appaer in sysfs infrastructure: > /sys/class/leds/mlxreg\:status\:amber/delay_off > /sys/class/leds/mlxreg\:status\:amber/delay_on > > LED setting is controlled through the on-board programmable devices, > which exports its register map. This device could be attached to any > bus type, for which register mapping is supported. > > Signed-off-by: Vadim Pasternak <vadimp@mellanox.com> > --- > v2->v3: > Comments pointed out by Jacek: > - fix order in includes; > - add declaration pdata in mlxreg_led_store_hw and mlxreg_led_get_hw; > - add declaration of led_data in mlxreg_led_config; A few similar problems still remain. Please refer below. > - use LED_ON in assignment instead of 1; > - fix mutex call in mlxreg_led_remove; > v1->v2: > Comments pointed out by Jacek: > - remove macros MLXREG_MAP and MLXREG_CDEV; > - brightness_set_blocking insteaf of brightness_set, this fix allows > removing of context validation and workqueue and also three fields from > struct mlxreg_core_led_data in mlxreg.h; > - remove MLXREG_LED_NAME; > - extend Kconfig description; > Changes added by Vadim: > - remove unnecessary includes after dropping workqueue; > --- > MAINTAINERS | 1 + > drivers/leds/Kconfig | 10 ++ > drivers/leds/Makefile | 1 + > drivers/leds/leds-mlxreg.c | 299 +++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 311 insertions(+) > create mode 100644 drivers/leds/leds-mlxreg.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 205d397..ac6b0d0 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -8566,6 +8566,7 @@ M: Vadim Pasternak <vadimp@mellanox.com> > L: linux-leds@vger.kernel.org > S: Supported > F: drivers/leds/leds-mlxcpld.c > +F: drivers/leds/leds-mlxreg.c > F: Documentation/leds/leds-mlxcpld.txt > > MELLANOX PLATFORM DRIVER > diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig > index 594b24d..1c6563d 100644 > --- a/drivers/leds/Kconfig > +++ b/drivers/leds/Kconfig > @@ -657,6 +657,16 @@ config LEDS_MLXCPLD > This option enabled support for the LEDs on the Mellanox > boards. Say Y to enabled these. > > +config LEDS_MLXREG > + tristate "LED support for the Mellanox BMC cards" > + depends on LEDS_CLASS > + help > + This option enabled support for the LEDs on the Mellanox BMC cards. > + The driver can be activated from the device tree or by the direct > + platform device add call. Say Y to enabled these. To compile this > + driver as a module, choose 'M' here: the module will be called > + leds-mlxreg. > + > config LEDS_USER > tristate "Userspace LED support" > depends on LEDS_CLASS > diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile > index 909dae6..3eb76e5 100644 > --- a/drivers/leds/Makefile > +++ b/drivers/leds/Makefile > @@ -69,6 +69,7 @@ obj-$(CONFIG_LEDS_IS31FL319X) += leds-is31fl319x.o > obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o > obj-$(CONFIG_LEDS_PM8058) += leds-pm8058.o > obj-$(CONFIG_LEDS_MLXCPLD) += leds-mlxcpld.o > +obj-$(CONFIG_LEDS_MLXREG) += leds-mlxreg.o > obj-$(CONFIG_LEDS_NIC78BX) += leds-nic78bx.o > obj-$(CONFIG_LEDS_MT6323) += leds-mt6323.o > > diff --git a/drivers/leds/leds-mlxreg.c b/drivers/leds/leds-mlxreg.c > new file mode 100644 > index 0000000..6a424d9 > --- /dev/null > +++ b/drivers/leds/leds-mlxreg.c > @@ -0,0 +1,299 @@ > +/* > + * Copyright (c) 2017 Mellanox Technologies. All rights reserved. > + * Copyright (c) 2017 Vadim Pasternak <vadimp@mellanox.com> > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions are met: > + * > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. Neither the names of the copyright holders nor the names of its > + * contributors may be used to endorse or promote products derived from > + * this software without specific prior written permission. > + * > + * Alternatively, this software may be distributed under the terms of the > + * GNU General Public License ("GPL") version 2 as published by the Free > + * Software Foundation. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS > + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN > + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > + * POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#include <linux/bitops.h> > +#include <linux/device.h> > +#include <linux/io.h> > +#include <linux/leds.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/platform_data/mlxreg.h> > +#include <linux/platform_device.h> > +#include <linux/regmap.h> > + > +/* Codes for LEDs. */ > +#define MLXREG_LED_OFFSET_HALF 0x01 /* Offset from solid: 3Hz blink */ > +#define MLXREG_LED_OFFSET_FULL 0x02 /* Offset from solid: 6Hz blink */ > +#define MLXREG_LED_IS_OFF 0x00 /* Off */ > +#define MLXREG_LED_RED_SOLID 0x05 /* Solid red */ > +#define MLXREG_LED_GREEN_SOLID 0x0D /* Solid green */ > +#define MLXREG_LED_AMBER_SOLID 0x09 /* Solid amber */ > +#define MLXREG_LED_BLINK_3HZ 167 /* ~167 msec off/on - HW support */ > +#define MLXREG_LED_BLINK_6HZ 83 /* ~83 msec off/on - HW support */ > + > +#define cdev_to_priv(c) container_of(c, struct mlxreg_core_led_data, led_cdev) > + > +/** > + * struct mlxreg_led_priv_data - platform private data: > + * > + * @pdev: platform device; > + * @pdata: platform data; > + * @access_lock: mutex for attribute IO access; > + */ > +struct mlxreg_led_priv_data { > + struct platform_device *pdev; > + struct mlxreg_core_led_platform_data *pdata; > + struct mutex access_lock; /* protect IO operations */ > +}; > + > +static int > +mlxreg_led_store_hw(struct mlxreg_core_led_data *led_pdata, u8 vset) > +{ > + struct mlxreg_led_priv_data *priv = led_pdata->data_parent; > + struct mlxreg_core_led_platform_data *pdata = priv->pdata; > + u32 regval; > + u32 nib; > + int ret; > + > + /* > + * Each LED is controlled through low or high nibble of the relevant > + * register byte. Register offset is specified by off parameter. > + * Parameter vset provides color code: 0x0 for off, 0x5 for solid red, > + * 0x6 for 3Hz blink red, 0xd for solid green, 0xe for 3Hz blink > + * green. > + * Parameter mask specifies which nibble is used for specific LED: mask > + * 0xf0 - lower nibble is to be used (bits from 0 to 3), mask 0x0f - > + * higher nibble (bits from 4 to 7). > + */ > + mutex_lock(&priv->access_lock); > + > + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); > + if (ret) > + goto access_error; > + > + nib = (ror32(led_pdata->led->mask, led_pdata->led->bit) == 0xf0) ? > + rol32(vset, led_pdata->led->bit) : > + rol32(vset, led_pdata->led->bit + 4); > + regval = (regval & led_pdata->led->mask) | nib; > + > + ret = regmap_write(pdata->regmap, led_pdata->led->reg, regval); It would be convenient to have a "led" variable here too. > + > +access_error: > + mutex_unlock(&priv->access_lock); > + > + return ret; > +} > + > +static enum led_brightness > +mlxreg_led_get_hw(struct mlxreg_core_led_data *led_pdata) > +{ > + struct mlxreg_led_priv_data *priv = led_pdata->data_parent; > + struct mlxreg_core_led_platform_data *pdata = priv->pdata; > + u32 regval; > + int ret; > + > + /* > + * Each LED is controlled through low or high nibble of the relevant > + * register byte. Register offset is specified by off parameter. > + * Parameter vset provides color code: 0x0 for off, 0x5 for solid red, > + * 0x6 for 3Hz blink red, 0xd for solid green, 0xe for 3Hz blink > + * green. > + * Parameter mask specifies which nibble is used for specific LED: mask > + * 0xf0 - lower nibble is to be used (bits from 0 to 3), mask 0x0f - > + * higher nibble (bits from 4 to 7). > + */ > + ret = regmap_read(pdata->regmap, led_pdata->led->reg, ®val); > + if (ret < 0) { > + dev_warn(led_pdata->led_cdev.dev, "Failed to get current brightness, error: %d\n", > + ret); > + /* Assume the LED is OFF */ > + ret = LED_OFF; > + goto access_error; > + } > + > + regval = regval & ~led_pdata->led->mask; > + regval = (ror32(led_pdata->led->mask, led_pdata->led->bit) == 0xf0) ? > + ror32(regval, led_pdata->led->bit) : > + ror32(regval, led_pdata->led->bit + 4); Ditto. > + if (regval >= led_pdata->base_color && > + regval <= (led_pdata->base_color + MLXREG_LED_OFFSET_FULL)) > + ret = LED_FULL; > + else > + ret = LED_OFF; > + > +access_error: > + > + return ret; > +} > + > +static int > +mlxreg_led_brightness_set(struct led_classdev *cled, enum led_brightness value) > +{ > + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); > + > + if (value) > + return mlxreg_led_store_hw(led_pdata, led_pdata->base_color); > + else > + return mlxreg_led_store_hw(led_pdata, MLXREG_LED_IS_OFF); > +} > + > +static enum led_brightness > +mlxreg_led_brightness_get(struct led_classdev *cled) > +{ > + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); > + > + return mlxreg_led_get_hw(led_pdata); > +} > + > +static int > +mlxreg_led_blink_set(struct led_classdev *cled, unsigned long *delay_on, > + unsigned long *delay_off) > +{ > + struct mlxreg_core_led_data *led_pdata = cdev_to_priv(cled); > + int err; > + > + /* > + * HW supports two types of blinking: full (6Hz) and half (3Hz). > + * For delay on/off zero LED is setting to solid color. For others > + * combination blinking is to be controlled by the software timer. > + */ > + if (!(*delay_on == 0 && *delay_off == 0) && > + !(*delay_on == MLXREG_LED_BLINK_3HZ && > + *delay_off == MLXREG_LED_BLINK_3HZ) && > + !(*delay_on == MLXREG_LED_BLINK_6HZ && > + *delay_off == MLXREG_LED_BLINK_6HZ)) > + return -EINVAL; > + > + if (*delay_on == MLXREG_LED_BLINK_6HZ) > + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color + > + MLXREG_LED_OFFSET_FULL); > + else if (*delay_on == MLXREG_LED_BLINK_3HZ) > + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color + > + MLXREG_LED_OFFSET_HALF); > + else > + err = mlxreg_led_store_hw(led_pdata, led_pdata->base_color); > + > + return err; > +} > + > +static int mlxreg_led_config(struct mlxreg_led_priv_data *priv) > +{ > + struct mlxreg_core_led_platform_data *pdata = priv->pdata; > + struct mlxreg_core_data *data = pdata->data->led; This is entirely messed up. pdata->data should be assigned to an auxiliary 'data' variable and then 'led_data' variable should be assigned data->led. > + struct mlxreg_core_led_data *led_data; It will of course clash with this variable's name, so it indicates that there is some problem with the variable naming semantics. Maybe taking one more look at the data structures here will allow for creating something less convoluted? > + struct led_classdev *led_cdev; > + int brightness; > + int i; > + int err; > + > + for (i = 0; i < pdata->counter; i++, data++) { > + led_data = &pdata->data[i]; > + led_cdev = &led_data->led_cdev; > + led_data->data_parent = priv; > + if (strstr(data->label, "red")) { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_RED_SOLID; > + } else if (strstr(data->label, "amber")) { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_AMBER_SOLID; > + } else { > + brightness = LED_OFF; > + led_data->base_color = MLXREG_LED_GREEN_SOLID; > + } > + sprintf(led_data->led_cdev_name, "%s:%s", "mlxreg", > + data->label); > + led_cdev->name = led_data->led_cdev_name; > + led_cdev->brightness = brightness; > + led_cdev->max_brightness = LED_ON; > + led_cdev->brightness_set_blocking = > + mlxreg_led_brightness_set; > + led_cdev->brightness_get = mlxreg_led_brightness_get; > + led_cdev->blink_set = mlxreg_led_blink_set; > + led_cdev->flags = LED_CORE_SUSPENDRESUME; > + led_data->led = data; > + err = devm_led_classdev_register(&priv->pdev->dev, led_cdev); > + if (err) > + return err; > + > + if (led_cdev->brightness) > + mlxreg_led_brightness_set(led_cdev, > + led_cdev->brightness); > + dev_info(led_cdev->dev, "label: %s, mask: 0x%02x, offset:0x%02x\n", > + data->label, data->mask, data->reg); > + } > + > + return 0; > +} > + > +static int mlxreg_led_probe(struct platform_device *pdev) > +{ > + struct mlxreg_core_led_platform_data *pdata; > + struct mlxreg_led_priv_data *priv; > + > + pdata = dev_get_platdata(&pdev->dev); > + if (!pdata) { > + dev_err(&pdev->dev, "Failed to get platform data.\n"); > + return -EINVAL; > + } > + > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + mutex_init(&priv->access_lock); > + priv->pdev = pdev; > + priv->pdata = pdata; > + > + return mlxreg_led_config(priv); > +} > + > +static int mlxreg_led_remove(struct platform_device *pdev) > +{ > + struct mlxreg_led_priv_data *priv = dev_get_drvdata(&pdev->dev); > + > + mutex_destroy(&priv->access_lock); > + > + return 0; > +} > + > +static const struct of_device_id mlxreg_led_dt_match[] = { > + { .compatible = "mellanox,leds-mlxreg" }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, mlxreg_dt_match); > + > +static struct platform_driver mlxreg_led_driver = { > + .driver = { > + .name = "leds-mlxreg", > + .of_match_table = of_match_ptr(mlxreg_led_dt_match), > + }, > + .probe = mlxreg_led_probe, > + .remove = mlxreg_led_remove, > +}; > + > +module_platform_driver(mlxreg_led_driver); > + > +MODULE_AUTHOR("Vadim Pasternak <vadimp@mellanox.com>"); > +MODULE_DESCRIPTION("Mellanox LED regmap driver"); > +MODULE_LICENSE("Dual BSD/GPL"); > +MODULE_ALIAS("platform:leds-mlxreg"); > -- Best regards, Jacek Anaszewski ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-02 18:13 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-07-31 16:21 [patch v3 0/1] Introduce support for mlxreg LED driver Vadim Pasternak 2017-07-31 16:21 ` [patch v3 1/1] leds: add driver for support Mellanox regmap LEDs for BMC Vadim Pasternak 2017-08-02 8:38 ` Pavel Machek 2017-08-02 9:16 ` Vadim Pasternak 2017-08-02 11:11 ` Pavel Machek 2017-08-02 18:13 ` Jacek Anaszewski
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.