August 2007 - U-Boot

[U-Boot-Users] [PATCH] fdt, mpc5xxx: Adapt MPC5xxx to use libfdt in ft_cpu_setup()
by Bartlomiej Sieka 30 Aug '07

30 Aug '07

Signed-off-by: Grzegorz Bernacki <gjb(a)semihalf.com> --- Not sure where this should be merged, it was applied to u-boot-fdt#fdt (as of 01f771763ed822145b54819abb9c4516c8216d48) merged with the master (as of cc3023b9f95d7ac959a764471a65001062aecf41). Tested on two MPC5200B-based boards, one using CONFIG_OF_LIBFDT, the other using CONFIG_OF_FLAT_TREE. diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index 1eac2bb..c4484ef 100644 --- a/cpu/mpc5xxx/cpu.c +++ b/cpu/mpc5xxx/cpu.c @@ -33,6 +33,9 @@ #if defined(CONFIG_OF_FLAT_TREE) #include <ft_build.h> +#elif defined(CONFIG_OF_LIBFDT) +#include <libfdt.h> +#include <libfdt_env.h> #endif DECLARE_GLOBAL_DATA_PTR; @@ -109,9 +112,125 @@ unsigned long get_tbclk (void) return (tbclk); } +#if defined(CONFIG_OF_LIBFDT) +/* + * "Setter" functions used to add/modify FDT entries. + */ +static int fdt_set_tbfreq(void *fdt, int nodeoffset, const char *name, bd_t *bd) +{ + u32 tmp; + /* + * Create or update the property. + */ + tmp = cpu_to_be32(OF_TBCLK); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +static int fdt_set_busfreq(void *fdt, int nodeoffset, const char *name, + bd_t *bd) +{ + u32 tmp; + /* + * Create or update the property. + */ + tmp = cpu_to_be32(bd->bi_busfreq); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +static int fdt_set_clockfreq(void *fdt, int nodeoffset, const char *name, + bd_t *bd) +{ + u32 tmp; + /* + * Create or update the property. + */ + tmp = cpu_to_be32(bd->bi_intfreq); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +static int fdt_set_ipbusfreq(void *fdt, int nodeoffset, const char *name, + bd_t *bd) +{ + u32 tmp; + /* + * Create or update the property. + */ + tmp = cpu_to_be32(bd->bi_ipbfreq); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +static int fdt_set_macaddress(void *fdt, int nodeoffset, const char *name, + bd_t *bd) +{ + /* + * Fix it up if it exists, don't create it if it doesn't exist. + */ + if (fdt_get_property(fdt, nodeoffset, name, 0)) { + return fdt_setprop(fdt, nodeoffset, name, bd->bi_enetaddr, 6); + } + return 0; +} + /* ------------------------------------------------------------------------- */ +/* + * Fixups to the fdt. + */ +static const struct { + char *node; + char *prop; + int (*set_fn)(void *fdt, int nodeoffset, const char *name, bd_t *bd); +} fixup_props[] = { + { "/cpus/" OF_CPU, + "timebase-frequency", + fdt_set_tbfreq + }, + { "/cpus/" OF_CPU, + "bus-frequency", + fdt_set_busfreq + }, + { "/cpus/" OF_CPU, + "clock-frequency", + fdt_set_clockfreq + }, + { "/" OF_SOC, + "bus-frequency", + fdt_set_ipbusfreq + }, + { "/" OF_SOC "/ethernet@3000", + "mac-address", + fdt_set_macaddress + }, + { "/" OF_SOC "/ethernet@3000", + "local-mac-address", + fdt_set_macaddress + } +}; -#ifdef CONFIG_OF_FLAT_TREE +void +ft_cpu_setup(void *blob, bd_t *bd) +{ + int nodeoffset; + int err; + int j; + + for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) { + nodeoffset = fdt_find_node_by_path(blob, fixup_props[j].node); + if (nodeoffset >= 0) { + err = fixup_props[j].set_fn(blob, nodeoffset, + fixup_props[j].prop, bd); + if (err < 0) + printf("Problem setting %s = %s: %s\n", + fixup_props[j].node, + fixup_props[j].prop, + fdt_strerror(err)); + } else { + printf("Couldn't find %s: %s\n", + fixup_props[j].node, + fdt_strerror(nodeoffset)); + } + } +} +#elif defined(CONFIG_OF_FLAT_TREE) void ft_cpu_setup(void *blob, bd_t *bd) { @@ -132,8 +251,9 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); - p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/local-mac-address", &len); + p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/local-mac-address", + &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); } -#endif +#endif /* defined(CONFIG_OF_LIBFDT) */

8 19

[U-Boot-Users] newbies to u-boot
by Bhagwat 30 Aug '07

30 Aug '07

Hi, can Anyone point me to u-boot startup documentation. I am newbie to u-boot, infact new to bootloaders. I am using ARM7 core. regards. Bhagwat

4 3

[U-Boot-Users] [PATCH] Support LBA48 MODE
by Chen Gong 30 Aug '07

30 Aug '07

This patch add a new SCSI command READ16 to support LBA48 mode. But it is not complete because only 32bit not 48bit can be supported. Now it can read correct capacity and boot from a big hard disk( >137G & <2T) Signed-off-by: Chen Gong <g.chen(a)freescale.com> --- common/cmd_scsi.c | 31 +++++++++- drivers/ahci.c | 132 +++++++++++++++++++++++++++++++++++----- include/ata.h | 1 + include/configs/MPC8641HPCN.h | 1 + include/scsi.h | 1 + 5 files changed, 148 insertions(+), 18 deletions(-) diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 00b84fa..49ae5c7 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -31,6 +31,7 @@ #include <command.h> #include <asm/processor.h> #include <scsi.h> +#include <ata.h> #include <image.h> #include <pci.h> @@ -70,6 +71,8 @@ void scsi_setup_test_unit_ready(ccb * pccb); void scsi_setup_read_capacity(ccb * pccb); void scsi_setup_read6(ccb * pccb, unsigned long start, unsigned short blocks); void scsi_setup_read_ext(ccb * pccb, unsigned long start, unsigned short blocks); +void scsi_setup_read16_ext(ccb * pccb, unsigned long start, + unsigned short blocks); void scsi_setup_inquiry(ccb * pccb); void scsi_ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len); @@ -539,6 +542,33 @@ void scsi_setup_read_capacity(ccb * pccb) } +/* FIXME: only support 32bit address, not 48bit */ +void scsi_setup_read16_ext(ccb * pccb, unsigned long start, + unsigned short blocks) +{ + pccb->cmd[0] = SCSI_READ16; + pccb->cmd[1] = pccb->lun<<5; + pccb->cmd[2] = 0; + pccb->cmd[3] = 0; + pccb->cmd[4] = 0; + pccb->cmd[5] = 0; + pccb->cmd[6] = ((unsigned char) (start>>24))&0xff; + pccb->cmd[7] = ((unsigned char) (start>>16))&0xff; + pccb->cmd[8] = ((unsigned char) (start>>8))&0xff; + pccb->cmd[9] = ((unsigned char) (start))&0xff; + pccb->cmd[10] = 0; + pccb->cmd[11] = 0; + pccb->cmd[12] = ((unsigned char) (blocks>>8))&0xff; + pccb->cmd[13] = (unsigned char) blocks & 0xff; + pccb->cmdlen = 16; + pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */ + debug ("scsi_setup_read16_ext: cmd: %02X %02X startblk " + "%02X%02X%02X%02X blccnt %02X%02X\n", + pccb->cmd[0], pccb->cmd[1], + pccb->cmd[6], pccb->cmd[7], pccb->cmd[8], pccb->cmd[9], + pccb->cmd[12], pccb->cmd[13]); +} + void scsi_setup_read_ext(ccb * pccb, unsigned long start, unsigned short blocks) { pccb->cmd[0]=SCSI_READ10; @@ -550,7 +580,6 @@ void scsi_setup_read_ext(ccb * pccb, unsigned long start, unsigned short blocks) pccb->cmd[6]=0; pccb->cmd[7]=((unsigned char) (blocks>>8))&0xff; pccb->cmd[8]=(unsigned char) blocks & 0xff; - pccb->cmd[6]=0; pccb->cmdlen=10; pccb->msgout[0]=SCSI_IDENTIFY; /* NOT USED */ debug ("scsi_setup_read_ext: cmd: %02X %02X startblk %02X%02X%02X%02X blccnt %02X%02X\n", diff --git a/drivers/ahci.c b/drivers/ahci.c index 38f7c40..f951dea 100644 --- a/drivers/ahci.c +++ b/drivers/ahci.c @@ -39,11 +39,23 @@ #include <linux/ctype.h> #include <ahci.h> +#define COMMANDSET2_LBA48 (1 << 10) + struct ahci_probe_ent *probe_ent = NULL; hd_driveid_t *ataid[AHCI_MAX_PORTS]; #define writel_with_flush(a,b) do { writel(a,b); readl(b); } while (0) +void swap_buf_le16(u16 *buf, unsigned int buf_words) +{ +#ifdef __BIG_ENDIAN + unsigned int i; + + for (i = 0; i < buf_words; i++) + buf[i] = le16_to_cpu(buf[i]); +#endif /* __BIG_ENDIAN */ +} + static inline u32 ahci_port_base(u32 base, u32 port) { @@ -238,6 +250,7 @@ static void ahci_print_info(struct ahci_probe_ent *probe_ent) "%s%s%s%s%s%s%s\n", cap & (1 << 31) ? "64bit " : "", cap & (1 << 30) ? "ncq " : "", + cap & (1 << 29) ? "sntf " : "", cap & (1 << 28) ? "ilck " : "", cap & (1 << 27) ? "stag " : "", cap & (1 << 26) ? "pm " : "", @@ -537,6 +550,7 @@ static int ata_scsiop_inquiry(ccb *pccb) debug("scsi_ahci: SCSI inquiry command failure.\n"); return -EIO; } + swap_buf_le16(tmpid, 256); if (ataid[port]) free(ataid[port]); @@ -575,20 +589,41 @@ static int ata_scsiop_read10(ccb * pccb) return 0; memset(fis, 0, 20); - /* Construct the FIS */ - fis[0] = 0x27; /* Host to device FIS. */ - fis[1] = 1 << 7; /* Command FIS. */ - fis[2] = ATA_CMD_RD_DMA; /* Command byte. */ - - /* LBA address, only support LBA28 in this driver */ - fis[4] = pccb->cmd[5]; - fis[5] = pccb->cmd[4]; - fis[6] = pccb->cmd[3]; - fis[7] = (pccb->cmd[2] & 0x0f) | 0xe0; - - /* Sector Count */ - fis[12] = pccb->cmd[8]; - fis[13] = pccb->cmd[7]; + if (lba & 0xF0000000) { + /* Construct the FIS */ + fis[0] = 0x27; /* Host to device FIS. */ + fis[1] = 1 << 7; /* Command FIS. */ + fis[2] = ATA_CMD_RD_DMAX; /* Command type. */ + fis[3] = len & 0xff; + fis[11] = (len >> 8) & 0xff; + + /* LBA48 address */ + fis[4] = pccb->cmd[5]; + fis[5] = pccb->cmd[4]; + fis[6] = pccb->cmd[3]; + fis[8] = pccb->cmd[2]; + + fis[7] = 3 << 6; + + /* Sector Count */ + fis[12] = pccb->cmd[8]; + fis[13] = pccb->cmd[7]; + } else { + /* Construct the FIS */ + fis[0] = 0x27; /* Host to device FIS. */ + fis[1] = 1 << 7; /* Command FIS. */ + fis[2] = ATA_CMD_RD_DMA; /* Command type. */ + + /* LBA28 address */ + fis[4] = pccb->cmd[5]; + fis[5] = pccb->cmd[4]; + fis[6] = pccb->cmd[3]; + fis[7] = (pccb->cmd[2] & 0x0f) | 0xe0; + + /* Sector Count */ + fis[12] = pccb->cmd[8]; + fis[13] = pccb->cmd[7]; + } /* Read from ahci */ if (get_ahci_device_data(pccb->target, (u8 *) & fis, 20, @@ -617,8 +652,14 @@ static int ata_scsiop_read_capacity10(ccb *pccb) memset(buf, 0, 8); - *(u32 *) buf = le32_to_cpu(ataid[pccb->target]->lba_capacity); - + if ((ataid[pccb->target]->command_set_2 & COMMANDSET2_LBA48)) { + ((u16 *)buf)[0] = ataid[pccb->target]->lba48_capacity[1]; + ((u16 *)buf)[1] = ataid[pccb->target]->lba48_capacity[0]; + } else { + ((u16 *)buf)[0] = ataid[pccb->target]->lba_capacity & 0xffff; + ((u16 *)buf)[1] = + (ataid[pccb->target]->lba_capacity >> 16) & 0xffff; + } buf[6] = 512 >> 8; buf[7] = 512 & 0xff; @@ -627,6 +668,60 @@ static int ata_scsiop_read_capacity10(ccb *pccb) return 0; } +/* + * SCSI READ16 command operation. + */ +static int ata_scsiop_read16(ccb * pccb) +{ + u32 len = 0; + u8 fis[20]; + + len |= ((u32)pccb->cmd[10]) << 24; + len |= ((u32)pccb->cmd[11]) << 16; + len |= ((u32)pccb->cmd[12]) << 8; + len |= ((u32)pccb->cmd[13]); + + /* For 10-byte and 16-byte SCSI R/W commands, transfer + * length 0 means transfer 0 block of data. + * However, for ATA R/W commands, sector count 0 means + * 256 or 65536 sectors, not 0 sectors as in SCSI. + * + * WARNING: one or two older ATA drives treat 0 as 0... + */ + if (!len) + return 0; + memset(fis, 0, 20); + + /* Construct the FIS */ + fis[0] = 0x27; /* Host to device FIS. */ + fis[1] = 1 << 7; /* Command FIS. */ + fis[2] = ATA_CMD_RD_DMAX; /* Command type. */ + fis[3] = len & 0xff; + fis[11] = (len >> 8) & 0xff; + + /* LBA48 address */ + fis[4] = pccb->cmd[9]; + fis[5] = pccb->cmd[8]; + fis[6] = pccb->cmd[7]; + fis[8] = pccb->cmd[6]; + + fis[10] = pccb->cmd[3]; + fis[7] = 3 << 6; + + /* Sector Count */ + fis[12] = pccb->cmd[13]; + fis[13] = pccb->cmd[12]; + + /* Read from ahci */ + if (get_ahci_device_data(pccb->target, (u8 *) & fis, 20, + pccb->pdata, pccb->datalen)) { + debug("scsi_ahci: SCSI READ16 command failure.\n"); + return -EIO; + } + + return 0; +} + /* * SCSI TEST UNIT READY command operation. @@ -645,6 +740,9 @@ int scsi_exec(ccb *pccb) case SCSI_READ10: ret = ata_scsiop_read10(pccb); break; + case SCSI_READ16: + ret = ata_scsiop_read16(pccb); + break; case SCSI_RD_CAPAC: ret = ata_scsiop_read_capacity10(pccb); break; @@ -655,7 +753,7 @@ int scsi_exec(ccb *pccb) ret = ata_scsiop_inquiry(pccb); break; default: - printf("Unsupport SCSI command 0x%02x\n", pccb->cmd[0]); + printf("Unsupported SCSI command 0x%02x\n", pccb->cmd[0]); return FALSE; } diff --git a/include/ata.h b/include/ata.h index 8584226..4973020 100644 --- a/include/ata.h +++ b/include/ata.h @@ -99,6 +99,7 @@ #define ATA_CMD_WR_MULT 0xC5 /* Write Multiple */ #define ATA_CMD_SETMULT 0xC6 /* Set Multiple Mode */ #define ATA_CMD_RD_DMA 0xC8 /* Read DMA (with retries) */ +#define ATA_CMD_RD_DMAX 0x25 /* Read DMA EXT (with retries) */ #define ATA_CMD_RD_DMAN 0xC9 /* Read DMS ( no retries) */ #define ATA_CMD_WR_DMA 0xCA /* Write DMA (with retries) */ #define ATA_CMD_WR_DMAN 0xCB /* Write DMA ( no retires) */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 94f1428..5b69d60 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -384,6 +384,7 @@ #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI +#define CONFIG_LBA48 #define CONFIG_SATA_ULI5288 #define CFG_SCSI_MAX_SCSI_ID 4 #define CFG_SCSI_MAX_LUN 1 diff --git a/include/scsi.h b/include/scsi.h index 2be4d40..28382f6 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -147,6 +147,7 @@ typedef struct SCSI_cmd_block{ #define SCSI_MED_REMOVL 0x1E /* Prevent/Allow medium Removal (O) */ #define SCSI_READ6 0x08 /* Read 6-byte (MANDATORY) */ #define SCSI_READ10 0x28 /* Read 10-byte (MANDATORY) */ +#define SCSI_READ16 0x88 /* Read 16-byte (MANDATORY) */ #define SCSI_RD_CAPAC 0x25 /* Read Capacity (MANDATORY) */ #define SCSI_RD_DEFECT 0x37 /* Read Defect Data (O) */ #define SCSI_READ_LONG 0x3E /* Read Long (O) */ -- 1.5.2

1 0

[U-Boot-Users] [PATCH4] microblaze -Support time without timer
by Michal Simek 30 Aug '07

30 Aug '07

Desc: Support time without timer Signed-off-by: Michal Simek <monstr(a)monstr.eu> diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c index ab1cb12..b350453 100644 --- a/cpu/microblaze/timer.c +++ b/cpu/microblaze/timer.c @@ -33,10 +33,17 @@ void reset_timer (void) timestamp = 0; } +#ifdef CFG_TIMER_0 ulong get_timer (ulong base) { return (timestamp - base); } +#else +ulong get_timer (ulong base) +{ + return (timestamp++ - base); +} +#endif void set_timer (ulong t) { diff --git a/lib_microblaze/time.c b/lib_microblaze/time.c index 3fa1b11..0fef834 100644 --- a/lib_microblaze/time.c +++ b/lib_microblaze/time.c @@ -26,9 +26,17 @@ #include <common.h> +#ifdef CFG_TIMER_0 void udelay (unsigned long usec) { int i; i = get_timer (0); while ((get_timer (0) - i) < (usec / 1000)) ; } +#else +void udelay (unsigned long usec) +{ + unsigned int i; + for (i = 0; i < (usec * XILINX_CLOCK_FREQ / 10000000); i++); +} +#endif

1 0

[U-Boot-Users] [PATCH3] microblaze - Remove problem with disabled BARREL SHIFTER
by Michal Simek 30 Aug '07

30 Aug '07

Desc: Remove problem with disabled BARREL SHIFTER Signed-off-by: Michal Simek <monstr(a)monstr.eu> diff --git a/cpu/microblaze/start.S b/cpu/microblaze/start.S index 3c027ff..8740284 100644 --- a/cpu/microblaze/start.S +++ b/cpu/microblaze/start.S @@ -33,15 +33,13 @@ _start: addi r1, r0, CFG_INIT_SP_OFFSET addi r1, r1, -4 /* Decrement SP to top of memory */ /* add opcode instruction for 32bit jump - 2 instruction imm & brai*/ - addi r6, r0, 0xb000 /* hex b000 opcode imm */ - bslli r6, r6, 16 /* shift */ + addi r6, r0, 0xb0000000 /* hex b000 opcode imm */ swi r6, r0, 0x0 /* reset address */ swi r6, r0, 0x8 /* user vector exception */ swi r6, r0, 0x10 /* interrupt */ swi r6, r0, 0x20 /* hardware exception */ - addi r6, r0, 0xb808 /* hew b808 opcode brai*/ - bslli r6, r6, 16 + addi r6, r0, 0xb8080000 /* hew b808 opcode brai*/ swi r6, r0, 0x4 /* reset address */ swi r6, r0, 0xC /* user vector exception */ swi r6, r0, 0x14 /* interrupt */

1 0

[U-Boot-Users] [PATCH2] microblaze - email reparation
by Michal Simek 30 Aug '07

30 Aug '07

Desc: email reparation Signed-off-by: Michal Simek <monstr(a)monstr.eu> diff --git a/cpu/microblaze/cache.c b/cpu/microblaze/cache.c index 6ce0b55..4b7866f 100644 --- a/cpu/microblaze/cache.c +++ b/cpu/microblaze/cache.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2007 Michal Simek * - * Michal SIMEK <moonstr(a)monstr.eu> + * Michal SIMEK <monstr(a)monstr.eu> * * See file CREDITS for list of people who contributed to this * project.

1 0

[U-Boot-Users] [PATCH] Fix MPC8544DS PCIe3 scsi.
by Ed Swarthout 30 Aug '07

30 Aug '07

From: Ed Swarthout <ed.swarthout(a)freescale.com> Increase PCIe 3 Memory region to 8M to fix scsi invalid port number: SCSI: scanning bus for devices... Invaild port number 1 Invaild port number 2 Invaild port number 3 Signed-off-by: Ed Swarthout <ed.swarthout(a)freescale.com> --- d64ee908 reduced PCIe 3 region by too much. With this fix I get 0xb010c000 assigned to bar5. board/freescale/mpc8544ds/init.S | 2 +- include/configs/MPC8544DS.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/mpc8544ds/init.S b/board/freescale/mpc8544ds/init.S index 900c368..ca1b5d5 100644 --- a/board/freescale/mpc8544ds/init.S +++ b/board/freescale/mpc8544ds/init.S @@ -237,6 +237,6 @@ law_entry: /* contains both PCIE3 MEM & IO space */ .long (CFG_PCIE3_MEM_PHYS>>12) & 0xfffff - .long LAWAR_EN | LAWAR_TRGT_PCIE3 | (LAWAR_SIZE & LAWAR_SIZE_2M) + .long LAWAR_EN | LAWAR_TRGT_PCIE3 | (LAWAR_SIZE & LAWAR_SIZE_16M) 4: entry_end diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 746f360..ba5aa00 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -308,9 +308,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* controller 3, direct to uli, tgtid 3, Base address b000 */ #define CFG_PCIE3_MEM_BASE 0xb0000000 #define CFG_PCIE3_MEM_PHYS CFG_PCIE3_MEM_BASE -#define CFG_PCIE3_MEM_SIZE 0x00100000 /* 1M */ +#define CFG_PCIE3_MEM_SIZE 0x00800000 /* 8M of 16M LAW */ #define CFG_PCIE3_IO_BASE 0x00000000 -#define CFG_PCIE3_IO_PHYS 0xb0100000 /* reuse mem LAW */ +#define CFG_PCIE3_IO_PHYS 0xb0800000 /* reuse mem LAW */ #define CFG_PCIE3_IO_SIZE 0x00100000 /* 1M */ #if defined(CONFIG_PCI) -- 1.5.3.rc5.18.ga85e4

6 12

[U-Boot-Users] [PATCH] tftp: don't implicity trust the format of recevied packets
by Grant Likely 30 Aug '07

30 Aug '07

From: Grant Likely <grant.likely(a)secretlab.ca> The TFTP OACK code trusts that the incoming packet is formated as ASCII text and can be processed by string functions. It also as a loop limit overflow bug where if the packet length is less than 8, it ends up looping over *all* of memory to find the 'blksize' string. This patch solves the problem by forcing the packet to be null terminated and using strstr() to search for the sub string. Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca> --- net/tftp.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/tftp.c b/net/tftp.c index fb2f505..27f5e88 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -238,9 +238,9 @@ TftpSend (void) static void TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) { + char * blksize; ushort proto; ushort *s; - int i; if (dest != TftpOurPort) { #ifdef CONFIG_MCAST_TFTP @@ -272,22 +272,22 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len) case TFTP_OACK: #ifdef ET_DEBUG - printf("Got OACK: %s %s\n", pkt, pkt+strlen(pkt)+1); + printf("Got OACK:\n"); + print_buffer (0, pkt, 1, len, 16); #endif TftpState = STATE_OACK; TftpServerPort = src; + /* Check for 'blksize' option */ - for (i=0;i<len-8;i++) { - if (strcmp ((char*)pkt+i,"blksize") == 0) { - TftpBlkSize = (unsigned short) - simple_strtoul((char*)pkt+i+8,NULL,10); + pkt[len] = 0; /* NULL terminate so string ops work */ + blksize = strstr((char*)pkt, "blksize"); + if ((blksize) && (blksize + 8 < (char*)pkt + len)) { + TftpBlkSize = simple_strtoul(blksize + 8, NULL, 10); #ifdef ET_DEBUG - printf ("Blocksize ack: %s, %d\n", - (char*)pkt+i+8,TftpBlkSize); + printf("Blocksize ack: %d\n", TftpBlkSize); #endif - break; - } } + #ifdef CONFIG_MCAST_TFTP parse_multicast_oack((char *)pkt,len-1); if ((Multicast) && (!MasterClient))

2 1

[U-Boot-Users] [GIT PULL] Please pull 85xx tree
by Andy Fleming 29 Aug '07

29 Aug '07

The following changes since commit 94c47fdaf14cb29fa3fb4d4da2efdd96c803b46b: Jason Jin (1): Remove the bios emulator binary files from MAI board are found in the git repository at: git://www.denx.de/git/u-boot-mpc85xx.git Ed Swarthout (1): 8548cds fixes Haiying Wang (1): Enable L2 cache for MPC8568MDS board Kumar Gala (1): Fix MPC8544DS PCIe3 scsi. board/cds/mpc8548cds/mpc8548cds.c | 14 +++++++++++--- cpu/mpc85xx/cpu_init.c | 2 +- drivers/fsl_pci_init.c | 4 +++- include/configs/MPC8548CDS.h | 15 ++++++--------- include/configs/MPC8568MDS.h | 6 +++--- 5 files changed, 24 insertions(+), 17 deletions(-)

3 2

[U-Boot-Users] [PATCH] sbc8641: remove unused OF_FLAT_TREE_MAX_SIZE
by Kim Phillips 29 Aug '07

29 Aug '07

this had slipped through the cracks, since the sbc board was added after I wrote the original patch to remove all these symbols, and before it was merged. Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- Due to its triviality, I'm assuming WD can pick this straight up, otherwise I'll bring it to jdl's attention. include/configs/sbc8641d.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 3525ab4..54eac38 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -270,9 +270,6 @@ #define CONFIG_OF_FLAT_TREE 1 #define CONFIG_OF_BOARD_SETUP 1 -/* maximum size of the flat tree (8K) */ -#define OF_FLAT_TREE_MAX_SIZE 8192 - #define OF_CPU "PowerPC,8641@0" #define OF_SOC "soc@f8000000" #define OF_TBCLK (bd->bi_busfreq / 4) -- 1.5.2.2

3 2