USB: ezusb: add functions for firmware download

This patch adds new functions to upload firmware to the controller. The
drivers currently using ezusb are adapted to use these new functions.

This also fixes a bug occuring during firmware loading in the
whiteheat-driver:
The driver iterates over an ihex-formatted firmware using ++ on a "const
struct ihex_binrec*" which leads to faulty results, because ihex data is
read as length. The function "ihex_next_binrec(record)" has so be used
to work correctly

Signed-off-by: René Bürgel <rene.buergel@sohard.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 79 insertions, 0 deletions

diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index bc3076f2c066..4223d761223d 100644
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/serial/ezusb.c
@@ -13,6 +13,8 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/usb.h>
+#include <linux/firmware.h>
+#include <linux/ihex.h>
 
 struct ezusb_fx_type {
         /* EZ-USB Control and Status Register.  Bit 0 controls 8051 reset */
@@ -79,3 +81,80 @@ int ezusb_fx2_set_reset(struct usb_device *dev, unsigned char reset_bit)
         return ezusb_set_reset(dev, ezusb_fx2.cpucs_reg, reset_bit);
 }
 EXPORT_SYMBOL_GPL(ezusb_fx2_set_reset);
+
+static int ezusb_ihex_firmware_download(struct usb_device *dev,
+                                        struct ezusb_fx_type fx,
+                                        const char *firmware_path)
+{
+        int ret = -ENOENT;
+        const struct firmware *firmware = NULL;
+        const struct ihex_binrec *record;
+
+        if (request_ihex_firmware(&firmware, firmware_path,
+                                  &dev->dev)) {
+                dev_err(&dev->dev,
+                        "%s - request \"%s\" failed\n",
+                        __func__, firmware_path);
+                goto out;
+        }
+
+        ret = ezusb_set_reset(dev, fx.cpucs_reg, 0);
+        if (ret < 0)
+                goto out;
+
+        record = (const struct ihex_binrec *)firmware->data;
+        for (; record; record = ihex_next_binrec(record)) {
+                if (be32_to_cpu(record->addr) > fx.max_internal_adress) {
+                        ret = ezusb_writememory(dev, be32_to_cpu(record->addr),
+                                                (unsigned char *)record->data,
+                                                be16_to_cpu(record->len), WRITE_EXT_RAM);
+                        if (ret < 0) {
+                                dev_err(&dev->dev, "%s - ezusb_writememory "
+                                        "failed writing internal memory "
+                                        "(%d %04X %p %d)\n", __func__, ret,
+                                        be32_to_cpu(record->addr), record->data,
+                                        be16_to_cpu(record->len));
+                                goto out;
+                        }
+                }
+        }
+
+        ret = ezusb_set_reset(dev, fx.cpucs_reg, 1);
+        if (ret < 0)
+                goto out;
+        record = (const struct ihex_binrec *)firmware->data;
+        for (; record; record = ihex_next_binrec(record)) {
+                if (be32_to_cpu(record->addr) <= fx.max_internal_adress) {
+                        ret = ezusb_writememory(dev, be32_to_cpu(record->addr),
+                                                (unsigned char *)record->data,
+                                                be16_to_cpu(record->len), WRITE_INT_RAM);
+                        if (ret < 0) {
+                                dev_err(&dev->dev, "%s - ezusb_writememory "
+                                        "failed writing external memory "
+                                        "(%d %04X %p %d)\n", __func__, ret,
+                                        be32_to_cpu(record->addr), record->data,
+                                        be16_to_cpu(record->len));
+                                goto out;
+                        }
+                }
+        }
+        ret = ezusb_set_reset(dev, fx.cpucs_reg, 0);
+out:
+        release_firmware(firmware);
+        return ret;
+}
+
+int ezusb_fx1_ihex_firmware_download(struct usb_device *dev,
+                                     const char *firmware_path)
+{
+        return ezusb_ihex_firmware_download(dev, ezusb_fx1, firmware_path);
+}
+EXPORT_SYMBOL_GPL(ezusb_fx1_ihex_firmware_download);
+
+int ezusb_fx2_ihex_firmware_download(struct usb_device *dev,
+                                     const char *firmware_path)
+{
+        return ezusb_ihex_firmware_download(dev, ezusb_fx2, firmware_path);
+}
+EXPORT_SYMBOL_GPL(ezusb_fx2_ihex_firmware_download);
+