dev.c (13a3972585af60ec367d209cedbd3601e0c77467) dev.c (7c4213f6a52f35ff6ba2d97aa4eb04cbfc963b86)
1/*
2 * (C) Copyright 2011 - 2012 Samsung Electronics
3 * EXT4 filesystem implementation in Uboot by
4 * Uma Shankar <uma.shankar@samsung.com>
5 * Manjunatha C Achar <a.manjunatha@samsung.com>
6 *
7 * made from existing ext2/dev.c file of Uboot
8 * (C) Copyright 2004

--- 62 unchanged lines hidden (view full) ---

71 sector += byte_offset >> log2blksz;
72 byte_offset &= ext4fs_block_dev_desc->blksz - 1;
73
74 debug(" <" LBAFU ", %d, %d>\n", sector, byte_offset, byte_len);
75
76 if (byte_offset != 0) {
77 int readlen;
78 /* read first part which isn't aligned with start of sector */
1/*
2 * (C) Copyright 2011 - 2012 Samsung Electronics
3 * EXT4 filesystem implementation in Uboot by
4 * Uma Shankar <uma.shankar@samsung.com>
5 * Manjunatha C Achar <a.manjunatha@samsung.com>
6 *
7 * made from existing ext2/dev.c file of Uboot
8 * (C) Copyright 2004

--- 62 unchanged lines hidden (view full) ---

71 sector += byte_offset >> log2blksz;
72 byte_offset &= ext4fs_block_dev_desc->blksz - 1;
73
74 debug(" <" LBAFU ", %d, %d>\n", sector, byte_offset, byte_len);
75
76 if (byte_offset != 0) {
77 int readlen;
78 /* read first part which isn't aligned with start of sector */
79 if (ext4fs_block_dev_desc->
80 block_read(ext4fs_block_dev_desc->dev,
81 part_info->start + sector, 1,
82 (unsigned long *) sec_buf) != 1) {
79 if (ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc,
80 part_info->start + sector,
81 1, (void *)sec_buf)
82 != 1) {
83 printf(" ** ext2fs_devread() read error **\n");
84 return 0;
85 }
86 readlen = min((int)ext4fs_block_dev_desc->blksz - byte_offset,
87 byte_len);
88 memcpy(buf, sec_buf + byte_offset, readlen);
89 buf += readlen;
90 byte_len -= readlen;

--- 5 unchanged lines hidden (view full) ---

96
97 /* read sector aligned part */
98 block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
99
100 if (block_len == 0) {
101 ALLOC_CACHE_ALIGN_BUFFER(u8, p, ext4fs_block_dev_desc->blksz);
102
103 block_len = ext4fs_block_dev_desc->blksz;
83 printf(" ** ext2fs_devread() read error **\n");
84 return 0;
85 }
86 readlen = min((int)ext4fs_block_dev_desc->blksz - byte_offset,
87 byte_len);
88 memcpy(buf, sec_buf + byte_offset, readlen);
89 buf += readlen;
90 byte_len -= readlen;

--- 5 unchanged lines hidden (view full) ---

96
97 /* read sector aligned part */
98 block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
99
100 if (block_len == 0) {
101 ALLOC_CACHE_ALIGN_BUFFER(u8, p, ext4fs_block_dev_desc->blksz);
102
103 block_len = ext4fs_block_dev_desc->blksz;
104 ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc->dev,
104 ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc,
105 part_info->start + sector,
105 part_info->start + sector,
106 1, (unsigned long *)p);
106 1, (void *)p);
107 memcpy(buf, p, byte_len);
108 return 1;
109 }
110
107 memcpy(buf, p, byte_len);
108 return 1;
109 }
110
111 if (ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc->dev,
112 part_info->start + sector,
113 block_len >> log2blksz,
114 (unsigned long *) buf) !=
115 block_len >> log2blksz) {
111 if (ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc,
112 part_info->start + sector,
113 block_len >> log2blksz,
114 (void *)buf) !=
115 block_len >> log2blksz) {
116 printf(" ** %s read error - block\n", __func__);
117 return 0;
118 }
119 block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
120 buf += block_len;
121 byte_len -= block_len;
122 sector += block_len / ext4fs_block_dev_desc->blksz;
123
124 if (byte_len != 0) {
125 /* read rest of data which are not in whole sector */
116 printf(" ** %s read error - block\n", __func__);
117 return 0;
118 }
119 block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
120 buf += block_len;
121 byte_len -= block_len;
122 sector += block_len / ext4fs_block_dev_desc->blksz;
123
124 if (byte_len != 0) {
125 /* read rest of data which are not in whole sector */
126 if (ext4fs_block_dev_desc->
127 block_read(ext4fs_block_dev_desc->dev,
128 part_info->start + sector, 1,
129 (unsigned long *) sec_buf) != 1) {
126 if (ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc,
127 part_info->start + sector,
128 1, (void *)sec_buf)
129 != 1) {
130 printf("* %s read error - last part\n", __func__);
131 return 0;
132 }
133 memcpy(buf, sec_buf, byte_len);
134 }
135 return 1;
136}
137
138int ext4_read_superblock(char *buffer)
139{
140 struct ext_filesystem *fs = get_fs();
141 int sect = SUPERBLOCK_START >> fs->dev_desc->log2blksz;
142 int off = SUPERBLOCK_START % fs->dev_desc->blksz;
143
144 return ext4fs_devread(sect, off, SUPERBLOCK_SIZE,
145 buffer);
146}
130 printf("* %s read error - last part\n", __func__);
131 return 0;
132 }
133 memcpy(buf, sec_buf, byte_len);
134 }
135 return 1;
136}
137
138int ext4_read_superblock(char *buffer)
139{
140 struct ext_filesystem *fs = get_fs();
141 int sect = SUPERBLOCK_START >> fs->dev_desc->log2blksz;
142 int off = SUPERBLOCK_START % fs->dev_desc->blksz;
143
144 return ext4fs_devread(sect, off, SUPERBLOCK_SIZE,
145 buffer);
146}