staging/gdm72xx: sdio_boot: replace firmware upgrade API

Replace firmware upgrade API in download_image().

Signed-off-by: Macpaul Lin <macpaul.from.taiwan@gmail.com>
Cc: Macpaul Lin <macpaul@gmail.com>
Cc: Paul Stewart <pstew@chromium.org>
Cc: Ben Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gdm72xx/sdio_boot.c b/drivers/staging/gdm72xx/sdio_boot.c
index 65624bca8b3ab354f0cfb312bff1f69229a59357..38feb1acd8e06c845d9da13b4824d0c9dbb99713 100644 (file)
--- a/drivers/staging/gdm72xx/sdio_boot.c
+++ b/drivers/staging/gdm72xx/sdio_boot.c
@@ -24,15 +24,18 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
 
+#include <linux/firmware.h>
+
 #include "gdm_sdio.h"
 
 #define TYPE_A_HEADER_SIZE     4
 #define TYPE_A_LOOKAHEAD_SIZE   16
-#define YMEM0_SIZE                     0x8000  /* 32kbytes */
+#define YMEM0_SIZE             0x8000  /* 32kbytes */
 #define DOWNLOAD_SIZE          (YMEM0_SIZE - TYPE_A_HEADER_SIZE)
 
-#define KRN_PATH       "/lib/firmware/gdm72xx/gdmskrn.bin"
-#define RFS_PATH       "/lib/firmware/gdm72xx/gdmsrfs.bin"
+#define FW_DIR                 "gdm72xx/"
+#define FW_KRN                 "gdmskrn.bin"
+#define FW_RFS                 "gdmsrfs.bin"
 
 static u8 *tx_buf;
 
@@ -52,57 +55,57 @@ static int ack_ready(struct sdio_func *func)
        return 0;
 }
 
-static int download_image(struct sdio_func *func, char *img_name)
+static int download_image(struct sdio_func *func, const char *img_name)
 {
-       int ret = 0, len, size, pno;
-       struct file *filp = NULL;
-       struct inode *inode = NULL;
+       int ret = 0, len, pno;
        u8 *buf = tx_buf;
        loff_t pos = 0;
-
-       filp = filp_open(img_name, O_RDONLY | O_LARGEFILE, 0);
-       if (IS_ERR(filp)) {
-               printk(KERN_ERR "Can't find %s.\n", img_name);
-               return -ENOENT;
+       int img_len;
+       const struct firmware *firm;
+
+       ret = request_firmware(&firm, img_name, &func->dev);
+       if (ret < 0) {
+               printk(KERN_ERR
+                      "requesting firmware %s failed with error %d\n",
+                       img_name, ret);
+               return ret;
        }
 
-       inode = filp->f_dentry->d_inode;
-       if (!S_ISREG(inode->i_mode)) {
-               printk(KERN_ERR "Invalid file type: %s\n", img_name);
-               ret = -EINVAL;
-               goto out;
+       buf = kmalloc(DOWNLOAD_SIZE + TYPE_A_HEADER_SIZE, GFP_KERNEL);
+       if (buf == NULL) {
+               printk(KERN_ERR "Error: kmalloc\n");
+               return -ENOMEM;
        }
 
-       size = i_size_read(inode->i_mapping->host);
-       if (size <= 0) {
-               printk(KERN_ERR "Unable to find file size: %s\n", img_name);
-               ret = size;
+       img_len = firm->size;
+
+       if (img_len <= 0) {
+               ret = -1;
                goto out;
        }
 
        pno = 0;
-       while ((len = filp->f_op->read(filp, buf + TYPE_A_HEADER_SIZE,
-                                       DOWNLOAD_SIZE, &pos))) {
-               if (len < 0) {
-                       ret = -1;
-                       goto out;
+       while (img_len > 0) {
+               if (img_len > DOWNLOAD_SIZE) {
+                       len = DOWNLOAD_SIZE;
+                       buf[3] = 0;
+               } else {
+                       len = img_len; /* the last packet */
+                       buf[3] = 2;
                }
 
                buf[0] = len & 0xff;
                buf[1] = (len >> 8) & 0xff;
                buf[2] = (len >> 16) & 0xff;
 
-               if (pos >= size)        /* The last packet */
-                       buf[3] = 2;
-               else
-                       buf[3] = 0;
-
+               memcpy(buf+TYPE_A_HEADER_SIZE, firm->data + pos, len);
                ret = sdio_memcpy_toio(func, 0, buf, len + TYPE_A_HEADER_SIZE);
                if (ret < 0) {
                        printk(KERN_ERR "gdmwm: send image error: "
                                "packet number = %d ret = %d\n", pno, ret);
                        goto out;
                }
+
                if (buf[3] == 2)        /* The last packet */
                        break;
                if (!ack_ready(func)) {
@@ -119,17 +122,21 @@ static int download_image(struct sdio_func *func, char *img_name)
                sdio_writeb(func, 0x01, 0x13, &ret);
                sdio_writeb(func, 0x00, 0x10, &ret);    /* PCRRT */
 
+               img_len -= DOWNLOAD_SIZE;
+               pos += DOWNLOAD_SIZE;
                pno++;
        }
+
 out:
-       filp_close(filp, NULL);
+       kfree(buf);
        return ret;
 }
 
 int sdio_boot(struct sdio_func *func)
 {
-       static mm_segment_t fs;
        int ret;
+       const char *krn_name = FW_DIR FW_KRN;
+       const char *rfs_name = FW_DIR FW_RFS;
 
        tx_buf = kmalloc(YMEM0_SIZE, GFP_KERNEL);
        if (tx_buf == NULL) {
@@ -137,21 +144,17 @@ int sdio_boot(struct sdio_func *func)
                return -ENOMEM;
        }
 
-       fs = get_fs();
-       set_fs(get_ds());
-
-       ret = download_image(func, KRN_PATH);
+       ret = download_image(func, krn_name);
        if (ret)
                goto restore_fs;
        printk(KERN_INFO "GCT: Kernel download success.\n");
 
-       ret = download_image(func, RFS_PATH);
+       ret = download_image(func, rfs_name);
        if (ret)
                goto restore_fs;
        printk(KERN_INFO "GCT: Filesystem download success.\n");
 
 restore_fs:
-       set_fs(fs);
        kfree(tx_buf);
        return ret;
 }