* [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions
@ 2018-03-08 17:37 Andrey Smirnov
2018-03-08 17:37 ` [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug() Andrey Smirnov
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrey Smirnov @ 2018-03-08 17:37 UTC (permalink / raw)
To: Lee Jones
Cc: Andrey Smirnov, linux-kernel, cphealy, Lucas Stach, Guenter Roeck
Add code that would query and print out bootloader and application
firmware version info.
Cc: linux-kernel@vger.kernel.org
Cc: cphealy@gmail.com
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Tested-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
Changes since [v1]:
- Removed unused deving from the middle of 'struct rave_status'
[v1] https://lkml.kernel.org/r/20180226150739.13457-1-andrew.smirnov@gmail.com
drivers/mfd/rave-sp.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index c8173de5653a..be243678a61e 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -160,6 +160,8 @@ struct rave_sp_variant {
* @variant: Device variant specific information
* @event_notifier_list: Input event notification chain
*
+ * @part_number_firmware: Firmware version
+ * @part_number_bootloader: Bootloader version
*/
struct rave_sp {
struct serdev_device *serdev;
@@ -171,8 +173,40 @@ struct rave_sp {
const struct rave_sp_variant *variant;
struct blocking_notifier_head event_notifier_list;
+
+ const char *part_number_firmware;
+ const char *part_number_bootloader;
};
+struct rave_sp_version {
+ u8 hardware;
+ __le16 major;
+ u8 minor;
+ u8 letter[2];
+} __packed;
+
+struct rave_sp_status {
+ struct rave_sp_version bootloader_version;
+ struct rave_sp_version firmware_version;
+ u16 rdu_eeprom_flag;
+ u16 dds_eeprom_flag;
+ u8 pic_flag;
+ u8 orientation;
+ u32 etc;
+ s16 temp[2];
+ u8 backlight_current[3];
+ u8 dip_switch;
+ u8 host_interrupt;
+ u16 voltage_28;
+ u8 i2c_device_status;
+ u8 power_status;
+ u8 general_status;
+ u8 deprecated1;
+ u8 power_led_status;
+ u8 deprecated2;
+ u8 periph_power_shutoff;
+} __packed;
+
static bool rave_sp_id_is_event(u8 code)
{
return (code & 0xF0) == RAVE_SP_EVNT_BASE;
@@ -609,6 +643,52 @@ static int rave_sp_default_cmd_translate(enum rave_sp_command command)
}
}
+static const char *devm_rave_sp_version(struct device *dev,
+ struct rave_sp_version *version)
+{
+ /*
+ * NOTE: The format string below uses %02d to display u16
+ * intentionally for the sake of backwards compatibility with
+ * legacy software.
+ */
+ return devm_kasprintf(dev, GFP_KERNEL, "%02d%02d%02d.%c%c\n",
+ version->hardware,
+ le16_to_cpu(version->major),
+ version->minor,
+ version->letter[0],
+ version->letter[1]);
+}
+
+static int rave_sp_get_status(struct rave_sp *sp)
+{
+ struct device *dev = &sp->serdev->dev;
+ u8 cmd[] = {
+ [0] = RAVE_SP_CMD_STATUS,
+ [1] = 0
+ };
+ struct rave_sp_status status;
+ const char *version;
+ int ret;
+
+ ret = rave_sp_exec(sp, cmd, sizeof(cmd), &status, sizeof(status));
+ if (ret)
+ return ret;
+
+ version = devm_rave_sp_version(dev, &status.firmware_version);
+ if (!version)
+ return -ENOMEM;
+
+ sp->part_number_firmware = version;
+
+ version = devm_rave_sp_version(dev, &status.bootloader_version);
+ if (!version)
+ return -ENOMEM;
+
+ sp->part_number_bootloader = version;
+
+ return 0;
+}
+
static const struct rave_sp_checksum rave_sp_checksum_8b2c = {
.length = 1,
.subroutine = csum_8b2c,
@@ -657,6 +737,7 @@ static const struct serdev_device_ops rave_sp_serdev_device_ops = {
static int rave_sp_probe(struct serdev_device *serdev)
{
struct device *dev = &serdev->dev;
+ const char *unknown = "unknown\n";
struct rave_sp *sp;
u32 baud;
int ret;
@@ -689,6 +770,20 @@ static int rave_sp_probe(struct serdev_device *serdev)
serdev_device_set_baudrate(serdev, baud);
+ ret = rave_sp_get_status(sp);
+ if (ret) {
+ dev_warn(dev, "Failed to get firmware status: %d\n", ret);
+ sp->part_number_firmware = unknown;
+ sp->part_number_bootloader = unknown;
+ }
+
+ /*
+ * Those strings already have a \n embedded, so there's no
+ * need to have one in format string.
+ */
+ dev_info(dev, "Firmware version: %s", sp->part_number_firmware);
+ dev_info(dev, "Bootloader version: %s", sp->part_number_bootloader);
+
return devm_of_platform_populate(dev);
}
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug()
2018-03-08 17:37 [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Andrey Smirnov
@ 2018-03-08 17:37 ` Andrey Smirnov
2018-03-12 14:12 ` Lee Jones
2018-03-08 17:37 ` [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte Andrey Smirnov
2018-03-12 14:11 ` [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Lee Jones
2 siblings, 1 reply; 6+ messages in thread
From: Andrey Smirnov @ 2018-03-08 17:37 UTC (permalink / raw)
To: Lee Jones
Cc: Andrey Smirnov, linux-kernel, cphealy, Lucas Stach, Guenter Roeck
Convert print_hex_dump() to print_hex_dump_debug() to be able to
leverage CONFIG_DYNAMIC_DEBUG.
Cc: linux-kernel@vger.kernel.org
Cc: cphealy@gmail.com
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/mfd/rave-sp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index be243678a61e..5c1442fa2308 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -309,8 +309,8 @@ static int rave_sp_write(struct rave_sp *sp, const u8 *data, u8 data_size)
length = dest - frame;
- print_hex_dump(KERN_DEBUG, "rave-sp tx: ", DUMP_PREFIX_NONE,
- 16, 1, frame, length, false);
+ print_hex_dump_debug("rave-sp tx: ", DUMP_PREFIX_NONE,
+ 16, 1, frame, length, false);
return serdev_device_write(sp->serdev, frame, length, HZ);
}
@@ -451,8 +451,8 @@ static void rave_sp_receive_frame(struct rave_sp *sp,
struct device *dev = &sp->serdev->dev;
u8 crc_calculated[checksum_length];
- print_hex_dump(KERN_DEBUG, "rave-sp rx: ", DUMP_PREFIX_NONE,
- 16, 1, data, length, false);
+ print_hex_dump_debug("rave-sp rx: ", DUMP_PREFIX_NONE,
+ 16, 1, data, length, false);
if (unlikely(length <= checksum_length)) {
dev_warn(dev, "Dropping short frame\n");
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte
2018-03-08 17:37 [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Andrey Smirnov
2018-03-08 17:37 ` [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug() Andrey Smirnov
@ 2018-03-08 17:37 ` Andrey Smirnov
2018-03-12 14:12 ` Lee Jones
2018-03-12 14:11 ` [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Lee Jones
2 siblings, 1 reply; 6+ messages in thread
From: Andrey Smirnov @ 2018-03-08 17:37 UTC (permalink / raw)
To: Lee Jones
Cc: Andrey Smirnov, linux-kernel, cphealy, Lucas Stach, Guenter Roeck
Check received frame length _before_ accepting next byte in order to
avoid incorrectly rejecting payloads that are RAVE_SP_RX_BUFFER_SIZE
long.
Cc: linux-kernel@vger.kernel.org
Cc: cphealy@gmail.com
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Tested-by: Lucas Stach <l.stach@pengutronix.de>
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/mfd/rave-sp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index 5c1442fa2308..7db1b32d61e2 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -546,8 +546,6 @@ static int rave_sp_receive_buf(struct serdev_device *serdev,
/* FALLTHROUGH */
case RAVE_SP_EXPECT_ESCAPED_DATA:
- deframer->data[deframer->length++] = byte;
-
if (deframer->length == sizeof(deframer->data)) {
dev_warn(dev, "Bad frame: Too long\n");
/*
@@ -562,6 +560,8 @@ static int rave_sp_receive_buf(struct serdev_device *serdev,
goto reset_framer;
}
+ deframer->data[deframer->length++] = byte;
+
/*
* We've extracted out special byte, now we
* can go back to regular data collecting
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions
2018-03-08 17:37 [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Andrey Smirnov
2018-03-08 17:37 ` [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug() Andrey Smirnov
2018-03-08 17:37 ` [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte Andrey Smirnov
@ 2018-03-12 14:11 ` Lee Jones
2 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2018-03-12 14:11 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: linux-kernel, cphealy, Lucas Stach, Guenter Roeck
On Thu, 08 Mar 2018, Andrey Smirnov wrote:
> Add code that would query and print out bootloader and application
> firmware version info.
>
> Cc: linux-kernel@vger.kernel.org
> Cc: cphealy@gmail.com
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Lucas Stach <l.stach@pengutronix.de>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
>
> Changes since [v1]:
>
> - Removed unused deving from the middle of 'struct rave_status'
>
> [v1] https://lkml.kernel.org/r/20180226150739.13457-1-andrew.smirnov@gmail.com
>
> drivers/mfd/rave-sp.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 95 insertions(+)
Applied, thanks.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug()
2018-03-08 17:37 ` [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug() Andrey Smirnov
@ 2018-03-12 14:12 ` Lee Jones
0 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2018-03-12 14:12 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: linux-kernel, cphealy, Lucas Stach, Guenter Roeck
On Thu, 08 Mar 2018, Andrey Smirnov wrote:
> Convert print_hex_dump() to print_hex_dump_debug() to be able to
> leverage CONFIG_DYNAMIC_DEBUG.
>
> Cc: linux-kernel@vger.kernel.org
> Cc: cphealy@gmail.com
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> drivers/mfd/rave-sp.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte
2018-03-08 17:37 ` [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte Andrey Smirnov
@ 2018-03-12 14:12 ` Lee Jones
0 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2018-03-12 14:12 UTC (permalink / raw)
To: Andrey Smirnov; +Cc: linux-kernel, cphealy, Lucas Stach, Guenter Roeck
On Thu, 08 Mar 2018, Andrey Smirnov wrote:
> Check received frame length _before_ accepting next byte in order to
> avoid incorrectly rejecting payloads that are RAVE_SP_RX_BUFFER_SIZE
> long.
>
> Cc: linux-kernel@vger.kernel.org
> Cc: cphealy@gmail.com
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Lucas Stach <l.stach@pengutronix.de>
> Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> drivers/mfd/rave-sp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-12 14:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 17:37 [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Andrey Smirnov
2018-03-08 17:37 ` [PATCH v2 2/3] mfd: rave-sp: Convert print_hex_dump() to print_hex_dump_debug() Andrey Smirnov
2018-03-12 14:12 ` Lee Jones
2018-03-08 17:37 ` [PATCH v2 3/3] mfd: rave-sp: Check received frame length before accepting next byte Andrey Smirnov
2018-03-12 14:12 ` Lee Jones
2018-03-12 14:11 ` [PATCH v2 1/3] mfd: rave-sp: Add code to print firmware versions Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).