ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-21 09:42:09 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

mvebu: puzzle-mcu: improve led driver

Browse Source 
Set blinking mode using scheduled work instead of blocking which may
result in deadlocks.
Add dynamic kprintf debugging hexdumps of all MCU rx and tx.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-12-21 21:44:37 +00:00
parent 15aa53d7ee
commit 7e4c1cca8a
No known key found for this signature in database
GPG Key ID: 5A8F39C31C3217CA
1 changed files with 75 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
target/linux/mvebu/patches-5.10/910-drivers-leds-wt61p803-puzzle-improvements.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/leds/leds-iei-wt61p803-puzzle.c --- a/drivers/leds/leds-iei-wt61p803-puzzle.c
+++ b/drivers/leds/leds-iei-wt61p803-puzzle.c +++ b/drivers/leds/leds-iei-wt61p803-puzzle.c
@@ -9,10 +9,13 @@ @@ -9,9 +9,13 @@
#include <linux/mfd/iei-wt61p803-puzzle.h> #include <linux/mfd/iei-wt61p803-puzzle.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
@ -8,34 +8,34 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/slab.h> #include <linux/slab.h>
+#include <linux/workqueue.h>
+#define IEI_LEDS_MAX 4
+ +
+#define IEI_LEDS_MAX 4
enum iei_wt61p803_puzzle_led_state { enum iei_wt61p803_puzzle_led_state {
IEI_LED_OFF = 0x30, IEI_LED_OFF = 0x30,
IEI_LED_ON = 0x31, @@ -33,7 +37,11 @@ struct iei_wt61p803_puzzle_led {
@@ -34,6 +37,9 @@ struct iei_wt61p803_puzzle_led { struct iei_wt61p803_puzzle *mcu;
unsigned char response_buffer[IEI_WT61P803_PUZZLE_BUF_SIZE]; unsigned char response_buffer[IEI_WT61P803_PUZZLE_BUF_SIZE];
struct mutex lock; /* mutex to protect led_power_state */ struct mutex lock; /* mutex to protect led_power_state */
+ struct work_struct work;
int led_power_state; int led_power_state;
+ int id; + int id;
+ bool blinking; + u8 blinking;
+ bool active_low; + bool active_low;
}; };
static inline struct iei_wt61p803_puzzle_led *cdev_to_iei_wt61p803_puzzle_led static inline struct iei_wt61p803_puzzle_led *cdev_to_iei_wt61p803_puzzle_led
@@ -51,10 +57,20 @@ static int iei_wt61p803_puzzle_led_brigh @@ -51,10 +59,18 @@ static int iei_wt61p803_puzzle_led_brigh
size_t reply_size; size_t reply_size;
int ret; int ret;
+ mutex_lock(&priv->lock);
+ if (priv->blinking) { + if (priv->blinking) {
+ if (brightness == LED_OFF) + if (brightness == LED_OFF)
+ priv->blinking = false; + priv->blinking = 0;
+ else + else
+ return 0; + return 0;
+ } + }
+ mutex_unlock(&priv->lock);
+ +
led_power_cmd[0] = IEI_WT61P803_PUZZLE_CMD_HEADER_START; led_power_cmd[0] = IEI_WT61P803_PUZZLE_CMD_HEADER_START;
led_power_cmd[1] = IEI_WT61P803_PUZZLE_CMD_LED; led_power_cmd[1] = IEI_WT61P803_PUZZLE_CMD_LED;
@ -43,22 +43,40 @@
- led_power_cmd[3] = brightness == LED_OFF ? IEI_LED_OFF : IEI_LED_ON; - led_power_cmd[3] = brightness == LED_OFF ? IEI_LED_OFF : IEI_LED_ON;
+ led_power_cmd[2] = IEI_WT61P803_PUZZLE_CMD_LED_SET(priv->id); + led_power_cmd[2] = IEI_WT61P803_PUZZLE_CMD_LED_SET(priv->id);
+ led_power_cmd[3] = ((brightness == LED_OFF) ^ priv->active_low) ? + led_power_cmd[3] = ((brightness == LED_OFF) ^ priv->active_low) ?
+ IEI_LED_OFF : IEI_LED_ON; + IEI_LED_OFF : priv->blinking?priv->blinking:IEI_LED_ON;
ret = iei_wt61p803_puzzle_write_command(priv->mcu, led_power_cmd, ret = iei_wt61p803_puzzle_write_command(priv->mcu, led_power_cmd,
sizeof(led_power_cmd), sizeof(led_power_cmd),
@@ -90,39 +106,164 @@ static enum led_brightness iei_wt61p803_ @@ -90,39 +106,166 @@ static enum led_brightness iei_wt61p803_
return led_state; return led_state;
} }
+static void iei_wt61p803_puzzle_led_apply_blink(struct work_struct *work)
+{
+ struct iei_wt61p803_puzzle_led *priv = container_of(work, struct iei_wt61p803_puzzle_led, work);
+ unsigned char led_blink_cmd[5] = {};
+ unsigned char resp_buf[IEI_WT61P803_PUZZLE_BUF_SIZE];
+ size_t reply_size;
+
+ led_blink_cmd[0] = IEI_WT61P803_PUZZLE_CMD_HEADER_START;
+ led_blink_cmd[1] = IEI_WT61P803_PUZZLE_CMD_LED;
+ led_blink_cmd[2] = IEI_WT61P803_PUZZLE_CMD_LED_SET(priv->id);
+ led_blink_cmd[3] = priv->blinking;
+
+ iei_wt61p803_puzzle_write_command(priv->mcu, led_blink_cmd,
+ sizeof(led_blink_cmd),
+ resp_buf,
+ &reply_size);
+
+ return;
+}
+
+static int iei_wt61p803_puzzle_led_set_blink(struct led_classdev *cdev, +static int iei_wt61p803_puzzle_led_set_blink(struct led_classdev *cdev,
+ unsigned long *delay_on, + unsigned long *delay_on,
+ unsigned long *delay_off) + unsigned long *delay_off)
+{ +{
+ struct iei_wt61p803_puzzle_led *priv = cdev_to_iei_wt61p803_puzzle_led(cdev); + struct iei_wt61p803_puzzle_led *priv = cdev_to_iei_wt61p803_puzzle_led(cdev);
+ unsigned char led_blink_cmd[5] = {}; + u8 blink_mode = 0;
+ unsigned char resp_buf[IEI_WT61P803_PUZZLE_BUF_SIZE];
+ size_t reply_size;
+ int ret = 0; + int ret = 0;
+ +
+ /* set defaults */ + /* set defaults */
@ -67,57 +85,39 @@
+ *delay_off = 500; + *delay_off = 500;
+ } + }
+ +
+ /* minimum delay for soft-driven blinking is 50ms to keep load low */ + /* minimum delay for soft-driven blinking is 100ms to keep load low */
+ if (*delay_on < 50) + if (*delay_on < 100)
+ *delay_on = 50; + *delay_on = 100;
+ +
+ if (*delay_off < 50) + if (*delay_off < 100)
+ *delay_off = 50; + *delay_off = 100;
+ +
+ if (*delay_on != *delay_off) + /* offload blinking to hardware, if possible */
+ return -EINVAL; + if (*delay_on != *delay_off) {
+ + ret = -EINVAL;
+ /* aggressively offload blinking to hardware, if possible */ + } else if (*delay_on == 100) {
+ if (*delay_on < 100) { + blink_mode = IEI_LED_BLINK_5HZ;
+ return -EINVAL;
+ } else if (*delay_on < 200) {
+ *delay_on = 100; + *delay_on = 100;
+ *delay_off = 100; + *delay_off = 100;
+ } else if (*delay_on <= 500) { + } else if (*delay_on <= 500) {
+ blink_mode = IEI_LED_BLINK_1HZ;
+ *delay_on = 500; + *delay_on = 500;
+ *delay_off = 500; + *delay_off = 500;
+ } else { + } else {
+ return -EINVAL; + ret = -EINVAL;
+ } + }
+ +
+ led_blink_cmd[0] = IEI_WT61P803_PUZZLE_CMD_HEADER_START;
+ led_blink_cmd[1] = IEI_WT61P803_PUZZLE_CMD_LED;
+ led_blink_cmd[2] = IEI_WT61P803_PUZZLE_CMD_LED_SET(priv->id);
+ led_blink_cmd[3] = (*delay_on == 100)?IEI_LED_BLINK_5HZ:IEI_LED_BLINK_1HZ;
+
+ ret = iei_wt61p803_puzzle_write_command(priv->mcu, led_blink_cmd,
+ sizeof(led_blink_cmd),
+ resp_buf,
+ &reply_size);
+
+ if (ret)
+ return ret;
+
+ if (reply_size != 3)
+ return -EIO;
+
+ if (!(resp_buf[0] == IEI_WT61P803_PUZZLE_CMD_HEADER_START &&
+ resp_buf[1] == IEI_WT61P803_PUZZLE_CMD_RESPONSE_OK &&
+ resp_buf[2] == IEI_WT61P803_PUZZLE_CHECKSUM_RESPONSE_OK))
+ return -EIO;
+
+ mutex_lock(&priv->lock); + mutex_lock(&priv->lock);
+ priv->blinking = true; + priv->blinking = blink_mode;
+ mutex_unlock(&priv->lock); + mutex_unlock(&priv->lock);
+ +
+ if (blink_mode)
+ schedule_work(&priv->work);
+
+ return ret; + return ret;
+} +}
+ +
+
+static int iei_wt61p803_puzzle_led_set_dt_default(struct led_classdev *cdev, +static int iei_wt61p803_puzzle_led_set_dt_default(struct led_classdev *cdev,
+ struct device_node *np) + struct device_node *np)
+{ +{
@ -204,7 +204,7 @@
+ priv->mcu = mcu; + priv->mcu = mcu;
+ priv->id = reg; + priv->id = reg;
+ priv->led_power_state = 1; + priv->led_power_state = 1;
+ priv->blinking = false; + priv->blinking = 0;
+ init_data.fwnode = of_fwnode_handle(child); + init_data.fwnode = of_fwnode_handle(child);
+ +
+ priv->cdev.brightness_set_blocking = iei_wt61p803_puzzle_led_brightness_set_blocking; + priv->cdev.brightness_set_blocking = iei_wt61p803_puzzle_led_brightness_set_blocking;
@ -213,6 +213,8 @@
+ +
+ priv->cdev.max_brightness = 1; + priv->cdev.max_brightness = 1;
+ +
+ INIT_WORK(&priv->work, iei_wt61p803_puzzle_led_apply_blink);
+
+ ret = iei_wt61p803_puzzle_led_set_dt_default(&priv->cdev, child); + ret = iei_wt61p803_puzzle_led_set_dt_default(&priv->cdev, child);
+ if (ret) { + if (ret) {
+ dev_err(dev, "Could apply default from DT\n"); + dev_err(dev, "Could apply default from DT\n");
@ -245,3 +247,25 @@
#define IEI_WT61P803_PUZZLE_CMD_TEMP 0x54 /* T */ #define IEI_WT61P803_PUZZLE_CMD_TEMP 0x54 /* T */
#define IEI_WT61P803_PUZZLE_CMD_TEMP_ALL 0x41 /* A */ #define IEI_WT61P803_PUZZLE_CMD_TEMP_ALL 0x41 /* A */
--- a/drivers/mfd/iei-wt61p803-puzzle.c
+++ b/drivers/mfd/iei-wt61p803-puzzle.c
@@ -176,6 +176,9 @@ static int iei_wt61p803_puzzle_recv_buf(
struct iei_wt61p803_puzzle *mcu = serdev_device_get_drvdata(serdev);
int ret;
+ print_hex_dump_debug("puzzle-mcu rx: ", DUMP_PREFIX_NONE,
+ 16, 1, data, size, false);
+
ret = iei_wt61p803_puzzle_process_resp(mcu, data, size);
/* Return the number of processed bytes if function returns error,
* discard the remaining incoming data, since the frame this data
@@ -246,6 +249,9 @@ int iei_wt61p803_puzzle_write_command(st
cmd[size - 1] = iei_wt61p803_puzzle_checksum(cmd, size - 1);
+ print_hex_dump_debug("puzzle-mcu tx: ", DUMP_PREFIX_NONE,
+ 16, 1, cmd, size, false);
+
/* Initialize reply struct */
reinit_completion(&mcu->reply->received);
mcu->reply->size = 0;