August 2011 - U-Boot

[U-Boot] [PATCH v 0/5] arm: omap4: omap4460 support
by Aneesh V 20 Aug '11

20 Aug '11

OMAP4460 is the latest addition to the OMAP4 family. OMAP4460 has dual core Cortex-A9 CPUs that can be clocked upto 1.5 GHz The memory architecture has been improved to provide better performance and there several other minor improvements in various modules. Aneesh V (5): omap4: add omap4460 revision detection omap4: sdram init changes for omap4460 omap: reuse omap3 gpio support in omap4 omap4: support TPS programming omap4: clock init support for omap4460 arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c | 41 +++---- arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/board.c | 12 ++ arch/arm/cpu/armv7/omap4/board.c | 19 +++ arch/arm/cpu/armv7/omap4/clocks.c | 128 +++++++++++++++++++--- arch/arm/cpu/armv7/omap4/emif.c | 39 ++++--- arch/arm/include/asm/arch-omap3/cpu.h | 26 +++++ arch/arm/include/asm/arch-omap3/gpio.h | 86 --------------- arch/arm/include/asm/arch-omap4/clocks.h | 28 +++++- arch/arm/include/asm/arch-omap4/cpu.h | 26 +++++ arch/arm/include/asm/arch-omap4/emif.h | 10 ++- arch/arm/include/asm/arch-omap4/mux_omap4.h | 1 + arch/arm/include/asm/arch-omap4/omap4.h | 9 ++ arch/arm/include/asm/armv7.h | 1 + 15 files changed, 281 insertions(+), 147 deletions(-) rename arch/arm/cpu/armv7/{omap3 => omap-common}/gpio.c (76%) delete mode 100644 arch/arm/include/asm/arch-omap3/gpio.h

5 25

[U-Boot] [PATCH] Fix compilation for OMAP3 EVM
by Vincent 20 Aug '11

20 Aug '11

Signed-off-by: Vincent Stehlé <vincent.stehle(a)laposte.net> --- board/ti/evm/evm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 30c1c57..d0604e9 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -33,7 +33,6 @@ #include <asm/arch/mem.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> -#include <asm/arch/gpio.h> #include <i2c.h> #include <asm/mach-types.h> #include "evm.h" -- 1.7.2.5

2 2

[U-Boot] [PATCH V2] NAND: Really ignore bad blocks when scrubbing
by Marek Vasut 20 Aug '11

20 Aug '11

This patch avoids BBT completely when scrubbing, not even initial BBT scan happens. Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- drivers/mtd/nand/nand_base.c | 2 +- drivers/mtd/nand/nand_util.c | 22 +++++----------------- include/linux/mtd/mtd.h | 1 + 3 files changed, 7 insertions(+), 18 deletions(-) V2: get rid of the nand_block_bad_scrub() hack. diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index a5f872e..3093067 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2224,7 +2224,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, /* * heck if we have a bad block, we do not erase bad blocks ! */ - if (nand_block_checkbad(mtd, ((loff_t) page) << + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { printk(KERN_WARNING "nand_erase: attempt to erase a " "bad block at page 0x%08x\n", page); diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 81bf366..0c3b7f7 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -57,12 +57,6 @@ typedef struct mtd_info mtd_info_t; #define cpu_to_je16(x) (x) #define cpu_to_je32(x) (x) -/*****************************************************************************/ -static int nand_block_bad_scrub(struct mtd_info *mtd, loff_t ofs, int getchip) -{ - return 0; -} - /** * nand_erase_opts: - erase NAND flash with support for various options * (jffs2 formating) @@ -82,10 +76,10 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) int bbtest = 1; int result; int percent_complete = -1; - int (*nand_block_bad_old)(struct mtd_info *, loff_t, int) = NULL; const char *mtd_device = meminfo->name; struct mtd_oob_ops oob_opts; struct nand_chip *chip = meminfo->priv; + struct nand_chip *priv_nand = meminfo->priv; if ((opts->offset & (meminfo->writesize - 1)) != 0) { printf("Attempt to erase non page aligned data\n"); @@ -110,11 +104,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) * and disable bad block table while erasing. */ if (opts->scrub) { - struct nand_chip *priv_nand = meminfo->priv; - - nand_block_bad_old = priv_nand->block_bad; - priv_nand->block_bad = nand_block_bad_scrub; - /* we don't need the bad block table anymore... + erase.scrub = opts->scrub; + /* + * We don't need the bad block table anymore... * after scrub, there are no bad blocks left! */ if (priv_nand->bbt) { @@ -204,12 +196,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) if (!opts->quiet) printf("\n"); - if (nand_block_bad_old) { - struct nand_chip *priv_nand = meminfo->priv; - - priv_nand->block_bad = nand_block_bad_old; + if (opts->scrub) priv_nand->scan_bbt(meminfo); - } return 0; } diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 3b18d7d..13a711d 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -55,6 +55,7 @@ struct erase_info { u_long priv; u_char state; struct erase_info *next; + int scrub; }; struct mtd_erase_region_info { -- 1.7.5.4

1 0

[U-Boot] [PATCH] NAND: Really ignore bad blocks when scrubbing
by Marek Vasut 20 Aug '11

20 Aug '11

Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- drivers/mtd/nand/nand_base.c | 2 +- drivers/mtd/nand/nand_util.c | 1 + include/linux/mtd/mtd.h | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index a5f872e..3093067 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2224,7 +2224,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, /* * heck if we have a bad block, we do not erase bad blocks ! */ - if (nand_block_checkbad(mtd, ((loff_t) page) << + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { printk(KERN_WARNING "nand_erase: attempt to erase a " "bad block at page 0x%08x\n", page); diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 81bf366..9da6eea 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -98,6 +98,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) erase.mtd = meminfo; erase.len = meminfo->erasesize; erase.addr = opts->offset; + erase.scrub = opts->scrub; erase_length = lldiv(opts->length + meminfo->erasesize - 1, meminfo->erasesize); diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 3b18d7d..13a711d 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -55,6 +55,7 @@ struct erase_info { u_long priv; u_char state; struct erase_info *next; + int scrub; }; struct mtd_erase_region_info { -- 1.7.5.4

4 6

[U-Boot] [PATCH v2] Add 'sf update' command to do smart SPI flash update
by Simon Glass 19 Aug '11

19 Aug '11

This adds a new SPI flash command which only rewrites blocks if the contents need to change. This can speed up SPI flash programming when much of the data is unchanged from what is already there. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: -Moved loop into a function -Moved malloc outside loop -Other minor changes from review comments common/cmd_sf.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 2 deletions(-) diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 11a491d..e69dc1e 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <malloc.h> #include <spi_flash.h> #include <asm/io.h> @@ -109,6 +110,78 @@ static int do_spi_flash_probe(int argc, char * const argv[]) return 0; } +/** + * Write a block of data to SPI flash, first checking if it is different from + * what is already there. + * + * If the data being written is the same, then *skipped is incremented by len. + * + * @param flash flash context pointer + * @param offset flash offset to write + * @param len number of bytes to write + * @param buf buffer to write from + * @param cmp_buf read buffer to use to compare data + * @param skipped Count of skipped data (incremented by this function) + * @return NULL if OK, else a string containing the stage which failed + */ +static const char *write_block(struct spi_flash *flash, u32 offset, + size_t len, const char *buf, char *cmp_buf, size_t *skipped) +{ + debug("offset=%#x, sector_size=%#x, len=%#x\n", + offset, flash->sector_size, len); + if (spi_flash_read(flash, offset, len, cmp_buf)) + return"read"; + if (memcmp(cmp_buf, buf, len) == 0) { + debug("Skip region %x size %x: no change\n", + offset, len); + *skipped += len; + return NULL; + } + if (spi_flash_erase(flash, offset, len)) + return "erase"; + if (spi_flash_write(flash, offset, len, buf)) + return "write"; + return NULL; +} + +/** + * Update an area of SPI flash by erasing and writing any blocks which need + * to change. Existing blocks with the correct data are left unchanged. + * + * @param flash flash context pointer + * @param offset flash offset to write + * @param len number of bytes to write + * @param buf buffer to write from + * @return 0 if ok, 1 on error + */ +static int spi_flash_update(struct spi_flash *flash, u32 offset, + size_t len, const char *buf) +{ + const char *err_oper = NULL; + char *cmp_buf; + const char *end = buf + len; + size_t todo; /* number of bytes to do in this pass */ + size_t skipped; /* statistics */ + + cmp_buf = malloc(flash->sector_size); + if (cmp_buf) { + for (skipped = 0; buf < end; buf += todo, offset += todo) { + todo = min(end - buf, flash->sector_size); + err_oper = write_block(flash, offset, todo, buf, + cmp_buf, &skipped); + } + } else { + err_oper = "malloc"; + } + free(cmp_buf); + if (err_oper) { + printf("SPI flash %s failed\n", err_oper); + return 1; + } + printf("%d bytes written, %d bytes skipped\n", len - skipped, skipped); + return 0; +} + static int do_spi_flash_read_write(int argc, char * const argv[]) { unsigned long addr; @@ -137,7 +210,9 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) return 1; } - if (strcmp(argv[0], "read") == 0) + if (strcmp(argv[0], "update") == 0) + ret = spi_flash_update(flash, offset, len, buf); + else if (strcmp(argv[0], "read") == 0) ret = spi_flash_read(flash, offset, len, buf); else ret = spi_flash_write(flash, offset, len, buf); @@ -203,7 +278,8 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return 1; } - if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0) + if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0 || + strcmp(cmd, "update") == 0) ret = do_spi_flash_read_write(argc, argv); else if (strcmp(cmd, "erase") == 0) ret = do_spi_flash_erase(argc, argv); @@ -229,4 +305,6 @@ U_BOOT_CMD( " at `addr' to flash at `offset'\n" "sf erase offset [+]len - erase `len' bytes from `offset'\n" " `+len' round up `len' to block size" + "sf update addr offset len - erase and write `len' bytes from memory\n" + " at `addr' to flash at `offset'\n" ); -- 1.7.3.1

2 2

[U-Boot] [PATCH] Add 'sf update' command to do smart SPI flash update
by Simon Glass 19 Aug '11

19 Aug '11

This adds a new SPI flash command which only rewrites blocks if the contents need to change. This can speed up SPI flash programming when much of the data is unchanged from what is already there. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/cmd_sf.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 2 deletions(-) diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 11a491d..4a807eb 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <malloc.h> #include <spi_flash.h> #include <asm/io.h> @@ -109,6 +110,70 @@ static int do_spi_flash_probe(int argc, char * const argv[]) return 0; } +/** + * Update an area of SPI flash by erasing and writing any blocks which need + * to change. Existing blocks with the correct data are left unchanged. + * + * @param flash flash context pointer + * @param offset flash offset to write + * @param len number of bytes to write + * @param buf buffer to write from + */ +static int spi_flash_update(struct spi_flash *flash, u32 offset, + size_t len, const char *buf) +{ + const char *oper; + int err = 0; + char *cmp_buf = NULL; + size_t cmp_size = 0; + size_t todo; /* number of bytes to do in this pass */ + size_t skipped, written; /* statistics */ + + for (skipped = written = 0; !err && len > 0; + buf += todo, offset += todo, len -= todo) { + todo = min(len, flash->sector_size); + debug("offset=%#x, sector_size=%#x, todo=%#x\n", + offset, flash->sector_size, todo); + if (!err) { + oper = "malloc"; + if (todo > cmp_size) { + if (cmp_buf) + free(cmp_buf); + cmp_buf = malloc(todo); + cmp_size = todo; + } + err = cmp_buf == NULL; + } + if (!err) { + oper = "read"; + err = spi_flash_read(flash, offset, todo, cmp_buf); + } + if (!err) { + if (0 == memcmp(cmp_buf, buf, todo)) { + debug("Skip region %x size %x: no change\n", + offset, todo); + skipped += todo; + continue; + } + } + if (!err) { + oper = "erase"; + err = spi_flash_erase(flash, offset, todo); + } + if (!err) { + oper = "write"; + err = spi_flash_write(flash, offset, todo, buf); + written += todo; + } + } + printf("%d bytes written, %d bytes skipped\n", written, skipped); + if (err) + printf("SPI flash %s failed\n", oper); + if (cmp_buf) + free(cmp_buf); + return err; +} + static int do_spi_flash_read_write(int argc, char * const argv[]) { unsigned long addr; @@ -137,7 +202,9 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) return 1; } - if (strcmp(argv[0], "read") == 0) + if (strcmp(argv[0], "update") == 0) + ret = spi_flash_update(flash, offset, len, buf); + else if (strcmp(argv[0], "read") == 0) ret = spi_flash_read(flash, offset, len, buf); else ret = spi_flash_write(flash, offset, len, buf); @@ -203,7 +270,8 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return 1; } - if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0) + if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0 || + strcmp(cmd, "update") == 0) ret = do_spi_flash_read_write(argc, argv); else if (strcmp(cmd, "erase") == 0) ret = do_spi_flash_erase(argc, argv); @@ -229,4 +297,7 @@ U_BOOT_CMD( " at `addr' to flash at `offset'\n" "sf erase offset [+]len - erase `len' bytes from `offset'\n" " `+len' round up `len' to block size" + "sf update addr offset len - erase and write `len' bytes from " + "memory\n" + " at `addr' to flash at `offset'\n" ); -- 1.7.3.1

2 6

[U-Boot] please pull u-boot-samsung/master
by Minkyu Kang 19 Aug '11

19 Aug '11

Dear Albert ARIBAUD, The following changes since commit 6477396323193c04ebb510dd2786173da31f4911: arm: fix bd pointer dereference prior initialization (2011-08-17 18:10:34 +0200) are available in the git repository at: git://git.denx.de/u-boot-samsung master Anton Staaf (1): mmc: S5P: Support DMA restarts at buffer boundaries Chander Kashyap (3): SMDKV310: Fix build error for smdkv310 board SMDKV310: Fix undefined reference error SMDKV310: MMC SPL: Remove unwanted dummy functions Dirk Behme (1): SMDKV310: Fix host compilation of mkv310_image Łukasz Majewski (2): gpio:samsung s5p_ suffix add for GPIO functions gpio:samsung: s5p_ suffix add for GPIO functions (C210_universal) arch/arm/include/asm/arch-s5pc1xx/gpio.h | 16 +++++----- arch/arm/include/asm/arch-s5pc2xx/gpio.h | 16 +++++----- board/samsung/goni/goni.c | 8 +++--- board/samsung/smdkc100/smdkc100.c | 2 +- board/samsung/smdkv310/smdkv310.c | 10 +++--- board/samsung/universal_c210/universal.c | 28 ++++++++++---------- drivers/gpio/s5p_gpio.c | 20 +++++++------- drivers/mmc/s5p_mmc.c | 15 ++++++++--- mmc_spl/board/samsung/smdkv310/Makefile | 1 + mmc_spl/board/samsung/smdkv310/mmc_boot.c | 28 +------------------- .../board/samsung/smdkv310/tools/mkv310_image.c | 1 + mmc_spl/board/samsung/smdkv310/u-boot.lds | 2 + 12 files changed, 66 insertions(+), 81 deletions(-)

2 1

[U-Boot] Possible bug in UBIFS function ubifs_finddir
by Rod Boyce 19 Aug '11

19 Aug '11

All, Hello again it has been a while since I was here. I am working on u-boot once again and think I may have found a bug in the UBIFS sub-system. The function is ubifs_finddir and the issue is that there seems to be a free of a pointer in a structure that has already been freed. This is causing the free function to rightly crash. The code is in the error path of the ubifs_finddir at the end of the function line 363: if (file) free(file); if (dentry) free(dentry); if (dir) free(dir); if (file->private_data) kfree(file->private_data); file->private_data = NULL; file->f_pos = 2; The issue is that we are free'ing the file pointer at the top of this block and then trying to free the private_data element after the base pointer. I will fix and send a patch but before I do I just wanted to make sure I was not missing the obvious. Has this been discussed before and is there already a patch? Regards, Rod Boyce

4 8

[U-Boot] Open and Read the attched message very well and reply immediately.
by Fgfgf Fgfgf 19 Aug '11

19 Aug '11

1 0

[U-Boot] [PATCH] mmc:dcache:samsung: D cache invalidate/flush for Samsung MMC DMA buffers
by Lukasz Majewski 19 Aug '11

19 Aug '11

This commit is fixing the problem with DMA (SDMA in Samsung MMC controller) transfer for D Cache enabled. The D Cache corresponding to the DMA buffer shall be flushed before transfer and invalidated when transfer is completed. Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> CC: Andy Fleming <afleming(a)gmail.com> CC: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- drivers/mmc/s5p_mmc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c index f136813..6bc2eb5 100644 --- a/drivers/mmc/s5p_mmc.c +++ b/drivers/mmc/s5p_mmc.c @@ -54,6 +54,9 @@ static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data) /* We do not handle DMA boundaries, so set it to max (512 KiB) */ writew((7 << 12) | (data->blocksize & 0xFFF), &host->reg->blksize); writew(data->blocks, &host->reg->blkcnt); + + flush_dcache_range((u32)data->dest, + (u32)data->dest + (data->blocks * data->blocksize)); } static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data) @@ -237,6 +240,10 @@ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, break; } else if (mask & (1 << 1)) { /* Transfer Complete */ + invalidate_dcache_range((u32)data->dest, + (u32)data->dest + + (data->blocks * + data->blocksize)); debug("r/w is done\n"); break; } -- 1.7.2.3

1 0