Commit fa0d2f44 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Wim Van Sebroeck

watchdog: ziirave_wdt: Fix DOWNLOAD_START payload

Bootloader firmware expects the following traffic for DOWNLOAD_END:

S Addr Wr [A] 0x10 [A] P

using ziirave_firm_write_byte() will result in

S Addr Wr [A] 0x10 [A] 0x01 [A] 0x01 [A] P

which happens to work because firmware will ignore any extra bytes
sent. Fix this by converting the code to use i2c_smbus_write_byte()
instead.
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rick Ramstetter <rick@anteaterllc.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20190812200906.31344-21-andrew.smirnov@gmail.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent fe05178c
...@@ -217,13 +217,6 @@ static int ziirave_firm_write_block_data(struct watchdog_device *wdd, ...@@ -217,13 +217,6 @@ static int ziirave_firm_write_block_data(struct watchdog_device *wdd,
return ret; return ret;
} }
static int ziirave_firm_write_byte(struct watchdog_device *wdd, u8 command,
u8 byte, bool wait_for_ack)
{
return ziirave_firm_write_block_data(wdd, command, 1, &byte,
wait_for_ack);
}
static bool ziirave_firm_addr_readonly(u32 addr) static bool ziirave_firm_addr_readonly(u32 addr)
{ {
return addr < ZIIRAVE_FIRM_FLASH_MEMORY_START || return addr < ZIIRAVE_FIRM_FLASH_MEMORY_START ||
...@@ -375,12 +368,18 @@ static int ziirave_firm_upload(struct watchdog_device *wdd, ...@@ -375,12 +368,18 @@ static int ziirave_firm_upload(struct watchdog_device *wdd,
msleep(500); msleep(500);
ret = ziirave_firm_write_byte(wdd, ZIIRAVE_CMD_DOWNLOAD_START, 1, true); ret = i2c_smbus_write_byte(client, ZIIRAVE_CMD_DOWNLOAD_START);
if (ret) { if (ret) {
dev_err(&client->dev, "Failed to start download\n"); dev_err(&client->dev, "Failed to start download\n");
return ret; return ret;
} }
ret = ziirave_firm_read_ack(wdd);
if (ret) {
dev_err(&client->dev, "No ACK for start download\n");
return ret;
}
msleep(500); msleep(500);
for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) { for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment