December 2011 - U-Boot

[U-Boot] Pull request - microblaze
by Michal Simek 18 Sep '12

18 Sep '12

Dear Wolfgang Denk, please pull the following changes. Thanks, Michal The following changes since commit 99ffccbd3e5b7bc715e2eed6ea6d36f4020b56d8: Diana CRACIUN (1): Flush cache after the OS image is loaded into the memory. are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master Michal Simek (25): net: emaclite: Change driver name and add address net: emaclite: Remove deviceid property net: emaclite: Use calloc instead of malloc net: emaclite: Remove baseaddress from xemaclite net: emaclite: Use dynamic allocation net: emaclite: Setup RX/TX ping pong for every instance net: emaclite: Move RX/TX ping pong initialization to board net: emaclite: Use helper function for io accesses net: emaclite: Fix coding style net: emaclite: Use unsigned long for baseaddr net: emaclite: Use PKTSIZE directly microblaze: Fix in/out_be8/16/32 functions microblaze: Support CTRL+C when tftp is running microblaze: Support flashes on lower addresses microblaze: Initialize jumptable and console microblaze: Fix unaligned.h for endians microblaze: Copy bootfile from variables microblaze: Remove debug saving value microblaze: Setup MB vectors if feature is enable for u-boot microblaze: Save and restore first unused vector microblaze: Clean up reset asm code microblaze: Do not select NFS for platforms without ethernet microblaze: Remove address offset for uart16550 microblaze: Fix no return statement from microblaze-generic board microblaze: Enable FDT/FIT support arch/microblaze/cpu/start.S | 66 ++--- arch/microblaze/include/asm/io.h | 33 ++- arch/microblaze/include/asm/unaligned.h | 17 +-- arch/microblaze/lib/board.c | 17 ++ .../xilinx/microblaze-generic/microblaze-generic.c | 18 +- drivers/net/xilinx_emaclite.c | 285 +++++++++++--------- include/configs/microblaze-generic.h | 9 +- include/netdev.h | 3 +- 8 files changed, 251 insertions(+), 197 deletions(-) -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian

3 18

[U-Boot] [PATCH] [U-BOOT] Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.
by Aldo Brett Cedillo Martinez 06 Sep '12

06 Sep '12

Configures GPMC, adds macros to enable net commands, and adds proper initialization to board_eth_init function. I have a similar patch to enable ethernet in zoom3 after initial support patch. Signed-off-by: Aldo Brett Cedillo Martinez <aldo.cedillo(a)ti.com> --- board/logicpd/zoom2/zoom2.c | 21 +++++++++++++++++++++ include/configs/omap3_zoom2.h | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c index e9f6625..54d3e9f 100644 --- a/board/logicpd/zoom2/zoom2.c +++ b/board/logicpd/zoom2/zoom2.c @@ -60,6 +60,16 @@ static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = { 0x1D0904C4, 0 }; +/* Ethernet GPMC configuration */ +static u32 gpmc_eth[GPMC_MAX_REG] = { + NET_GPMC_CONFIG1, + NET_GPMC_CONFIG2, + NET_GPMC_CONFIG3, + NET_GPMC_CONFIG4, + NET_GPMC_CONFIG5, + NET_GPMC_CONFIG6, 0 +}; + /* Used to track the revision of the board */ static zoom2_revision revision = ZOOM2_REVISION_UNKNOWN; @@ -130,6 +140,12 @@ int board_init (void) enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[3], SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M); +#ifdef CONFIG_CMD_NET + gpmc_config = gpmc_eth; + enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[7], + CONFIG_SMC911X_BASE, GPMC_SIZE_16M); +#endif /* (CONFIG_CMD_NET) */ + /* board id for Linux */ gd->bd->bi_arch_number = MACH_TYPE_OMAP_ZOOM2; /* boot param addr */ @@ -186,6 +202,11 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_LAN91C96 rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE); #endif + +#ifdef CONFIG_SMC911X + rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); +#endif + return rc; } #endif diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index eef95fe..c66d571 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -154,7 +154,7 @@ #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMI /* iminfo */ #undef CONFIG_CMD_IMLS /* List all found images */ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_SYS_NO_FLASH @@ -165,6 +165,14 @@ #define CONFIG_SYS_I2C_BUS_SELECT 1 #define CONFIG_DRIVER_OMAP34XX_I2C 1 +/* Ethernet */ +#ifdef CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_SMC911X +#define CONFIG_SMC911X_32_BIT +#define CONFIG_SMC911X_BASE 0x2C000000 +#endif /* (CONFIG_CMD_NET) */ + /* * TWL4030 */ -- 1.6.3.3

3 3

[U-Boot] [PATCH 2/2] ext4fs write support
by uma.shankar＠samsung.com 13 Aug '12

13 Aug '12

From: Uma Shankar <uma.shankar(a)samsung.com> Signed-off-by: Uma Shankar <uma.shankar(a)samsung.com> Signed-off-by: Manjunatha C Achar <a.manjunatha(a)samsung.com> Signed-off-by: Iqbal Shareef <iqbal.ams(a)samsung.com> Signed-off-by: Hakgoo Lee <goodguy.lee(a)samsung.com> --- common/cmd_ext4.c | 135 +++++ fs/ext4/Makefile | 2 +- fs/ext4/crc16.c | 62 +++ fs/ext4/crc16.h | 16 + fs/ext4/ext4_common.c | 1386 +++++++++++++++++++++++++++++++++++++++++++++++- fs/ext4/ext4_common.h | 17 + fs/ext4/ext4_journal.c | 650 +++++++++++++++++++++++ fs/ext4/ext4_journal.h | 147 +++++ fs/ext4/ext4fs.c | 1038 ++++++++++++++++++++++++++++++++++++- include/ext4fs.h | 8 + 10 files changed, 3457 insertions(+), 4 deletions(-) create mode 100644 fs/ext4/crc16.c create mode 100644 fs/ext4/crc16.h create mode 100644 fs/ext4/ext4_journal.c create mode 100644 fs/ext4/ext4_journal.h diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c index 7c2d541..781c6fe 100644 --- a/common/cmd_ext4.c +++ b/common/cmd_ext4.c @@ -47,11 +47,53 @@ uint64_t total_sector; uint64_t part_offset; +static unsigned long part_size; +static int cur_part = 1; #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_FS_TYPE_OFFSET 0x36 #define DOS_FS32_TYPE_OFFSET 0x52 +static int ext4_register_device(block_dev_desc_t *dev_desc, int part_no) +{ + unsigned char buffer[SECTOR_SIZE]; + disk_partition_t info; + + if (!dev_desc->block_read) + return -1; + + /* check if we have a MBR (on floppies we have only a PBR) */ + if (dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) { + printf("** Can't read from device %d **\n", dev_desc->dev); + return -1; + } + if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 || + buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) { + /* no signature found */ + return -1; + } + + /* First we assume there is a MBR */ + if (!get_partition_info(dev_desc, part_no, &info)) { + part_offset = info.start; + cur_part = part_no; + part_size = info.size; + } else if ((strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], + "FAT", 3) == 0) || (strncmp((char *)&buffer + [DOS_FS32_TYPE_OFFSET], + "FAT32", 5) == 0)) { + /* ok, we assume we are on a PBR only */ + cur_part = 1; + part_offset = 0; + } else { + printf("** Partition %d not valid on device %d **\n", + part_no, dev_desc->dev); + return -1; + } + + return 0; +} + int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { char *filename = NULL; @@ -241,6 +283,94 @@ int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return 0; } +int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + char *filename = "/"; + int part_length; + unsigned long part = 1; + int dev = 0; + char *ep; + unsigned long ram_address; + unsigned long file_size; + disk_partition_t info; + struct ext_filesystem *fs; + + if (argc < 6) + return cmd_usage(cmdtp); + + dev = (int)simple_strtoul(argv[2], &ep, 16); + ext4_dev_desc = get_dev(argv[1], dev); + if (ext4_dev_desc == NULL) { + printf("Block device %s %d not" + "supported\n", argv[1], dev); + return 1; + } + if (init_fs(ext4_dev_desc)) + return 1; + + fs = get_fs(); + if (*ep) { + if (*ep != ':') { + puts("Invalid boot device, use `dev[:part]'\n"); + goto fail; + } + (int)strict_strtoul(++ep, 16, &part); + } + + /*get the filename */ + filename = argv[3]; + + /*get the address in hexadecimal format (string to int) */ + strict_strtoul(argv[4], 16, &ram_address); + + /*get the filesize in base 10 format */ + strict_strtoul(argv[5], 10, &file_size); + + /*set the device as block device */ + part_length = ext2fs_set_blk_dev(fs->dev_desc, part); + if (part_length == 0) { + printf("Bad partition - %s %d:%lu\n", argv[1], dev, part); + goto fail; + } + + /*register the device and partition */ + if (ext4_register_device(fs->dev_desc, part) != 0) { + printf("Unable to use %s %d:%lu for fattable\n", + argv[1], dev, part); + goto fail; + } + + /*get the partition information */ + if (!get_partition_info(fs->dev_desc, part, &info)) { + total_sector = (info.size * info.blksz) / SECTOR_SIZE; + fs->total_sect = total_sector; + } else { + printf("error : get partition info\n"); + goto fail; + } + + /*mount the filesystem */ + if (!ext4fs_mount(part_length)) { + printf("Bad ext4 partition %s %d:%lu\n", argv[1], dev, part); + goto fail; + } + + /*start write */ + if (ext4fs_write(filename, (unsigned char *)ram_address, file_size)) { + printf("** Error ext4fs_write() **\n"); + goto fail; + } + + ext4fs_close(); + deinit_fs(fs->dev_desc); + return 0; + +fail: + ext4fs_close(); + deinit_fs(fs->dev_desc); + return 1; +} + U_BOOT_CMD(ext4ls, 4, 1, do_ext4_ls, "list files in a directory (default /)", "<interface> <dev[:part]> [directory]\n" @@ -251,3 +381,8 @@ U_BOOT_CMD(ext4load, 6, 0, do_ext4_load, "<interface> <dev[:part]> [addr] [filename] [bytes]\n" " - load binary file 'filename' from 'dev' on 'interface'\n" " to address 'addr' from ext2 filesystem"); +U_BOOT_CMD + (ext4write, 6, 1, do_ext4_write, + "create a file in the root directory", + "<interface> <dev[:part]> [Absolute filename path] [Address] [sizebytes]\n" + " - create a file in / directory"); diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile index 850f821..1e7e7a8 100644 --- a/fs/ext4/Makefile +++ b/fs/ext4/Makefile @@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)libext4fs.o AOBJS = -COBJS-$(CONFIG_CMD_EXT4) := ext4fs.o ext4_common.o +COBJS-$(CONFIG_CMD_EXT4) := ext4fs.o ext4_common.o ext4_journal.o crc16.o SRCS := $(AOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS-y)) diff --git a/fs/ext4/crc16.c b/fs/ext4/crc16.c new file mode 100644 index 0000000..3afb34d --- /dev/null +++ b/fs/ext4/crc16.c @@ -0,0 +1,62 @@ +/* + * crc16.c + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ + +#include <common.h> +#include <asm/byteorder.h> +#include <linux/stat.h> +#include "crc16.h" + +/** CRC table for the CRC-16. The poly is 0x8005 (x16 + x15 + x2 + 1) */ +static __u16 const crc16_table[256] = { + 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, + 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, + 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, + 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, + 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, + 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, + 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, + 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, + 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, + 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, + 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, + 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, + 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, + 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, + 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, + 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, + 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, + 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, + 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, + 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, + 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, + 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, + 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, + 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, + 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, + 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, + 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, + 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, + 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, + 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, + 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, + 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 +}; + +/** + * Compute the CRC-16 for the data buffer +*/ + +unsigned int ext2fs_crc16(unsigned int crc, + const void *buffer, unsigned int len) +{ + const unsigned char *cp = buffer; + + while (len--) + crc = (((crc >> 8) & 0xffU) ^ + crc16_table[(crc ^ *cp++) & 0xffU]) & 0x0000ffffU; + return crc; +} diff --git a/fs/ext4/crc16.h b/fs/ext4/crc16.h new file mode 100644 index 0000000..5fd113a --- /dev/null +++ b/fs/ext4/crc16.h @@ -0,0 +1,16 @@ +/* + * crc16.h - CRC-16 routine + * Implements the standard CRC-16: + * Width 16 + * Poly 0x8005 (x16 + x15 + x2 + 1) + * Init 0 + * + * Copyright (c) 2005 Ben Gardner <bgardner(a)wabtec.com> + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. + */ +#ifndef __CRC16_H +#define __CRC16_H +extern unsigned int ext2fs_crc16(unsigned int crc, + const void *buffer, unsigned int len); +#endif diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 6f9351c..29b578d 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -22,7 +22,13 @@ /* * ext4load - based on code from GRUB2 fs/ext2.c -*/ + * + * ext4write - based on existing ext2 support in UBOOT and ext4 + * implementation in Linux Kernel + * Journaling feature of ext4 has been referred from JBD2 + * (Journaling Block device 2) implementation in Linux Kernel + */ + #include <common.h> #include <ext_common.h> #include <ext4fs.h> @@ -30,7 +36,8 @@ #include <asm/byteorder.h> #include <linux/stat.h> #include <linux/time.h> -#include "ext4_common.h" +#include "crc16.h" +#include "ext4_journal.h" struct ext2_data *ext4fs_root; struct ext2fs_node *ext4fs_file; @@ -65,6 +72,834 @@ void *xzalloc(size_t size) return ptr; } +uint32_t ext4fs_div_roundup(uint32_t size, uint32_t n) +{ + uint32_t res = size / n; + if (res * n != size) + res++; + return res; +} + +/* To convert big endian journal superblock entries to little endian */ +unsigned int be_le(unsigned int num) +{ + unsigned int swapped; + swapped = (((num >> 24) & 0xff) | + ((num << 8) & 0xff0000) | + ((num >> 8) & 0xff00) | ((num << 24) & 0xff000000)); + return swapped; +} + +/* 4-byte number*/ +unsigned int le_be(unsigned int num) +{ + return ((num & 0xff) << 24) + ((num & 0xff00) << 8) + + ((num & 0xff0000) >> 8) + ((num >> 24) & 0xff); +} + +void put_ext4(uint64_t off, void *buf, uint32_t size) +{ + uint64_t startblock, remainder; + short sector_size = 512; + unsigned char *temp_ptr = NULL; + char sec_buf[SECTOR_SIZE]; + struct ext_filesystem *fs = get_fs(); + + startblock = off / (uint64_t) sector_size; + startblock += part_offset; + remainder = off % (uint64_t) sector_size; + remainder &= SECTOR_SIZE - 1; + + if (fs->dev_desc == NULL) + return; + + if ((startblock + (size / SECTOR_SIZE)) > + (part_offset + fs->total_sect)) { + printf("part_offset is %lu\n", part_offset); + printf("total_sector is %llu\n", fs->total_sect); + printf("error: overflow occurs\n"); + return; + } + + if (remainder) { + if (fs->dev_desc->block_read) { + fs->dev_desc->block_read(fs->dev_desc->dev, + startblock, 1, + (unsigned char *)sec_buf); + temp_ptr = (unsigned char *)sec_buf; + memcpy((temp_ptr + remainder), + (unsigned char *)buf, size); + fs->dev_desc->block_write(fs->dev_desc->dev, + startblock, 1, + (unsigned char *)sec_buf); + } + } else { + if (size / SECTOR_SIZE != 0) { + fs->dev_desc->block_write(fs->dev_desc->dev, + startblock, + size / SECTOR_SIZE, + (unsigned long *)buf); + } else { + fs->dev_desc->block_read(fs->dev_desc->dev, + startblock, 1, + (unsigned char *)sec_buf); + temp_ptr = (unsigned char *)sec_buf; + memcpy(temp_ptr, buf, size); + fs->dev_desc->block_write(fs->dev_desc->dev, + startblock, 1, + (unsigned long *)sec_buf); + } + } + return; +} + +static int _get_new_inode_no(unsigned char *buffer) +{ + struct ext_filesystem *fs = get_fs(); + unsigned char input; + int operand, status, count = 1, j = 0; + + /*get the blocksize of the filesystem */ + unsigned char *ptr = buffer; + while (*ptr == 255) { + ptr++; + count += 8; + if (count > (uint32_t) ext4fs_root->sblock.inodes_per_group) + 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; + } + } + ptr = ptr + 1; + } + return -1; +} + +static int _get_new_blk_no(unsigned char *buffer) +{ + unsigned char input; + int operand, status, count = 0, j = 0; + 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; + if (count == (fs->blksz * 8)) + 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; + } + } + ptr = ptr + 1; + } + return -1; +} + +int set_block_bmap(long int blockno, unsigned char *buffer, int index) +{ + int i, remainder, status; + unsigned char *ptr = buffer; + unsigned char operand; + i = blockno / 8; + remainder = blockno % 8; + int blocksize = EXT2_BLOCK_SIZE(ext4fs_root); + + i = i - (index * blocksize); + if (blocksize != 1024) { + ptr = ptr + i; + operand = 1 << remainder; + status = *ptr & operand; + if (status) + return -1; + else { + *ptr = *ptr | operand; + return 0; + } + } else { + if (remainder == 0) { + ptr = ptr + i - 1; + operand = (1 << 7); + } else { + ptr = ptr + i; + operand = (1 << (remainder - 1)); + } + status = *ptr & operand; + if (status) + return -1; + else { + *ptr = *ptr | operand; + return 0; + } + } +} + +void reset_block_bmap(long int blockno, unsigned char *buffer, int index) +{ + int i, remainder, status; + unsigned char *ptr = buffer; + unsigned char operand; + i = blockno / 8; + remainder = blockno % 8; + int blocksize = EXT2_BLOCK_SIZE(ext4fs_root); + + i = i - (index * blocksize); + if (blocksize != 1024) { + ptr = ptr + i; + operand = (1 << remainder); + status = *ptr & operand; + if (status) + *ptr = *ptr & ~(operand); + } else { + if (remainder == 0) { + ptr = ptr + i - 1; + operand = (1 << 7); + } else { + ptr = ptr + i; + operand = (1 << (remainder - 1)); + } + status = *ptr & operand; + if (status) + *ptr = *ptr & ~(operand); + } + return; +} + +int set_inode_bmap(int inode_no, unsigned char *buffer, int index) +{ + int i, remainder, status; + unsigned char *ptr = buffer; + unsigned char operand; + + inode_no -= (index * (uint32_t) ext4fs_root->sblock.inodes_per_group); + i = inode_no / 8; + remainder = inode_no % 8; + if (remainder == 0) { + ptr = ptr + i - 1; + operand = (1 << 7); + } else { + ptr = ptr + i; + operand = (1 << (remainder - 1)); + } + status = *ptr & operand; + if (status) + return -1; + else { + *ptr = *ptr | operand; + return 0; + } +} + +void reset_inode_bmap(int inode_no, unsigned char *buffer, int index) +{ + int i, remainder, status; + unsigned char *ptr = buffer; + unsigned char operand; + + inode_no -= (index * (uint32_t) ext4fs_root->sblock.inodes_per_group); + i = inode_no / 8; + remainder = inode_no % 8; + if (remainder == 0) { + ptr = ptr + i - 1; + operand = (1 << 7); + } else { + ptr = ptr + i; + operand = (1 << (remainder - 1)); + } + status = *ptr & operand; + if (status) + *ptr = *ptr & ~(operand); + return; +} + +int ext4fs_checksum_update(unsigned int i) +{ + struct ext2_block_group *desc; + struct ext_filesystem *fs = get_fs(); + __u16 crc = 0; + + desc = (struct ext2_block_group *)&fs->gd[i]; + if (fs->sb->feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) { + int offset = offsetof(struct ext2_block_group, bg_checksum); + + crc = ext2fs_crc16(~0, fs->sb->unique_id, + sizeof(fs->sb->unique_id)); + crc = ext2fs_crc16(crc, &i, sizeof(i)); + crc = ext2fs_crc16(crc, desc, offset); + offset += sizeof(desc->bg_checksum); /* skip checksum */ + assert(offset == sizeof(*desc)); + } + return crc; +} + +static int check_void_in_dentry(struct ext2_dirent *dir, char *filename) +{ + int dentry_length = 0; + short padding_factor = 0; + int sizeof_void_space = 0; + int new_entry_byte_reqd = 0; + + if (dir->namelen % 4 != 0) + padding_factor = 4 - (dir->namelen % 4); + + dentry_length = sizeof(struct ext2_dirent) + + dir->namelen + padding_factor; + sizeof_void_space = dir->direntlen - dentry_length; + if (sizeof_void_space == 0) { + return 0; + } else { + padding_factor = 0; + if (strlen(filename) % 4 != 0) + padding_factor = 4 - (strlen(filename) % 4); + + new_entry_byte_reqd = strlen(filename) + + sizeof(struct ext2_dirent) + padding_factor; + if (sizeof_void_space >= new_entry_byte_reqd) { + dir->direntlen = dentry_length; + return sizeof_void_space; + } else + return 0; + } +} + +void update_parent_dentry(char *filename, int *p_ino, int file_type) +{ + unsigned int *zero_buffer = NULL; + char *root_first_block_buffer = NULL; + struct ext_filesystem *fs = get_fs(); + int direct_blk_idx; + long int root_blknr; + 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, inodeno, status; + /*directory entry */ + struct ext2_dirent *dir; + char *ptr = NULL; + char *temp_dir = NULL; + + /*##START: Update the root directory entry block of root inode ### */ + /*since we are populating this file under root + *directory take the root inode and its first block + *currently we are looking only in first block of root + *inode*/ + + zero_buffer = xzalloc(fs->blksz); + if (!zero_buffer) + return; + root_first_block_buffer = (char *)xzalloc(fs->blksz); + if (!root_first_block_buffer) + return; +RESTART: + + /*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; + } + + status = ext2fs_devread(first_block_no_of_root + * fs->sect_perblk, + 0, fs->blksz, root_first_block_buffer); + if (status == 0) + goto fail; + else { + if (log_journal(root_first_block_buffer, + first_block_no_of_root)) + goto fail; + dir = (struct ext2_dirent *)root_first_block_buffer; + ptr = (char *)dir; + totalbytes = 0; + while (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 + */ + + /* traversing the each directory entry */ + if (fs->blksz - totalbytes == 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("1st Block Full:" + "allocating new block\n"); + + if (direct_blk_idx == + INDIRECT_BLOCKS - 1) { + printf("Directory capacity" + "exceeds the limit\n"); + goto fail; + } + g_parent_inode->b.blocks.dir_blocks + [direct_blk_idx] = get_new_blk_no(); + if (g_parent_inode->b.blocks.dir_blocks + [direct_blk_idx] == -1) { + printf("no block" + "left to assign\n"); + goto fail; + } + put_ext4(((uint64_t) + (g_parent_inode->b.blocks. + dir_blocks[direct_blk_idx] * + fs->blksz)), zero_buffer, + fs->blksz); + g_parent_inode->size = + g_parent_inode->size + fs->blksz; + g_parent_inode->blockcnt = + g_parent_inode->blockcnt + + fs->sect_perblk; + if (put_metadata + (root_first_block_buffer, + first_block_no_of_root)) + goto fail; + goto RESTART; + } + dir->direntlen = last_entry_dirlen; + break; + } + + templength = dir->direntlen; + totalbytes = totalbytes + templength; + sizeof_void_space = check_void_in_dentry(dir, filename); + if (sizeof_void_space) + break; + + dir = (struct ext2_dirent *)((char *)dir + templength); + ptr = (char *)dir; + } + + /*make a pointer ready for creating next directory entry */ + templength = dir->direntlen; + totalbytes = totalbytes + templength; + dir = (struct ext2_dirent *)((char *)dir + templength); + ptr = (char *)dir; + + /*get the next available inode number */ + inodeno = get_new_inode_no(); + if (inodeno == -1) { + printf("no inode left to assign\n"); + goto fail; + } + dir->inode = inodeno; + if (sizeof_void_space) + dir->direntlen = sizeof_void_space; + else + dir->direntlen = fs->blksz - totalbytes; + dir->namelen = strlen(filename); + dir->filetype = FILETYPE_REG; /*regular file */ + temp_dir = (char *)dir; + temp_dir = temp_dir + sizeof(struct ext2_dirent); + memcpy(temp_dir, filename, strlen(filename)); + } + *p_ino = inodeno; + + /*update or write the 1st block of root inode */ + if (put_metadata(root_first_block_buffer, first_block_no_of_root)) + goto fail; + +fail: + if (zero_buffer) + free(zero_buffer); + if (root_first_block_buffer) + free(root_first_block_buffer); + + /*END: Update the root directory entry block of root inode */ +} + +static int search_dir(struct ext2_inode *parent_inode, char *dirname) +{ + unsigned char *block_buffer; + struct ext_filesystem *fs = get_fs(); + struct ext2_dirent *dir = NULL; + struct ext2_dirent *previous_dir = NULL; + int status, inodeno, totalbytes, templength, direct_blk_idx; + int found = 0; + char *ptr; + long int blknr; + + /*get the first block of root */ + /*read the block no allocated to a file */ + for (direct_blk_idx = 0; direct_blk_idx < INDIRECT_BLOCKS; + direct_blk_idx++) { + blknr = read_allocated_block(parent_inode, direct_blk_idx); + if (blknr == 0) + goto fail; + + /*read the blocks of parenet inode */ + block_buffer = xzalloc(fs->blksz); + if (!block_buffer) + goto fail; + + status = ext2fs_devread(blknr * fs->sect_perblk, + 0, fs->blksz, (char *)block_buffer); + if (status == 0) + goto fail; + else { + dir = (struct ext2_dirent *)block_buffer; + ptr = (char *)dir; + totalbytes = 0; + while (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 + */ + if (strlen(dirname) == dir->namelen) { + if (strncmp(dirname, ptr + + sizeof(struct ext2_dirent), + dir->namelen) == 0) { + previous_dir->direntlen += + dir->direntlen; + inodeno = dir->inode; + dir->inode = 0; + found = 1; + break; + } + } + + if (fs->blksz - totalbytes == dir->direntlen) + break; + + /*traversing the each directory entry */ + templength = dir->direntlen; + totalbytes = totalbytes + templength; + previous_dir = dir; + dir = (struct ext2_dirent *)((char *)dir + + templength); + ptr = (char *)dir; + } + } + + if (found == 1) { + if (block_buffer) { + free(block_buffer); + block_buffer = NULL; + } + return inodeno; + } + + if (block_buffer) { + free(block_buffer); + block_buffer = NULL; + } + } + +fail: + if (block_buffer) { + free(block_buffer); + block_buffer = NULL; + } + return -1; +} + +static int find_dir_depth(char *dirname) +{ + char *token = strtok(dirname, "/"); + int count = 0; + while (token != NULL) { + token = strtok(NULL, "/"); + count++; + } + return count + 1 + 1; + /* + *for example for string /home/temp + *depth=home(1)+temp(1)+1 extra for NULL; + *so count is 4; + */ +} + +static int parse_path(char **arr, char *dirname) +{ + char *token = strtok(dirname, "/"); + int i = 0; + + /*add root */ + arr[i] = xzalloc(strlen("/") + 1); + if (!arr[i]) + return -1; + + arr[i++] = "/"; + + /*add each path entry after root */ + while (token != NULL) { + arr[i] = xzalloc(strlen(token) + 1); + if (!arr[i]) + return -1; + memcpy(arr[i++], token, strlen(token)); + token = strtok(NULL, "/"); + } + + arr[i] = NULL; + /*success */ + return 0; +} + +int iget(int inode_no, struct ext2_inode *inode) +{ + if (ext4fs_read_inode(ext4fs_root, inode_no, inode) == 0) + return -1; + else + return 0; +} + +/* +* Function:get_parent_inode_num +* Return Value: inode Number of the parent directory of file/Directory to be +* created +* dirname : Input parmater, input path name of the file/directory to be created +* dname : Output parameter, to be filled with the name of the directory +* extracted from dirname +*/ +int get_parent_inode_num(char *dirname, char *dname, int flags) +{ + char **ptr = NULL; + int i, depth = 0; + char *depth_dirname = NULL; + char *parse_dirname = NULL; + struct ext2_inode *parent_inode = NULL; + struct ext2_inode *first_inode = NULL; + struct ext2_inode temp_inode; + int matched_inode_no; + int result_inode_no = -1; + + if (*dirname != '/') { + printf("Please supply Absolute path\n"); + return -1; + } + + depth_dirname = (char *)xzalloc(strlen(dirname) + 1); + if (!depth_dirname) + return -1; + + memcpy(depth_dirname, dirname, strlen(dirname)); + depth = find_dir_depth(depth_dirname); + parse_dirname = (char *)xzalloc(strlen(dirname) + 1); + if (!parse_dirname) + goto fail; + memcpy(parse_dirname, dirname, strlen(dirname)); + + ptr = (char **)xzalloc((depth) * sizeof(char *)); + if (!ptr) + goto fail; + if (parse_path(ptr, parse_dirname)) + goto fail; + parent_inode = (struct ext2_inode *) + xzalloc(sizeof(struct ext2_inode)); + if (!parent_inode) + goto fail; + first_inode = (struct ext2_inode *) + xzalloc(sizeof(struct ext2_inode)); + if (!first_inode) + goto fail; + memcpy(parent_inode, ext4fs_root->inode, sizeof(struct ext2_inode)); + memcpy(first_inode, parent_inode, sizeof(struct ext2_inode)); + if (flags & F_FILE) + result_inode_no = EXT2_ROOT_INO; + for (i = 1; i < depth; i++) { + matched_inode_no = search_dir(parent_inode, ptr[i]); + if (matched_inode_no == -1) { + if (ptr[i + 1] == NULL && i == 1) { + result_inode_no = EXT2_ROOT_INO; + goto END; + } else { + if (ptr[i + 1] == NULL) + break; + printf("Invalid path\n"); + result_inode_no = -1; + goto fail; + } + } else { + if (ptr[i + 1] != NULL) { + memset(parent_inode, '\0', + sizeof(struct ext2_inode)); + if (iget(matched_inode_no, parent_inode)) { + result_inode_no = -1; + goto fail; + } + result_inode_no = matched_inode_no; + } else + break; + } + } + +END: + if (i == 1) + matched_inode_no = search_dir(first_inode, ptr[i]); + else + matched_inode_no = search_dir(parent_inode, ptr[i]); + + if (matched_inode_no != -1) { + iget(matched_inode_no, &temp_inode); + if (temp_inode.mode & S_IFDIR) { + printf("It is a Directory\n"); + result_inode_no = -1; + goto fail; + } + } + + if (strlen(ptr[i]) > 256) { + result_inode_no = -1; + goto fail; + } + memcpy(dname, ptr[i], strlen(ptr[i])); + +fail: + if (depth_dirname) + free(depth_dirname); + if (parse_dirname) + free(parse_dirname); + if (ptr) + free(ptr); + if (parent_inode) + free(parent_inode); + if (first_inode) + free(first_inode); + + return result_inode_no; +} + +static int check_filename(char *filename, unsigned int blknr) +{ + char *root_first_block_buffer, *root_first_block_addr; + unsigned int first_block_no_of_root; + struct ext_filesystem *fs = get_fs(); + struct ext2_dirent *dir; + struct ext2_dirent *previous_dir = NULL; + int totalbytes = 0; + int templength = 0; + int status, inodeno; + int found = 0; + char *ptr; + + first_block_no_of_root = blknr; + root_first_block_buffer = (char *)xzalloc(fs->blksz); + if (!root_first_block_buffer) + return -1; + root_first_block_addr = root_first_block_buffer; + status = ext2fs_devread(first_block_no_of_root * + fs->sect_perblk, 0, + fs->blksz, root_first_block_buffer); + if (status == 0) { + goto fail; + } else { + if (log_journal(root_first_block_buffer, + first_block_no_of_root)) + goto fail; + dir = (struct ext2_dirent *)root_first_block_buffer; + ptr = (char *)dir; + totalbytes = 0; + while (dir->direntlen >= 0) { + if (strlen(filename) == dir->namelen) { + if (strncmp(filename, + ptr + sizeof(struct ext2_dirent), + dir->namelen) == 0) { + printf("file found deleting\n"); + previous_dir->direntlen += + dir->direntlen; + inodeno = dir->inode; + dir->inode = 0; + found = 1; + break; + } + } + + if (fs->blksz - totalbytes == dir->direntlen) + break; + + /*traversing the each directory entry */ + templength = dir->direntlen; + totalbytes = totalbytes + templength; + previous_dir = dir; + dir = (struct ext2_dirent *)((char *)dir + templength); + ptr = (char *)dir; + } + } + + if (found == 1) { + if (put_metadata(root_first_block_addr, first_block_no_of_root)) + goto fail; + return inodeno; + } + +fail: + if (root_first_block_buffer) + free(root_first_block_buffer); + return -1; +} + +int ext4fs_filename_check(char *filename) +{ + short direct_blk_idx = 0; + long int blknr = -1; + int inodeno = -1; + + /*read the block no allocated to a file */ + for (direct_blk_idx = 0; direct_blk_idx < INDIRECT_BLOCKS; + direct_blk_idx++) { + blknr = read_allocated_block(g_parent_inode, direct_blk_idx); + if (blknr == 0) + break; + inodeno = check_filename(filename, blknr); + if (inodeno != -1) + return inodeno; + } + return -1; +} + static struct ext4_extent_header *ext4fs_find_leaf(struct ext2_data *data, char *buf, struct ext4_extent_header *ext_block, uint32_t fileblock) { @@ -152,6 +987,553 @@ int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode) return 1; } +long int get_new_blk_no(void) +{ + short i, status; + int remainder; + unsigned int bg_idx; + static int prev_bg_bitmap_index = -1; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + char *zero_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer || !zero_buffer) + goto fail; + struct ext2_block_group *gd = (struct ext2_block_group *)fs->gdtable; + + if (fs->first_pass_bbmap == 0) { + for (i = 0; i < fs->no_blkgrp; i++) { + if (gd[i].free_blocks) { + if (gd[i].bg_flags & EXT4_BG_BLOCK_UNINIT) { + put_ext4(((uint64_t) (gd[i].block_id * + fs->blksz)), + zero_buffer, fs->blksz); + gd[i].bg_flags = + gd[i]. + bg_flags & ~EXT4_BG_BLOCK_UNINIT; + memcpy(fs->blk_bmaps[i], zero_buffer, + fs->blksz); + } + fs->curr_blkno = + _get_new_blk_no(fs->blk_bmaps[i]); + if (fs->curr_blkno == -1) { + /*if block bitmap is completely fill */ + continue; + } + fs->curr_blkno = fs->curr_blkno + + (i * fs->blksz * 8); + fs->first_pass_bbmap++; + gd[i].free_blocks--; + fs->sb->free_blocks--; + status = ext2fs_devread(gd[i].block_id * + fs->sect_perblk, 0, + fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[i].block_id)) + goto fail; + goto success; + } else { + debug("no space left on block group %d\n", i); + } + } + goto fail; + } else { +restart: + fs->curr_blkno++; + /*get the blockbitmap index respective to blockno */ + if (fs->blksz != 1024) { + bg_idx = fs->curr_blkno / + (uint32_t) ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = fs->curr_blkno / + (uint32_t) ext4fs_root->sblock.blocks_per_group; + remainder = fs->curr_blkno % + (uint32_t) ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + + if (bg_idx >= fs->no_blkgrp) + goto fail; + + if (gd[bg_idx].free_blocks == 0) { + debug("block group %u is full. Skipping\n", bg_idx); + fs->curr_blkno = fs->curr_blkno + + ext4fs_root->sblock.blocks_per_group; + fs->curr_blkno--; + goto restart; + } + + if (gd[bg_idx].bg_flags & EXT4_BG_BLOCK_UNINIT) { + memset(zero_buffer, '\0', fs->blksz); + put_ext4(((uint64_t) (gd[bg_idx].block_id * fs->blksz)), + zero_buffer, fs->blksz); + memcpy(fs->blk_bmaps[bg_idx], zero_buffer, fs->blksz); + gd[bg_idx].bg_flags = gd[bg_idx].bg_flags & + ~EXT4_BG_BLOCK_UNINIT; + } + + if (set_block_bmap(fs->curr_blkno, fs->blk_bmaps[bg_idx], + bg_idx) != 0) { + debug("going for restart for the block no %ld %u\n", + fs->curr_blkno, bg_idx); + goto restart; + } + + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[bg_idx].block_id + * fs->sect_perblk, + 0, fs->blksz, journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[bg_idx].block_id)) + goto fail; + + prev_bg_bitmap_index = bg_idx; + } + gd[bg_idx].free_blocks--; + fs->sb->free_blocks--; + goto success; + } +success: + if (journal_buffer) + free(journal_buffer); + if (zero_buffer) + free(zero_buffer); + return fs->curr_blkno; +fail: + if (journal_buffer) + free(journal_buffer); + if (zero_buffer) + free(zero_buffer); + return -1; +} + +int get_new_inode_no(void) +{ + short i, status; + unsigned int ibmap_idx; + static int prev_inode_bitmap_index = -1; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + char *zero_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer || !zero_buffer) + goto fail; + struct ext2_block_group *gd = (struct ext2_block_group *)fs->gdtable; + + if (fs->first_pass_ibmap == 0) { + for (i = 0; i < fs->no_blkgrp; i++) { + if (gd[i].free_inodes) { + if (gd[i].bg_flags & EXT4_BG_INODE_UNINIT) { + put_ext4(((uint64_t) + (gd[i].inode_id * fs->blksz)), + zero_buffer, fs->blksz); + gd[i].bg_flags = gd[i].bg_flags & + ~EXT4_BG_INODE_UNINIT; + memcpy(fs->inode_bmaps[i], + zero_buffer, fs->blksz); + } + fs->curr_inode_no = + _get_new_inode_no(fs->inode_bmaps[i]); + if (fs->curr_inode_no == -1) { + /*if block bitmap is completely fill */ + continue; + } + fs->curr_inode_no = fs->curr_inode_no + + (i * ext4fs_root->sblock.inodes_per_group); + fs->first_pass_ibmap++; + gd[i].free_inodes--; + gd[i].bg_itable_unused--; + fs->sb->free_inodes--; + status = ext2fs_devread(gd[i].inode_id * + fs->sect_perblk, 0, + fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[i].inode_id)) + goto fail; + goto success; + } else + debug("no inode left on block group %d\n", i); + } + goto fail; + } else { +restart: + fs->curr_inode_no++; + /*get the blockbitmap index respective to blockno */ + ibmap_idx = fs->curr_inode_no / + (uint32_t) ext4fs_root->sblock.inodes_per_group; + if (gd[ibmap_idx].bg_flags & EXT4_BG_INODE_UNINIT) { + memset(zero_buffer, '\0', fs->blksz); + put_ext4(((uint64_t) (gd[ibmap_idx].inode_id * + fs->blksz)), zero_buffer, + fs->blksz); + gd[ibmap_idx].bg_flags = + gd[ibmap_idx].bg_flags & ~EXT4_BG_INODE_UNINIT; + memcpy(fs->inode_bmaps[ibmap_idx], zero_buffer, + fs->blksz); + } + + if (set_inode_bmap(fs->curr_inode_no, + fs->inode_bmaps[ibmap_idx], + ibmap_idx) != 0) { + debug("going for restart for the block no %d %u\n", + fs->curr_inode_no, ibmap_idx); + goto restart; + } + + /*journal backup */ + if (prev_inode_bitmap_index != ibmap_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[ibmap_idx].inode_id + * fs->sect_perblk, + 0, fs->blksz, journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[ibmap_idx].inode_id)) + goto fail; + prev_inode_bitmap_index = ibmap_idx; + } + + gd[ibmap_idx].free_inodes--; + gd[ibmap_idx].bg_itable_unused--; + fs->sb->free_inodes--; + goto success; + } + +success: + if (journal_buffer) + free(journal_buffer); + if (zero_buffer) + free(zero_buffer); + return fs->curr_inode_no; + +fail: + if (journal_buffer) + free(journal_buffer); + if (zero_buffer) + free(zero_buffer); + return -1; + +} + +/*allocation of single indirect blocks*/ +static void alloc_single_indirect_block(struct ext2_inode *file_inode, + unsigned int *total_remaining_blocks, + unsigned int *no_blks_reqd) +{ + short i, status; + long int actual_block_no; + /*single indirect */ + unsigned int *SI_buffer = NULL; + long int SI_blockno; + unsigned int *SI_start_addr = NULL; + struct ext_filesystem *fs = get_fs(); + + if (*total_remaining_blocks != 0) { + SI_buffer = xzalloc(fs->blksz); + if (!SI_buffer) + return; + SI_start_addr = SI_buffer; + SI_blockno = get_new_blk_no(); + if (SI_blockno == -1) { + printf("no block left to assign\n"); + goto fail; + } + (*no_blks_reqd)++; + debug("SIPB %ld: %u\n", SI_blockno, *total_remaining_blocks); + + status = ext2fs_devread(SI_blockno * fs->sect_perblk, + 0, fs->blksz, (char *)SI_buffer); + memset(SI_buffer, '\0', fs->blksz); + if (status == 0) + goto fail; + + for (i = 0; i < (fs->blksz / sizeof(int)); i++) { + actual_block_no = get_new_blk_no(); + if (actual_block_no == -1) { + printf("no block left to assign\n"); + goto fail; + } + *SI_buffer = actual_block_no; + debug("SIAB %u: %u\n", *SI_buffer, + *total_remaining_blocks); + + SI_buffer++; + (*total_remaining_blocks)--; + if (*total_remaining_blocks == 0) + break; + } + + /*write the block to disk */ + put_ext4(((uint64_t) (SI_blockno * fs->blksz)), + SI_start_addr, fs->blksz); + file_inode->b.blocks.indir_block = SI_blockno; + } +fail: + if (SI_start_addr) + free(SI_start_addr); + return; +} + +/*allocation of double indirect blocks*/ +static void alloc_double_indirect_block(struct ext2_inode *file_inode, + unsigned int *total_remaining_blocks, + unsigned int *no_blks_reqd) +{ + short i, j, status; + long int actual_block_no; + /*double indirect */ + long int DI_blockno_parent, DI_blockno_child; + unsigned int *DI_parent_buffer = NULL; + unsigned int *DI_child_buff = NULL; + unsigned int *DI_block_start_addr = NULL; + unsigned int *DI_child_buff_start = NULL; + struct ext_filesystem *fs = get_fs(); + + if (*total_remaining_blocks != 0) { + /*double indirect parent block connecting to inode */ + DI_blockno_parent = get_new_blk_no(); + if (DI_blockno_parent == -1) { + printf("no block left to assign\n"); + goto fail; + } + DI_parent_buffer = xzalloc(fs->blksz); + if (!DI_parent_buffer) + goto fail; + + DI_block_start_addr = DI_parent_buffer; + (*no_blks_reqd)++; + debug("DIPB %ld: %u\n", DI_blockno_parent, + *total_remaining_blocks); + + status = ext2fs_devread(DI_blockno_parent * + fs->sect_perblk, 0, + fs->blksz, (char *)DI_parent_buffer); + memset(DI_parent_buffer, '\0', fs->blksz); + + /*START: for each double indirect parent + *block create one more block*/ + for (i = 0; i < (fs->blksz / sizeof(int)); i++) { + DI_blockno_child = get_new_blk_no(); + if (DI_blockno_child == -1) { + printf("no block left to assign\n"); + goto fail; + } + DI_child_buff = xzalloc(fs->blksz); + if (!DI_child_buff) + goto fail; + + DI_child_buff_start = DI_child_buff; + *DI_parent_buffer = DI_blockno_child; + DI_parent_buffer++; + (*no_blks_reqd)++; + debug("DICB %ld: %u\n", DI_blockno_child, + *total_remaining_blocks); + + status = ext2fs_devread(DI_blockno_child * + fs->sect_perblk, 0, + fs->blksz, + (char *)DI_child_buff); + memset(DI_child_buff, '\0', fs->blksz); + /*END: for each double indirect parent block block */ + /*filling of actual datablocks for each child */ + for (j = 0; j < (fs->blksz / sizeof(int)); j++) { + actual_block_no = get_new_blk_no(); + if (actual_block_no == -1) { + printf("no block left to assign\n"); + goto fail; + } + *DI_child_buff = actual_block_no; + debug("DIAB %ld: %u\n", actual_block_no, + *total_remaining_blocks); + + DI_child_buff++; + (*total_remaining_blocks)--; + if (*total_remaining_blocks == 0) + break; + } + /*write the block table */ + put_ext4(((uint64_t) (DI_blockno_child * fs->blksz)), + DI_child_buff_start, fs->blksz); + if (DI_child_buff_start) + free(DI_child_buff_start); + + if (*total_remaining_blocks == 0) + break; + } + put_ext4(((uint64_t) (DI_blockno_parent * fs->blksz)), + DI_block_start_addr, fs->blksz); + file_inode->b.blocks.double_indir_block = DI_blockno_parent; + } +fail: + if (DI_block_start_addr) + free(DI_block_start_addr); + return; +} + +/*allocation of triple indirect blocks*/ +static void alloc_triple_indirect_block(struct ext2_inode *file_inode, + unsigned int *total_remaining_blocks, + unsigned int *no_blks_reqd) +{ + short i, j, k; + long int actual_block_no; + /*Triple Indirect */ + long int TI_gp_blockno, TI_parent_blockno, TI_child_blockno; + unsigned int *TI_gp_buff = NULL; + unsigned int *TI_parent_buff = NULL; + unsigned int *TI_child_buff = NULL; + unsigned int *TI_gp_buff_start_addr = NULL; + unsigned int *TI_pbuff_start_addr = NULL; + unsigned int *TI_cbuff_start_addr = NULL; + struct ext_filesystem *fs = get_fs(); + if (*total_remaining_blocks != 0) { + /*triple indirect grand parent block connecting to inode */ + TI_gp_blockno = get_new_blk_no(); + if (TI_gp_blockno == -1) { + printf("no block left to assign\n"); + goto fail; + } + TI_gp_buff = xzalloc(fs->blksz); + if (!TI_gp_buff) + goto fail; + + TI_gp_buff_start_addr = TI_gp_buff; + (*no_blks_reqd)++; + debug("TIGPB %ld: %u\n", TI_gp_blockno, + *total_remaining_blocks); + + /* for each 4 byte grand parent entry create one more block */ + for (i = 0; i < (fs->blksz / sizeof(int)); i++) { + TI_parent_blockno = get_new_blk_no(); + if (TI_parent_blockno == -1) { + printf("no block left to assign\n"); + goto fail; + } + TI_parent_buff = xzalloc(fs->blksz); + if (!TI_parent_buff) + goto fail; + + TI_pbuff_start_addr = TI_parent_buff; + *TI_gp_buff = TI_parent_blockno; + TI_gp_buff++; + (*no_blks_reqd)++; + debug("TIPB %ld: %u\n", TI_parent_blockno, + *total_remaining_blocks); + + /*for each 4 byte entry parent create one more block */ + for (j = 0; j < (fs->blksz / sizeof(int)); j++) { + TI_child_blockno = get_new_blk_no(); + if (TI_child_blockno == -1) { + printf("no block" + "left assign\n"); + goto fail; + } + TI_child_buff = xzalloc(fs->blksz); + if (!TI_child_buff) + goto fail; + + TI_cbuff_start_addr = TI_child_buff; + *TI_parent_buff = TI_child_blockno; + TI_parent_buff++; + (*no_blks_reqd)++; + debug("TICB %ld: %u\n", TI_parent_blockno, + *total_remaining_blocks); + + /*filling of actual datablocks for each child */ + for (k = 0; k < (fs->blksz / sizeof(int)); + k++) { + actual_block_no = get_new_blk_no(); + if (actual_block_no == -1) { + printf("no block" + "left to assign\n"); + goto fail; + } + *TI_child_buff = actual_block_no; + debug("TIAB %ld: %u\n", actual_block_no, + *total_remaining_blocks); + + TI_child_buff++; + (*total_remaining_blocks)--; + if (*total_remaining_blocks == 0) + break; + } + /*write the child block */ + put_ext4(((uint64_t) (TI_child_blockno * + fs->blksz)), + TI_cbuff_start_addr, fs->blksz); + if (TI_cbuff_start_addr) + free(TI_cbuff_start_addr); + + if (*total_remaining_blocks == 0) + break; + } + /*write the parent block */ + put_ext4(((uint64_t) (TI_parent_blockno * fs->blksz)), + TI_pbuff_start_addr, fs->blksz); + if (TI_pbuff_start_addr) + free(TI_pbuff_start_addr); + + if (*total_remaining_blocks == 0) + break; + } + /*write the grand parent block */ + put_ext4(((uint64_t) (TI_gp_blockno * fs->blksz)), + TI_gp_buff_start_addr, fs->blksz); + file_inode->b.blocks.tripple_indir_block = TI_gp_blockno; + } +fail: + if (TI_gp_buff_start_addr) + free(TI_gp_buff_start_addr); + return; +} + +void allocate_blocks(struct ext2_inode *file_inode, + unsigned int total_remaining_blocks, + unsigned int *total_no_of_block) +{ + short i; + long int direct_blockno; + unsigned int no_blks_reqd = 0; + + /*-------------START:Allocation of Blocks to Inode-------------*/ + /*allocation of direct blocks */ + for (i = 0; i < INDIRECT_BLOCKS; i++) { + direct_blockno = get_new_blk_no(); + if (direct_blockno == -1) { + printf("no block left to assign\n"); + return; + } + file_inode->b.blocks.dir_blocks[i] = direct_blockno; + debug("DB %ld: %u\n", direct_blockno, total_remaining_blocks); + + total_remaining_blocks--; + if (total_remaining_blocks == 0) + break; + } + + /*allocation of single indirect blocks */ + alloc_single_indirect_block(file_inode, &total_remaining_blocks, + &no_blks_reqd); + + /*allocation of double indirect blocks */ + alloc_double_indirect_block(file_inode, &total_remaining_blocks, + &no_blks_reqd); + + /*allocation of triple indirect blocks */ + alloc_triple_indirect_block(file_inode, &total_remaining_blocks, + &no_blks_reqd); + + /*-----------------END:Allocation of Blocks to Inode-------------- */ + *total_no_of_block += no_blks_reqd; + return; +} + long int read_allocated_block(struct ext2_inode *inode, int fileblock) { long int blknr; diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h index 73f218d..a2a7e7a 100644 --- a/fs/ext4/ext4_common.h +++ b/fs/ext4/ext4_common.h @@ -41,4 +41,21 @@ extern unsigned long part_offset; int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode); +uint32_t ext4fs_div_roundup(uint32_t size, uint32_t n); +int ext4fs_checksum_update(unsigned int i); +int get_parent_inode_num(char *dirname, char *dname, int flags); +void update_parent_dentry(char *filename, int *p_ino, int file_type); +long int get_new_blk_no(void); +int get_new_inode_no(void); +void reset_block_bmap(long int blockno, unsigned char *buffer, int index); +int set_block_bmap(long int blockno, unsigned char *buffer, int index); +int set_inode_bmap(int inode_no, unsigned char *buffer, int index); +void reset_inode_bmap(int inode_no, unsigned char *buffer, int index); +int iget(int inode_no, struct ext2_inode *inode); +void allocate_blocks(struct ext2_inode *file_inode, + unsigned int total_remaining_blocks, + unsigned int *total_no_of_block); +void put_ext4(uint64_t off, void *buf, uint32_t size); +unsigned int be_le(unsigned int num); +unsigned int le_be(unsigned int num); #endif diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c new file mode 100644 index 0000000..fa9c89d --- /dev/null +++ b/fs/ext4/ext4_journal.c @@ -0,0 +1,650 @@ +/* + * (C) Copyright 2011 Samsung Electronics + * EXT4 filesystem implementation in Uboot by + * Uma Shankar <uma.shankar(a)samsung.com> + * Manjunatha C Achar <a.manjunatha(a)samsung.com> + * + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * Journaling feature of ext4 has been referred from JBD2 + * (Journaling Block device 2) implementation in Linux Kernel + */ +#include <common.h> +#include "ext4_journal.h" +#include <ext_common.h> +#include <ext4fs.h> +#include <malloc.h> + +static struct revoke_blk_list *revk_blk_list; +static struct revoke_blk_list *prev_node; +static int first_node = TRUE; + +int gindex; +int gd_index; +int jrnl_blk_idx; +struct journal_log *journal_ptr[MAX_JOURNAL_ENTRIES]; +struct dirty_blocks *dirty_block_ptr[MAX_JOURNAL_ENTRIES]; + +int init_journal(void) +{ + int i; + char *temp = NULL; + struct ext_filesystem *fs = get_fs(); + + /*init globals */ + revk_blk_list = NULL; + prev_node = NULL; + gindex = 0; + gd_index = 0; + jrnl_blk_idx = 1; + + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + journal_ptr[i] = (struct journal_log *)xzalloc + (sizeof(struct journal_log)); + if (!journal_ptr[i]) + goto fail; + dirty_block_ptr[i] = (struct dirty_blocks *) + xzalloc(sizeof(struct dirty_blocks)); + if (!dirty_block_ptr[i]) + goto fail; + journal_ptr[i]->buf = NULL; + journal_ptr[i]->blknr = -1; + + dirty_block_ptr[i]->buf = NULL; + dirty_block_ptr[i]->blknr = -1; + } + + if (fs->blksz == 4096) { + temp = (char *)xzalloc(fs->blksz); + if (!temp) + goto fail; + journal_ptr[gindex]->buf = (char *)xzalloc(fs->blksz); + if (!journal_ptr[gindex]->buf) + goto fail; + ext2fs_devread(0, 0, fs->blksz, temp); + memcpy(temp + SUPERBLOCK_SIZE, fs->sb, SUPERBLOCK_SIZE); + memcpy(journal_ptr[gindex]->buf, temp, fs->blksz); + journal_ptr[gindex++]->blknr = 0; + free(temp); + } else { + journal_ptr[gindex]->buf = (char *)xzalloc(fs->blksz); + if (!journal_ptr[gindex]->buf) + goto fail; + memcpy(journal_ptr[gindex]->buf, fs->sb, SUPERBLOCK_SIZE); + journal_ptr[gindex++]->blknr = 1; + } + + /* Check the file system state using journal super block */ + if (check_journal_state(SCAN)) + goto fail; + if (check_journal_state(RECOVER)) + goto fail; + return 0; +fail: + return -1; +} + +void dump_metadata(void) +{ + struct ext_filesystem *fs = get_fs(); + int i; + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (dirty_block_ptr[i]->blknr == -1) + break; + put_ext4((uint64_t) (dirty_block_ptr[i]->blknr * fs->blksz), + dirty_block_ptr[i]->buf, (uint32_t) fs->blksz); + } + return; +} + +void free_journal(void) +{ + int i; + jrnl_blk_idx = 1; + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (dirty_block_ptr[i]->blknr == -1) + break; + if (dirty_block_ptr[i]->buf) + free(dirty_block_ptr[i]->buf); + } + + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (journal_ptr[i]->blknr == -1) + break; + if (journal_ptr[i]->buf) + free(journal_ptr[i]->buf); + } + + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (journal_ptr[i]) + free(journal_ptr[i]); + if (dirty_block_ptr[i]) + free(dirty_block_ptr[i]); + } + gindex = 0; + gd_index = 0; + return; +} + +int log_gdt(char *gd_table) +{ + struct ext_filesystem *fs = get_fs(); + short i; + long int var = fs->gdtable_blkno; + for (i = 0; i < fs->no_blk_pergdt; i++) { + journal_ptr[gindex]->buf = (char *)xzalloc(fs->blksz); + if (!journal_ptr[gindex]->buf) + return -1; + memcpy(journal_ptr[gindex]->buf, gd_table, fs->blksz); + gd_table += fs->blksz; + journal_ptr[gindex++]->blknr = var++; + } + return 0; +} + +/* This function stores the backup copy of meta data in RAM +* journal_buffer -- Buffer containing meta data +* blknr -- Block number on disk of the meta data buffer +*/ +int log_journal(char *journal_buffer, long int blknr) +{ + struct ext_filesystem *fs = get_fs(); + short i; + + if (!journal_buffer) { + printf("Invalid input arguments %s\n", __func__); + return -1; + } + + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (journal_ptr[i]->blknr == -1) + break; + if (journal_ptr[i]->blknr == blknr) + return 0; + } + + journal_ptr[gindex]->buf = (char *)xzalloc(fs->blksz); + if (!journal_ptr[gindex]->buf) + return -1; + + memcpy(journal_ptr[gindex]->buf, journal_buffer, fs->blksz); + journal_ptr[gindex++]->blknr = blknr; + return 0; +} + +/* This function stores the modified meta data in RAM +* metadata_buffer -- Buffer containing meta data +* blknr -- Block number on disk of the meta data buffer +*/ +int put_metadata(char *metadata_buffer, long int blknr) +{ + struct ext_filesystem *fs = get_fs(); + if (!metadata_buffer) { + printf("Invalid input arguments %s\n", __func__); + return -1; + } + dirty_block_ptr[gd_index]->buf = (char *)xzalloc(fs->blksz); + if (!dirty_block_ptr[gd_index]->buf) + return -1; + memcpy(dirty_block_ptr[gd_index]->buf, metadata_buffer, fs->blksz); + dirty_block_ptr[gd_index++]->blknr = blknr; + return 0; +} + +/*------------------------------------*/ +/*Revoke block handling functions*/ +void print_revoke_blks(char *revk_blk) +{ + struct journal_revoke_header_t *header; + int offset, max; + long int blocknr; + + if (revk_blk == NULL) + return; + + header = (struct journal_revoke_header_t *) revk_blk; + offset = sizeof(struct journal_revoke_header_t); + max = be_le(header->r_count); + printf("total bytes %d\n", max); + + while (offset < max) { + blocknr = be_le(*((long int *)(revk_blk + offset))); + printf("revoke blknr is %ld\n", blocknr); + offset += 4; + } + return; +} + +static struct revoke_blk_list *_get_node(void) +{ + struct revoke_blk_list *tmp_node; + tmp_node = (struct revoke_blk_list *) + malloc(sizeof(struct revoke_blk_list)); + if (tmp_node == NULL) + return NULL; + tmp_node->content = NULL; + tmp_node->next = NULL; + return tmp_node; +} + +void push_revoke_blk(char *buffer) +{ + struct revoke_blk_list *node; + struct ext_filesystem *fs = get_fs(); + if (buffer == NULL) { + printf("buffer ptr is NULL\n"); + return; + } + node = _get_node(); + if (!node) { + printf("_get_node: malloc failed\n"); + return; + } + + node->content = (char *)malloc(fs->blksz); + memcpy(node->content, buffer, fs->blksz); + + if (first_node == TRUE) { + revk_blk_list = node; + prev_node = node; + first_node = FALSE; + } else { + prev_node->next = node; + prev_node = node; + } + return; +} + +void free_revoke_blks() +{ + struct revoke_blk_list *tmp_node = revk_blk_list; + struct revoke_blk_list *next_node = NULL; + + while (tmp_node != NULL) { + if (tmp_node->content) + free(tmp_node->content); + tmp_node = tmp_node->next; + } + + tmp_node = revk_blk_list; + while (tmp_node != NULL) { + next_node = tmp_node->next; + free(tmp_node); + tmp_node = next_node; + } + + revk_blk_list = NULL; + prev_node = NULL; + first_node = TRUE; + return; +} + +int check_blknr_for_revoke(long int blknr, int sequence_no) +{ + struct journal_revoke_header_t *header; + int offset, max; + long int blocknr; + char *revk_blk; + struct revoke_blk_list *tmp_revk_node = revk_blk_list; + while (tmp_revk_node != NULL) { + revk_blk = tmp_revk_node->content; + + header = (struct journal_revoke_header_t *) revk_blk; + if (sequence_no <= be_le(header->r_header.h_sequence)) { + offset = sizeof(struct journal_revoke_header_t); + max = be_le(header->r_count); + + while (offset < max) { + blocknr = be_le(*((long int *) + (revk_blk + offset))); + if (blocknr == blknr) + goto found; + offset += 4; + } + } + tmp_revk_node = tmp_revk_node->next; + } + return -1; + +found: + return 0; +} + +/* +* This function parses the journal blocks and replays the +* suceessful transactions. A transaction is successfull +* if commit block is found for a descriptor block +* The tags in descriptor block contain the disk block +* numbers of the metadata to be replayed +*/ +void recover_transaction(int prev_desc_logical_no) +{ + struct ext2_inode inode_journal; + struct ext_filesystem *fs = get_fs(); + struct journal_header_t *jdb; + long int blknr; + char *p_jdb; + int ofs, flags; + int i; + struct ext3_journal_block_tag *tag; + char *temp_buff = (char *)xzalloc(fs->blksz); + char *metadata_buff = (char *)xzalloc(fs->blksz); + if (!temp_buff || !metadata_buff) + goto fail; + i = prev_desc_logical_no; + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, + (struct ext2_inode *)&inode_journal); + blknr = read_allocated_block((struct ext2_inode *) + &inode_journal, i); + ext2fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, temp_buff); + p_jdb = (char *)temp_buff; + jdb = (struct journal_header_t *) temp_buff; + ofs = sizeof(struct journal_header_t); + + do { + tag = (struct ext3_journal_block_tag *)&p_jdb[ofs]; + ofs += sizeof(struct ext3_journal_block_tag); + + if (ofs > fs->blksz) + break; + + flags = be_le(tag->flags); + if (!(flags & EXT3_JOURNAL_FLAG_SAME_UUID)) + ofs += 16; + + i++; + debug("\t\ttag %u\n", be_le(tag->block)); + if (revk_blk_list != NULL) { + if (check_blknr_for_revoke(be_le(tag->block), + be_le(jdb->h_sequence)) == + 0) { + continue; + } + } + blknr = read_allocated_block(&inode_journal, i); + ext2fs_devread(blknr * fs->sect_perblk, 0, + fs->blksz, metadata_buff); + put_ext4((uint64_t) (be_le(tag->block) * fs->blksz), + metadata_buff, (uint32_t) fs->blksz); + } while (!(flags & EXT3_JOURNAL_FLAG_LAST_TAG)); +fail: + if (temp_buff) + free(temp_buff); + if (metadata_buff) + free(metadata_buff); +} + +void print_jrnl_status(int recovery_flag) +{ + if (recovery_flag == RECOVER) + printf("Journal Recovery Completed\n"); + else + printf("Journal Scan Completed\n"); + return; +} + +int check_journal_state(int recovery_flag) +{ + struct ext2_inode inode_journal; + struct ext_filesystem *fs = get_fs(); + struct journal_superblock_t *jsb; + struct journal_header_t *jdb; + char *p_jdb; + int i; + int DB_FOUND = NO; + long int blknr; + int transaction_state = TRANSACTION_COMPLETE; + int prev_desc_logical_no = 0; + int curr_desc_logical_no = 0; + int ofs, flags, block; + struct ext3_journal_block_tag *tag; + char *temp_buff, *temp_buff1; + + temp_buff = (char *)xzalloc(fs->blksz); + if (!temp_buff) + return -1; + temp_buff1 = (char *)xzalloc(fs->blksz); + if (!temp_buff1) { + free(temp_buff); + return -1; + } + + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal); + blknr = read_allocated_block(&inode_journal, EXT2_JOURNAL_SUPERBLOCK); + ext2fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, temp_buff); + jsb = (struct journal_superblock_t *) temp_buff; + + if (fs->sb->feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) { + if (recovery_flag == RECOVER) + printf("Recovery required\n"); + } else { + if (recovery_flag == RECOVER) + printf("File System is consistent\n"); + goto END; + } + + if (be_le(jsb->s_start) == 0) + goto END; + + if (!(jsb->s_feature_compat & le_be(JBD2_FEATURE_COMPAT_CHECKSUM))) + jsb->s_feature_compat |= le_be(JBD2_FEATURE_COMPAT_CHECKSUM); + + i = be_le(jsb->s_first); + while (1) { + block = be_le(jsb->s_first); + blknr = read_allocated_block(&inode_journal, i); + memset(temp_buff1, '\0', fs->blksz); + ext2fs_devread(blknr * fs->sect_perblk, + 0, fs->blksz, temp_buff1); + jdb = (struct journal_header_t *) temp_buff1; + + if (be_le(jdb->h_blocktype) == EXT3_JOURNAL_DESCRIPTOR_BLOCK) { + if (be_le(jdb->h_sequence) != be_le(jsb->s_sequence)) { + print_jrnl_status(recovery_flag); + break; + } + + curr_desc_logical_no = i; + if (transaction_state == TRANSACTION_COMPLETE) + transaction_state = TRANSACTION_RUNNING; + else + return -1; + p_jdb = (char *)temp_buff1; + ofs = sizeof(struct journal_header_t); + do { + tag = (struct ext3_journal_block_tag *) + &p_jdb[ofs]; + ofs += sizeof(struct ext3_journal_block_tag); + if (ofs > fs->blksz) + break; + flags = be_le(tag->flags); + if (!(flags & EXT3_JOURNAL_FLAG_SAME_UUID)) + ofs += 16; + i++; + debug("\t\ttag %u\n", be_le(tag->block)); + } while (!(flags & EXT3_JOURNAL_FLAG_LAST_TAG)); + i++; + DB_FOUND = YES; + } else if (be_le(jdb->h_blocktype) == + EXT3_JOURNAL_COMMIT_BLOCK) { + if ((be_le(jdb->h_sequence) != be_le(jsb->s_sequence)) + || (DB_FOUND == NO)) { + print_jrnl_status(recovery_flag); + break; + } + + if (transaction_state == TRANSACTION_RUNNING) { + transaction_state = TRANSACTION_COMPLETE; + i++; + jsb->s_sequence = + le_be(be_le(jsb->s_sequence) + 1); + } + prev_desc_logical_no = curr_desc_logical_no; + recover_transaction(prev_desc_logical_no); + DB_FOUND = NO; + } else if (be_le(jdb->h_blocktype) == + EXT3_JOURNAL_REVOKE_BLOCK) { + if (be_le(jdb->h_sequence) != be_le(jsb->s_sequence)) { + print_jrnl_status(recovery_flag); + break; + } + if (recovery_flag == SCAN) + push_revoke_blk((char *)jdb); + i++; + } else { + debug("Else Case\n"); + if (be_le(jdb->h_sequence) != be_le(jsb->s_sequence)) { + print_jrnl_status(recovery_flag); + break; + } + } + } + +END: + if (recovery_flag == RECOVER) { + jsb->s_start = le_be(1); + jsb->s_sequence = le_be(be_le(jsb->s_sequence) + 1); + ext2fs_devread(SUPERBLOCK_SECTOR, 0, SUPERBLOCK_SIZE, + (char *)fs->sb); + fs->sb->feature_incompat |= EXT3_FEATURE_INCOMPAT_RECOVER; + + put_ext4((uint64_t) (SUPERBLOCK_SIZE), + (struct ext2_sblock *)fs->sb, + (uint32_t) SUPERBLOCK_SIZE); + ext2fs_devread(SUPERBLOCK_SECTOR, 0, SUPERBLOCK_SIZE, + (char *)fs->sb); + + blknr = + read_allocated_block(&inode_journal, + EXT2_JOURNAL_SUPERBLOCK); + put_ext4((uint64_t) (blknr * fs->blksz), + (struct journal_superblock_t *)temp_buff, + (uint32_t) fs->blksz); + free_revoke_blks(); + } + free(temp_buff); + free(temp_buff1); + + return 0; +} + +static void update_descriptor_block(long int blknr) +{ + struct journal_header_t jdb; + struct ext3_journal_block_tag tag; + struct ext2_inode inode_journal; + struct journal_superblock_t *jsb; + long int jsb_blknr; + struct ext_filesystem *fs = get_fs(); + char *buf = NULL, *temp = NULL; + int i; + char *temp_buff = (char *)xzalloc(fs->blksz); + if (!temp_buff) + return; + + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal); + jsb_blknr = read_allocated_block(&inode_journal, + EXT2_JOURNAL_SUPERBLOCK); + ext2fs_devread(jsb_blknr * fs->sect_perblk, 0, fs->blksz, temp_buff); + jsb = (struct journal_superblock_t *) temp_buff; + + jdb.h_blocktype = le_be(EXT3_JOURNAL_DESCRIPTOR_BLOCK); + jdb.h_magic = le_be(EXT3_JOURNAL_MAGIC_NUMBER); + jdb.h_sequence = jsb->s_sequence; + buf = (char *)xzalloc(fs->blksz); + if (!buf) { + free(temp_buff); + return; + } + temp = buf; + memcpy(buf, &jdb, sizeof(struct journal_header_t)); + temp += sizeof(struct journal_header_t); + + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (journal_ptr[i]->blknr == -1) + break; + + tag.block = le_be(journal_ptr[i]->blknr); + tag.flags = le_be(EXT3_JOURNAL_FLAG_SAME_UUID); + memcpy(temp, &tag, sizeof(struct ext3_journal_block_tag)); + temp = temp + sizeof(struct ext3_journal_block_tag); + } + + tag.block = le_be(journal_ptr[--i]->blknr); + tag.flags = le_be(EXT3_JOURNAL_FLAG_LAST_TAG); + memcpy(temp - sizeof(struct ext3_journal_block_tag), &tag, + sizeof(struct ext3_journal_block_tag)); + put_ext4((uint64_t) (blknr * fs->blksz), buf, (uint32_t) fs->blksz); + + free(temp_buff); + free(buf); +} + +static void update_commit_block(long int blknr) +{ + struct journal_header_t jdb; + struct ext_filesystem *fs = get_fs(); + char *buf = NULL; + struct ext2_inode inode_journal; + struct journal_superblock_t *jsb; + long int jsb_blknr; + char *temp_buff = (char *)xzalloc(fs->blksz); + if (!temp_buff) + return; + + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal); + jsb_blknr = read_allocated_block(&inode_journal, + EXT2_JOURNAL_SUPERBLOCK); + ext2fs_devread(jsb_blknr * fs->sect_perblk, 0, fs->blksz, temp_buff); + jsb = (struct journal_superblock_t *) temp_buff; + + jdb.h_blocktype = le_be(EXT3_JOURNAL_COMMIT_BLOCK); + jdb.h_magic = le_be(EXT3_JOURNAL_MAGIC_NUMBER); + jdb.h_sequence = jsb->s_sequence; + buf = (char *)xzalloc(fs->blksz); + if (!buf) { + free(temp_buff); + return; + } + memcpy(buf, &jdb, sizeof(struct journal_header_t)); + put_ext4((uint64_t) (blknr * fs->blksz), buf, (uint32_t) fs->blksz); + + free(temp_buff); + free(buf); +} + +void update_journal(void) +{ + struct ext2_inode inode_journal; + struct ext_filesystem *fs = get_fs(); + long int blknr; + int i; + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal); + blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++); + update_descriptor_block(blknr); + for (i = 0; i < MAX_JOURNAL_ENTRIES; i++) { + if (journal_ptr[i]->blknr == -1) + break; + blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++); + put_ext4((uint64_t) (blknr * fs->blksz), + journal_ptr[i]->buf, (uint32_t) fs->blksz); + } + blknr = read_allocated_block(&inode_journal, jrnl_blk_idx++); + update_commit_block(blknr); + printf("update journal finished\n"); +} diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h new file mode 100644 index 0000000..e4413d2 --- /dev/null +++ b/fs/ext4/ext4_journal.h @@ -0,0 +1,147 @@ +/* + * (C) Copyright 2011 Samsung Electronics + * EXT4 filesystem implementation in Uboot by + * Uma Shankar <uma.shankar(a)samsung.com> + * Manjunatha C Achar <a.manjunatha(a)samsung.com> + * + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * Journaling feature of ext4 has been referred from JBD2 + * (Journaling Block device 2) implementation in Linux Kernel + */ + +#ifndef __EXT4_JRNL__ +#define __EXT4_JRNL__ + +#include "ext4_common.h" + +#define EXT2_JOURNAL_INO 8 /* Journal inode */ +#define EXT2_JOURNAL_SUPERBLOCK 0 /* Journal Superblock number */ + +#define JBD2_FEATURE_COMPAT_CHECKSUM 0x00000001 +#define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U +#define TRANSACTION_RUNNING 1 +#define TRANSACTION_COMPLETE 0 +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ +#define EXT3_JOURNAL_DESCRIPTOR_BLOCK 1 +#define EXT3_JOURNAL_COMMIT_BLOCK 2 +#define EXT3_JOURNAL_SUPERBLOCK_V1 3 +#define EXT3_JOURNAL_SUPERBLOCK_V2 4 +#define EXT3_JOURNAL_REVOKE_BLOCK 5 +#define EXT3_JOURNAL_FLAG_ESCAPE 1 +#define EXT3_JOURNAL_FLAG_SAME_UUID 2 +#define EXT3_JOURNAL_FLAG_DELETED 4 +#define EXT3_JOURNAL_FLAG_LAST_TAG 8 + +/* Maximum entries in 1 journal transaction */ +#define MAX_JOURNAL_ENTRIES 100 +struct journal_log { + char *buf; + int blknr; +}; + +struct dirty_blocks { + char *buf; + int blknr; +}; + +/* + * Standard header for all descriptor blocks: + */ +struct journal_header_t { + __u32 h_magic; + __u32 h_blocktype; + __u32 h_sequence; +}; + +/* + * The journal superblock. All fields are in big-endian byte order. + */ +struct journal_superblock_t { + /* 0x0000 */ + struct journal_header_t s_header; + + /* 0x000C */ + /* Static information describing the journal */ + __u32 s_blocksize; /* journal device blocksize */ + __u32 s_maxlen; /* total blocks in journal file */ + __u32 s_first; /* first block of log information */ + + /* 0x0018 */ + /* Dynamic information describing the current state of the log */ + __u32 s_sequence; /* first commit ID expected in log */ + __u32 s_start; /* blocknr of start of log */ + + /* 0x0020 */ + /* Error value, as set by journal_abort(). */ + __s32 s_errno; + + /* 0x0024 */ + /* Remaining fields are only valid in a version-2 superblock */ + __u32 s_feature_compat; /* compatible feature set */ + __u32 s_feature_incompat; /* incompatible feature set */ + __u32 s_feature_ro_compat; /* readonly-compatible feature set */ + /* 0x0030 */ + __u8 s_uuid[16]; /* 128-bit uuid for journal */ + + /* 0x0040 */ + __u32 s_nr_users; /* Nr of filesystems sharing log */ + + __u32 s_dynsuper; /* Blocknr of dynamic superblock copy */ + + /* 0x0048 */ + __u32 s_max_transaction; /* Limit of journal blocks per trans. */ + __u32 s_max_trans_data; /* Limit of data blocks per trans. */ + + /* 0x0050 */ + __u32 s_padding[44]; + + /* 0x0100 */ + __u8 s_users[16 * 48]; /* ids of all fs'es sharing the log */ + /* 0x0400 */ +} ; + +struct ext3_journal_block_tag { + uint32_t block; + uint32_t flags; +}; + +struct journal_revoke_header_t { + struct journal_header_t r_header; + int r_count; /* Count of bytes used in the block */ +}; + +struct revoke_blk_list { + char *content; /*revoke block itself */ + struct revoke_blk_list *next; +}; + +extern struct ext2_data *ext4fs_root; + +int init_journal(void); +void deinit_journal(void); +int log_gdt(char *gd_table); +void update_journal(void); +int check_journal_state(int recovery_flag); +int log_journal(char *journal_buffer, long int blknr); +int put_metadata(char *metadata_buffer, long int blknr); +void dump_metadata(void); +void free_journal(void); +void free_revoke_blks(void); +void push_revoke_blk(char *buffer); +#endif diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index d4faa16..0a033aa 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -22,7 +22,13 @@ /* * ext4load - based on code from GRUB2 fs/ext2.c -*/ + * + * ext4write - based on existing ext2 support in UBOOT and ext4 + * implementation in Linux Kernel. + * Journaling feature of ext4 has been referred from JBD2 + * (Journaling Block device 2) implementation in Linux Kernel + */ + #include <common.h> #include <malloc.h> #include <asm/byteorder.h> @@ -31,6 +37,7 @@ #include <ext_common.h> #include <ext4fs.h> #include "ext4_common.h" +#include "ext4_journal.h" int ext4fs_symlinknest; block_dev_desc_t *ext4_dev_desc; @@ -213,3 +220,1032 @@ int ext4fs_read(char *buf, unsigned len) return 0; return ext4fs_read_file(ext4fs_file, 0, len, buf); } + +static void ext4fs_update(void) +{ + short i; + update_journal(); + struct ext_filesystem *fs = get_fs(); + + /*Update the super block */ + put_ext4((uint64_t) (SUPERBLOCK_SIZE), + (struct ext2_sblock *)fs->sb, (uint32_t) SUPERBLOCK_SIZE); + + /*update the block group */ + for (i = 0; i < fs->no_blkgrp; i++) { + fs->gd[i].bg_checksum = ext4fs_checksum_update(i); + put_ext4((uint64_t) (fs->gd[i].block_id * fs->blksz), + fs->blk_bmaps[i], (uint32_t) fs->blksz); + } + + /*update the inode table group */ + for (i = 0; i < fs->no_blkgrp; i++) { + put_ext4((uint64_t) (fs->gd[i].inode_id * fs->blksz), + fs->inode_bmaps[i], (uint32_t) fs->blksz); + } + + /*update the block group descriptor table */ + put_ext4((uint64_t) (fs->gdtable_blkno * fs->blksz), + (struct ext2_block_group *)fs->gdtable, (uint32_t) + (fs->blksz * fs->no_blk_pergdt)); + + dump_metadata(); + + gindex = 0; + gd_index = 0; +} + +int ext4fs_get_bgdtable(void) +{ + int status; + int grp_desc_size; + struct ext_filesystem *fs = get_fs(); + grp_desc_size = sizeof(struct ext2_block_group); + fs->no_blk_pergdt = (fs->no_blkgrp * grp_desc_size) / fs->blksz; + if ((fs->no_blkgrp * grp_desc_size) % fs->blksz) + fs->no_blk_pergdt++; + + /*allocate mem for gdtable */ + fs->gdtable = (char *)xzalloc(fs->blksz * fs->no_blk_pergdt); + if (!fs->gdtable) + return -1; + /*Read the first group descriptor table */ + status = ext2fs_devread(fs->gdtable_blkno * fs->sect_perblk, 0, + fs->blksz * fs->no_blk_pergdt, fs->gdtable); + if (status == 0) + goto fail; + + if (log_gdt(fs->gdtable)) { + printf("Error in log_gdt\n"); + return -1; + } + + return 0; +fail: + if (fs->gdtable) { + free(fs->gdtable); + fs->gdtable = NULL; + } + return -1; +} + +static void delete_single_indirect_block(struct ext2_inode *inode) +{ + struct ext2_block_group *gd; + static int prev_bg_bitmap_index = -1; + long int blknr; + int remainder; + int bg_idx; + int status; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer) + return; + /*get the block group descriptor table */ + gd = (struct ext2_block_group *)fs->gdtable; + + /*deleting the single indirect block associated with inode */ + if (inode->b.blocks.indir_block != 0) { + debug("SIPB releasing %u\n", inode->b.blocks.indir_block); + blknr = inode->b.blocks.indir_block; + if (fs->blksz != 1024) { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = blknr / + (uint32_t) ext4fs_root->sblock.blocks_per_group; + remainder = blknr % (uint32_t) + ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx); + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + status = + ext2fs_devread(gd[bg_idx].block_id * + fs->sect_perblk, 0, fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } +fail: + if (journal_buffer) + free(journal_buffer); + return; + +} + +/*deleting the double indirect blocks */ +static void delete_double_indirect_block(struct ext2_inode *inode) +{ + int i; + short status; + static int prev_bg_bitmap_index = -1; + long int blknr; + int remainder; + int bg_idx; + unsigned int *double_indirect_buffer; + unsigned int *DIB_start_addr = NULL; + struct ext2_block_group *gd; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer) + return; + /*get the block group descriptor table */ + gd = (struct ext2_block_group *)fs->gdtable; + + if (inode->b.blocks.double_indir_block != 0) { + double_indirect_buffer = (unsigned int *)xzalloc(fs->blksz); + if (!double_indirect_buffer) + return; + DIB_start_addr = (unsigned int *)double_indirect_buffer; + blknr = inode->b.blocks.double_indir_block; + status = ext2fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, + (char *)double_indirect_buffer); + for (i = 0; i < fs->blksz / sizeof(int); i++) { + if (*double_indirect_buffer == 0) + break; + + debug("DICB releasing %u\n", *double_indirect_buffer); + if (fs->blksz != 1024) { + bg_idx = (*double_indirect_buffer) / + (uint32_t) ext4fs_root->sblock. + blocks_per_group; + } else { + bg_idx = (*double_indirect_buffer) / + (uint32_t) ext4fs_root->sblock. + blocks_per_group; + remainder = + (*double_indirect_buffer) % + (uint32_t) ext4fs_root->sblock. + blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(*double_indirect_buffer, + fs->blk_bmaps[bg_idx], bg_idx); + double_indirect_buffer++; + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + status = ext2fs_devread(gd[bg_idx].block_id + * fs->sect_perblk, 0, + fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + + if (log_journal(journal_buffer, + gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } + + /*removing the parent double indirect block */ + /*find the bitmap index */ + blknr = inode->b.blocks.double_indir_block; + if (fs->blksz != 1024) { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = blknr / + (uint32_t) ext4fs_root->sblock.blocks_per_group; + remainder = + blknr % + (uint32_t) ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx); + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[bg_idx].block_id * + fs->sect_perblk, 0, fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + + if (log_journal(journal_buffer, gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + debug("DIPB releasing %ld\n", blknr); + } +fail: + if (DIB_start_addr) + free(DIB_start_addr); + if (journal_buffer) + free(journal_buffer); + return; +} + +/*deleting the triple indirect blocks */ +static void delete_triple_indirect_block(struct ext2_inode *inode) +{ + int i, j; + short status; + static int prev_bg_bitmap_index = -1; + long int blknr; + int remainder; + int bg_idx; + unsigned int *TIGP_buffer = NULL; + unsigned int *TIB_start_addr = NULL; + unsigned int *TIP_buffer = NULL; + unsigned int *TIPB_start_addr = NULL; + struct ext2_block_group *gd; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer) + return; + /*get the block group descriptor table */ + gd = (struct ext2_block_group *)fs->gdtable; + + if (inode->b.blocks.tripple_indir_block != 0) { + TIGP_buffer = (unsigned int *)xzalloc(fs->blksz); + if (!TIGP_buffer) + return; + TIB_start_addr = (unsigned int *)TIGP_buffer; + blknr = inode->b.blocks.tripple_indir_block; + status = ext2fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, + (char *)TIGP_buffer); + for (i = 0; i < fs->blksz / sizeof(int); i++) { + if (*TIGP_buffer == 0) + break; + debug("TIGPB releasing %u\n", *TIGP_buffer); + + TIP_buffer = (unsigned int *)xzalloc(fs->blksz); + if (!TIP_buffer) + goto fail; + TIPB_start_addr = (unsigned int *)TIP_buffer; + status = ext2fs_devread((*TIGP_buffer) * + fs->sect_perblk, 0, fs->blksz, + (char *)TIP_buffer); + for (j = 0; j < fs->blksz / sizeof(int); j++) { + if (*TIP_buffer == 0) + break; + if (fs->blksz != 1024) { + bg_idx = (*TIP_buffer) / (uint32_t) + ext4fs_root->sblock. + blocks_per_group; + } else { + bg_idx = (*TIP_buffer) / (uint32_t) + ext4fs_root->sblock. + blocks_per_group; + + remainder = (*TIP_buffer) % (uint32_t) + ext4fs_root->sblock. + blocks_per_group; + if (!remainder) + bg_idx--; + } + + reset_block_bmap(*TIP_buffer, + fs->blk_bmaps[bg_idx], bg_idx); + + TIP_buffer++; + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + status = + ext2fs_devread(gd[bg_idx].block_id * + fs->sect_perblk, 0, + fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + + if (log_journal(journal_buffer, + gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } + if (TIPB_start_addr) { + free(TIPB_start_addr); + TIPB_start_addr = NULL; + } + + /*removing the grand parent blocks + *which is connected to inode + */ + if (fs->blksz != 1024) { + bg_idx = (*TIGP_buffer) / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = (*TIGP_buffer) / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + + remainder = (*TIGP_buffer) % (uint32_t) + ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(*TIGP_buffer, + fs->blk_bmaps[bg_idx], bg_idx); + + TIGP_buffer++; + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = + ext2fs_devread(gd[bg_idx].block_id * + fs->sect_perblk, 0, + fs->blksz, journal_buffer); + if (status == 0) + goto fail; + + if (log_journal(journal_buffer, + gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } + + /*removing the grand parent triple indirect block */ + /*find the bitmap index */ + blknr = inode->b.blocks.tripple_indir_block; + if (fs->blksz != 1024) { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + remainder = blknr % (uint32_t) + ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx); + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[bg_idx].block_id + * fs->sect_perblk, 0, fs->blksz, + journal_buffer); + if (status == 0) + goto fail; + + if (log_journal(journal_buffer, gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + debug("TIGPB iteself releasing %ld\n", blknr); + } +fail: + if (TIB_start_addr) + free(TIB_start_addr); + if (TIPB_start_addr) + free(TIPB_start_addr); + if (journal_buffer) + free(journal_buffer); + return; +} + +static int ext4fs_delete_file(int inodeno) +{ + struct ext2_inode inode; + short status; + int i; + int remainder; + long int blknr; + int bg_idx; + int inode_bitmap_index; + char *read_buffer; + char *start_block_address = NULL; + unsigned int no_blocks; + + static int prev_bg_bitmap_index = -1; + unsigned int inodes_per_block; + long int blkno; + unsigned int blkoff; + struct ext2_inode *inode_buffer; + struct ext2_block_group *gd; + struct ext_filesystem *fs = get_fs(); + char *journal_buffer = (char *)xzalloc(fs->blksz); + if (!journal_buffer) + return -1; + /*get the block group descriptor table */ + gd = (struct ext2_block_group *)fs->gdtable; + status = ext4fs_read_inode(ext4fs_root, inodeno, &inode); + if (status == 0) + goto fail; + + /*read the block no allocated to a file */ + no_blocks = inode.size / fs->blksz; + if (inode.size % fs->blksz) + no_blocks++; + + if (le32_to_cpu(inode.flags) & EXT4_EXTENTS_FLAG) { + struct ext2fs_node *node_inode = + (struct ext2fs_node *) xzalloc(sizeof(struct ext2fs_node)); + if (!node_inode) + goto fail; + node_inode->data = ext4fs_root; + node_inode->ino = inodeno; + node_inode->inode_read = 0; + memcpy(&(node_inode->inode), &inode, sizeof(struct ext2_inode)); + + for (i = 0; i < no_blocks; i++) { + blknr = read_allocated_block(&(node_inode->inode), i); + if (fs->blksz != 1024) { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + } else { + bg_idx = blknr / (uint32_t) + ext4fs_root->sblock.blocks_per_group; + remainder = blknr % (uint32_t) + ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx); + debug("EXT4_EXTENTS Block releasing %ld: %d\n", + blknr, bg_idx); + + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + status = + ext2fs_devread(gd[bg_idx].block_id * + fs->sect_perblk, 0, + fs->blksz, journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, + gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } + if (node_inode) { + free(node_inode); + node_inode = NULL; + } + } else { + /*deleting the single indirect block associated with inode */ + delete_single_indirect_block(&inode); + + /*deleting the double indirect blocks */ + delete_double_indirect_block(&inode); + + /*deleting the triple indirect blocks */ + delete_triple_indirect_block(&inode); + + /*read the block no allocated to a file */ + no_blocks = inode.size / fs->blksz; + if (inode.size % fs->blksz) + no_blocks++; + for (i = 0; i < no_blocks; i++) { + blknr = read_allocated_block(&inode, i); + if (fs->blksz != 1024) { + bg_idx = blknr / + (uint32_t) ext4fs_root->sblock. + blocks_per_group; + } else { + bg_idx = + blknr / + (uint32_t) ext4fs_root->sblock. + blocks_per_group; + remainder = blknr % (uint32_t) + ext4fs_root->sblock.blocks_per_group; + if (!remainder) + bg_idx--; + } + reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx); + debug("ActualB releasing %ld: %d\n", blknr, bg_idx); + + gd[bg_idx].free_blocks++; + fs->sb->free_blocks++; + /*journal backup */ + if (prev_bg_bitmap_index != bg_idx) { + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[bg_idx].block_id + * fs->sect_perblk, + 0, fs->blksz, + journal_buffer); + if (status == 0) { + free(journal_buffer); + goto fail; + } + if (log_journal(journal_buffer, + gd[bg_idx].block_id)) + goto fail; + prev_bg_bitmap_index = bg_idx; + } + } + } + + /*from the inode no to blockno */ + inodes_per_block = EXT2_BLOCK_SIZE(ext4fs_root) / fs->inodesz; + inode_bitmap_index = inodeno / + (uint32_t) ext4fs_root->sblock.inodes_per_group; + + /*get the block no */ + inodeno--; + blkno = __le32_to_cpu(gd[inode_bitmap_index].inode_table_id) + + (inodeno % __le32_to_cpu(ext4fs_root->sblock.inodes_per_group)) + / inodes_per_block; + + /*get the offset of the inode */ + blkoff = ((inodeno) % inodes_per_block) * fs->inodesz; + + /*read the block no containing the inode */ + read_buffer = (char *)xzalloc(fs->blksz); + if (!read_buffer) + goto fail; + start_block_address = read_buffer; + status = ext2fs_devread(blkno * fs->sect_perblk, + 0, fs->blksz, read_buffer); + if (status == 0) + goto fail; + + if (log_journal(read_buffer, blkno)) + goto fail; + + read_buffer = read_buffer + blkoff; + inode_buffer = (struct ext2_inode *)read_buffer; + memset(inode_buffer, '\0', sizeof(struct ext2_inode)); + + /*write the inode to original position in inode table */ + if (put_metadata(start_block_address, blkno)) + goto fail; + + /*update the respective inode bitmaps */ + inodeno++; + reset_inode_bmap(inodeno, fs->inode_bmaps + [inode_bitmap_index], inode_bitmap_index); + gd[inode_bitmap_index].free_inodes++; + fs->sb->free_inodes++; + /*journal backup */ + memset(journal_buffer, '\0', fs->blksz); + status = ext2fs_devread(gd[inode_bitmap_index].inode_id * + fs->sect_perblk, 0, fs->blksz, journal_buffer); + if (status == 0) + goto fail; + if (log_journal(journal_buffer, gd[inode_bitmap_index].inode_id)) + goto fail; + + ext4fs_update(); + ext4fs_deinit(); + + if (ext4fs_init() != 0) { + printf("error in File System init\n"); + goto fail; + } + + /*free */ + if (start_block_address) + free(start_block_address); + if (journal_buffer) + free(journal_buffer); + return 0; + +fail: + if (start_block_address) + free(start_block_address); + if (journal_buffer) + free(journal_buffer); + return -1; +} + +int ext4fs_init(void) +{ + short status; + int i; + int sector_per_block; + unsigned int real_free_blocks = 0; + struct ext_filesystem *fs = get_fs(); + + /*populate fs */ + fs->blksz = EXT2_BLOCK_SIZE(ext4fs_root); + fs->inodesz = INODE_SIZE_FILESYSTEM(ext4fs_root); + fs->sect_perblk = fs->blksz / SECTOR_SIZE; + + sector_per_block = fs->sect_perblk; + /*get the superblock */ + fs->sb = (struct ext2_sblock *)xzalloc(SUPERBLOCK_SIZE); + if (!fs->sb) + return -1; + status = ext2fs_devread(SUPERBLOCK_SECTOR, 0, + SUPERBLOCK_SIZE, (char *)fs->sb); + if (status == 0) + goto fail; + + /*init journal */ + if (init_journal()) + goto fail; + + /*get the no of blockgroups */ + + fs->no_blkgrp = (uint32_t) ext4fs_div_roundup + ((uint32_t) (ext4fs_root->sblock.total_blocks + - ext4fs_root->sblock.first_data_block), + (uint32_t) ext4fs_root->sblock.blocks_per_group); + + /*get the block group descriptor table */ + fs->gdtable_blkno = ((EXT2_MIN_BLOCK_SIZE == fs->blksz) + 1); + if (ext4fs_get_bgdtable() == -1) { + printf("*Eror in getting the block group descriptor table\n"); + goto fail; + } else { + fs->gd = (struct ext2_block_group *)fs->gdtable; + } + + /*load all the available bitmap block of the partition */ + fs->blk_bmaps = (unsigned char **)xzalloc + (fs->no_blkgrp * sizeof(unsigned char *)); + if (!fs->blk_bmaps) + goto fail; + for (i = 0; i < fs->no_blkgrp; i++) { + fs->blk_bmaps[i] = (unsigned char *)xzalloc(fs->blksz); + if (!fs->blk_bmaps[i]) + goto fail; + } + + for (i = 0; i < fs->no_blkgrp; i++) { + status = + ext2fs_devread(fs->gd[i].block_id * sector_per_block, 0, + fs->blksz, (char *)fs->blk_bmaps[i]); + if (status == 0) + goto fail; + } + + /*load all the available inode bitmap of the partition */ + fs->inode_bmaps = (unsigned char **)xzalloc + (fs->no_blkgrp * sizeof(unsigned char *)); + if (!fs->inode_bmaps) + goto fail; + for (i = 0; i < fs->no_blkgrp; i++) { + fs->inode_bmaps[i] = (unsigned char *)xzalloc(fs->blksz); + if (!fs->inode_bmaps[i]) + goto fail; + } + + for (i = 0; i < fs->no_blkgrp; i++) { + status = ext2fs_devread(fs->gd[i].inode_id * sector_per_block, + 0, fs->blksz, + (char *)fs->inode_bmaps[i]); + if (status == 0) + goto fail; + } + + /* + *check filesystem consistency with free blocks of file system + *some time we observed that superblock freeblocks does not match + *with the blockgroups freeblocks when improper + *reboot of a linux kernel + */ + for (i = 0; i < fs->no_blkgrp; i++) + real_free_blocks = real_free_blocks + fs->gd[i].free_blocks; + if (real_free_blocks != fs->sb->free_blocks) + fs->sb->free_blocks = real_free_blocks; + return 0; + +fail: + ext4fs_deinit(); + return -1; +} + +void ext4fs_deinit(void) +{ + int i; + struct ext2_inode inode_journal; + struct journal_superblock_t *jsb; + long int blknr; + struct ext_filesystem *fs = get_fs(); + /*free journal */ + char *temp_buff = (char *)xzalloc(fs->blksz); + if (temp_buff) { + ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, + &inode_journal); + blknr = + read_allocated_block(&inode_journal, + EXT2_JOURNAL_SUPERBLOCK); + ext2fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, + temp_buff); + jsb = (struct journal_superblock_t *)temp_buff; + jsb->s_start = le_be(0); + put_ext4((uint64_t) (blknr * fs->blksz), + (struct journal_superblock_t *)temp_buff, + (uint32_t) fs->blksz); + free(temp_buff); + } + free_journal(); + /*get the superblock */ + ext2fs_devread(SUPERBLOCK_SECTOR, 0, SUPERBLOCK_SIZE, (char *)fs->sb); + fs->sb->feature_incompat &= ~EXT3_FEATURE_INCOMPAT_RECOVER; + put_ext4((uint64_t) (SUPERBLOCK_SIZE), + (struct ext2_sblock *)fs->sb, (uint32_t) SUPERBLOCK_SIZE); + if (fs->sb) { + free(fs->sb); + fs->sb = NULL; + } + + if (fs->blk_bmaps) { + for (i = 0; i < fs->no_blkgrp; i++) { + if (fs->blk_bmaps[i]) { + free(fs->blk_bmaps[i]); + fs->blk_bmaps[i] = NULL; + } + } + free(fs->blk_bmaps); + fs->blk_bmaps = NULL; + } + + if (fs->inode_bmaps) { + for (i = 0; i < fs->no_blkgrp; i++) { + if (fs->inode_bmaps[i]) { + free(fs->inode_bmaps[i]); + fs->inode_bmaps[i] = NULL; + } + } + free(fs->inode_bmaps); + fs->inode_bmaps = NULL; + } + + if (fs->gdtable) { + free(fs->gdtable); + fs->gdtable = NULL; + } + fs->gd = NULL; + /* + *Reinitiliazed the global inode and + *block bitmap first execution check variables + */ + fs->first_pass_ibmap = 0; + fs->first_pass_bbmap = 0; + fs->curr_inode_no = 0; + fs->curr_blkno = 0; + + return; +} + +static int ext4fs_write_file(struct ext2_inode *file_inode, + int pos, unsigned int len, char *buf) +{ + int i; + int blockcnt; + int log2blocksize = LOG2_EXT2_BLOCK_SIZE(ext4fs_root); + unsigned int filesize = __le32_to_cpu(file_inode->size); + struct ext_filesystem *fs = get_fs(); + int previous_block_number = -1; + int delayed_start = 0; + int delayed_extent = 0; + int delayed_skipfirst = 0; + int delayed_next = 0; + char *delayed_buf = NULL; + + /* Adjust len so it we can't read past the end of the file. */ + if (len > filesize) + len = filesize; + + blockcnt = ((len + pos) + fs->blksz - 1) / fs->blksz; + + for (i = pos / fs->blksz; i < blockcnt; i++) { + long int blknr; + int blockend = fs->blksz; + int skipfirst = 0; + blknr = read_allocated_block(file_inode, i); + if (blknr < 0) + return -1; + + blknr = blknr << log2blocksize; + + if (blknr) { + if (previous_block_number != -1) { + if (delayed_next == blknr) { + delayed_extent += blockend; + delayed_next += blockend >> SECTOR_BITS; + } else { /* spill */ + put_ext4((uint64_t) (delayed_start * + SECTOR_SIZE), + delayed_buf, + (uint32_t) delayed_extent); + previous_block_number = blknr; + delayed_start = blknr; + delayed_extent = blockend; + delayed_skipfirst = skipfirst; + delayed_buf = buf; + delayed_next = blknr + + (blockend >> SECTOR_BITS); + } + } else { + previous_block_number = blknr; + delayed_start = blknr; + delayed_extent = blockend; + delayed_skipfirst = skipfirst; + delayed_buf = buf; + delayed_next = blknr + + (blockend >> SECTOR_BITS); + } + } else { + if (previous_block_number != -1) { + /* spill */ + put_ext4((uint64_t) (delayed_start * + SECTOR_SIZE), delayed_buf, + (uint32_t) delayed_extent); + previous_block_number = -1; + } + memset(buf, 0, fs->blksz - skipfirst); + } + buf += fs->blksz - skipfirst; + } + if (previous_block_number != -1) { + /* spill */ + put_ext4((uint64_t) (delayed_start * SECTOR_SIZE), + delayed_buf, (uint32_t) delayed_extent); + previous_block_number = -1; + } + return len; +} + +int ext4fs_write(char *fname, unsigned char *buffer, unsigned long sizebytes) +{ + int ret = 0; + /*inode */ + struct ext2_inode *file_inode = NULL; + unsigned char *inode_buffer = NULL; + int parent_inodeno; + int inodeno; + time_t timestamp = 0; + + /*filesize */ + uint64_t total_no_of_bytes_for_file; + unsigned int total_no_of_block_for_file; + unsigned int total_remaining_blocks; + int existing_file_inodeno; + char filename[256]; + + char *temp_ptr = NULL; + long int itable_blkno, parent_itable_blkno, blkoff; + struct ext2_sblock *sblock = &(ext4fs_root->sblock); + unsigned int inodes_per_block; + unsigned int inode_bitmap_index; + struct ext_filesystem *fs = get_fs(); + + g_parent_inode = (struct ext2_inode *) + xzalloc(sizeof(struct ext2_inode)); + if (!g_parent_inode) + goto fail; + + if (ext4fs_init() != 0) { + printf("error in File System init\n"); + return -1; + } + inodes_per_block = fs->blksz / fs->inodesz; + parent_inodeno = get_parent_inode_num(fname, filename, F_FILE); + if (parent_inodeno == -1) + goto fail; + if (iget(parent_inodeno, g_parent_inode)) + goto fail; + /*check if the filename is already present in root */ + existing_file_inodeno = ext4fs_filename_check(filename); + if (existing_file_inodeno != -1) { + ret = ext4fs_delete_file(existing_file_inodeno); + fs->first_pass_bbmap = 0; + fs->curr_blkno = 0; + + fs->first_pass_ibmap = 0; + fs->curr_inode_no = 0; + if (ret) + goto fail; + } + /*calucalate how many blocks required */ + total_no_of_bytes_for_file = sizebytes; + total_no_of_block_for_file = total_no_of_bytes_for_file / fs->blksz; + if (total_no_of_bytes_for_file % fs->blksz != 0) { + total_no_of_block_for_file++; + debug("total bytes for a file %u\n", + total_no_of_block_for_file); + } + total_remaining_blocks = total_no_of_block_for_file; + /*Test for available space in partition */ + if (fs->sb->free_blocks < total_no_of_block_for_file) { + printf("Not enough space on partition !!!\n"); + goto fail; + } + + update_parent_dentry(filename, &inodeno, FILETYPE_REG); + /*prepare file inode */ + inode_buffer = xmalloc(fs->inodesz); + memset(inode_buffer, '\0', fs->inodesz); + file_inode = (struct ext2_inode *)inode_buffer; + file_inode->mode = S_IFREG | S_IRWXU | + S_IRGRP | S_IROTH | S_IXGRP | S_IXOTH; + /* ToDo: Update correct time */ + file_inode->mtime = timestamp; + file_inode->atime = timestamp; + file_inode->ctime = timestamp; + file_inode->nlinks = 1; + file_inode->size = sizebytes; + + /* Allocate data blocks */ + allocate_blocks(file_inode, total_remaining_blocks, + &total_no_of_block_for_file); + /* + *write the inode to inode table after last filled inode in inode table + *we are using hardcoded gd[0].inode_table_id becuase 0th blockgroup + *is suffcient to create more than 1000 file.TODO exapnd the logic to + *all blockgroup + */ + file_inode->blockcnt = (total_no_of_block_for_file * fs->blksz) + / SECTOR_SIZE; + + temp_ptr = (char *)xzalloc(fs->blksz); + if (!temp_ptr) + goto fail; + inode_bitmap_index = inodeno / + (uint32_t) ext4fs_root->sblock.inodes_per_group; + inodeno--; + itable_blkno = + __le32_to_cpu(fs->gd[inode_bitmap_index].inode_table_id) + + (inodeno % __le32_to_cpu(sblock->inodes_per_group)) + / inodes_per_block; + blkoff = (inodeno % inodes_per_block) * fs->inodesz; + ext2fs_devread(itable_blkno * fs->sect_perblk, 0, fs->blksz, temp_ptr); + if (log_journal(temp_ptr, itable_blkno)) + goto fail; + + memcpy(temp_ptr + blkoff, inode_buffer, fs->inodesz); + if (put_metadata(temp_ptr, itable_blkno)) + goto fail; + /*Copy the file content into data blocks */ + if (ext4fs_write_file(file_inode, 0, sizebytes, (char *)buffer) == -1) { + printf("Error in copying content\n"); + goto fail; + } + inode_bitmap_index = parent_inodeno / + (uint32_t) ext4fs_root->sblock.inodes_per_group; + parent_inodeno--; + parent_itable_blkno = + __le32_to_cpu(fs->gd[inode_bitmap_index].inode_table_id) + + (parent_inodeno % __le32_to_cpu(sblock->inodes_per_group)) / + inodes_per_block; + blkoff = (parent_inodeno % inodes_per_block) * fs->inodesz; + if (parent_itable_blkno != itable_blkno) { + memset(temp_ptr, '\0', fs->blksz); + ext2fs_devread(parent_itable_blkno * fs->sect_perblk, + 0, fs->blksz, temp_ptr); + if (log_journal(temp_ptr, parent_itable_blkno)) + goto fail; + + memcpy(temp_ptr + blkoff, g_parent_inode, + sizeof(struct ext2_inode)); + if (put_metadata(temp_ptr, parent_itable_blkno)) + goto fail; + free(temp_ptr); + } else { + /* 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)); + gd_index--; + if (put_metadata(temp_ptr, itable_blkno)) + goto fail; + free(temp_ptr); + } + ext4fs_update(); + ext4fs_deinit(); + + fs->first_pass_bbmap = 0; + fs->curr_blkno = 0; + fs->first_pass_ibmap = 0; + fs->curr_inode_no = 0; + if (inode_buffer) + free(inode_buffer); + if (g_parent_inode) { + free(g_parent_inode); + g_parent_inode = NULL; + } + return 0; + +fail: + ext4fs_deinit(); + if (inode_buffer) + free(inode_buffer); + if (g_parent_inode) { + free(g_parent_inode); + g_parent_inode = NULL; + } + return -1; +} diff --git a/include/ext4fs.h b/include/ext4fs.h index fd7bd47..e4e2c3e 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -102,9 +102,17 @@ extern block_dev_desc_t *ext4_dev_desc; extern struct ext2_data *ext4fs_root; extern struct ext2fs_node *ext4fs_file; +extern struct ext2_inode *g_parent_inode; +extern int gd_index; +extern int gindex; + struct ext_filesystem *get_fs(void); int init_fs(block_dev_desc_t *); void deinit_fs(block_dev_desc_t *); +int ext4fs_init(void); +void ext4fs_deinit(void); +int ext4fs_write(char *fname, unsigned char *buffer, unsigned long sizebytes); +int ext4fs_filename_check(char *filename); int ext4fs_open(const char *filename); int ext4fs_read(char *buf, unsigned len); int ext4fs_mount(unsigned part_length); -- 1.7.0.4

5 13

[U-Boot] [PATCH/RFC] global_data: unify global flag defines
by Mike Frysinger 09 Aug '12

09 Aug '12

All the global flag defines are the same across all arches (ignoring two unique x86 ones). So unify them in one place, and add a simple way for arches to extend for their needs. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- note: this depends on Graeme's x86 boot flag clean up arch/arm/include/asm/global_data.h | 14 +----------- arch/avr32/include/asm/global_data.h | 14 +----------- arch/blackfin/include/asm/global_data.h | 14 +----------- arch/m68k/include/asm/global_data.h | 14 +----------- arch/microblaze/include/asm/global_data.h | 14 +----------- arch/mips/include/asm/global_data.h | 14 +----------- arch/nds32/include/asm/global_data.h | 14 +----------- arch/nios2/include/asm/global_data.h | 10 +-------- arch/powerpc/include/asm/global_data.h | 14 +----------- arch/sandbox/include/asm/global_data.h | 14 +----------- arch/sh/include/asm/global_data.h | 9 +------- arch/sparc/include/asm/global_data.h | 14 +----------- arch/x86/include/asm/global_data.h | 16 +------------- include/asm-generic/global_data_flags.h | 33 +++++++++++++++++++++++++++++ 14 files changed, 46 insertions(+), 162 deletions(-) create mode 100644 include/asm-generic/global_data_flags.h diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index c3ff789..f8088fe 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -86,17 +84,7 @@ typedef struct global_data { #endif } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r8") diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h index 5c654bd..7878bb1 100644 --- a/arch/avr32/include/asm/global_data.h +++ b/arch/avr32/include/asm/global_data.h @@ -28,8 +28,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -52,17 +50,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm("r5") diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h index 67aa30f..ad42e91 100644 --- a/arch/blackfin/include/asm/global_data.h +++ b/arch/blackfin/include/asm/global_data.h @@ -36,8 +36,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { bd_t *bd; @@ -61,17 +59,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t * volatile gd asm ("P3") diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index 0ba2b43..cd55b83 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -70,17 +68,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #if 0 extern gd_t *global_data; diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index 6e8537c..0dc4ce9 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -30,8 +30,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -49,17 +47,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r31") diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index f6cf9fe..6e2cdc7 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -32,8 +32,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -63,17 +61,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("k0") diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h index de20a0a..94bd4c2 100644 --- a/arch/nds32/include/asm/global_data.h +++ b/arch/nds32/include/asm/global_data.h @@ -39,8 +39,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set CONFIG_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -67,17 +65,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Envs imported into hash table */ +#include <asm-generic/global_data_flags.h> #ifdef CONFIG_GLOBAL_DATA_NOT_REG10 extern volatile gd_t g_gd; diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index 4b86fbd..3b0d9e6 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -44,15 +44,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* flags */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp") diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 01f1d4a..5a5877f 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -33,8 +33,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -186,17 +184,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #if 1 #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2") diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h index 8d47191..64d6ddc 100644 --- a/arch/sandbox/include/asm/global_data.h +++ b/arch/sandbox/include/asm/global_data.h @@ -31,8 +31,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -49,17 +47,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Env. imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR extern gd_t *gd diff --git a/arch/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h index 1b782fc..6e534ad 100644 --- a/arch/sh/include/asm/global_data.h +++ b/arch/sh/include/asm/global_data.h @@ -44,14 +44,7 @@ typedef struct global_data char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("r13") diff --git a/arch/sparc/include/asm/global_data.h b/arch/sparc/include/asm/global_data.h index 613e2d8..93d3cc0 100644 --- a/arch/sparc/include/asm/global_data.h +++ b/arch/sparc/include/asm/global_data.h @@ -35,8 +35,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -78,17 +76,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("%g7") diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index f177a4f..2b8a2ed 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ #ifndef __ASSEMBLY__ @@ -80,19 +78,7 @@ extern gd_t *gd; #define GD_SIZE 15 -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ -#define GD_FLG_COLD_BOOT 0x00100 /* Cold Boot */ -#define GD_FLG_WARM_BOOT 0x00200 /* Warm Boot */ +#include <asm-generic/global_data_flags.h> #if 0 #define DECLARE_GLOBAL_DATA_PTR diff --git a/include/asm-generic/global_data_flags.h b/include/asm-generic/global_data_flags.h new file mode 100644 index 0000000..ee4ddb7 --- /dev/null +++ b/include/asm-generic/global_data_flags.h @@ -0,0 +1,33 @@ +/* + * transitional header until we merge global_data.h + * + * (C) Copyright 2000-2010 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef __ASM_GENERIC_GLOBAL_DATA_FLAGS_H +#define __ASM_GENERIC_GLOBAL_DATA_FLAGS_H + +/* + * Global Data Flags + */ +#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ +#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ +#define GD_FLG_SILENT 0x00004 /* Silent mode */ +#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ +#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ +#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ +#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ +#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ + +/* + * Base for arches to start adding their own: + * #define GD_FLG_FOO (GD_FLG_ARCH_BASE << 0) + * #define GD_FLG_BAR (GD_FLG_ARCH_BASE << 1) + * #define GD_FLG_COW (GD_FLG_ARCH_BASE << 2) + */ +#define GD_FLG_ARCH_BASE 0x00100 + +#endif -- 1.7.6.1

3 11

[U-Boot] cfi: Problem with Intel Strata 28F320 flash
by Heiko Schocher 03 Aug '12

03 Aug '12

Hello, as I am actual trying to get the keymile boards in sync with actual mainline u-boot, I faced the following Problem with an Intel Strata Flash on the mgcoge (mpc8247 based board): I couldn;t unprotect/erase/write/protect some (not all!) Flash sectors. For Example, I could do this without errors on the sectors where u-boot sits (First three sectors), but not with the environment (next two sectors)! After some debugging, I found out, that, if I revert commit commit 54652991caedc39b2ec2e5b49e750669bfcd1e2e Author: Philippe De Muyter <phdm(a)macqel.be> Date: Tue Aug 17 18:40:25 2010 +0200 Work around bug in Numonyx P33/P30 256-Mbit 65nm flash chips. I have "ported" U-boot to a in house made board with Numonyx Axcell P33/P30 256-Mbit 65nm flash chips. After some time :( searching for bugs in our board or soft, we have discovered that those chips have a small but annoying bug, documented in "Numonyx Axcell P33/P30 256-Mbit Specification Update" [...] It works again fine, and without problems ... did somebody faced similiar issues with the cfi driver? Some Ideas? bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

5 7

[U-Boot] building tools/env
by Steve DeLaney 24 Jul '12

24 Jul '12

hi there, I'm attempting to build u-boot 1.1.1 tools/env and the build is failed. Any ideas on best way to enable it in the build. Here's what I did so far first, update tools/Makefile TOOLSUBDIRS = env then top level build make clobber mrproper make octeon_cn3010_evb_hs5_config make all the build in tools/env fails due to missing include files linux/mtd/mtd.h zlib.h add to tools/env/Makefile CPPFLAGS += ../../include and include CPPFLAGS here: fw_printenv : $(SOURCES) $(HEADERS) $(CROSS_COMPILE)gcc -Wall $(CPPFLAGS) -DUSE_HOSTCC $(SOURCES) -o fw_printenv but this leads to build error on definitions of uint32_t, phys_addr_t and erase_info_t Any ideas on preferred way to build tools/env? thanks in advance!

4 3

[U-Boot] [PATCH 1/2] NET: NE2000: Cleanup IO accessors
by Marek Vasut 13 Jul '12

13 Jul '12

Introduce ne2k_register_io(in, out), which allows user to supply two functions. One for reading data from the card, the other for writing data to the card. Then introduce drivers' private data, which carry pointers to these functions and are passed throughout the driver. The private data will carry more entries later. Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- drivers/net/ne2000_base.c | 318 +++++++++++++++++++++++++++------------------ include/netdev.h | 2 + 2 files changed, 191 insertions(+), 129 deletions(-) NOTE: Formating not cleaned up, only relevant change made! diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 88f2b37..35a8581 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -76,10 +76,7 @@ Add SNMP #include <command.h> #include <net.h> #include <malloc.h> - -/* forward definition of function used for the uboot interface */ -void uboot_push_packet_len(int len); -void uboot_push_tx_done(int key, int val); +#include <errno.h> /* NE2000 base header file */ #include "ne2000_base.h" @@ -94,12 +91,37 @@ void uboot_push_tx_done(int key, int val); static dp83902a_priv_data_t nic; /* just one instance of the card supported */ +uint32_t ne2k_default_in(uint8_t *addr, uint32_t offset) +{ + uint32_t ret; + DP_IN(addr, offset, ret); + return ret; +} + +void ne2k_default_out(uint8_t *addr, uint32_t offset, uint32_t val) +{ + DP_OUT(addr, offset, val); +} + +struct ne2k_io_accessors { + uint32_t (*in)(uint8_t *addr, uint32_t offset); + void (*out)(uint8_t *addr, uint32_t offset, uint32_t val); +}; + +struct ne2k_private_data { + struct ne2k_io_accessors io; +}; + +/* forward definition of function used for the uboot interface */ +void uboot_push_packet_len(struct ne2k_private_data *pdata, int len); +void uboot_push_tx_done(int key, int val); + /** * This function reads the MAC address from the serial EEPROM, * used if PROM read fails. Does nothing for ax88796 chips (sh boards) */ static bool -dp83902a_init(unsigned char *enetaddr) +dp83902a_init(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; u8* base; @@ -116,13 +138,17 @@ dp83902a_init(unsigned char *enetaddr) DEBUG_LINE(); #if defined(NE2000_BASIC_INIT) + unsigned char *enetaddr = dev->enetaddr; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; + /* AX88796L doesn't need */ /* Prepare ESA */ - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1); /* Select page 1 */ + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1); /* Select page 1 */ /* Use the address from the serial EEPROM */ for (i = 0; i < 6; i++) - DP_IN(base, DP_P1_PAR0+i, dp->esa[i]); - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0); /* Select page 0 */ + dp->esa[i] = io->in(base, DP_P1_PAR0+i); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0); /* Select page 0 */ printf("NE2000 - %s ESA: %02x:%02x:%02x:%02x:%02x:%02x\n", "eeprom", @@ -139,16 +165,18 @@ dp83902a_init(unsigned char *enetaddr) } static void -dp83902a_stop(void) +dp83902a_stop(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; DEBUG_FUNCTION(); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ - DP_OUT(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ - DP_OUT(base, DP_IMR, 0x00); /* Disable all interrupts */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ + io->out(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ + io->out(base, DP_IMR, 0x00); /* Disable all interrupts */ dp->running = false; } @@ -160,9 +188,12 @@ dp83902a_stop(void) * the hardware ready to send/receive packets. */ static void -dp83902a_start(u8 * enaddr) +dp83902a_start(struct eth_device *dev) { dp83902a_priv_data_t *dp = &nic; + unsigned char *enaddr = dev->enetaddr; + struct ne2k_private_data *pdata = dev->priv; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int i; @@ -170,37 +201,37 @@ dp83902a_start(u8 * enaddr) DEBUG_FUNCTION(); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ - DP_OUT(base, DP_DCR, DP_DCR_INIT); - DP_OUT(base, DP_RBCH, 0); /* Remote byte count */ - DP_OUT(base, DP_RBCL, 0); - DP_OUT(base, DP_RCR, DP_RCR_MON); /* Accept no packets */ - DP_OUT(base, DP_TCR, DP_TCR_LOCAL); /* Transmitter [virtually] off */ - DP_OUT(base, DP_TPSR, dp->tx_buf1); /* Transmitter start page */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP); /* Brutal */ + io->out(base, DP_DCR, DP_DCR_INIT); + io->out(base, DP_RBCH, 0); /* Remote byte count */ + io->out(base, DP_RBCL, 0); + io->out(base, DP_RCR, DP_RCR_MON); /* Accept no packets */ + io->out(base, DP_TCR, DP_TCR_LOCAL); /* Transmitter [virtually] off */ + io->out(base, DP_TPSR, dp->tx_buf1); /* Transmitter start page */ dp->tx1 = dp->tx2 = 0; dp->tx_next = dp->tx_buf1; dp->tx_started = false; dp->running = true; - DP_OUT(base, DP_PSTART, dp->rx_buf_start); /* Receive ring start page */ - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); /* Receive ring boundary */ - DP_OUT(base, DP_PSTOP, dp->rx_buf_end); /* Receive ring end page */ + io->out(base, DP_PSTART, dp->rx_buf_start); /* Receive ring start page */ + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); /* Receive ring boundary */ + io->out(base, DP_PSTOP, dp->rx_buf_end); /* Receive ring end page */ dp->rx_next = dp->rx_buf_start - 1; dp->running = true; - DP_OUT(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ - DP_OUT(base, DP_IMR, DP_IMR_All); /* Enable all interrupts */ - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1 | DP_CR_STOP); /* Select page 1 */ - DP_OUT(base, DP_P1_CURP, dp->rx_buf_start); /* Current page - next free page for Rx */ + io->out(base, DP_ISR, 0xFF); /* Clear any pending interrupts */ + io->out(base, DP_IMR, DP_IMR_All); /* Enable all interrupts */ + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1 | DP_CR_STOP); /* Select page 1 */ + io->out(base, DP_P1_CURP, dp->rx_buf_start); /* Current page - next free page for Rx */ dp->running = true; for (i = 0; i < ETHER_ADDR_LEN; i++) { /* FIXME */ /*((vu_short*)( base + ((DP_P1_PAR0 + i) * 2) + * 0x1400)) = enaddr[i];*/ - DP_OUT(base, DP_P1_PAR0+i, enaddr[i]); + io->out(base, DP_P1_PAR0+i, enaddr[i]); } /* Enable and start device */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_TCR, DP_TCR_NORMAL); /* Normal transmit operations */ - DP_OUT(base, DP_RCR, DP_RCR_AB); /* Accept broadcast, no errors, no multicast */ + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_TCR, DP_TCR_NORMAL); /* Normal transmit operations */ + io->out(base, DP_RCR, DP_RCR_AB); /* Accept broadcast, no errors, no multicast */ dp->running = true; } @@ -211,9 +242,10 @@ dp83902a_start(u8 * enaddr) */ static void -dp83902a_start_xmit(int start_page, int len) +dp83902a_start_xmit(struct ne2k_private_data *pdata, int start_page, int len) { dp83902a_priv_data_t *dp = (dp83902a_priv_data_t *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; DEBUG_FUNCTION(); @@ -224,12 +256,12 @@ dp83902a_start_xmit(int start_page, int len) printf("TX already started?!?\n"); #endif - DP_OUT(base, DP_ISR, (DP_ISR_TxP | DP_ISR_TxE)); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_TBCL, len & 0xFF); - DP_OUT(base, DP_TBCH, len >> 8); - DP_OUT(base, DP_TPSR, start_page); - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); + io->out(base, DP_ISR, (DP_ISR_TxP | DP_ISR_TxE)); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_TBCL, len & 0xFF); + io->out(base, DP_TBCH, len >> 8); + io->out(base, DP_TPSR, start_page); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); dp->tx_started = true; } @@ -239,9 +271,10 @@ dp83902a_start_xmit(int start_page, int len) * that there is free buffer space (dp->tx_next). */ static void -dp83902a_send(u8 *data, int total_len, u32 key) +dp83902a_send(struct ne2k_private_data *pdata, u8 *data, int total_len, u32 key) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int len, start_page, pkt_len, i, isr; #if DEBUG & 4 @@ -271,7 +304,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) printf("TX prep page %d len %d\n", start_page, pkt_len); #endif - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ { /* * Dummy read. The manual sez something slightly different, @@ -279,15 +312,14 @@ dp83902a_send(u8 *data, int total_len, u32 key) * does (i.e., also read data). */ - u16 tmp; int len = 1; - DP_OUT(base, DP_RSAL, 0x100 - len); - DP_OUT(base, DP_RSAH, (start_page - 1) & 0xff); - DP_OUT(base, DP_RBCL, len); - DP_OUT(base, DP_RBCH, 0); - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_RDMA | DP_CR_START); - DP_IN_DATA(dp->data, tmp); + io->out(base, DP_RSAL, 0x100 - len); + io->out(base, DP_RSAH, (start_page - 1) & 0xff); + io->out(base, DP_RBCL, len); + io->out(base, DP_RBCH, 0); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_RDMA | DP_CR_START); + io->in(dp->data, 0); } #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_TX_DMA @@ -299,11 +331,11 @@ dp83902a_send(u8 *data, int total_len, u32 key) #endif /* Send data to device buffer(s) */ - DP_OUT(base, DP_RSAL, 0); - DP_OUT(base, DP_RSAH, start_page); - DP_OUT(base, DP_RBCL, pkt_len & 0xFF); - DP_OUT(base, DP_RBCH, pkt_len >> 8); - DP_OUT(base, DP_CR, DP_CR_WDMA | DP_CR_START); + io->out(base, DP_RSAL, 0); + io->out(base, DP_RSAH, start_page); + io->out(base, DP_RBCL, pkt_len & 0xFF); + io->out(base, DP_RBCH, pkt_len >> 8); + io->out(base, DP_CR, DP_CR_WDMA | DP_CR_START); /* Put data into buffer */ #if DEBUG & 4 @@ -316,7 +348,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) if (0 == (++dx % 16)) printf("\n "); #endif - DP_OUT_DATA(dp->data, *data++); + io->out(dp->data, 0, *data++); len--; } #if DEBUG & 4 @@ -329,7 +361,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) /* Padding to 802.3 length was required */ for (i = total_len; i < pkt_len;) { i++; - DP_OUT_DATA(dp->data, 0); + io->out(dp->data, 0, 0); } } @@ -344,11 +376,11 @@ dp83902a_send(u8 *data, int total_len, u32 key) /* Wait for DMA to complete */ do { - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); } while ((isr & DP_ISR_RDC) == 0); /* Then disable DMA */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); /* Start transmit if not already going */ if (!dp->tx_started) { @@ -357,7 +389,7 @@ dp83902a_send(u8 *data, int total_len, u32 key) } else { dp->tx_int = 2; /* Expecting interrupt from BUF2 */ } - dp83902a_start_xmit(start_page, pkt_len); + dp83902a_start_xmit(pdata, start_page, pkt_len); } } @@ -369,23 +401,23 @@ dp83902a_send(u8 *data, int total_len, u32 key) * 'dp83902a_recv' will be called to actually fetch it from the hardware. */ static void -dp83902a_RxEvent(void) +dp83902a_RxEvent(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 rsr; u8 rcv_hdr[4]; int i, len, pkt, cur; DEBUG_FUNCTION(); - DP_IN(base, DP_RSR, rsr); + io->in(base, DP_RSR); while (true) { /* Read incoming packet header */ - DP_OUT(base, DP_CR, DP_CR_PAGE1 | DP_CR_NODMA | DP_CR_START); - DP_IN(base, DP_P1_CURP, cur); - DP_OUT(base, DP_P1_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_IN(base, DP_BNDRY, pkt); + io->out(base, DP_CR, DP_CR_PAGE1 | DP_CR_NODMA | DP_CR_START); + cur = io->in(base, DP_P1_CURP); + io->out(base, DP_P1_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + pkt = io->in(base, DP_BNDRY); pkt += 1; if (pkt == dp->rx_buf_end) @@ -394,27 +426,27 @@ dp83902a_RxEvent(void) if (pkt == cur) { break; } - DP_OUT(base, DP_RBCL, sizeof(rcv_hdr)); - DP_OUT(base, DP_RBCH, 0); - DP_OUT(base, DP_RSAL, 0); - DP_OUT(base, DP_RSAH, pkt); + io->out(base, DP_RBCL, sizeof(rcv_hdr)); + io->out(base, DP_RBCH, 0); + io->out(base, DP_RSAL, 0); + io->out(base, DP_RSAH, pkt); if (dp->rx_next == pkt) { if (cur == dp->rx_buf_start) - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); else - DP_OUT(base, DP_BNDRY, cur - 1); /* Update pointer */ + io->out(base, DP_BNDRY, cur - 1); /* Update pointer */ return; } dp->rx_next = pkt; - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ - DP_OUT(base, DP_CR, DP_CR_RDMA | DP_CR_START); + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_CR, DP_CR_RDMA | DP_CR_START); #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_RX_DMA CYGACC_CALL_IF_DELAY_US(10); #endif /* read header (get data size)*/ for (i = 0; i < sizeof(rcv_hdr);) { - DP_IN_DATA(dp->data, rcv_hdr[i++]); + rcv_hdr[i++] = io->in(dp->data, 0); } #if DEBUG & 5 @@ -424,12 +456,12 @@ dp83902a_RxEvent(void) len = ((rcv_hdr[3] << 8) | rcv_hdr[2]) - sizeof(rcv_hdr); /* data read */ - uboot_push_packet_len(len); + uboot_push_packet_len(pdata, len); if (rcv_hdr[1] == dp->rx_buf_start) - DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1); + io->out(base, DP_BNDRY, dp->rx_buf_end - 1); else - DP_OUT(base, DP_BNDRY, rcv_hdr[1] - 1); /* Update pointer */ + io->out(base, DP_BNDRY, rcv_hdr[1] - 1); /* Update pointer */ } } @@ -441,9 +473,10 @@ dp83902a_RxEvent(void) * efficient processing in the upper layers of the stack. */ static void -dp83902a_recv(u8 *data, int len) +dp83902a_recv(struct ne2k_private_data *pdata, u8 *data, int len) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; int i, mlen; u8 saved_char = 0; @@ -459,13 +492,13 @@ dp83902a_recv(u8 *data, int len) #endif /* Read incoming packet data */ - DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); - DP_OUT(base, DP_RBCL, len & 0xFF); - DP_OUT(base, DP_RBCH, len >> 8); - DP_OUT(base, DP_RSAL, 4); /* Past header */ - DP_OUT(base, DP_RSAH, dp->rx_next); - DP_OUT(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ - DP_OUT(base, DP_CR, DP_CR_RDMA | DP_CR_START); + io->out(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START); + io->out(base, DP_RBCL, len & 0xFF); + io->out(base, DP_RBCH, len >> 8); + io->out(base, DP_RSAL, 4); /* Past header */ + io->out(base, DP_RSAH, dp->rx_next); + io->out(base, DP_ISR, DP_ISR_RDC); /* Clear end of DMA */ + io->out(base, DP_CR, DP_CR_RDMA | DP_CR_START); #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_RX_DMA CYGACC_CALL_IF_DELAY_US(10); #endif @@ -489,7 +522,7 @@ dp83902a_recv(u8 *data, int len) { u8 tmp; - DP_IN_DATA(dp->data, tmp); + tmp = io->in(dp->data, 0); #if DEBUG & 4 printf(" %02x", tmp); if (0 == (++dx % 16)) printf("\n "); @@ -506,16 +539,16 @@ dp83902a_recv(u8 *data, int len) } static void -dp83902a_TxEvent(void) +dp83902a_TxEvent(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 tsr; u32 key; DEBUG_FUNCTION(); - DP_IN(base, DP_TSR, tsr); + io->in(base, DP_TSR); if (dp->tx_int == 1) { key = dp->tx1_key; dp->tx1 = 0; @@ -526,10 +559,10 @@ dp83902a_TxEvent(void) /* Start next packet if one is ready */ dp->tx_started = false; if (dp->tx1) { - dp83902a_start_xmit(dp->tx1, dp->tx1_len); + dp83902a_start_xmit(pdata, dp->tx1, dp->tx1_len); dp->tx_int = 1; } else if (dp->tx2) { - dp83902a_start_xmit(dp->tx2, dp->tx2_len); + dp83902a_start_xmit(pdata, dp->tx2, dp->tx2_len); dp->tx_int = 2; } else { dp->tx_int = 0; @@ -543,16 +576,16 @@ dp83902a_TxEvent(void) * interrupt. */ static void -dp83902a_ClearCounters(void) +dp83902a_ClearCounters(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; - u8 cnt1, cnt2, cnt3; - DP_IN(base, DP_FER, cnt1); - DP_IN(base, DP_CER, cnt2); - DP_IN(base, DP_MISSED, cnt3); - DP_OUT(base, DP_ISR, DP_ISR_CNT); + io->in(base, DP_FER); + io->in(base, DP_CER); + io->in(base, DP_MISSED); + io->out(base, DP_ISR, DP_ISR_CNT); } /* @@ -560,55 +593,57 @@ dp83902a_ClearCounters(void) * out in section 7.0 of the datasheet. */ static void -dp83902a_Overflow(void) +dp83902a_Overflow(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *)&nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; u8 isr; /* Issue a stop command and wait 1.6ms for it to complete. */ - DP_OUT(base, DP_CR, DP_CR_STOP | DP_CR_NODMA); + io->out(base, DP_CR, DP_CR_STOP | DP_CR_NODMA); CYGACC_CALL_IF_DELAY_US(1600); /* Clear the remote byte counter registers. */ - DP_OUT(base, DP_RBCL, 0); - DP_OUT(base, DP_RBCH, 0); + io->out(base, DP_RBCL, 0); + io->out(base, DP_RBCH, 0); /* Enter loopback mode while we clear the buffer. */ - DP_OUT(base, DP_TCR, DP_TCR_LOCAL); - DP_OUT(base, DP_CR, DP_CR_START | DP_CR_NODMA); + io->out(base, DP_TCR, DP_TCR_LOCAL); + io->out(base, DP_CR, DP_CR_START | DP_CR_NODMA); /* * Read in as many packets as we can and acknowledge any and receive * interrupts. Since the buffer has overflowed, a receive event of * some kind will have occured. */ - dp83902a_RxEvent(); - DP_OUT(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE); + dp83902a_RxEvent(pdata); + io->out(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE); /* Clear the overflow condition and leave loopback mode. */ - DP_OUT(base, DP_ISR, DP_ISR_OFLW); - DP_OUT(base, DP_TCR, DP_TCR_NORMAL); + io->out(base, DP_ISR, DP_ISR_OFLW); + io->out(base, DP_TCR, DP_TCR_NORMAL); /* * If a transmit command was issued, but no transmit event has occured, * restart it here. */ - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); if (dp->tx_started && !(isr & (DP_ISR_TxP|DP_ISR_TxE))) { - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_TXPKT | DP_CR_START); } } static void -dp83902a_poll(void) +dp83902a_poll(struct ne2k_private_data *pdata) { struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic; + const struct ne2k_io_accessors *io = &pdata->io; u8 *base = dp->base; u8 isr; - DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0 | DP_CR_START); - DP_IN(base, DP_ISR, isr); + io->out(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0 | DP_CR_START); + isr = io->in(base, DP_ISR); while (0 != isr) { /* * The CNT interrupt triggers when the MSB of one of the error @@ -616,7 +651,7 @@ dp83902a_poll(void) * we should read their values to reset them. */ if (isr & DP_ISR_CNT) { - dp83902a_ClearCounters(); + dp83902a_ClearCounters(pdata); } /* * Check for overflow. It's a special case, since there's a @@ -624,27 +659,27 @@ dp83902a_poll(void) * a running state.a */ if (isr & DP_ISR_OFLW) { - dp83902a_Overflow(); + dp83902a_Overflow(pdata); } else { /* * Other kinds of interrupts can be acknowledged simply by * clearing the relevant bits of the ISR. Do that now, then * handle the interrupts we care about. */ - DP_OUT(base, DP_ISR, isr); /* Clear set bits */ + io->out(base, DP_ISR, isr); /* Clear set bits */ if (!dp->running) break; /* Is this necessary? */ /* * Check for tx_started on TX event since these may happen * spuriously it seems. */ if (isr & (DP_ISR_TxP|DP_ISR_TxE) && dp->tx_started) { - dp83902a_TxEvent(); + dp83902a_TxEvent(pdata); } if (isr & (DP_ISR_RxP|DP_ISR_RxE)) { - dp83902a_RxEvent(); + dp83902a_RxEvent(pdata); } } - DP_IN(base, DP_ISR, isr); + isr = io->in(base, DP_ISR); } } @@ -655,13 +690,13 @@ static u8 *pbuf = NULL; static int pkey = -1; static int initialized = 0; -void uboot_push_packet_len(int len) { +void uboot_push_packet_len(struct ne2k_private_data *pdata, int len) { PRINTK("pushed len = %d\n", len); if (len >= 2000) { printf("NE2000: packet too big\n"); return; } - dp83902a_recv(&pbuf[0], len); + dp83902a_recv(pdata, &pbuf[0], len); /*Just pass it to the upper layer*/ NetReceive(&pbuf[0], len); @@ -717,7 +752,7 @@ static int ne2k_setup_driver(struct eth_device *dev) if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr)) { /* If the MAC address is not in the environment, get it: */ if (!get_prom(dev->enetaddr, nic.base)) /* get MAC from prom */ - dp83902a_init(dev->enetaddr); /* fallback: seeprom */ + dp83902a_init(dev); /* fallback: seeprom */ /* And write it into the environment otherwise eth_write_hwaddr * returns -1 due to eth_getenv_enetaddr_by_index() failing, * and this causes "Warning: failed to set MAC address", and @@ -729,7 +764,7 @@ static int ne2k_setup_driver(struct eth_device *dev) static int ne2k_init(struct eth_device *dev, bd_t *bd) { - dp83902a_start(dev->enetaddr); + dp83902a_start(dev); initialized = 1; return 0; } @@ -738,28 +773,30 @@ static void ne2k_halt(struct eth_device *dev) { debug("### ne2k_halt\n"); if(initialized) - dp83902a_stop(); + dp83902a_stop(dev); initialized = 0; } static int ne2k_recv(struct eth_device *dev) { - dp83902a_poll(); + struct ne2k_private_data *pdata = dev->priv; + dp83902a_poll(pdata); return 1; } static int ne2k_send(struct eth_device *dev, volatile void *packet, int length) { int tmo; + struct ne2k_private_data *pdata = dev->priv; debug("### ne2k_send\n"); pkey = -1; - dp83902a_send((u8 *) packet, length, 666); + dp83902a_send(pdata, (u8 *) packet, length, 666); tmo = get_timer (0) + TOUT * CONFIG_SYS_HZ; while(1) { - dp83902a_poll(); + dp83902a_poll(pdata); if (pkey != -1) { PRINTK("Packet sucesfully sent\n"); return 0; @@ -775,25 +812,48 @@ static int ne2k_send(struct eth_device *dev, volatile void *packet, int length) /** * Setup the driver for use and register it with the eth layer - * @return 0 on success, -1 on error (causing caller to print error msg) + * @return 0 on success, < 0 on error (causing caller to print error msg) */ -int ne2k_register(void) +int ne2k_register_io(uint32_t (*in)(uint8_t *addr, uint32_t offset), + void (*out)(uint8_t *addr, uint32_t offset, uint32_t value)) { struct eth_device *dev; + struct ne2k_private_data *pdata; dev = calloc(sizeof(*dev), 1); if (dev == NULL) - return -1; + return -ENOMEM; + + pdata = calloc(sizeof(struct ne2k_private_data), 1); + if (pdata == NULL) { + free(dev); + return -ENOMEM; + } if (ne2k_setup_driver(dev)) - return -1; + return -EINVAL; + + if (in == NULL) + in = ne2k_default_in; + + if (out == NULL) + out = ne2k_default_out; + + pdata->io.in = in; + pdata->io.out = out; dev->init = ne2k_init; dev->halt = ne2k_halt; dev->send = ne2k_send; dev->recv = ne2k_recv; + dev->priv = pdata; sprintf(dev->name, "NE2000"); return eth_register(dev); } + +int ne2k_register(void) +{ + return ne2k_register_io(NULL, NULL); +} diff --git a/include/netdev.h b/include/netdev.h index 150fa8e..7ea4642 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -81,6 +81,8 @@ int mpc82xx_scc_enet_initialize(bd_t *bis); int mvgbe_initialize(bd_t *bis); int natsemi_initialize(bd_t *bis); int ne2k_register(void); +int ne2k_register_io(uint32_t (*in)(uint8_t *addr, uint32_t offset), + void (*out)(uint8_t *addr, uint32_t offset, uint32_t value)); int npe_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis); -- 1.7.7.1

3 11

[U-Boot] [PATCH] pxe: get ethaddr from the current device instead of env
by Rob Herring 11 Jul '12

11 Jul '12

From: Rob Herring <rob.herring(a)calxeda.com> The env variable "ethaddr" may not be set, so get the address from the eth_device struct instead. This also enables pxe for secondary ethernet devices. Signed-off-by: Rob Herring <rob.herring(a)calxeda.com> --- common/cmd_pxe.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 3efd700..f14ef89 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -56,38 +56,31 @@ static char *from_env(char *envvar) */ static int format_mac_pxe(char *outbuf, size_t outbuf_len) { - size_t ethaddr_len; - char *p, *ethaddr; - - ethaddr = from_env("ethaddr"); - - if (!ethaddr) - return -ENOENT; - - ethaddr_len = strlen(ethaddr); + char *p; + struct eth_device *dev; /* * ethaddr_len + 4 gives room for "01-", ethaddr, and a NUL byte at * the end. */ - if (outbuf_len < ethaddr_len + 4) { - printf("outbuf is too small (%d < %d)\n", - outbuf_len, ethaddr_len + 4); - + if (outbuf_len < 21) { + printf("outbuf is too small (%d < 21)\n", outbuf_len); return -EINVAL; } - strcpy(outbuf, "01-"); + eth_set_current(); + dev = eth_get_dev(); + if (!dev) + return -ENODEV; - for (p = outbuf + 3; *ethaddr; ethaddr++, p++) { - if (*ethaddr == ':') + sprintf(outbuf, "01-%pM", dev->enetaddr); + for (p = outbuf + 3; *p; p++) { + if (*p == ':') *p = '-'; else - *p = tolower(*ethaddr); + *p = tolower(*p); } - *p = '\0'; - return 1; } -- 1.7.5.4

4 13

[U-Boot] [PATCH v4] at91: Add support for Bluewater Systems Snapper 9G45 module
by Simon Glass 30 Jun '12

30 Jun '12

Snapper 9G45 is a ARM9-based CPU module with 1GB NAND and 128MB DDR SDRAM. This patch includes NAND and Ethernet support. Signed-off-by: Simon Glass <sglass(a)bluewatersys.com> --- Changes in v2: - Removed unneeded i2c config - Added machine type define Changes in v3: - Use CONFIG_MACH_TYPE instead of custom code - Reduce PHY reset delay to minimum required Changes in v4: - Add MAINTAINERS entry and update Snapper boards since Ryan has moved - Fix ip= bootarg error - Remove I2C as this is not needed MAINTAINERS | 3 +- board/bluewater/snapper9g45/Makefile | 43 ++++++++ board/bluewater/snapper9g45/snapper9g45.c | 151 +++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/snapper9g45.h | 157 +++++++++++++++++++++++++++++ 5 files changed, 354 insertions(+), 1 deletions(-) create mode 100644 board/bluewater/snapper9g45/Makefile create mode 100644 board/bluewater/snapper9g45/snapper9g45.c create mode 100644 include/configs/snapper9g45.h diff --git a/MAINTAINERS b/MAINTAINERS index 576fea8..c12ee54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -300,10 +300,11 @@ Dan Malek <dan(a)embeddedalley.com> stxssa MPC85xx stxxtc MPC8xx -Ryan Mallon <ryan(a)bluewatersys.com> +Simon Glass <sglass(a)bluewatersys.com> snapper9260 ARM926EJS (AT91SAM9260 SoC) snapper9g20 ARM926EJS (AT91SAM9G20 SoC) + snapper9g45 ARM926EJS (AT91SAM9G45 SoC) Eran Man <eran(a)nbase.co.il> diff --git a/board/bluewater/snapper9g45/Makefile b/board/bluewater/snapper9g45/Makefile new file mode 100644 index 0000000..9016e5a --- /dev/null +++ b/board/bluewater/snapper9g45/Makefile @@ -0,0 +1,43 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y += snapper9g45.o + +SRCS := $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/bluewater/snapper9g45/snapper9g45.c b/board/bluewater/snapper9g45/snapper9g45.c new file mode 100644 index 0000000..4e5afb1 --- /dev/null +++ b/board/bluewater/snapper9g45/snapper9g45.c @@ -0,0 +1,151 @@ +/* + * (C) Copyright 2011 Bluewater Systems Ltd + * Author: Andre Renaud <andre(a)bluewatersys.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91sam9g45_matrix.h> +#include <asm/arch/at91sam9_smc.h> +#include <asm/arch/at91_common.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_rstc.h> +#include <asm/arch/gpio.h> +#include <asm/arch/hardware.h> +#include <net.h> +#include <netdev.h> + +DECLARE_GLOBAL_DATA_PTR; + +static void macb_hw_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; + struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC; + unsigned long erstl; + + /* Enable clock */ + writel(1 << ATMEL_ID_EMAC, &pmc->pcer); + + /* + * Disable pull-up on: + * RXDV (PA15) => PHY normal mode (not Test mode) / CRSDV + * ERX0 (PA12) => PHY ADDR0 / RXD0 + * ERX1 (PA13) => PHY ADDR1 => PHYADDR = 0x0 / RXD1 + * + * PHY has internal pull-down + */ + writel(pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA12) | + pin_to_mask(AT91_PIN_PA13), + &pioa->pudr); + + /* Need to reset PHY -> needs 100us, so use minimum reset period */ + erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK; + writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0) | + AT91_RSTC_MR_URSTEN, &rstc->mr); + writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr); + + /* Wait for end hardware reset */ + while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) + ; + + /* Restore NRST value */ + writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr); + + /* The phy internal reset take 21ms */ + mdelay(21); + + /* Re-enable pull-up */ + writel(pin_to_mask(AT91_PIN_PA15) | + pin_to_mask(AT91_PIN_PA12) | + pin_to_mask(AT91_PIN_PA13), + &pioa->puer); + + at91_macb_hw_init(); +} + +static void nand_hw_init(void) +{ + struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; + struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; + unsigned long csa; + + /* Enable CS3 as NAND/SmartMedia */ + csa = readl(&matrix->ebicsa); + csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, &matrix->ebicsa); + + /* Configure SMC CS3 for NAND/SmartMedia */ + writel(AT91_SMC_SETUP_NWE(2) | AT91_SMC_SETUP_NCS_WR(0) | + AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(0), + &smc->cs[3].setup); + writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(4) | + AT91_SMC_PULSE_NRD(4) | AT91_SMC_PULSE_NCS_RD(4), + &smc->cs[3].pulse); + writel(AT91_SMC_CYCLE_NWE(7) | AT91_SMC_CYCLE_NRD(7), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | + AT91_SMC_MODE_DBW_8 | + AT91_SMC_MODE_TDF_CYCLE(3), + &smc->cs[3].mode); + + /* Configure RDY/BSY */ + at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); +} + +int board_init(void) +{ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + /* Enable PIO clocks */ + writel((1 << ATMEL_ID_PIOA) | + (1 << ATMEL_ID_PIOB) | + (1 << ATMEL_ID_PIOC | + (1 << ATMEL_ID_PIODE)), &pmc->pcer); + + /* Address of boot parameters */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + + /* Initialise peripherals */ + at91_seriald_hw_init(); + nand_hw_init(); + + macb_hw_init(); + + return 0; +} + +int board_eth_init(bd_t *bis) +{ + return macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x1b); +} + +int dram_init(void) +{ + gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, + CONFIG_SYS_SDRAM_SIZE); + return 0; +} diff --git a/boards.cfg b/boards.cfg index 604becf..b6123c2 100644 --- a/boards.cfg +++ b/boards.cfg @@ -94,6 +94,7 @@ at91sam9xeek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91sam9xeek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1 snapper9260 arm arm926ejs - bluewater at91 snapper9260:AT91SAM9260 snapper9g20 arm arm926ejs snapper9260 bluewater at91 snapper9260:AT91SAM9G20 +snapper9g45 arm arm926ejs snapper9g45 bluewater at91 snapper9g45:AT91SAM9G45 sbc35_a9g20_nandflash arm arm926ejs sbc35_a9g20 calao at91 sbc35_a9g20:AT91SAM9G20,SYS_USE_NANDFLASH sbc35_a9g20_eeprom arm arm926ejs sbc35_a9g20 calao at91 sbc35_a9g20:AT91SAM9G20,SYS_USE_EEPROM tny_a9g20_nandflash arm arm926ejs tny_a9260 calao at91 tny_a9260:AT91SAM9G20,SYS_USE_NANDFLASH diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h new file mode 100644 index 0000000..30181ad --- /dev/null +++ b/include/configs/snapper9g45.h @@ -0,0 +1,157 @@ +/* + * Bluewater Systems Snapper 9G45 modules + * + * (C) Copyright 2011 Bluewater Systems + * Author: Andre Renaud <andre(a)bluewatersys.com> + * Author: Ryan Mallon <ryan(a)bluewatersys.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* SoC type is defined in boards.cfg */ +#include <asm/hardware.h> +#include <asm/sizes.h> + +#define CONFIG_SYS_TEXT_BASE 0x70000000 + +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 +#define CONFIG_SYS_HZ 1000 + +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_SKIP_LOWLEVEL_INIT + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_FIT + +/* SDRAM */ +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 +#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) /* 128MB */ +#define CONFIG_SYS_INIT_SP_ADDR (ATMEL_BASE_SRAM + 0x1000 - \ + GENERATED_GBL_DATA_SIZE) + +/* Mem test settings */ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024)) + +/* NAND flash */ +#define CONFIG_NAND_ATMEL +#define CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /*0x40000000*/ +#define CONFIG_SYS_NAND_DBW_8 +#define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* AD21 */ +#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) /* AD22 */ +#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 + +/* Ethernet */ +#define CONFIG_MACB +#define CONFIG_RMII +#define CONFIG_NET_RETRY_COUNT 20 +#define CONFIG_TFTP_PORT +#define CONFIG_TFTP_TSIZE + +/* USB */ +#define CONFIG_USB_ATMEL +#define CONFIG_USB_OHCI_NEW +#define CONFIG_DOS_PARTITION +#define CONFIG_SYS_USB_OHCI_CPU_INIT +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00700000 /* _UHP_OHCI_BASE */ +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g45" +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 +#define CONFIG_USB_STORAGE + +/* GPIOs and IO expander */ +#define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1 + +/* UARTs/Serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYS +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } +#define CONFIG_SYS_PROMPT "Snapper> " + +/* Boot options */ +#define CONFIG_SYS_LOAD_ADDR 0x71000000 +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK + +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Environment settings */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET (512 << 10) +#define CONFIG_ENV_SIZE (256 << 10) +#define CONFIG_ENV_OVERWRITE +#define CONFIG_BOOTARGS "console=ttyS0,115200 ip=dhcp" + +/* Console settings */ +#define CONFIG_SYS_CBSIZE 256 +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_EXTBDINFO +#define CONFIG_CMDLINE_EDITING +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* U-Boot memory settings */ +#define CONFIG_SYS_MALLOC_LEN (1 << 20) +#define CONFIG_STACKSIZE (256 << 10) +#define CONFIG_MACH_TYPE 2817 + +/* Command line configuration */ +#include <config_cmd_default.h> + +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_FAT +#undef CONFIG_CMD_GPIO +#define CONFIG_CMD_USB +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND + +#endif -- 1.7.5.4

2 1

[U-Boot] [PATCH 2/2] P4080/PBL: add tool to support pbl image build.
by Shaohui Xie 04 Jun '12

04 Jun '12

The tool can build u-boot image which can be used by PBL, run "make P4080DS_RAMBOOT_PBL" can make all works done, the default output image is u-boot.pbl, for more details please refer to doc/README.pblimage. Signed-off-by: Shaohui Xie <b21989(a)freescale.com> --- Makefile | 5 + board/freescale/corenet_ds/config.mk | 26 +++ board/freescale/corenet_ds/pblimage.cfg | 59 ++++++ common/image.c | 1 + doc/README.pblimage | 83 ++++++++ include/image.h | 1 + tools/Makefile | 2 + tools/mkimage.c | 5 + tools/mkimage.h | 2 + tools/pblimage.c | 329 +++++++++++++++++++++++++++++++ tools/pblimage.h | 36 ++++ 11 files changed, 549 insertions(+), 0 deletions(-) create mode 100644 board/freescale/corenet_ds/config.mk create mode 100644 board/freescale/corenet_ds/pblimage.cfg create mode 100644 doc/README.pblimage create mode 100644 tools/pblimage.c create mode 100644 tools/pblimage.h diff --git a/Makefile b/Makefile index dc2e3d8..ca6078e 100644 --- a/Makefile +++ b/Makefile @@ -361,6 +361,10 @@ $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ +$(obj)u-boot.pbl: $(obj)u-boot.bin + $(obj)tools/mkimage -n $(PBL_CONFIG) -T pblimage \ + -d $< $@ + $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin @@ -1156,6 +1160,7 @@ clobber: clean $(obj)cscope.* $(obj)*.*~ @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) @rm -f $(obj)u-boot.kwb + @rm -f $(obj)u-boot.pbl @rm -f $(obj)u-boot.imx @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk new file mode 100644 index 0000000..c94938f --- /dev/null +++ b/board/freescale/corenet_ds/config.mk @@ -0,0 +1,26 @@ +# +# Copyright 2011 Freescale Semiconductor, Inc. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +ifeq ($(CONFIG_RAMBOOT_PBL), y) +PBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/pblimage.cfg +ALL += $(obj)u-boot.pbl +endif diff --git a/board/freescale/corenet_ds/pblimage.cfg b/board/freescale/corenet_ds/pblimage.cfg new file mode 100644 index 0000000..96c55ee --- /dev/null +++ b/board/freescale/corenet_ds/pblimage.cfg @@ -0,0 +1,59 @@ +# +# Copyright 2011 Freescale Semiconductor, Inc. +# Written-by: Shaohui Xie<b21989(a)freescale.com> +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# +# Refer docs/README.pblimage for more details about how-to configure +# and create PBL boot image +# + +#PBL preamble and RCW header +aa55aa55 010e0100 +#64 bytes RCW data +4c580000 00000000 18185218 0000cccc +40464000 3c3c2000 58000000 61000000 +00000000 00000000 00000000 008b6000 +00000000 00000000 00000000 00000000 + +#PBI commands +#Initialize CPC1 +09010000 00200400 +09138000 00000000 +091380c0 00000100 +09010100 00000000 +09010104 fff0000b +09010f00 08000000 +09010000 80000000 +#Configure LAW for CPC1 +09000d00 00000000 +09000d04 fff00000 +09000d08 81000013 +09000010 00000000 +09000014 ff000000 +09000018 81000000 +#Initialize eSPI controller +09110000 80000403 +09110020 2d170008 +09110024 00100008 +09110028 00100008 +0911002c 00100008 +#Flush PBL data +09138000 00000000 +091380c0 00000000 diff --git a/common/image.c b/common/image.c index f63a2ff..76e493d 100644 --- a/common/image.c +++ b/common/image.c @@ -141,6 +141,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_FLATDT, "flat_dt", "Flat Device Tree", }, { IH_TYPE_KWBIMAGE, "kwbimage", "Kirkwood Boot Image",}, { IH_TYPE_IMXIMAGE, "imximage", "Freescale i.MX Boot Image",}, + { IH_TYPE_PBLIMAGE, "pblimage", "Freescale PBL Boot Image",}, { -1, "", "", }, }; diff --git a/doc/README.pblimage b/doc/README.pblimage new file mode 100644 index 0000000..e7ebea0 --- /dev/null +++ b/doc/README.pblimage @@ -0,0 +1,83 @@ +------------------------------------------------------------------ +Freescale PBL(pre-boot loader) Boot Image generation using mkimage +------------------------------------------------------------------ + +This document describes the U-Boot feature as it +is implemented for the Freescale P4080. + +The P4080 SoC's can boot directly from eSPI FLASH. + +for more details refer section 5 Pre-boot loader specifications. + +Building PBL boot image and boot steps +-------------------------------------- + +1. To build the PBL boot image for P4080DS: + make P4080DS_RAMBOOT_PBL + The default image is u-boot.pbl. + +2. Command below provided a way to re-build the PBL boot image if the +configuration file needes to be modified while the u-boot.bin does not +need to be re-build. + +Command syntax: +-------------- +./tools/mkimage -n <board specific configuration file> \ + -T pblimage -d <input_raw_binary> <output_pblboot_file> + +for ex. +./tools/mkimage -n ./board/freescale/corenet_ds/pblimage.cfg \ + -T pblimage -d u-boot.bin u-boot.pbl + + +3. pblimage support available with mkimage utility will generate Freescale PBL +boot image that can be flashed on the board eSPI flash. After flashed the +image u-boot.pbl, Change SW1[2] = off, then power on, board will boot from +eSPI flash. + +Board specific configuration file specifications: +------------------------------------------------ +1. This file must present in the $(BOARDDIR) and the name should be + pblimage.cfg (since this is used in Makefile) +2. This file can have empty lines and lines starting with "#" as first + character to put comments + +Typical example of pblimage.cfg file: +----------------------------------- + +#PBL preamble and RCW header +aa55aa55 010e0100 +#64 bytes RCW data +4c580000 00000000 18185218 0000cccc +40464000 3c3c2000 58000000 61000000 +00000000 00000000 00000000 008b6000 +00000000 00000000 00000000 00000000 + +#PBI commands +#Initialize CPC1 +09010000 00200400 +09138000 00000000 +091380c0 00000100 +09010100 00000000 +09010104 fff0000b +09010f00 08000000 +09010000 80000000 +#Configure LAW for CPC1 +09000d00 00000000 +09000d04 fff00000 +09000d08 81000013 +09000010 00000000 +09000014 ff000000 +09000018 81000000 +#Initialize eSPI controller +09110000 80000403 +09110020 2d170008 +09110024 00100008 +09110028 00100008 +0911002c 00100008 +#Flush PBL data +09138000 00000000 +091380c0 00000000 + +------------------------------------------------ +Author: Shaohui Xie<b21989(a)freescale.com> diff --git a/include/image.h b/include/image.h index 005e0d2..56b849e 100644 --- a/include/image.h +++ b/include/image.h @@ -157,6 +157,7 @@ #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ #define IH_TYPE_KWBIMAGE 9 /* Kirkwood Boot Image */ #define IH_TYPE_IMXIMAGE 10 /* Freescale IMXBoot Image */ +#define IH_TYPE_PBLIMAGE 11 /* Freescale PBLBoot Image */ /* * Compression Types diff --git a/tools/Makefile b/tools/Makefile index 623f908..c068bc0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -83,6 +83,7 @@ OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o NOPED_OBJ_FILES-y += kwbimage.o +NOPED_OBJ_FILES-y += pblimage.o NOPED_OBJ_FILES-y += imximage.o NOPED_OBJ_FILES-y += mkimage.o OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o @@ -181,6 +182,7 @@ $(obj)mkimage$(SFX): $(obj)crc32.o \ $(obj)image.o \ $(obj)imximage.o \ $(obj)kwbimage.o \ + $(obj)pblimage.o \ $(obj)md5.o \ $(obj)mkimage.o \ $(obj)os_support.o \ diff --git a/tools/mkimage.c b/tools/mkimage.c index f5859d7..a3e793a 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -149,6 +149,8 @@ main (int argc, char **argv) int retval = 0; struct image_type_params *tparams = NULL; + /* Init Freescale PBL Boot image generation/list support */ + init_pbl_image_type(); /* Init Kirkwood Boot image generation/list support */ init_kwb_image_type (); /* Init Freescale imx Boot image generation/list support */ @@ -421,6 +423,9 @@ NXTARG: ; break; } } + } else if (params.type == IH_TYPE_PBLIMAGE) { + /* the copy_file need to be re-write for PBL. */ + pbl_load_uboot(ifd, &params); } else { copy_file (ifd, params.datafile, 0); } diff --git a/tools/mkimage.h b/tools/mkimage.h index 9033a7d..597dcaf 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -139,6 +139,8 @@ void mkimage_register (struct image_type_params *tparams); * * Supported image types init functions */ +void pbl_load_uboot(int, struct mkimage_params *); +void init_pbl_image_type(void); void init_kwb_image_type (void); void init_imx_image_type (void); void init_default_image_type (void); diff --git a/tools/pblimage.c b/tools/pblimage.c new file mode 100644 index 0000000..d0c29a6 --- /dev/null +++ b/tools/pblimage.c @@ -0,0 +1,329 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ +#define _GNU_SOURCE + +#include "mkimage.h" +#include <image.h> +#include "pblimage.h" + +/* + * PBL can load 64 bytes each time in MAX, so the u-boot need to be splited into + * pieces of 64 bytes, PBL needs a command for each piece, the command looks + * like 81xxxxxx, the "xxxxxx" is offset, it starts from F80000 in our case. + */ +static unsigned int uboot_label = 0x81F80000; +/* + * need to store all bytes in memory for calculating crc32, then write the + * bytes to image file for PBL boot. + */ +static unsigned char mem_buf[600000]; +static unsigned char *pmem_buf = mem_buf; +static int mem_byte_cnt; +static char *fname = "Unknown"; +static int lineno = -1; +static struct pbl_header pblimage_header; + +static union +{ + char c[4]; + unsigned char l; +} endian_test = { {'l', '?', '?', 'b'} }; + +#define ENDIANNESS ((char)endian_test.l) + +static void generate_pbl_cmd(void) +{ + unsigned int val = uboot_label; + uboot_label += 0x40; + int i; + + for (i = 3; i >= 0; i--) { + *pmem_buf++ = (val >> (i * 8)) & 0xff; + mem_byte_cnt++; + } +} + +static void pbl_fget(size_t size, FILE *stream) +{ + unsigned char c; + while (size) { + c = (unsigned char)fgetc(stream); + *pmem_buf++ = c; + mem_byte_cnt++; + size--; + } +} + +/* load splited u-boot with PBI command 81xxxxxx. */ +static void load_uboot(FILE *fp_uboot) +{ + while (uboot_label < 0x82000000) { + generate_pbl_cmd(); + pbl_fget(64, fp_uboot); + } +} + +static void check_get_hexval(char *token) +{ + uint32_t hexval; + int i; + + if (!sscanf(token, "%x", &hexval)) { + printf("Error:%s[%d] - Invalid hex data(%s)\n", fname, + lineno, token); + exit(EXIT_FAILURE); + } + for (i = 3; i >= 0; i--) { + *pmem_buf++ = (hexval >> (i * 8)) & 0xff; + mem_byte_cnt++; + } +} + +static void pbl_parser(char *name) +{ + FILE *fd = NULL; + char *line = NULL; + char *token, *saveptr1, *saveptr2; + size_t len = 0; + + fname = name; + fd = fopen(name, "r"); + if (fd == NULL) { + printf("Error:%s - Can't open\n", fname); + exit(EXIT_FAILURE); + } + + while ((getline(&line, &len, fd)) > 0) { + lineno++; + token = strtok_r(line, "\r\n", &saveptr1); + /* drop all lines with zero tokens (= empty lines) */ + if (token == NULL) + continue; + for (line = token;; line = NULL) { + token = strtok_r(line, " \t", &saveptr2); + if (token == NULL) + break; + /* Drop all text starting with '#' as comments */ + if (token[0] == '#') + break; + check_get_hexval(token); + } + } + if (line) + free(line); + fclose(fd); +} + +static uint32_t crc_table[256]; + +static void make_crc_table(void) +{ + uint32_t mask; + int i, j; + uint32_t poly; /* polynomial exclusive-or pattern */ + + /* + * the polynomial used by PBL is 1 + x1 + x2 + x4 + x5 + x7 + x8 + x10 + * + x11 + x12 + x16 + x22 + x23 + x26 + x32. + */ + poly = 0x04c11db7; + + for (i = 0; i < 256; i++) { + mask = i << 24; + for (j = 0; j < 8; j++) { + if (mask & 0x80000000) + mask = (mask << 1) ^ poly; + else + mask <<= 1; + } + crc_table[i] = mask; + } +} + +unsigned long pbl_crc32(unsigned long crc, const char *buf, unsigned int len) +{ + unsigned int crc32_val = 0xffffffff; + unsigned int xor = 0x0; + int i; + + make_crc_table(); + + for (i = 0; i < len; i++) + crc32_val = (crc32_val << 8) ^ + crc_table[(crc32_val >> 24) ^ (*buf++ & 0xff)]; + + crc32_val = crc32_val ^ xor; + if (crc32_val < 0) { + crc32_val += 0xffffffff; + crc32_val += 1; + } + return crc32_val; +} + +static unsigned int reverse_byte(unsigned int val) +{ + unsigned int temp; + unsigned char *p1; + int j; + + temp = val; + p1 = (unsigned char *)&temp; + for (j = 3; j >= 0; j--) + *p1++ = (val >> (j * 8)) & 0xff; + return temp; +} + +/* write end command and crc command to memory. */ +static void add_end_cmd(void) +{ + unsigned int pbl_end_cmd[4] = {0x09138000, 0x00000000, + 0x091380c0, 0x00000000}; + unsigned int crc32_pbl; + int i; + unsigned char *p = (unsigned char *)&pbl_end_cmd; + + if (ENDIANNESS == 'l') { + for (i = 0; i < 4; i++) + pbl_end_cmd[i] = reverse_byte(pbl_end_cmd[i]); + } + + for (i = 0; i < 16; i++) { + *pmem_buf++ = *p++; + mem_byte_cnt++; + } + + /* Add PBI CRC command. */ + *pmem_buf++ = 0x08; + *pmem_buf++ = 0x13; + *pmem_buf++ = 0x80; + *pmem_buf++ = 0x40; + mem_byte_cnt += 4; + + /* calculated CRC32 and write it to memory. */ + crc32_pbl = pbl_crc32(0, (const char *)mem_buf, mem_byte_cnt); + *pmem_buf++ = (crc32_pbl >> 24) & 0xff; + *pmem_buf++ = (crc32_pbl >> 16) & 0xff; + *pmem_buf++ = (crc32_pbl >> 8) & 0xff; + *pmem_buf++ = (crc32_pbl) & 0xff; + mem_byte_cnt += 4; + + if (((mem_byte_cnt) % 16) != 0) { + for (i = 0; i < 8; i++) { + *pmem_buf++ = 0x0; + mem_byte_cnt++; + } + } + if ((mem_byte_cnt % 16 != 0)) { + printf("Error: Bad size of image file\n"); + exit(EXIT_FAILURE); + } + +} + +void pbl_load_uboot(int ifd, struct mkimage_params *params) +{ + FILE *fp_uboot; + int size; + + /* parse the pblimage.cfg file. */ + pbl_parser(params->imagename); + + fp_uboot = fopen(params->datafile, "r"); + if (fp_uboot == NULL) { + printf("Error: %s open failed\n", params->datafile); + exit(EXIT_FAILURE); + } + + load_uboot(fp_uboot); + add_end_cmd(); + fclose(fp_uboot); + lseek(ifd, 0, SEEK_SET); + + size = mem_byte_cnt; + if (write(ifd, (const void *)&mem_buf, size) != size) { + fprintf(stderr, "Write error on %s: %s\n", + params->imagefile, strerror(errno)); + exit(EXIT_FAILURE); + } +} + +static int pblimage_check_image_types(uint8_t type) +{ + if (type == IH_TYPE_PBLIMAGE) + return EXIT_SUCCESS; + else + return EXIT_FAILURE; +} + +static int pblimage_verify_header(unsigned char *ptr, int image_size, + struct mkimage_params *params) +{ + + struct pbl_header *pbl_hdr = (struct pbl_header *) ptr; + + /* Only a few checks can be done: search for magic numbers */ + if (ENDIANNESS == 'l') { + if (pbl_hdr->preamble != reverse_byte(RCW_PREAMBLE)) + return -FDT_ERR_BADSTRUCTURE; + + if (pbl_hdr->rcwheader != reverse_byte(RCW_HEADER)) + return -FDT_ERR_BADSTRUCTURE; + } else { + if (pbl_hdr->preamble != RCW_PREAMBLE) + return -FDT_ERR_BADSTRUCTURE; + + if (pbl_hdr->rcwheader != RCW_HEADER) + return -FDT_ERR_BADSTRUCTURE; + } + + return 0; +} + +static void pblimage_print_header(const void *ptr) +{ + printf("Image Type: Freescale pbl Boot Image\n"); +} + +static void pblimage_set_header(void *ptr, struct stat *sbuf, int ifd, + struct mkimage_params *params) +{ + /*nothing need to do, pbl_load_uboot takes care of whole file. */ +} + +/* + * pblimage parameters + */ +static struct image_type_params pblimage_params = { + .name = "Freescale PBL Boot Image support", + .header_size = sizeof(struct pbl_header), + .hdr = (void *)&pblimage_header, + .check_image_type = pblimage_check_image_types, + .verify_header = pblimage_verify_header, + .print_header = pblimage_print_header, + .set_header = pblimage_set_header, +}; + +void init_pbl_image_type(void) +{ + mem_byte_cnt = 0; + mkimage_register(&pblimage_params); +} diff --git a/tools/pblimage.h b/tools/pblimage.h new file mode 100644 index 0000000..887d4c9 --- /dev/null +++ b/tools/pblimage.h @@ -0,0 +1,36 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _PBLIMAGE_H_ +#define _PBLIMAGE_H_ + +#define RCW_BYTES 64 +#define RCW_PREAMBLE 0xaa55aa55 +#define RCW_HEADER 0x010e0100 + +struct pbl_header { + uint32_t preamble; + uint32_t rcwheader; + uint8_t rcw_data[RCW_BYTES]; +}; + +#endif /* _PBLIMAGE_H_ */ -- 1.6.4

3 2