coreboot-gerrit May 2013

coreboot-gerrit@coreboot.org

1 participants
593 discussions

Patch set updated for coreboot: 6e20610 Get buildgcc to behave reasonably with the -p choice.
by Paul Menzel 26 May '13

26 May '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3292 -gerrit commit 6e206102cf78a728ca36251aaeb43e898ff5e8cb Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Sun May 26 05:33:35 2013 -0700 Get buildgcc to behave reasonably with the -p choice. buildgcc has many wrong choices, and two right ones, but you would never guess that. It's even more frustrating when it spends lots of time building a full tool chain and you find out it's not the one you wanted and, still worse, you've forgotten what it does want and, even worse, it won't f-ing tell you what the two right choices are!. Have it tell you when you've done something wrong, and have it make reasonable decisions when you say things like -p arm instead of -p armv7a-eabi This change lowers my blood pressure 10 points. Change-Id: I44a59d7cb7a6260894d8bcb692a693ed25681ff8 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- util/crossgcc/buildgcc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 7d416c2..c436f8e 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -221,6 +221,16 @@ while true ; do esac done +case "$TARGETARCH" in + armv7a-eabi) break;; + i386-elf) break;; + i386-mingw32) break;; + i386*) TARGETARCH=i386-elf;; + arm*) TARGETARCH=armv7a-eabi;; + *) printf "Invalid architecture\n\n"; myhelp; exit 1;; +esac + +echo "Target arch is now $TARGETARCH" GDB_PACKAGE="GDB" PYTHON_PACKAGE="PYTHON" EXPAT_PACKAGE="EXPAT"

1 0

New patch to review for filo: 4a220d1 Fix a warning in fsys_squashfs.c
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3300 -gerrit commit 4a220d1ffcfa393680ca9e62d6c4ba610b49695a Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 15:14:57 2013 +0200 Fix a warning in fsys_squashfs.c Fix the following warning: fs/fsys_squashfs.c: In function 'read_bytes': fs/fsys_squashfs.c:74:30: warning: variable 'offset' set but not used [-Wunused-but-set-variable] by removing the unused code to assign 'offset'. Change-Id: If85647f98ea8e89eabb7d043632e39865cf8da7b Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- fs/fsys_squashfs.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/fsys_squashfs.c b/fs/fsys_squashfs.c index a82f00e..5dec882 100644 --- a/fs/fsys_squashfs.c +++ b/fs/fsys_squashfs.c @@ -71,12 +71,8 @@ static int inode_read(unsigned int inode_block, unsigned int inode_offset); */ static int read_bytes(long long address, unsigned int len, void *output_data) { - unsigned int block_number, offset; int ret; - block_number = address >> SECTOR_BITS; - offset = address - (block_number); - TRACE("reading from position 0x%x, bytes %d\n", (int)address, len); disk_read_func = disk_read_hook; ret = devread(0, (int)address, len, output_data);

1 0

New patch to review for filo: 3eb22de Fix two warnings by removing unused code
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3299 -gerrit commit 3eb22deb33318b8f756453288a475323a475c07f Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 15:10:01 2013 +0200 Fix two warnings by removing unused code Fix these warnings: fs/fsys_cramfs.c: In function 'cramfs_read': fs/fsys_cramfs.c:206:7: warning: variable 'devread_ret' set but not used [-Wunused-but-set-variable] fs/fsys_cramfs.c: In function 'cramfs_dir': fs/fsys_cramfs.c:295:6: warning: variable 'namelen' set but not used [-Wunused-but-set-variable] by removing the assignments and one unused call to strlen(). Change-Id: Ia2552b24263675bdef44a8c5fde8f67edf107912 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- fs/fsys_cramfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/fsys_cramfs.c b/fs/fsys_cramfs.c index d7cb19b..7866cdb 100644 --- a/fs/fsys_cramfs.c +++ b/fs/fsys_cramfs.c @@ -203,7 +203,6 @@ cramfs_read (char *buf, int len) int block_len; int ret = 0; long size = 0; - long devread_ret; nblocks = (cramfs_buf->inode.size - 1) / CRAMFS_BLOCK + 1; block = filepos / CRAMFS_BLOCK; @@ -226,7 +225,7 @@ cramfs_read (char *buf, int len) len, block, start, block_len); if (cramfs_buf->cached_block != block) { disk_read_func = disk_read_hook; - devread_ret = devread(0, start, block_len, cramfs_buf->data); + devread(0, start, block_len, cramfs_buf->data); disk_read_func = NULL; cramfs_buf->cached_block = block; } else debug_cramfs("%d was cached...", block); @@ -291,8 +290,6 @@ cramfs_dir(char *dirname) u32 dir_size; /* size of this directory */ u32 off; /* offset of this directory */ u32 loc; /* location within a directory */ - - int namelen; /* loop invariants: current_ino = inode to lookup @@ -425,7 +422,6 @@ cramfs_dir(char *dirname) cramfs_buf->inode.namelen << 2, cramfs_buf->name)) return 0; cramfs_buf->name[cramfs_buf->inode.namelen << 2] = '\0'; - namelen = cramfs_strlen(cramfs_buf->name); /* advance loc prematurely to next on-disk directory entry */ loc += sizeof(struct cramfs_inode) + (cramfs_buf->inode.namelen << 2);

1 0

New patch to review for filo: 2b9f22a Always use endianness functions from libpayload
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3298 -gerrit commit 2b9f22aabdb93fed51f5d368bae26f9515f3f75d Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 14:55:44 2013 +0200 Always use endianness functions from libpayload We have endianness functions in libpayload (in <endian.h>) now. Those make the filo versions of them obsolete. So always use libpayload's. Change-Id: I41829c2128b355ccb5096d88df8b669b4e920dfc Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- drivers/ide_new.c | 21 ++++---- drivers/ide_new.h | 5 -- fs/blockdev.c | 13 ++--- fs/eltorito.c | 7 +-- fs/fsys_cbfs.c | 4 +- fs/fsys_ext2fs.c | 125 ++++++++++++++++++++++--------------------- fs/fsys_reiserfs.c | 8 --- fs/squashfs_fs.h | 2 - include/fs.h | 1 - main/grub/md5.c | 16 +++--- x86/include/arch/byteorder.h | 64 ---------------------- 11 files changed, 94 insertions(+), 172 deletions(-) diff --git a/drivers/ide_new.c b/drivers/ide_new.c index cc1fb83..2e0965a 100644 --- a/drivers/ide_new.c +++ b/drivers/ide_new.c @@ -17,7 +17,6 @@ #include <libpayload.h> #include <config.h> -#include <arch/byteorder.h> #include <fs.h> #include "ide_new.h" @@ -676,8 +675,8 @@ ob_ide_atapi_drive_ready(struct ide_drive *drive) return 1; } - drive->sectors = __be32_to_cpu(cap.lba) + 1; - drive->bs = __be32_to_cpu(cap.block_size); + drive->sectors = be32toh(cap.lba) + 1; + drive->bs = be32toh(cap.block_size); return 0; } @@ -864,7 +863,7 @@ ob_ide_fixup_string(unsigned char *s, unsigned int len) #ifdef CONFIG_LITTLE_ENDIAN for (p = end ; p != s;) { unsigned short *pp = (unsigned short *) (p -= 2); - *pp = __be16_to_cpu(*pp); + *pp = be16toh(*pp); } #endif @@ -884,13 +883,13 @@ static int ob_ide_fixup_id(struct hd_driveid *id) { ob_ide_fixup_string(id->model, 40); - id->config = __le16_to_cpu(id->config); - id->lba_capacity = __le32_to_cpu(id->lba_capacity); - id->cyls = __le16_to_cpu(id->cyls); - id->heads = __le16_to_cpu(id->heads); - id->sectors = __le16_to_cpu(id->sectors); - id->command_set_2 = __le16_to_cpu(id->command_set_2); - id->cfs_enable_2 = __le16_to_cpu(id->cfs_enable_2); + id->config = le16toh(id->config); + id->lba_capacity = le32toh(id->lba_capacity); + id->cyls = le16toh(id->cyls); + id->heads = le16toh(id->heads); + id->sectors = le16toh(id->sectors); + id->command_set_2 = le16toh(id->command_set_2); + id->cfs_enable_2 = le16toh(id->cfs_enable_2); return 0; } diff --git a/drivers/ide_new.h b/drivers/ide_new.h index 742cc42..1956625 100644 --- a/drivers/ide_new.h +++ b/drivers/ide_new.h @@ -233,9 +233,4 @@ int ob_ide_init(int driveno); #define CONFIG_LITTLE_ENDIAN #define CONFIG_IDE_LBA48 -#define __be32_to_cpu be32_to_cpu -#define __be16_to_cpu be16_to_cpu -#define __le32_to_cpu le32_to_cpu -#define __le16_to_cpu le16_to_cpu - #endif diff --git a/fs/blockdev.c b/fs/blockdev.c index 7dd6c2e..0105712 100644 --- a/fs/blockdev.c +++ b/fs/blockdev.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <endian.h> #include <libpayload.h> #include <libpayload-config.h> #if defined(CONFIG_LIBPAYLOAD_STORAGE) && defined(CONFIG_STORAGE) @@ -88,8 +89,8 @@ static int open_pc_partition(int part, unsigned long *start_p, printf("Partition %d does not exist.\n", part + 1); return 0; } - *start_p = cpu_to_le32(*(u32 *) (p->start_sect)); - *length_p = cpu_to_le32(*(u32 *) (p->nr_sects)); + *start_p = htole32(*(u32 *) (p->start_sect)); + *length_p = htole32(*(u32 *) (p->nr_sects)); return 1; } else { /* Extended partition */ @@ -108,7 +109,7 @@ static int open_pc_partition(int part, unsigned long *start_p, } debug("Extended partition at %d.\n", i + 1); /* Visit each logical partition labels */ - ext_start = cpu_to_le32(*(u32 *) (p[i].start_sect)); + ext_start = htole32(*(u32 *) (p[i].start_sect)); cur_table = ext_start; cur_part = 4; for (;;) { @@ -127,8 +128,8 @@ static int open_pc_partition(int part, unsigned long *start_p, printf("Partition %d is empty.\n", part + 1); return 0; } - *start_p = cur_table + cpu_to_le32(*(u32 *) (p->start_sect)); - *length_p = cpu_to_le32(*(u32 *) (p->nr_sects)); + *start_p = cur_table + htole32(*(u32 *) (p->start_sect)); + *length_p = htole32(*(u32 *) (p->nr_sects)); return 1; } /* Second entry is link to next partition */ @@ -136,7 +137,7 @@ static int open_pc_partition(int part, unsigned long *start_p, debug("no link\n"); break; } - cur_table = ext_start + cpu_to_le32(*(u32 *) (p[1].start_sect)); + cur_table = ext_start + htole32(*(u32 *) (p[1].start_sect)); cur_part++; } diff --git a/fs/eltorito.c b/fs/eltorito.c index 82d14d5..4a6d0b0 100644 --- a/fs/eltorito.c +++ b/fs/eltorito.c @@ -15,6 +15,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <endian.h> #include <libpayload.h> #include <config.h> #include <fs.h> @@ -100,7 +101,7 @@ int open_eltorito_image(int part, unsigned long *offset_p, return 0; } - cat_offset = le32_to_cpu(*(u32*)boot_record.catalog_offset); + cat_offset = le32toh(*(u32*)boot_record.catalog_offset); debug("El-Torito boot catalog at sector %u\n", cat_offset); if (!devread(cat_offset<<2, 0, 2048, catalog)) return 0; @@ -115,7 +116,7 @@ int open_eltorito_image(int part, unsigned long *offset_p, /* All words must sum up to zero */ sum = 0; for (i = 0; i < sizeof(*ve); i += 2) - sum += le16_to_cpu(catalog[i]); + sum += le16toh(catalog[i]); sum &= 0xffff; if (sum != 0) { printf("El Torito boot catalog verify failed\n"); @@ -153,7 +154,7 @@ int open_eltorito_image(int part, unsigned long *offset_p, printf("Disc uses hard disk emulation - not supported\n"); return 0; } - *offset_p = le32_to_cpu(*(u32*)(de->start_sector)) << 2; + *offset_p = le32toh(*(u32*)(de->start_sector)) << 2; debug("offset=%#lx length=%#lx\n", *offset_p, *length_p); return 1; diff --git a/fs/fsys_cbfs.c b/fs/fsys_cbfs.c index 5c389e9..fef3090 100644 --- a/fs/fsys_cbfs.c +++ b/fs/fsys_cbfs.c @@ -59,8 +59,8 @@ cbfs_dir (char *dirname) } filepos = 0; - filemax = ntohl(file->len); - fileptr = (void*)file+ntohl(file->offset); + filemax = be32toh(file->len); + fileptr = (void*)file+be32toh(file->offset); return 1; } diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c index 987dceb..51b3faf 100644 --- a/fs/fsys_ext2fs.c +++ b/fs/fsys_ext2fs.c @@ -17,6 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <endian.h> #include "filesys.h" static int mapblock1, mapblock2; @@ -364,7 +365,7 @@ struct ext4_extent_header #define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) /* linux/ext2_fs.h */ -#define EXT2_BLOCK_SIZE_BITS(s) (le32_to_cpu((s)->s_log_block_size) + 10) +#define EXT2_BLOCK_SIZE_BITS(s) (le32toh((s)->s_log_block_size) + 10) /* kind of from ext2/super.c */ #define EXT2_BLOCK_SIZE(s) (1 << EXT2_BLOCK_SIZE_BITS(s)) /* linux/ext2fs.h */ @@ -393,47 +394,47 @@ void dump_super(struct ext2_super_block *s) { printf(" superblock 0x%p:\n", s); - printf(" inodes=%d\n", le32_to_cpu(s->s_inodes_count)); - printf(" blocks=%d\n", le32_to_cpu(s->s_blocks_count)); - printf(" reserved=%d\n", le32_to_cpu(s->s_r_blocks_count)); - printf(" i_free=%d\n", le32_to_cpu(s->s_free_inodes_count)); - printf(" b_free=%d\n", le32_to_cpu(s->s_free_blocks_count)); - printf(" first=%d\n", le32_to_cpu(s->s_first_data_block)); - printf(" log_b_size=%d, b_size=%d\n", le32_to_cpu(s->s_log_block_size), EXT2_BLOCK_SIZE(s)); - printf(" inode_size=%d\n", le32_to_cpu(EXT2_INODE_SIZE(s))); - printf(" (obsoleted) log_f_size=%d\n", le32_to_cpu(s->s_obso_log_frag_size)); - printf(" bpg=%d\n", le32_to_cpu(s->s_blocks_per_group)); - printf(" (obsoleted) fpg=%d\n", le32_to_cpu(s->s_obso_frags_per_group)); - printf(" ipg=%d\n", le32_to_cpu(s->s_inodes_per_group)); + printf(" inodes=%d\n", le32toh(s->s_inodes_count)); + printf(" blocks=%d\n", le32toh(s->s_blocks_count)); + printf(" reserved=%d\n", le32toh(s->s_r_blocks_count)); + printf(" i_free=%d\n", le32toh(s->s_free_inodes_count)); + printf(" b_free=%d\n", le32toh(s->s_free_blocks_count)); + printf(" first=%d\n", le32toh(s->s_first_data_block)); + printf(" log_b_size=%d, b_size=%d\n", le32toh(s->s_log_block_size), EXT2_BLOCK_SIZE(s)); + printf(" inode_size=%d\n", le32toh(EXT2_INODE_SIZE(s))); + printf(" (obsoleted) log_f_size=%d\n", le32toh(s->s_obso_log_frag_size)); + printf(" bpg=%d\n", le32toh(s->s_blocks_per_group)); + printf(" (obsoleted) fpg=%d\n", le32toh(s->s_obso_frags_per_group)); + printf(" ipg=%d\n", le32toh(s->s_inodes_per_group)); } void dump_group_desc(struct ext4_group_desc *g) { printf(" group_desc 0x%p:\n", g); - printf(" b_bmap block=%d\n", le32_to_cpu(g->bg_block_bitmap)); - printf(" i_bmap block=%d\n", le32_to_cpu(g->bg_inode_bitmap)); - printf(" i_tab block=%d\n", le32_to_cpu(g->bg_inode_table)); - printf(" free_blks=%d\n", le16_to_cpu(g->bg_free_blocks_count)); - printf(" free_inodes=%d\n", le16_to_cpu(g->bg_free_inodes_count)); - printf(" used_dirs=%d\n", le16_to_cpu(g->bg_used_dirs_count)); + printf(" b_bmap block=%d\n", le32toh(g->bg_block_bitmap)); + printf(" i_bmap block=%d\n", le32toh(g->bg_inode_bitmap)); + printf(" i_tab block=%d\n", le32toh(g->bg_inode_table)); + printf(" free_blks=%d\n", le16toh(g->bg_free_blocks_count)); + printf(" free_inodes=%d\n", le16toh(g->bg_free_inodes_count)); + printf(" used_dirs=%d\n", le16toh(g->bg_used_dirs_count)); } void dump_inode(struct ext2_inode *i) { printf(" inode 0x%p:\n", i); - printf(" mode=%o\n", le16_to_cpu(i->i_mode)); - printf(" uid=%d\n", le16_to_cpu(i->i_uid)); - printf(" gid=%d\n", le16_to_cpu(i->i_gid)); - printf(" size=%d\n", le32_to_cpu(i->i_size)); - printf(" atime=%d\n", le32_to_cpu(i->i_atime)); - printf(" ctime=%d\n", le32_to_cpu(i->i_ctime)); - printf(" mtime=%d\n", le32_to_cpu(i->i_mtime)); - printf(" dtime=%d\n", le32_to_cpu(i->i_dtime)); - printf(" links=%d\n", le16_to_cpu(i->i_links_count)); - printf(" blocks=%d\n", le32_to_cpu(i->i_blocks)); - printf(" flags=%d\n", le32_to_cpu(i->i_flags)); + printf(" mode=%o\n", le16toh(i->i_mode)); + printf(" uid=%d\n", le16toh(i->i_uid)); + printf(" gid=%d\n", le16toh(i->i_gid)); + printf(" size=%d\n", le32toh(i->i_size)); + printf(" atime=%d\n", le32toh(i->i_atime)); + printf(" ctime=%d\n", le32toh(i->i_ctime)); + printf(" mtime=%d\n", le32toh(i->i_mtime)); + printf(" dtime=%d\n", le32toh(i->i_dtime)); + printf(" links=%d\n", le16toh(i->i_links_count)); + printf(" blocks=%d\n", le32toh(i->i_blocks)); + printf(" flags=%d\n", le32toh(i->i_flags)); } void @@ -473,7 +474,7 @@ ext2fs_mount (void) || part_length < (SBLOCK + (sizeof (struct ext2_super_block) / DEV_BSIZE)) || !devread (SBLOCK, 0, sizeof (struct ext2_super_block), (char *) SUPERBLOCK) - || le16_to_cpu(SUPERBLOCK->s_magic) != EXT2_SUPER_MAGIC) + || le16toh(SUPERBLOCK->s_magic) != EXT2_SUPER_MAGIC) retval = 0; return retval; @@ -509,9 +510,9 @@ ext2fs_block_map (int logical_block) if (logical_block < EXT2_NDIR_BLOCKS) { #ifdef E2DEBUG - printf ("ext2fs_block_map: returning %d\n", le32_to_cpu(INODE->i_block[logical_block])); + printf ("ext2fs_block_map: returning %d\n", le32toh(INODE->i_block[logical_block])); #endif /* E2DEBUG */ - return le32_to_cpu(INODE->i_block[logical_block]); + return le32toh(INODE->i_block[logical_block]); } /* else */ logical_block -= EXT2_NDIR_BLOCKS; @@ -519,13 +520,13 @@ ext2fs_block_map (int logical_block) if (logical_block < EXT2_ADDR_PER_BLOCK (SUPERBLOCK)) { if (mapblock1 != 1 - && !ext2_rdfsb (le32_to_cpu(INODE->i_block[EXT2_IND_BLOCK]), DATABLOCK1)) + && !ext2_rdfsb (le32toh(INODE->i_block[EXT2_IND_BLOCK]), DATABLOCK1)) { errnum = ERR_FSYS_CORRUPT; return -1; } mapblock1 = 1; - return le32_to_cpu(((__u32 *) DATABLOCK1)[logical_block]); + return le32toh(((__u32 *) DATABLOCK1)[logical_block]); } /* else */ logical_block -= EXT2_ADDR_PER_BLOCK (SUPERBLOCK); @@ -534,13 +535,13 @@ ext2fs_block_map (int logical_block) { int bnum; if (mapblock1 != 2 - && !ext2_rdfsb (le32_to_cpu(INODE->i_block[EXT2_DIND_BLOCK]), DATABLOCK1)) + && !ext2_rdfsb (le32toh(INODE->i_block[EXT2_DIND_BLOCK]), DATABLOCK1)) { errnum = ERR_FSYS_CORRUPT; return -1; } mapblock1 = 2; - if ((bnum = le32_to_cpu(((__u32 *) DATABLOCK1) + if ((bnum = le32toh(((__u32 *) DATABLOCK1) [logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)])) != mapblock2 && !ext2_rdfsb (bnum, DATABLOCK2)) @@ -549,20 +550,20 @@ ext2fs_block_map (int logical_block) return -1; } mapblock2 = bnum; - return le32_to_cpu(((__u32 *) DATABLOCK2) + return le32toh(((__u32 *) DATABLOCK2) [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]); } /* else */ mapblock2 = -1; logical_block -= (1 << (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)); if (mapblock1 != 3 - && !ext2_rdfsb (le32_to_cpu(INODE->i_block[EXT2_TIND_BLOCK]), DATABLOCK1)) + && !ext2_rdfsb (le32toh(INODE->i_block[EXT2_TIND_BLOCK]), DATABLOCK1)) { errnum = ERR_FSYS_CORRUPT; return -1; } mapblock1 = 3; - if (!ext2_rdfsb (le32_to_cpu(((__u32 *) DATABLOCK1) + if (!ext2_rdfsb (le32toh(((__u32 *) DATABLOCK1) [logical_block >> (EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK) * 2)]), DATABLOCK2)) @@ -570,7 +571,7 @@ ext2fs_block_map (int logical_block) errnum = ERR_FSYS_CORRUPT; return -1; } - if (!ext2_rdfsb (le32_to_cpu(((__u32 *) DATABLOCK2) + if (!ext2_rdfsb (le32toh(((__u32 *) DATABLOCK2) [(logical_block >> EXT2_ADDR_PER_BLOCK_BITS (SUPERBLOCK)) & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]), DATABLOCK2)) @@ -578,7 +579,7 @@ ext2fs_block_map (int logical_block) errnum = ERR_FSYS_CORRUPT; return -1; } - return le32_to_cpu(((__u32 *) DATABLOCK2) + return le32toh(((__u32 *) DATABLOCK2) [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)]); } @@ -786,8 +787,8 @@ static inline int ext2_is_fast_symlink (void) { int ea_blocks; - ea_blocks = le32_to_cpu(INODE->i_file_acl) ? EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE : 0; - return le32_to_cpu(INODE->i_blocks) == ea_blocks; + ea_blocks = le32toh(INODE->i_file_acl) ? EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE : 0; + return le32toh(INODE->i_blocks) == ea_blocks; } /* preconditions: ext2fs_mount already executed, therefore supblk in buffer @@ -841,16 +842,16 @@ ext2fs_dir (char *dirname) #endif /* E2DEBUG */ /* look up an inode */ - group_id = (current_ino - 1) / le32_to_cpu(SUPERBLOCK->s_inodes_per_group); + group_id = (current_ino - 1) / le32toh(SUPERBLOCK->s_inodes_per_group); group_desc = group_id >> log2 (EXT2_DESC_PER_BLOCK (SUPERBLOCK)); desc = group_id & (EXT2_DESC_PER_BLOCK (SUPERBLOCK) - 1); #ifdef E2DEBUG - printf ("ext2fs_dir: ipg=%d, dpb=%d\n", le32_to_cpu(SUPERBLOCK->s_inodes_per_group), + printf ("ext2fs_dir: ipg=%d, dpb=%d\n", le32toh(SUPERBLOCK->s_inodes_per_group), EXT2_DESC_PER_BLOCK (SUPERBLOCK)); printf ("ext2fs_dir: group_id=%d group_desc=%d desc=%d\n", group_id, group_desc, desc); #endif /* E2DEBUG */ if (!ext2_rdfsb ( - (WHICH_SUPER + group_desc + le32_to_cpu(SUPERBLOCK->s_first_data_block)), + (WHICH_SUPER + group_desc + le32toh(SUPERBLOCK->s_first_data_block)), (char*) GROUP_DESC)) { return 0; @@ -869,12 +870,12 @@ ext2fs_dir (char *dirname) return -1; } ino_blk = ext4_gdp->bg_inode_table + - (((current_ino - 1) % le32_to_cpu(SUPERBLOCK->s_inodes_per_group)) + (((current_ino - 1) % le32toh(SUPERBLOCK->s_inodes_per_group)) >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); #ifdef E2DEBUG printf ("ext2fs_dir: itab_blk=%d, i_in_grp=%d, log2=%lu\n", - le32_to_cpu(ext4_gdp[desc].bg_inode_table), - ((current_ino - 1) % le32_to_cpu(SUPERBLOCK->s_inodes_per_group)), + le32toh(ext4_gdp[desc].bg_inode_table), + ((current_ino - 1) % le32toh(SUPERBLOCK->s_inodes_per_group)), log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); printf ("ext2fs_dir: inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ @@ -909,7 +910,7 @@ ext2fs_dir (char *dirname) #endif /* E2DEBUG */ /* If we've got a symbolic link, then chase it. */ - if (S_ISLNK (le16_to_cpu(INODE->i_mode))) + if (S_ISLNK (le16toh(INODE->i_mode))) { int len; if (++link_count > MAX_LINK_COUNT) @@ -924,7 +925,7 @@ ext2fs_dir (char *dirname) len++; /* Get the symlink size. */ - filemax = le32_to_cpu(INODE->i_size); + filemax = le32toh(INODE->i_size); if (filemax + len > sizeof (linkbuf) - 2) { errnum = ERR_FILELENGTH; @@ -984,7 +985,7 @@ ext2fs_dir (char *dirname) /* if end of filename, INODE points to the file's inode */ if (!*dirname || isspace (*dirname)) { - if (!S_ISREG (le16_to_cpu(INODE->i_mode))) + if (!S_ISREG (le16toh(INODE->i_mode))) { errnum = ERR_BAD_FILETYPE; return 0; @@ -997,7 +998,7 @@ ext2fs_dir (char *dirname) return 0; } - filemax = le32_to_cpu(INODE->i_size); + filemax = le32toh(INODE->i_size); return 1; } @@ -1009,7 +1010,7 @@ ext2fs_dir (char *dirname) dirname++; /* if this isn't a directory of sufficient size to hold our file, abort */ - if (!(le32_to_cpu(INODE->i_size)) || !S_ISDIR (le16_to_cpu(INODE->i_mode))) + if (!(le32toh(INODE->i_size)) || !S_ISDIR (le16toh(INODE->i_mode))) { errnum = ERR_BAD_FILETYPE; return 0; @@ -1033,7 +1034,7 @@ ext2fs_dir (char *dirname) /* if our location/byte offset into the directory exceeds the size, give up */ - if (loc >= le32_to_cpu(INODE->i_size)) + if (loc >= le32toh(INODE->i_size)) { if (print_possibilities < 0) { @@ -1080,17 +1081,17 @@ ext2fs_dir (char *dirname) off = loc & (EXT2_BLOCK_SIZE (SUPERBLOCK) - 1); dp = (struct ext2_dir_entry *) (DATABLOCK2 + off); /* advance loc prematurely to next on-disk directory entry */ - loc += le16_to_cpu(dp->rec_len); + loc += le16toh(dp->rec_len); /* NOTE: ext2fs filenames are NOT null-terminated */ #ifdef E2DEBUG - printf ("ext2fs_dir: directory entry ino=%d\n", le32_to_cpu(dp->inode)); - if (le32_to_cpu(dp->inode)) + printf ("ext2fs_dir: directory entry ino=%d\n", le32toh(dp->inode)); + if (le32toh(dp->inode)) printf ("entry=%s\n", dp->name); #endif /* E2DEBUG */ - if (le32_to_cpu(dp->inode)) + if (le32toh(dp->inode)) { int saved_c = dp->name[dp->name_len]; @@ -1111,9 +1112,9 @@ ext2fs_dir (char *dirname) } } - while (!le32_to_cpu(dp->inode) || (str_chk || (print_possibilities && ch != '/'))); + while (!le32toh(dp->inode) || (str_chk || (print_possibilities && ch != '/'))); - current_ino = le32_to_cpu(dp->inode); + current_ino = le32toh(dp->inode); *(dirname = rest) = ch; } /* never get here */ diff --git a/fs/fsys_reiserfs.c b/fs/fsys_reiserfs.c index 74594f0..d3de6be 100644 --- a/fs/fsys_reiserfs.c +++ b/fs/fsys_reiserfs.c @@ -38,14 +38,6 @@ typedef unsigned long long __u64; /* linux/posix_type.h */ typedef long linux_off_t; -/* linux/little_endian.h */ -#define __cpu_to_le64(x) ((__u64) (x)) -#define __le64_to_cpu(x) ((__u64) (x)) -#define __cpu_to_le32(x) ((__u32) (x)) -#define __le32_to_cpu(x) ((__u32) (x)) -#define __cpu_to_le16(x) ((__u16) (x)) -#define __le16_to_cpu(x) ((__u16) (x)) - /* include/linux/reiser_fs.h */ /* This is the new super block of a journaling reiserfs system */ struct reiserfs_super_block diff --git a/fs/squashfs_fs.h b/fs/squashfs_fs.h index d4ba9b3..d561edb 100644 --- a/fs/squashfs_fs.h +++ b/fs/squashfs_fs.h @@ -849,8 +849,6 @@ struct squashfs_fragment_entry_2 { * architectures */ -#include <arch/byteorder.h> - #ifdef __BIG_ENDIAN /* convert from little endian to big endian */ #define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, \ diff --git a/include/fs.h b/include/fs.h index 3138ab5..c91ace7 100644 --- a/include/fs.h +++ b/include/fs.h @@ -20,7 +20,6 @@ #define FS_H #include <libpayload.h> -#include <arch/byteorder.h> typedef uint64_t sector_t; #define DEV_SECTOR_BITS 9 diff --git a/main/grub/md5.c b/main/grub/md5.c index ff344fc..1987714 100644 --- a/main/grub/md5.c +++ b/main/grub/md5.c @@ -41,8 +41,8 @@ #ifdef USE_MD5 -#define cpu_to_le32(x) (x) -#define le32_to_cpu(x) cpu_to_le32(x) +#define htole32(x) (x) +#define le32toh(x) htole32(x) typedef unsigned int UINT4; /* F, G, H and I are basic MD5 functions. @@ -103,7 +103,7 @@ static void md5_transform(const unsigned char block[64]) /* Round 1 */ for (i = 0; i < 16; i++) { - tmp = a + F(b, c, d) + le32_to_cpu(x[i]) + T[i]; + tmp = a + F(b, c, d) + le32toh(x[i]) + T[i]; tmp = ROTATE_LEFT(tmp, s1[i & 3]); tmp += b; a = d; @@ -113,7 +113,7 @@ static void md5_transform(const unsigned char block[64]) } /* Round 2 */ for (i = 0, j = 1; i < 16; i++, j += 5) { - tmp = a + G(b, c, d) + le32_to_cpu(x[j & 15]) + T[i + 16]; + tmp = a + G(b, c, d) + le32toh(x[j & 15]) + T[i + 16]; tmp = ROTATE_LEFT(tmp, s2[i & 3]); tmp += b; a = d; @@ -123,7 +123,7 @@ static void md5_transform(const unsigned char block[64]) } /* Round 3 */ for (i = 0, j = 5; i < 16; i++, j += 3) { - tmp = a + H(b, c, d) + le32_to_cpu(x[j & 15]) + T[i + 32]; + tmp = a + H(b, c, d) + le32toh(x[j & 15]) + T[i + 32]; tmp = ROTATE_LEFT(tmp, s3[i & 3]); tmp += b; a = d; @@ -133,7 +133,7 @@ static void md5_transform(const unsigned char block[64]) } /* Round 4 */ for (i = 0, j = 0; i < 16; i++, j += 7) { - tmp = a + I(b, c, d) + le32_to_cpu(x[j & 15]) + T[i + 48]; + tmp = a + I(b, c, d) + le32toh(x[j & 15]) + T[i + 48]; tmp = ROTATE_LEFT(tmp, s4[i & 3]); tmp += b; a = d; @@ -189,12 +189,12 @@ static unsigned char *md5_final() buflen = 0; } - *(UINT4 *) (buffer + 56) = cpu_to_le32(8 * length); + *(UINT4 *) (buffer + 56) = htole32(8 * length); *(UINT4 *) (buffer + 60) = 0; md5_transform(buffer); for (i = 0; i < 4; i++) - state[i] = cpu_to_le32(state[i]); + state[i] = htole32(state[i]); return (unsigned char *) state; } diff --git a/x86/include/arch/byteorder.h b/x86/include/arch/byteorder.h deleted file mode 100644 index afaebfa..0000000 --- a/x86/include/arch/byteorder.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef ARCH_ENDIAN_H -#define ARCH_ENDIAN_H - -static inline u16 __i386_bswap_16(u16 x) -{ - __asm__("xchgb %b0,%h0\n\t" - : "=q" (x) - : "0" (x)); - return x; -} - -static inline u32 __i386_bswap_32(u32 x) -{ - __asm__("xchgb %b0,%h0\n\t" - "rorl $16,%0\n\t" - "xchgb %b0,%h0" - : "=q" (x) - : "0" (x)); - return x; -} - - -#define __bswap_constant_16(x) \ - ((u16)((((u16)(x) & 0x00ff) << 8) | \ - (((u16)(x) & 0xff00) >> 8))) - -#define __bswap_constant_32(x) \ - ((u32)((((u32)(x) & 0x000000ffU) << 24) | \ - (((u32)(x) & 0x0000ff00U) << 8) | \ - (((u32)(x) & 0x00ff0000U) >> 8) | \ - (((u32)(x) & 0xff000000U) >> 24))) - -#define __bswap_16(x) \ - ((u16)(__builtin_constant_p(x) ? \ - __bswap_constant_16(x) : \ - __i386_bswap_16(x))) - - -#define __bswap_32(x) \ - ((u32)(__builtin_constant_p(x) ? \ - __bswap_constant_32(x) : \ - __i386_bswap_32(x))) - - -#define __BYTE_ORDER __LITTLE_ENDIAN - -#define le32_to_cpup(x) (*(u32 *)(x)) -#define cpu_to_le16p(x) (*(u16*)(x)) - -#define ntohl(x) __bswap_32(x) -#define htonl(x) __bswap_32(x) -#define ntohs(x) __bswap_16(x) -#define htons(x) __bswap_16(x) -#define cpu_to_le32(x) (x) -#define cpu_to_le16(x) (x) -#define cpu_to_be32(x) __bswap_32(x) -#define cpu_to_be16(x) __bswap_16(x) -#define le32_to_cpu(x) (x) -#define le16_to_cpu(x) (x) -#define be32_to_cpu(x) __bswap_32(x) -#define be16_to_cpu(x) __bswap_16(x) - -#endif /* ARCH_ENDIAN_H */ -

1 0

New patch to review for filo: 0ce2bc9 Fix compilation of fsys_ext2 with debugging
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3297 -gerrit commit 0ce2bc92eda2a0465ea5a6afb8b70cb3c9bd70ce Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 14:26:52 2013 +0200 Fix compilation of fsys_ext2 with debugging With time some changes to fsys_ext2 didn't make it into the debugging code. So track those changes. Change-Id: I576eaa2d481d45c178f3b1f51298dfa9a9061bbb Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- fs/fsys_ext2fs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c index 93a3ee6..987dceb 100644 --- a/fs/fsys_ext2fs.c +++ b/fs/fsys_ext2fs.c @@ -341,7 +341,7 @@ struct ext4_extent_header #define SUPERBLOCK \ ((struct ext2_super_block *)(FSYS_BUF)) #define GROUP_DESC \ - ((struct ext2_group_desc *) \ + ((struct ext4_group_desc *) \ ((char *)SUPERBLOCK + sizeof(struct ext2_super_block))) #define INODE \ ((struct ext2_inode *)((char *)GROUP_DESC + EXT2_BLOCK_SIZE(SUPERBLOCK))) @@ -401,14 +401,14 @@ dump_super(struct ext2_super_block *s) printf(" first=%d\n", le32_to_cpu(s->s_first_data_block)); printf(" log_b_size=%d, b_size=%d\n", le32_to_cpu(s->s_log_block_size), EXT2_BLOCK_SIZE(s)); printf(" inode_size=%d\n", le32_to_cpu(EXT2_INODE_SIZE(s))); - printf(" log_f_size=%d\n", le32_to_cpu(s->s_log_frag_size)); + printf(" (obsoleted) log_f_size=%d\n", le32_to_cpu(s->s_obso_log_frag_size)); printf(" bpg=%d\n", le32_to_cpu(s->s_blocks_per_group)); - printf(" fpg=%d\n", le32_to_cpu(s->s_frags_per_group)); + printf(" (obsoleted) fpg=%d\n", le32_to_cpu(s->s_obso_frags_per_group)); printf(" ipg=%d\n", le32_to_cpu(s->s_inodes_per_group)); } void -dump_group_desc(struct ext2_group_desc *g) +dump_group_desc(struct ext4_group_desc *g) { printf(" group_desc 0x%p:\n", g); printf(" b_bmap block=%d\n", le32_to_cpu(g->bg_block_bitmap));

1 0

New patch to review for filo: 9cf988c Correct some format strings
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3296 -gerrit commit 9cf988cd93672fd0f765c3681a615132e30f0075 Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 14:23:45 2013 +0200 Correct some format strings Correct format strings to get rid of some warnings. Change-Id: Iaf30b5b95159c71daded95e6a603cdebd40d81a6 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- fs/fsys_ext2fs.c | 16 ++++++++-------- fs/fsys_minix.c | 2 +- fs/vfs.c | 6 +++--- main/grub/builtins.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/fsys_ext2fs.c b/fs/fsys_ext2fs.c index 96e2e68..93a3ee6 100644 --- a/fs/fsys_ext2fs.c +++ b/fs/fsys_ext2fs.c @@ -392,7 +392,7 @@ struct ext4_extent_header void dump_super(struct ext2_super_block *s) { - printf(" superblock 0x%x:\n", s); + printf(" superblock 0x%p:\n", s); printf(" inodes=%d\n", le32_to_cpu(s->s_inodes_count)); printf(" blocks=%d\n", le32_to_cpu(s->s_blocks_count)); printf(" reserved=%d\n", le32_to_cpu(s->s_r_blocks_count)); @@ -410,7 +410,7 @@ dump_super(struct ext2_super_block *s) void dump_group_desc(struct ext2_group_desc *g) { - printf(" group_desc 0x%x:\n", g); + printf(" group_desc 0x%p:\n", g); printf(" b_bmap block=%d\n", le32_to_cpu(g->bg_block_bitmap)); printf(" i_bmap block=%d\n", le32_to_cpu(g->bg_inode_bitmap)); printf(" i_tab block=%d\n", le32_to_cpu(g->bg_inode_table)); @@ -422,7 +422,7 @@ dump_group_desc(struct ext2_group_desc *g) void dump_inode(struct ext2_inode *i) { - printf(" inode 0x%x:\n", i); + printf(" inode 0x%p:\n", i); printf(" mode=%o\n", le16_to_cpu(i->i_mode)); printf(" uid=%d\n", le16_to_cpu(i->i_uid)); printf(" gid=%d\n", le16_to_cpu(i->i_gid)); @@ -709,7 +709,7 @@ ext2fs_read (char *buf, int len) int size = 0; #ifdef E2DEBUG - printf("ext2fs_read(0x%x, %d)\n", buf, len); + printf("ext2fs_read(0x%p, %d)\n", buf, len); dump_inode(INODE); dump_inode_data((unsigned char *)INODE, sizeof (struct ext2_inode)); #endif /* E2DEBUG */ @@ -872,8 +872,8 @@ ext2fs_dir (char *dirname) (((current_ino - 1) % le32_to_cpu(SUPERBLOCK->s_inodes_per_group)) >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); #ifdef E2DEBUG - printf ("ext2fs_dir: itab_blk=%d, i_in_grp=%d, log2=%d\n", - le32_to_cpu(gdp[desc].bg_inode_table), + printf ("ext2fs_dir: itab_blk=%d, i_in_grp=%d, log2=%lu\n", + le32_to_cpu(ext4_gdp[desc].bg_inode_table), ((current_ino - 1) % le32_to_cpu(SUPERBLOCK->s_inodes_per_group)), log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); printf ("ext2fs_dir: inode table fsblock=%d\n", ino_blk); @@ -893,7 +893,7 @@ ext2fs_dir (char *dirname) printf ("ext2fs_dir: ipb=%d, sizeof(inode)=%d\n", EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE(SUPERBLOCK)); - printf ("ext2fs_dir: inode=%x, raw_inode=%x\n", INODE, raw_inode); + printf ("ext2fs_dir: inode=%p, raw_inode=%p\n", INODE, raw_inode); printf ("ext2fs_dir: offset into inode table block=%d\n", (int) raw_inode - (int) INODE); dump_inode(raw_inode); dump_inode_data((unsigned char *)INODE, EXT2_BLOCK_SIZE(SUPERBLOCK)); @@ -1063,7 +1063,7 @@ ext2fs_dir (char *dirname) else map = ext2fs_block_map (blk); #ifdef E2DEBUG - printf ("ext2fs_dir: fs block=%d\n", map); + printf ("ext2fs_dir: fs block=%ld\n", map); #endif /* E2DEBUG */ mapblock2 = -1; if (map < 0) diff --git a/fs/fsys_minix.c b/fs/fsys_minix.c index faa1710..f9b7519 100644 --- a/fs/fsys_minix.c +++ b/fs/fsys_minix.c @@ -476,7 +476,7 @@ minix_dir (char *dirname) the disk */ map = minix_block_map (blk); #ifdef DEBUG_MINIX - printf ("fs block=%d\n", map); + printf ("fs block=%ld\n", map); #endif mapblock2 = -1; if ((map < 0) || !minix_rdfsb (map, DATABLOCK2)) diff --git a/fs/vfs.c b/fs/vfs.c index 18db6ec..1cab143 100644 --- a/fs/vfs.c +++ b/fs/vfs.c @@ -213,13 +213,13 @@ int file_read(void *buf, unsigned long len) errnum = 0; - debug("reading %d bytes, offset 0x%x\n", len, filepos); + debug("reading %lu bytes, offset 0x%x\n", len, filepos); return fsys->read_func(buf, len); } unsigned long file_seek(unsigned long offset) { - debug("seeking to 0x%x\n", offset); + debug("seeking to 0x%lx\n", offset); filepos = offset; return filepos; } @@ -231,7 +231,7 @@ unsigned long file_size(void) void file_set_size(unsigned long size) { - debug("updating file size to %d bytes\n", size); + debug("updating file size to %lu bytes\n", size); filemax = size; using_devsize = 0; diff --git a/main/grub/builtins.c b/main/grub/builtins.c index e40663b..1297ad0 100644 --- a/main/grub/builtins.c +++ b/main/grub/builtins.c @@ -802,7 +802,7 @@ void copy_path_to_filo_bootline(char *arg, char *path, int use_rootdev, int appe strlcat(path, buffer, BOOT_LINE_LENGTH); } if (addr != -1) { - snprintf(buffer, 31, "@0x%x", addr); + snprintf(buffer, 31, "@0x%lx", addr); strlcat(path, buffer, BOOT_LINE_LENGTH); } buffer[0]=':';

1 0

New patch to review for filo: 7532acf Fix a warning in elfload.c
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3295 -gerrit commit 7532acf597009c44c15de15f5b5c3fdca3e05cef Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 14:06:41 2013 +0200 Fix a warning in elfload.c Fix the warning: main/elfload.c: In function 'load_segments': main/elfload.c:138:21: warning: variable 'time' set but not used [-Wunused-but-set-variable] by setting 'time' (and 'start_time') only when DEBUG is enabled. Change-Id: I19975963f180f7380dcae8d07f088505203fdbc9 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- main/elfload.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main/elfload.c b/main/elfload.c index 63ea2b4..3eb03c2 100644 --- a/main/elfload.c +++ b/main/elfload.c @@ -135,11 +135,12 @@ static int load_segments(Elf_phdr *phdr, int phnum, unsigned long checksum_offset) { unsigned long bytes; - u64 start_time, time; int i; bytes = 0; - start_time = currticks(); +#if defined(DEBUG) && (DEBUG == 1) + u64 start_time = currticks(); +#endif for (i = 0; i < phnum; i++) { if (phdr[i].p_type != PT_LOAD) continue; @@ -165,9 +166,11 @@ static int load_segments(Elf_phdr *phdr, int phnum, debug("ok\n"); } - time = currticks() - start_time; +#if defined(DEBUG) && (DEBUG == 1) + u64 time = currticks() - start_time; debug("Loaded %lu bytes in %ums (%luKB/s)\n", bytes, time, time? bytes/time : 0); +#endif return 1; }

1 0

New patch to review for filo: f7471b6 Fix random warnings in char_io.c
by Nico Huber 26 May '13

26 May '13

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3294 -gerrit commit f7471b63091dbad30db257ec49eed0e559033c7a Author: Nico Huber <nico.huber(a)secunet.com> Date: Sun May 26 12:00:16 2013 +0200 Fix random warnings in char_io.c Fix two warnings: char_io.c: In function 'grub_printf': char_io.c:86:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] char_io.c: In function 'init_page': char_io.c:104:4: warning: implicit declaration of function 'get_cb_version' [-Wimplicit-function-declaration] by removing the variable 'ret' and including sys_info.h for the 'get_cb_version' prototype. Change-Id: I596b17b3594f8909ff5d6eccb9cb0be475bf052e Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- main/grub/char_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/grub/char_io.c b/main/grub/char_io.c index fec3387..21df9f8 100644 --- a/main/grub/char_io.c +++ b/main/grub/char_io.c @@ -20,6 +20,7 @@ */ #include <libpayload.h> +#include <sys_info.h> #include <config.h> #include <version.h> #include <grub/shared.h> @@ -83,13 +84,12 @@ void grub_putstr(const char *str) void grub_printf(const char *format, ...) { - int ret; va_list args; #define OUTPUT_SIZE 256 char output[OUTPUT_SIZE]; va_start(args, format); - ret = vsnprintf(output, OUTPUT_SIZE, format, args); + vsnprintf(output, OUTPUT_SIZE, format, args); va_end(args); grub_putstr(output); refresh();

1 0

Patch merged into coreboot/master: c6d1da0 snow: Add a name to the serial console UART choice block.
by gerrit＠coreboot.org 26 May '13

26 May '13

the following patch was just integrated into master: commit c6d1da0b18a35470c5cf5d366d33fac957ae7974 Author: Gabe Black <gabeblack(a)chromium.org> Date: Sun May 26 11:31:56 2013 +0200 snow: Add a name to the serial console UART choice block. This allows other boards to have the same choice block without confusing kconfig. Change-Id: Iea5a7f2d1c263aa7992f504b832ca9c862833c3f Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Reviewed-on: http://review.coreboot.org/3293 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3293 for details. -gerrit

1 0

Patch set updated for coreboot: f833bc0 util/inteltool: Add support for mobile 5 chipset
by Ronald G. Minnich 26 May '13

26 May '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2993 -gerrit commit f833bc07ef9403385f4ebb86dd530d1ce22cf1d0 Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sun Mar 31 13:51:37 2013 +0200 util/inteltool: Add support for mobile 5 chipset Dump registers on mobile 5. Successfully tested on X201. Change-Id: I606371801d3ae6c96d3d404c9775c254bd0ffbc9 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/inteltool/cpu.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ util/inteltool/gpio.c | 6 +++ util/inteltool/inteltool.h | 1 + util/inteltool/memory.c | 90 +++++++++++++++++++++++++++++++++- util/inteltool/powermgt.c | 6 +++ util/inteltool/rootcmplx.c | 1 + 6 files changed, 221 insertions(+), 1 deletion(-) diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c index 80e1ed6..87fc471 100644 --- a/util/inteltool/cpu.c +++ b/util/inteltool/cpu.c @@ -888,6 +888,123 @@ int print_intel_core_msrs(void) { 0x0600, "IA32_DS_AREA" }, }; + static const msr_entry_t model20650_global_msrs[] = { + { 0x0000, "IA32_P5_MC_ADDR" }, + { 0x0001, "IA32_P5_MC_TYPE" }, + { 0x0006, "IA32_MONITOR_FILTER_LINE_SIZE" }, + { 0x0017, "IA32_PLATFORM_ID" }, + { 0x002a, "MSR_EBC_HARD_POWERON" }, +// WRITE ONLY { 0x0079, "IA32_BIOS_UPDT_TRIG" }, + { 0x00ce, "IA32_MSR_PLATFORM_INFO" }, + { 0x00e2, "IA32_MSR_PMG_CST_CONFIG" }, + { 0x019c, "IA32_THERM_STATUS" }, + { 0x019d, "MSR_THERM2_CTL" }, + { 0x01a0, "IA32_MISC_ENABLE" }, + { 0x0200, "IA32_MTRR_PHYSBASE0" }, + { 0x0201, "IA32_MTRR_PHYSMASK0" }, + { 0x0202, "IA32_MTRR_PHYSBASE1" }, + { 0x0203, "IA32_MTRR_PHYSMASK1" }, + { 0x0204, "IA32_MTRR_PHYSBASE2" }, + { 0x0205, "IA32_MTRR_PHYSMASK2" }, + { 0x0206, "IA32_MTRR_PHYSBASE3" }, + { 0x0207, "IA32_MTRR_PHYSMASK3" }, + { 0x0208, "IA32_MTRR_PHYSBASE4" }, + { 0x0209, "IA32_MTRR_PHYSMASK4" }, + { 0x020a, "IA32_MTRR_PHYSBASE5" }, + { 0x020b, "IA32_MTRR_PHYSMASK5" }, + { 0x020c, "IA32_MTRR_PHYSBASE6" }, + { 0x020d, "IA32_MTRR_PHYSMASK6" }, + { 0x020e, "IA32_MTRR_PHYSBASE7" }, + { 0x020f, "IA32_MTRR_PHYSMASK7" }, + { 0x0250, "IA32_MTRR_FIX64K_00000" }, + { 0x0258, "IA32_MTRR_FIX16K_80000" }, + { 0x0259, "IA32_MTRR_FIX16K_A0000" }, + { 0x0268, "IA32_MTRR_FIX4K_C0000" }, + { 0x0269, "IA32_MTRR_FIX4K_C8000" }, + { 0x026a, "IA32_MTRR_FIX4K_D0000" }, + { 0x026b, "IA32_MTRR_FIX4K_D8000" }, + { 0x026c, "IA32_MTRR_FIX4K_E0000" }, + { 0x026d, "IA32_MTRR_FIX4K_E8000" }, + { 0x026e, "IA32_MTRR_FIX4K_F0000" }, + { 0x026f, "IA32_MTRR_FIX4K_F8000" }, + { 0x02ff, "IA32_MTRR_DEF_TYPE" }, + { 0x0300, "MSR_BPU_COUNTER0" }, + { 0x0301, "MSR_BPU_COUNTER1" }, + /* Skipped through 0x3ff for now*/ + + /* All MCX_ADDR AND MCX_MISC MSRs depend on a bit being + * set in MCX_STATUS */ + { 0x400, "IA32_MC0_CTL" }, + { 0x401, "IA32_MC0_STATUS" }, + { 0x402, "IA32_MC0_ADDR" }, + { 0x403, "IA32_MC0_MISC" }, + { 0x404, "IA32_MC1_CTL" }, + { 0x405, "IA32_MC1_STATUS" }, + { 0x406, "IA32_MC1_ADDR" }, + { 0x407, "IA32_MC1_MISC" }, + { 0x408, "IA32_MC2_CTL" }, + { 0x409, "IA32_MC2_STATUS" }, + { 0x40a, "IA32_MC2_ADDR" }, + { 0x40c, "IA32_MC3_CTL" }, + { 0x40d, "IA32_MC3_STATUS" }, + { 0x40e, "IA32_MC3_ADDR" }, + { 0x410, "IA32_MC4_CTL" }, + { 0x411, "IA32_MC4_STATUS" }, + }; + + static const msr_entry_t model20650_per_core_msrs[] = { + { 0x0010, "IA32_TIME_STAMP_COUNTER" }, + { 0x001b, "IA32_APIC_BASE" }, + { 0x003a, "IA32_FEATURE_CONTROL" }, + { 0x008b, "IA32_BIOS_SIGN_ID" }, + { 0x009b, "IA32_SMM_MONITOR_CTL" }, + { 0x00e4, "IA32_PMG_IO_CAPTURE_BASE" }, + { 0x00fe, "IA32_MTRRCAP" }, + { 0x0174, "IA32_SYSENTER_CS" }, + { 0x0175, "IA32_SYSENTER_ESP" }, + { 0x0176, "IA32_SYSENTER_EIP" }, + { 0x0179, "IA32_MCG_CAP" }, + { 0x017a, "IA32_MCG_STATUS" }, + { 0x0186, "MSR_MCG_RBP" }, + { 0x0187, "MSR_MCG_RSP" }, + { 0x0188, "MSR_MCG_RFLAGS" }, + { 0x0189, "MSR_MCG_RIP" }, + { 0x0194, "MSR_MCG_R12" }, + { 0x0198, "IA32_PERF_STATUS" }, + { 0x0199, "IA32_PERF_CTL" }, + { 0x019a, "IA32_CLOCK_MODULATION" }, + { 0x019b, "IA32_THERM_INTERRUPT" }, + { 0x01a0, "IA32_MISC_ENABLE" }, // Bit 34 is Core Specific + { 0x01aa, "IA32_MISC_PWR_MGMT" }, + { 0x01d9, "MSR_DEBUGCTLA" }, + { 0x01fc, "MSR_POWER_CTL" }, + { 0x0277, "IA32_PAT" }, + /** Virtualization + { 0x480, "IA32_VMX_BASIC" }, + through + { 0x48b, "IA32_VMX_PROCBASED_CTLS2" }, + Not implemented in my CPU + */ + { 0x0600, "IA32_DS_AREA" }, + /* 0x0680 - 0x06cf Branch Records Skipped */ + + { 0x3a, "IA32_FEATURE_CONTROL" }, + { 0x13c, "MSR_FEATURE_CONFIG" }, + { 0x194, "MSR_FLEX_RATIO" }, + { 0x1a0, "IA32_MISC_ENABLE" }, + { 0x1a2, "MSR_TEMPERATURE_TARGET" }, + { 0x199, "IA32_PERF_CTL" }, + { 0x19b, "IA32_THERM_INTERRUPT" }, + { 0x401, "IA32_MC0_STATUS" }, + { 0x2e, "MSR_PIC_MSG_CONTROL" }, + { 0xce, "MSR_PLATFORM_INFO" }, + { 0xe2, "MSR_PMG_CST_CONFIG_CONTROL" }, + { 0xe4, "MSR_PMG_IO_CAPTURE_BASE" }, + { 0x1aa, "MSR_MISC_PWR_MGMT" }, + { 0x1ad, "MSR_TURBO_RATIO_LIMIT" }, + { 0x1fc, "MSR_POWER_CTL" }, + }; + typedef struct { unsigned int model; const msr_entry_t *global_msrs; @@ -904,6 +1021,7 @@ int print_intel_core_msrs(void) { 0x00f20, modelf2x_global_msrs, ARRAY_SIZE(modelf2x_global_msrs), modelf2x_per_core_msrs, ARRAY_SIZE(modelf2x_per_core_msrs) }, { 0x00f40, modelf4x_global_msrs, ARRAY_SIZE(modelf4x_global_msrs), modelf4x_per_core_msrs, ARRAY_SIZE(modelf4x_per_core_msrs) }, { 0x106c0, model6_atom_global_msrs, ARRAY_SIZE(model6_atom_global_msrs), model6_atom_per_core_msrs, ARRAY_SIZE(model6_atom_per_core_msrs) }, + { 0x20650, model20650_global_msrs, ARRAY_SIZE(model20650_global_msrs), model20650_per_core_msrs, ARRAY_SIZE(model20650_per_core_msrs) }, }; cpu_t *cpu = NULL; diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c index 7ce9939..820e266 100644 --- a/util/inteltool/gpio.c +++ b/util/inteltool/gpio.c @@ -523,6 +523,12 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs) size = ARRAY_SIZE(i631x_gpio_registers); break; + case PCI_DEVICE_ID_INTEL_MOBILE_5: + gpiobase = pci_read_word(sb, 0x48) & 0xfffc; + gpio_registers = i631x_gpio_registers; + size = ARRAY_SIZE(i631x_gpio_registers); + break; + case PCI_DEVICE_ID_INTEL_82371XX: printf("This southbridge has GPIOs in the PM unit.\n"); return 1; diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 5a6dcc8..7872a5f 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -60,6 +60,7 @@ #define PCI_DEVICE_ID_INTEL_ICH9M 0x2919 #define PCI_DEVICE_ID_INTEL_ICH9ME 0x2917 #define PCI_DEVICE_ID_INTEL_ICH10R 0x3a16 +#define PCI_DEVICE_ID_INTEL_MOBILE_5 0x3b07 #define PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC 0x8119 #define PCI_DEVICE_ID_INTEL_Z68 0x1c44 #define PCI_DEVICE_ID_INTEL_P67 0x1c46 diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c index 506620d..be8b0cb 100644 --- a/util/inteltool/memory.c +++ b/util/inteltool/memory.c @@ -64,13 +64,97 @@ static const io_register_t sandybridge_mch_registers[] = { { 0x5D10, 8, "SSKPD" }, // Sticky Scratchpad Data }; +volatile uint8_t *mchbar; + +static void write_mchbar32 (uint32_t addr, uint32_t val) +{ + * (volatile uint32_t *) (mchbar + addr) = val; +} + +static uint32_t read_mchbar32 (uint32_t addr) +{ + return * (volatile uint32_t *) (mchbar + addr); +} + +static uint8_t read_mchbar8 (uint32_t addr) +{ + return * (volatile uint8_t *) (mchbar + addr); +} + +static u16 read_500 (int channel, u16 addr, int split) +{ + uint32_t val; + write_mchbar32 (0x500 + (channel << 10), 0); + while (read_mchbar32 (0x500 + (channel << 10)) & 0x800000); + write_mchbar32 (0x500 + (channel << 10), 0x80000000 | (((read_mchbar8 (0x246 + (channel << 10)) >> 2) & 3) + 0xb88 - addr)); + while (read_mchbar32 (0x500 + (channel << 10)) & 0x800000); + val = read_mchbar32 (0x508 + (channel << 10)); + + return val & ((1 << split) - 1); +} + +static inline u16 get_lane_offset (int slot, int rank, int lane) +{ + return 0x124 * lane + ((lane & 4) ? 0x23e : 0) + 11 * rank + 22 * slot - 0x452 * (lane == 8); +} + +static inline u16 get_timing_register_addr (int lane, int tm, int slot, int rank) +{ + const u16 offs[] = { 0x1d, 0xa8, 0xe6, 0x5c }; + return get_lane_offset (slot, rank, lane) + offs[(tm + 3) % 4]; +} + +static void write_1d0 (u32 val, u16 addr, int bits, int flag) +{ + write_mchbar32 (0x1d0, 0); + while (read_mchbar32 (0x1d0) & 0x800000); + write_mchbar32 (0x1d4, (val & ((1 << bits) - 1)) | (2 << bits) | (flag << bits)); + write_mchbar32 (0x1d0, 0x40000000 | addr); + while (read_mchbar32 (0x1d0) & 0x800000); +} + +static u16 read_1d0 (u16 addr, int split) +{ + u32 val; + write_mchbar32 (0x1d0, 0); + while (read_mchbar32 (0x1d0) & 0x800000); + write_mchbar32 (0x1d0, 0x80000000 | (((read_mchbar8 (0x246) >> 2) & 3) + 0x361 - addr)); + while (read_mchbar32 (0x1d0) & 0x800000); + val = read_mchbar32 (0x1d8); + write_1d0 (0, 0x33d, 0, 0); + write_1d0 (0, 0x33d, 0, 0); + return val & ((1 << split) - 1); +} + +static void dump_timings (void) +{ + int channel, slot, rank, lane, i; + printf ("Timings:\n"); + for (channel = 0; channel < 2; channel++) + for (slot = 0; slot < 2; slot++) + for (rank = 0; rank < 2; rank++) { + printf ("channel %d, slot %d, rank %d\n", channel, slot, rank); + for (lane = 0; lane < 9; lane++) { + printf ("lane %d: ", lane); + for (i = 0; i < 4; i++) { + printf ("%x ", read_500 (channel, + get_timing_register_addr (lane, i, slot, rank), 9)); + } + printf ("\n"); + } + } + + printf ("[178] = %x\n", read_1d0 (0x178, 7)); + printf ("[10b] = %x\n", read_1d0 (0x10b, 6)); +} + + /* * (G)MCH MMIO Config Space */ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc) { int i, size = (16 * 1024); - volatile uint8_t *mchbar; uint64_t mchbar_phys; const io_register_t *mch_registers = NULL; struct pci_dev *nb_device6; /* "overflow device" on i865 */ @@ -229,6 +313,10 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc) } } + if (nb->device_id == PCI_DEVICE_ID_INTEL_CORE_1ST_GEN) { + printf ("clock_speed_index = %x\n", read_500 (0,0x609, 6) >> 1); + dump_timings (); + } unmap_physical((void *)mchbar, size); return 0; } diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c index f0f7664..3c874db 100644 --- a/util/inteltool/powermgt.c +++ b/util/inteltool/powermgt.c @@ -761,6 +761,12 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc) size = ARRAY_SIZE(i63xx_pm_registers); break; + case PCI_DEVICE_ID_INTEL_MOBILE_5: + pmbase = pci_read_word(sb, 0x40) & 0xfffc; + pm_registers = i63xx_pm_registers; + size = ARRAY_SIZE(i63xx_pm_registers); + break; + case 0x1234: // Dummy for non-existent functionality printf("This southbridge does not have PMBASE.\n"); return 1; diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c index 7cc55de..8cf2ffb 100644 --- a/util/inteltool/rootcmplx.c +++ b/util/inteltool/rootcmplx.c @@ -47,6 +47,7 @@ int print_rcba(struct pci_dev *sb) case PCI_DEVICE_ID_INTEL_ICH10R: case PCI_DEVICE_ID_INTEL_NM10: case PCI_DEVICE_ID_INTEL_I63XX: + case PCI_DEVICE_ID_INTEL_MOBILE_5: case PCI_DEVICE_ID_INTEL_Z68: case PCI_DEVICE_ID_INTEL_P67: case PCI_DEVICE_ID_INTEL_UM67:

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2013