pci: Set PCI_COMMAND_IO bit for VGA device

[u-boot] / drivers / dfu / dfu_mmc.c

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c
index 322bd8c5d2de2e0e0797665ca49f1a7fa5aea052..5a9fb4a6e24780ed3fda556ca522cd697d5f90dc 100644 (file)
--- a/drivers/dfu/dfu_mmc.c
+++ b/drivers/dfu/dfu_mmc.c
@@ -16,9 +16,9 @@
 #include <fat.h>
 #include <mmc.h>
 
-static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE)
-                               dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE];
+static unsigned char *dfu_file_buf;
 static long dfu_file_buf_len;
+static long dfu_file_buf_filled;
 
 static int mmc_access_part(struct dfu_entity *dfu, struct mmc *mmc, int part)
 {
@@ -27,7 +27,7 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc *mmc, int part)
        if (part == mmc->part_num)
                return 0;
 
-       ret = mmc_switch_part(dfu->dev_num, part);
+       ret = mmc_switch_part(dfu->data.mmc.dev_num, part);
        if (ret) {
                error("Cannot switch to partition %d\n", part);
                return ret;
@@ -40,10 +40,16 @@ static int mmc_access_part(struct dfu_entity *dfu, struct mmc *mmc, int part)
 static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len)
 {
-       struct mmc *mmc = find_mmc_device(dfu->dev_num);
+       struct mmc *mmc;
        u32 blk_start, blk_count, n = 0;
        int ret, part_num_bkp = 0;
 
+       mmc = find_mmc_device(dfu->data.mmc.dev_num);
+       if (!mmc) {
+               error("Device MMC %d - not found!", dfu->data.mmc.dev_num);
+               return -ENODEV;
+       }
+
        /*
         * We must ensure that we work in lba_blk_size chunks, so ALIGN
         * this value.
@@ -67,15 +73,15 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,
        }
 
        debug("%s: %s dev: %d start: %d cnt: %d buf: 0x%p\n", __func__,
-             op == DFU_OP_READ ? "MMC READ" : "MMC WRITE", dfu->dev_num,
-             blk_start, blk_count, buf);
+             op == DFU_OP_READ ? "MMC READ" : "MMC WRITE",
+             dfu->data.mmc.dev_num, blk_start, blk_count, buf);
        switch (op) {
        case DFU_OP_READ:
-               n = mmc->block_dev.block_read(dfu->dev_num, blk_start,
+               n = mmc->block_dev.block_read(dfu->data.mmc.dev_num, blk_start,
                                              blk_count, buf);
                break;
        case DFU_OP_WRITE:
-               n = mmc->block_dev.block_write(dfu->dev_num, blk_start,
+               n = mmc->block_dev.block_write(dfu->data.mmc.dev_num, blk_start,
                                               blk_count, buf);
                break;
        default:
@@ -151,7 +157,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,
                dfu->data.mmc.dev, dfu->data.mmc.part);
 
        if (op != DFU_OP_SIZE)
-               sprintf(cmd_buf + strlen(cmd_buf), " 0x%x", (unsigned int)buf);
+               sprintf(cmd_buf + strlen(cmd_buf), " %p", buf);
 
        sprintf(cmd_buf + strlen(cmd_buf), " %s", dfu->name);
 
@@ -205,7 +211,7 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu)
 
        if (dfu->layout != DFU_RAW_ADDR) {
                /* Do stuff here. */
-               ret = mmc_file_op(DFU_OP_WRITE, dfu, &dfu_file_buf,
+               ret = mmc_file_op(DFU_OP_WRITE, dfu, dfu_file_buf,
                                &dfu_file_buf_len);
 
                /* Now that we're done */
@@ -225,9 +231,12 @@ long dfu_get_medium_size_mmc(struct dfu_entity *dfu)
                return dfu->data.mmc.lba_size * dfu->data.mmc.lba_blk_size;
        case DFU_FS_FAT:
        case DFU_FS_EXT4:
+               dfu_file_buf_filled = -1;
                ret = mmc_file_op(DFU_OP_SIZE, dfu, NULL, &len);
                if (ret < 0)
                        return ret;
+               if (len > CONFIG_SYS_DFU_MAX_FILE_SIZE)
+                       return -1;
                return len;
        default:
                printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@@ -236,6 +245,27 @@ long dfu_get_medium_size_mmc(struct dfu_entity *dfu)
        }
 }
 
+static int mmc_file_unbuffer(struct dfu_entity *dfu, u64 offset, void *buf,
+                            long *len)
+{
+       int ret;
+       long file_len;
+
+       if (dfu_file_buf_filled == -1) {
+               ret = mmc_file_op(DFU_OP_READ, dfu, dfu_file_buf, &file_len);
+               if (ret < 0)
+                       return ret;
+               dfu_file_buf_filled = file_len;
+       }
+       if (offset + *len > dfu_file_buf_filled)
+               return -EINVAL;
+
+       /* Add to the current buffer. */
+       memcpy(buf, dfu_file_buf + offset, *len);
+
+       return 0;
+}
+
 int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
                long *len)
 {
@@ -247,7 +277,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
                break;
        case DFU_FS_FAT:
        case DFU_FS_EXT4:
-               ret = mmc_file_op(DFU_OP_READ, dfu, buf, len);
+               ret = mmc_file_unbuffer(dfu, offset, buf, len);
                break;
        default:
                printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@@ -257,6 +287,14 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
        return ret;
 }
 
+void dfu_free_entity_mmc(struct dfu_entity *dfu)
+{
+       if (dfu_file_buf) {
+               free(dfu_file_buf);
+               dfu_file_buf = NULL;
+       }
+}
+
 /*
  * @param s Parameter string containing space-separated arguments:
  *     1st:
@@ -270,7 +308,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,
  *     4th (optional):
  *             mmcpart <num> (access to HW eMMC partitions)
  */
-int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
+int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s)
 {
        const char *entity_type;
        size_t second_arg;
@@ -281,6 +319,8 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        const char *argv[3];
        const char **parg = argv;
 
+       dfu->data.mmc.dev_num = simple_strtoul(devstr, NULL, 10);
+
        for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) {
                *parg = strsep(&s, " ");
                if (*parg == NULL) {
@@ -297,9 +337,10 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        second_arg = simple_strtoul(argv[1], NULL, 0);
        third_arg = simple_strtoul(argv[2], NULL, 0);
 
-       mmc = find_mmc_device(dfu->dev_num);
+       mmc = find_mmc_device(dfu->data.mmc.dev_num);
        if (mmc == NULL) {
-               error("Couldn't find MMC device no. %d.\n", dfu->dev_num);
+               error("Couldn't find MMC device no. %d.\n",
+                     dfu->data.mmc.dev_num);
                return -ENODEV;
        }
 
@@ -361,6 +402,18 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
        dfu->write_medium = dfu_write_medium_mmc;
        dfu->flush_medium = dfu_flush_medium_mmc;
        dfu->inited = 0;
+       dfu->free_entity = dfu_free_entity_mmc;
+
+       /* Check if file buffer is ready */
+       if (!dfu_file_buf) {
+               dfu_file_buf = memalign(CONFIG_SYS_CACHELINE_SIZE,
+                                       CONFIG_SYS_DFU_MAX_FILE_SIZE);
+               if (!dfu_file_buf) {
+                       error("Could not memalign 0x%x bytes",
+                             CONFIG_SYS_DFU_MAX_FILE_SIZE);
+                       return -ENOMEM;
+               }
+       }
 
        return 0;
 }