August 2016 - U-Boot

[U-Boot] Remove atmel_dataflash_spi.c
by Jagan Teki 29 Aug '16

29 Aug '16

Hi Stelian/Alison, Need some inputs here, since atmel dataflash driver is already up-streamed on flash side at drivers/mtd/spi/sf_dataflash.c then what is the point of using drivers/spi/atmel_dataflash_spi.c at spi side. Are they identically same? can't we use sf_dataflash for common dataflash operations like what we does in atmel_dataflash_spi? Thanks! Jagan. -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India.

1 1

[U-Boot] [PATCH v3 13/13] ext4: initialize full inode for inodes bigger than 128 bytes
by Stefan Brüns 29 Aug '16

29 Aug '16

Make sure the the extra_isize field (offset 128) is initialized to 0 to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_write.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index 81a750b..38fbf68 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -454,7 +454,7 @@ static int ext4fs_delete_file(int inodeno) node_inode->data = ext4fs_root; node_inode->ino = inodeno; node_inode->inode_read = 0; - memcpy(&(node_inode->inode), &inode, sizeof(struct ext2_inode)); + memcpy(&(node_inode->inode), &inode, fs->inodesz); for (i = 0; i < no_blocks; i++) { blknr = read_allocated_block(&(node_inode->inode), i); @@ -560,7 +560,7 @@ static int ext4fs_delete_file(int inodeno) read_buffer = read_buffer + blkoff; inode_buffer = (struct ext2_inode *)read_buffer; - memset(inode_buffer, '\0', sizeof(struct ext2_inode)); + memset(inode_buffer, '\0', fs->inodesz); /* write the inode to original position in inode table */ if (ext4fs_put_metadata(start_block_address, blkno)) @@ -866,7 +866,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer, ALLOC_CACHE_ALIGN_BUFFER(char, filename, 256); memset(filename, 0x00, 256); - g_parent_inode = zalloc(sizeof(struct ext2_inode)); + g_parent_inode = zalloc(fs->inodesz); if (!g_parent_inode) goto fail; @@ -969,8 +969,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer, if (ext4fs_log_journal(temp_ptr, parent_itable_blkno)) goto fail; - memcpy(temp_ptr + blkoff, g_parent_inode, - sizeof(struct ext2_inode)); + memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz); if (ext4fs_put_metadata(temp_ptr, parent_itable_blkno)) goto fail; } else { @@ -978,8 +977,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer, * If parent and child fall in same inode table block * both should be kept in 1 buffer */ - memcpy(temp_ptr + blkoff, g_parent_inode, - sizeof(struct ext2_inode)); + memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz); gd_index--; if (ext4fs_put_metadata(temp_ptr, itable_blkno)) goto fail; -- 2.9.3

2 1

[U-Boot] [PATCH v3 12/13] ext4: Use correct value for inode size even on revision 0 filesystems
by Stefan Brüns 29 Aug '16

29 Aug '16

fs->inodesz is already correctly (i.e. dependent on fs revision) initialized in ext4fs_mount. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_write.c | 1 - include/ext_common.h | 2 -- 2 files changed, 3 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index 5e208ef..81a750b 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -609,7 +609,6 @@ int ext4fs_init(void) /* populate fs */ fs->blksz = EXT2_BLOCK_SIZE(ext4fs_root); - fs->inodesz = INODE_SIZE_FILESYSTEM(ext4fs_root); fs->sect_perblk = fs->blksz >> fs->dev_desc->log2blksz; /* get the superblock */ diff --git a/include/ext_common.h b/include/ext_common.h index 4cd2aa7..25216ca 100644 --- a/include/ext_common.h +++ b/include/ext_common.h @@ -52,8 +52,6 @@ #define LOG2_BLOCK_SIZE(data) (le32_to_cpu \ (data->sblock.log2_block_size) \ + EXT2_MIN_BLOCK_LOG_SIZE) -#define INODE_SIZE_FILESYSTEM(data) (le16_to_cpu \ - (data->sblock.inode_size)) #define EXT2_FT_DIR 2 #define SUCCESS 1 -- 2.9.3

2 1

[U-Boot] [PATCH v3 11/13] ext4: Fix memory leak in case of failure
by Stefan Brüns 29 Aug '16

29 Aug '16

temp_ptr should always be freed, even if the function is left via goto fail. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_write.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index 50c8415..5e208ef 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -974,7 +974,6 @@ int ext4fs_write(const char *fname, unsigned char *buffer, sizeof(struct ext2_inode)); if (ext4fs_put_metadata(temp_ptr, parent_itable_blkno)) goto fail; - free(temp_ptr); } else { /* * If parent and child fall in same inode table block @@ -985,7 +984,6 @@ int ext4fs_write(const char *fname, unsigned char *buffer, gd_index--; if (ext4fs_put_metadata(temp_ptr, itable_blkno)) goto fail; - free(temp_ptr); } ext4fs_update(); ext4fs_deinit(); @@ -996,6 +994,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer, fs->curr_inode_no = 0; free(inode_buffer); free(g_parent_inode); + free(temp_ptr); g_parent_inode = NULL; return 0; @@ -1003,6 +1002,7 @@ fail: ext4fs_deinit(); free(inode_buffer); free(g_parent_inode); + free(temp_ptr); g_parent_inode = NULL; return -1; -- 2.9.3

2 1

[U-Boot] [PATCH v3 10/13] ext4: Avoid out-of-bounds access of block bitmap
by Stefan Brüns 29 Aug '16

29 Aug '16

If the blocksize is 1024, count is initialized with 1. Incrementing count by 8 will never match (count == fs->blksz * 8), and ptr may be incremented beyond the buffer end if the bitmap is filled. Add the startblock offset after the loop. Remove the second loop, as only the first iteration will be done. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 362668b..11da6fa 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -158,18 +158,12 @@ static int _get_new_inode_no(unsigned char *buffer) static int _get_new_blk_no(unsigned char *buffer) { - unsigned char input; - int operand, status; + int operand; int count = 0; - int j = 0; + int i; unsigned char *ptr = buffer; struct ext_filesystem *fs = get_fs(); - if (fs->blksz != 1024) - count = 0; - else - count = 1; - while (*ptr == 255) { ptr++; count += 8; @@ -177,21 +171,17 @@ static int _get_new_blk_no(unsigned char *buffer) return -1; } - for (j = 0; j < fs->blksz; j++) { - input = *ptr; - int i = 0; - while (i <= 7) { - operand = 1 << i; - status = input & operand; - if (status) { - i++; - count++; - } else { - *ptr |= operand; - return count; - } + if (fs->blksz == 1024) + count += 1; + + for (i = 0; i <= 7; i++) { + operand = 1 << i; + if (*ptr & operand) { + count++; + } else { + *ptr |= operand; + return count; } - ptr = ptr + 1; } return -1; -- 2.9.3

2 1

[U-Boot] [PATCH v3 09/13] ext4: After completely filled group, scan next group from the beginning
by Stefan Brüns 29 Aug '16

29 Aug '16

The last free block of a block group may be in its middle. After it has been allocated, the next block group should be scanned from its beginning. The following command triggers the bad behaviour (on a blocksize 1024 fs): ./sandbox/u-boot -c 'i=0; host bind 0 ./disk.raw ; while test $i -lt 260 ; do echo $i; setexpr i $i + 1; ext4write host 0:2 0 /X${i} 0x1450; done ; ext4write host 0:2 0 /X240 0x2000 ; ' When 'X240' is extended from 5200 byte to 8192 byte, the new blocks should start from the first free block (8811), but it uses the blocks 8098-8103 and 16296-16297 -- 8103 + 1 + 8192 = 16296. This can be shown with debugfs, commands 'ffb' and 'stat X240'. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 1ebdbe6..362668b 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -895,8 +895,8 @@ uint32_t ext4fs_get_new_blk_no(void) goto fail; } else { -restart: fs->curr_blkno++; +restart: /* get the blockbitmap index respective to blockno */ bg_idx = fs->curr_blkno / blk_per_grp; if (fs->blksz == 1024) { @@ -914,8 +914,9 @@ restart: if (bgd[bg_idx].free_blocks == 0) { debug("block group %u is full. Skipping\n", bg_idx); - fs->curr_blkno = fs->curr_blkno + blk_per_grp; - fs->curr_blkno--; + fs->curr_blkno = (bg_idx + 1) * blk_per_grp; + if (fs->blksz == 1024) + fs->curr_blkno += 1; goto restart; } @@ -932,6 +933,7 @@ restart: bg_idx) != 0) { debug("going for restart for the block no %ld %u\n", fs->curr_blkno, bg_idx); + fs->curr_blkno++; goto restart; } -- 2.9.3

2 1

[U-Boot] [PATCH v3 08/13] ext4: do not clear zalloc'ed buffers a second time
by Stefan Brüns 29 Aug '16

29 Aug '16

zero_buffer is never written, thus clearing it is pointless. journal_buffer is completely initialized by ext4fs_devread (or in case of failure, not used). Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 3 --- 1 file changed, 3 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 0018937..1ebdbe6 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -921,7 +921,6 @@ restart: if (le16_to_cpu(bgd[bg_idx].bg_flags) & EXT4_BG_BLOCK_UNINIT) { uint16_t new_flags; - memset(zero_buffer, '\0', fs->blksz); put_ext4((uint64_t)le32_to_cpu(bgd[bg_idx].block_id) * fs->blksz, zero_buffer, fs->blksz); memcpy(fs->blk_bmaps[bg_idx], zero_buffer, fs->blksz); @@ -938,7 +937,6 @@ restart: /* journal backup */ if (prev_bg_bitmap_index != bg_idx) { - memset(journal_buffer, '\0', fs->blksz); status = ext4fs_devread( (lbaint_t)le32_to_cpu(bgd[bg_idx].block_id) * fs->sect_perblk, @@ -1032,7 +1030,6 @@ restart: ibmap_idx = fs->curr_inode_no / inodes_per_grp; if (le16_to_cpu(bgd[ibmap_idx].bg_flags) & EXT4_BG_INODE_UNINIT) { int new_flags; - memset(zero_buffer, '\0', fs->blksz); put_ext4((uint64_t)le32_to_cpu(bgd[ibmap_idx].inode_id) * fs->blksz, zero_buffer, fs->blksz); new_flags = le16_to_cpu(bgd[ibmap_idx].bg_flags) & ~EXT4_BG_INODE_UNINIT; -- 2.9.3

2 1

[U-Boot] [PATCH v3 07/13] ext4: only update number of of unused inodes if GDT_CSUM feature is set
by Stefan Brüns 29 Aug '16

29 Aug '16

e2fsck warns about "Group descriptor 0 marked uninitialized without feature set." The bg_itable_unused field is only defined if FEATURE_RO_COMPAT_GDT_CSUM is set, and should be set (kept) zero otherwise. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index eae23b7..0018937 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -980,12 +980,13 @@ int ext4fs_get_new_inode_no(void) if (!journal_buffer || !zero_buffer) goto fail; struct ext2_block_group *bgd = (struct ext2_block_group *)fs->gdtable; + int has_gdt_chksum = le32_to_cpu(fs->sb->feature_ro_compat) & + EXT4_FEATURE_RO_COMPAT_GDT_CSUM ? 1 : 0; if (fs->first_pass_ibmap == 0) { for (i = 0; i < fs->no_blkgrp; i++) { if (bgd[i].free_inodes) { - if (bgd[i].bg_itable_unused != - bgd[i].free_inodes) + if (has_gdt_chksum) bgd[i].bg_itable_unused = bgd[i].free_inodes; if (le16_to_cpu(bgd[i].bg_flags) & EXT4_BG_INODE_UNINIT) { @@ -1006,7 +1007,8 @@ int ext4fs_get_new_inode_no(void) (i * inodes_per_grp); fs->first_pass_ibmap++; ext4fs_bg_free_inodes_dec(&bgd[i]); - ext4fs_bg_itable_unused_dec(&bgd[i]); + if (has_gdt_chksum) + ext4fs_bg_itable_unused_dec(&bgd[i]); ext4fs_sb_free_inodes_dec(fs->sb); status = ext4fs_devread( (lbaint_t)le32_to_cpu(bgd[i].inode_id) * @@ -1061,12 +1063,10 @@ restart: goto fail; prev_inode_bitmap_index = ibmap_idx; } - if (bgd[ibmap_idx].bg_itable_unused != - bgd[ibmap_idx].free_inodes) + ext4fs_bg_free_inodes_dec(&bgd[ibmap_idx]); + if (has_gdt_chksum) bgd[ibmap_idx].bg_itable_unused = bgd[ibmap_idx].free_inodes; - ext4fs_bg_free_inodes_dec(&bgd[ibmap_idx]); - ext4fs_bg_itable_unused_dec(&bgd[ibmap_idx]); ext4fs_sb_free_inodes_dec(fs->sb); goto success; } -- 2.9.3

2 1

[U-Boot] [PATCH v3 04/13] ext4: Scan all directory blocks for space when inserting a new entry
by Stefan Brüns 29 Aug '16

29 Aug '16

Previously, only the last directory block was scanned for available space. Instead, scan all blocks back to front, and if no sufficient space is found, eventually append a new block. Blocks are only appended if the directory does not use extents or the new block would require insertion of indirect blocks, as the old code does. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 72 ++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) v3: Patch added to series diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 49d6465..96dc371 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -365,14 +365,10 @@ int ext4fs_update_parent_dentry(char *filename, int file_type) { unsigned int *zero_buffer = NULL; char *root_first_block_buffer = NULL; - int direct_blk_idx; - long int root_blknr; + int blk_idx; long int first_block_no_of_root = 0; - long int previous_blknr = -1; int totalbytes = 0; - short int padding_factor = 0; unsigned int new_entry_byte_reqd; - unsigned int last_entry_dirlen; int sizeof_void_space = 0; int templength = 0; int inodeno = -1; @@ -384,6 +380,7 @@ int ext4fs_update_parent_dentry(char *filename, int file_type) uint32_t new_blk_no; uint32_t new_size; uint32_t new_blockcnt; + uint32_t directory_blocks; zero_buffer = zalloc(fs->blksz); if (!zero_buffer) { @@ -396,19 +393,16 @@ int ext4fs_update_parent_dentry(char *filename, int file_type) printf("No Memory\n"); return -1; } + new_entry_byte_reqd = ROUND(strlen(filename) + + sizeof(struct ext2_dirent), 4); restart: + directory_blocks = le32_to_cpu(g_parent_inode->size) >> + LOG2_BLOCK_SIZE(ext4fs_root); + blk_idx = directory_blocks - 1; +restart_read: /* read the block no allocated to a file */ - for (direct_blk_idx = 0; direct_blk_idx < INDIRECT_BLOCKS; - direct_blk_idx++) { - root_blknr = read_allocated_block(g_parent_inode, - direct_blk_idx); - if (root_blknr == 0) { - first_block_no_of_root = previous_blknr; - break; - } - previous_blknr = root_blknr; - } + first_block_no_of_root = read_allocated_block(g_parent_inode, blk_idx); status = ext4fs_devread((lbaint_t)first_block_no_of_root * fs->sect_perblk, @@ -420,42 +414,33 @@ restart: goto fail; dir = (struct ext2_dirent *)root_first_block_buffer; totalbytes = 0; + while (le16_to_cpu(dir->direntlen) > 0) { - /* - * blocksize-totalbytes because last directory length - * i.e. dir->direntlen is free availble space in the - * block that means it is a last entry of directory - * entry - */ + unsigned short used_len = ROUND(dir->namelen + + sizeof(struct ext2_dirent), 4); - /* traversing the each directory entry */ + /* last entry of block */ if (fs->blksz - totalbytes == le16_to_cpu(dir->direntlen)) { - if (strlen(filename) % 4 != 0) - padding_factor = 4 - (strlen(filename) % 4); - - new_entry_byte_reqd = strlen(filename) + - sizeof(struct ext2_dirent) + padding_factor; - padding_factor = 0; - /* - * update last directory entry length to its - * length because we are creating new directory - * entry - */ - if (dir->namelen % 4 != 0) - padding_factor = 4 - (dir->namelen % 4); - last_entry_dirlen = dir->namelen + - sizeof(struct ext2_dirent) + padding_factor; - if ((fs->blksz - totalbytes - last_entry_dirlen) < - new_entry_byte_reqd) { - printf("Last Block Full:Allocate new block\n"); + /* check if new entry fits */ + if ((used_len + new_entry_byte_reqd) <= + le16_to_cpu(dir->direntlen)) { + dir->direntlen = cpu_to_le16(used_len); + break; + } else { + if (blk_idx > 0) { + printf("Block full, trying previous\n"); + blk_idx--; + goto restart_read; + } + printf("All blocks full: Allocate new\n"); if (le32_to_cpu(g_parent_inode->flags) & EXT4_EXTENTS_FL) { printf("Directory uses extents\n"); goto fail; } - if (direct_blk_idx == INDIRECT_BLOCKS - 1) { + if (directory_blocks >= INDIRECT_BLOCKS) { printf("Directory exceeds limit\n"); goto fail; } @@ -465,7 +450,8 @@ restart: goto fail; } put_ext4((uint64_t)new_blk_no * fs->blksz, zero_buffer, fs->blksz); - g_parent_inode->b.blocks.dir_blocks[direct_blk_idx] = + g_parent_inode->b.blocks. + dir_blocks[directory_blocks] = cpu_to_le32(new_blk_no); new_size = le32_to_cpu(g_parent_inode->size); @@ -482,8 +468,6 @@ restart: goto fail; goto restart; } - dir->direntlen = cpu_to_le16(last_entry_dirlen); - break; } templength = le16_to_cpu(dir->direntlen); -- 2.9.3

2 1

[U-Boot] [PATCH] spi: tegra: fix hand in set_mode()
by Stephen Warren 29 Aug '16

29 Aug '16

From: Stephen Warren <swarren(a)nvidia.com> In tegra20_slink.c, the set_mode() function may be executed before the SPI bus is claimed the first time, and hence the clocks to the SPI controller may not be running. If so, any register read/write at this time will hang the CPU. Fix this by ensuring the clock is running as soon as the driver is probed. This is observed on the Tegra30 Beaver board. Apply the same clock initialization fix to all other Tegra SPI drivers so that if set_mode() is ever implemented there, the same bug will not appear. Note that tegra114_spi.c already operates in this fashion. The clock manipulation code is copied from claim_bus() to probe() rather than moved. This ensures that any calls to set_speed() take effect; the clock can't be set once during probe and left unchanged. Fixes: 5cb1b7b395c0 ("spi: tegra20: Add support for mode selection") Cc: Mirza Krak <mirza.krak(a)hostmobility.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/spi/tegra20_sflash.c | 4 ++++ drivers/spi/tegra20_slink.c | 4 ++++ drivers/spi/tegra210_qspi.c | 3 +++ 3 files changed, 11 insertions(+) diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 6888a96139a7..ce3a2d398cfb 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -122,6 +122,10 @@ static int tegra20_sflash_probe(struct udevice *bus) priv->freq = plat->frequency; priv->periph_id = plat->periph_id; + /* Change SPI clock to correct frequency, PLLP_OUT0 source */ + clock_start_periph_pll(priv->periph_id, CLOCK_ID_PERIPH, + priv->freq); + return 0; } diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index 238edec23ba5..e1da23b7b44b 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -128,6 +128,10 @@ static int tegra30_spi_probe(struct udevice *bus) priv->freq = plat->frequency; priv->periph_id = plat->periph_id; + /* Change SPI clock to correct frequency, PLLP_OUT0 source */ + clock_start_periph_pll(priv->periph_id, CLOCK_ID_PERIPH, + priv->freq); + return 0; } diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 6bbbe9383954..026cff0c152e 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -131,6 +131,9 @@ static int tegra210_qspi_probe(struct udevice *bus) priv->freq = plat->frequency; priv->periph_id = plat->periph_id; + /* Change SPI clock to correct frequency, PLLP_OUT0 source */ + clock_start_periph_pll(priv->periph_id, CLOCK_ID_PERIPH, priv->freq); + return 0; } -- 2.9.3

4 7