July 2012 - U-Boot

[U-Boot] [PATCH 00/11] Support for ST-Ericsson snowball board
by mathieu.poirier＠linaro.org 10 Aug '12

10 Aug '12

From: "Mathieu J. Poirier" <mathieu.poirier(a)linaro.org> This set adds support for the ST-Ericsson u8500 based snowball board. Doing so it moves u8500-href code around to allow for code reuse between boards. It was sent out during the 12.07 cycle but never received an official ACK. John Rigby (1): u8500: Separating mmc config parameters from driver Mathieu J. Poirier (10): snowball: Add support for ux500 based snowball board u8500: Moving prcmu to cpu directory snowball: Adding architecture dependent initialisation snowball: Adding CPU clock initialisation snowball: Moving to ux500.v2 addess scheme for PRCMU access snowball: applying power to LAN and GBF controllers u8500: Moving processor-specific functions to cpu area. u8500: Enabling power to MMC device on AB8500 V2 armv7: Adding cpu specific cache managmenent snowball: Adding board specific cache cleanup routine MAINTAINERS | 4 + arch/arm/cpu/armv7/cpu.c | 8 + arch/arm/cpu/armv7/u8500/Makefile | 2 +- arch/arm/cpu/armv7/u8500/clock.c | 34 + arch/arm/cpu/armv7/u8500/cpu.c | 192 ++++++ arch/arm/cpu/armv7/u8500/prcmu.c | 229 +++++++ arch/arm/include/asm/arch-u8500/clock.h | 5 +- arch/arm/include/asm/arch-u8500/db8500_gpio.h | 42 ++ arch/arm/include/asm/arch-u8500/db8500_pincfg.h | 170 +++++ arch/arm/include/asm/arch-u8500/hardware.h | 33 +- arch/arm/include/asm/arch-u8500/prcmu.h | 76 +++ arch/arm/include/asm/arch-u8500/sys_proto.h | 1 + board/armltd/vexpress/ca9x4_ct_vxp.c | 21 +- board/st-ericsson/snowball/Makefile | 51 ++ board/st-ericsson/snowball/db8500_pins.h | 745 +++++++++++++++++++++++ board/st-ericsson/snowball/snowball.c | 367 +++++++++++ board/st-ericsson/u8500/Makefile | 2 +- board/st-ericsson/u8500/prcmu-fw.h | 55 -- board/st-ericsson/u8500/prcmu.c | 165 ----- board/st-ericsson/u8500/u8500_href.c | 99 +--- boards.cfg | 1 + drivers/gpio/Makefile | 1 + drivers/gpio/db8500_gpio.c | 225 +++++++ drivers/mmc/arm_pl180_mmci.c | 132 ++--- drivers/mmc/arm_pl180_mmci.h | 27 +- drivers/serial/serial_pl01x.c | 2 + include/configs/snowball.h | 268 ++++++++ 27 files changed, 2566 insertions(+), 391 deletions(-) create mode 100644 arch/arm/cpu/armv7/u8500/cpu.c create mode 100644 arch/arm/cpu/armv7/u8500/prcmu.c create mode 100644 arch/arm/include/asm/arch-u8500/db8500_gpio.h create mode 100644 arch/arm/include/asm/arch-u8500/db8500_pincfg.h create mode 100644 arch/arm/include/asm/arch-u8500/prcmu.h create mode 100644 board/st-ericsson/snowball/Makefile create mode 100644 board/st-ericsson/snowball/db8500_pins.h create mode 100644 board/st-ericsson/snowball/snowball.c delete mode 100644 board/st-ericsson/u8500/prcmu-fw.h delete mode 100644 board/st-ericsson/u8500/prcmu.c create mode 100644 drivers/gpio/db8500_gpio.c create mode 100644 include/configs/snowball.h -- 1.7.5.4

3 19

[U-Boot] [PATCH v2 1/5] arm: rmobile: Add basic support for Renesas R-Mobile
by Nobuhiro Iwamatsu 10 Aug '12

10 Aug '12

This patch adds minimum support for R-Mobile. Only minimal support with timer. This CPU can uses the peripheral of Renesas SuperH. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- arch/arm/cpu/armv7/rmobile/Makefile | 48 +++++++++++++ arch/arm/cpu/armv7/rmobile/cpu_info.c | 74 ++++++++++++++++++++ arch/arm/cpu/armv7/rmobile/timer.c | 97 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-rmobile/rmobile.h | 8 +++ 4 files changed, 227 insertions(+) create mode 100644 arch/arm/cpu/armv7/rmobile/Makefile create mode 100644 arch/arm/cpu/armv7/rmobile/cpu_info.c create mode 100644 arch/arm/cpu/armv7/rmobile/timer.c create mode 100644 arch/arm/include/asm/arch-rmobile/rmobile.h diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/cpu/armv7/rmobile/Makefile new file mode 100644 index 0000000..e7eb90f --- /dev/null +++ b/arch/arm/cpu/armv7/rmobile/Makefile @@ -0,0 +1,48 @@ +# +# (C) Copyright 2000-2006 +# 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$(SOC).o + +COBJS += cpu_info.o +COBJS += timer.o + +SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS) $(COBJS-y)) +START := $(addprefix $(obj),$(START)) + +all: $(obj).depend $(LIB) + +$(LIB): $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### + diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info.c b/arch/arm/cpu/armv7/rmobile/cpu_info.c new file mode 100644 index 0000000..789c2c3 --- /dev/null +++ b/arch/arm/cpu/armv7/rmobile/cpu_info.c @@ -0,0 +1,74 @@ +/* + * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> + * (C) Copyright 2012 Renesas Solutions Corp. + * + * 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/rmobile.h> + +#ifdef CONFIG_ARCH_CPU_INIT +int arch_cpu_init(void) +{ + icache_enable(); + return 0; +} +#endif + +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + dcache_enable(); +} +#endif + +#ifdef CONFIG_DISPLAY_CPUINFO +static u32 get_cpu_type(void) +{ + u32 id; + u32 type; + + id = readl(CCCR); + type = (id >> 8) & 0xFF; + + return type; +} + +static u32 get_cpu_rev(void) +{ + u32 id; + u32 rev; + + id = readl(CCCR); + rev = (id >> 4) & 0xF; + + return rev; +} + +int print_cpuinfo(void) +{ + switch (get_cpu_type()) { + default: + printf("CPU: Renesas Electronics CPU rev %d\n", get_cpu_rev()); + break; + } + return 0; +} +#endif diff --git a/arch/arm/cpu/armv7/rmobile/timer.c b/arch/arm/cpu/armv7/rmobile/timer.c new file mode 100644 index 0000000..1818739 --- /dev/null +++ b/arch/arm/cpu/armv7/rmobile/timer.c @@ -0,0 +1,97 @@ +/* + * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> + * (C) Copyright 2012 Renesas Solutions Corp. + * + * 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-armv7/globaltimer.h> +#include <asm/arch/rmobile.h> + +static struct globaltimer *global_timer = \ + (struct globaltimer *)GLOBAL_TIMER_BASE_ADDR; + +#define CLK2MHZ(clk) (clk / 1000 / 1000) +static u64 get_cpu_global_timer(void) +{ + u32 low, high; + u64 timer; + + u32 old = readl(&global_timer->cnt_h); + while (1) { + low = readl(&global_timer->cnt_l); + high = readl(&global_timer->cnt_h); + if (old == high) + break; + else + old = high; + } + + timer = high; + return (u64)((timer << 32) | low); +} + +static u64 get_time_us(void) +{ + u64 timer = get_cpu_global_timer(); + + timer = ((timer << 2) + (CLK2MHZ(CONFIG_SYS_CPU_CLK) >> 1)); + timer /= (u64)CLK2MHZ(CONFIG_SYS_CPU_CLK); + return timer; +} + +static ulong get_time_ms(void) +{ + return (ulong)(get_time_us() / 1000); +} + +int timer_init(void) +{ + writel(0x01, &global_timer->ctl); + return 0; +} + +void __udelay(unsigned long usec) +{ + u64 start, current; + u64 wait; + + start = get_cpu_global_timer() ; + wait = (u64)((usec * CLK2MHZ(CONFIG_SYS_CPU_CLK)) >> 2) ; + do { + current = get_cpu_global_timer(); + } while ((current - start) < wait); +} + +ulong get_timer(ulong base) +{ + return get_time_ms() - base; +} + +unsigned long long get_ticks(void) +{ + return get_cpu_global_timer(); +} + +ulong get_tbclk(void) +{ + return (ulong)(CONFIG_SYS_CPU_CLK >> 2); +} diff --git a/arch/arm/include/asm/arch-rmobile/rmobile.h b/arch/arm/include/asm/arch-rmobile/rmobile.h new file mode 100644 index 0000000..bf5e22a --- /dev/null +++ b/arch/arm/include/asm/arch-rmobile/rmobile.h @@ -0,0 +1,8 @@ +#ifndef __ASM_ARCH_RMOBILE_H +#define __ASM_ARCH_RMOBILE_H + +#if defined(CONFIG_RMOBILE) +#error "SOC Name not defined" +#endif /* CONFIG_RMOBILE */ + +#endif /* __ASM_ARCH_RMOBILE_H */ -- 1.7.10

3 14

[U-Boot] Sandbox question
by Wolfgang Denk 10 Aug '12

10 Aug '12

Hello, I have a few sandbox related questions (examples run on v2012.04) 1) Memory map - What is it supposed to look like? I get "DRAM: 128 MiB", and =>bdi boot_params = 0x00000000 DRAM bank = 0x00000000 -> start = 0x00000000 -> size = 0x08000000 FB base = 0x00000000 Yet I get: =>md 0x100 00000100:Segmentation fault 2) Sandbox does no handle EOF on stadin; this makes it impossible to use it in test scripts. For example, something like this should work: $ echo printenv | ./u-boot [As woraround I have to use ``echo 'printenv;reset' | ./u-boot''; this works, but is not really intuitive nore useful.] 3) For automatic test suites it would make a lot of sense if the return code of U-Boot was the return code of the last executed command (expecially when termination of U-Boot is the result of encountering EOF on stdin). What do you think? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de There is is no reason for any individual to have a computer in their home. -- Ken Olsen (President of Digital Equipment Corporation), Convention of the World Future Society, in Boston, 1977

5 18

[U-Boot] [PATCH] disk: generate GUID Partiton Tables
by Donghwa Lee 10 Aug '12

10 Aug '12

This patch manipulates GUID Papartition Tables. I send this patch on behalf of Gwuieon Jin. Signed-off-by: Gwuieon Jin <ge.jin(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- disk/part_efi.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ disk/part_efi.h | 2 + include/part.h | 2 + 3 files changed, 111 insertions(+), 0 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index b6cda57..ce25ad5 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -433,4 +433,111 @@ static int is_pte_valid(gpt_entry * pte) return 1; } } + +void set_gpt_table(block_dev_desc_t *dev_desc, unsigned int part_start_lba, + int parts, unsigned int *blocks, unsigned int *part_offset) +{ + legacy_mbr protective_mbr; + gpt_header p_gpt_head, s_gpt_head; + gpt_entry p_gpt_entry[GPT_ENTRY_NUMBERS], + s_gpt_entry[GPT_ENTRY_NUMBERS]; + efi_guid_t disk_uuid, part_uuid; + unsigned long crc32_tmp, tmp_val; + unsigned int size = 0; + unsigned int offset = part_start_lba; + int i; + + memset(&protective_mbr, 0, sizeof(legacy_mbr)); + memset(&p_gpt_head, 0, sizeof(gpt_header)); + memset(&s_gpt_head, 0, sizeof(gpt_header)); + memset(p_gpt_entry, 0, GPT_ENTRY_NUMBERS * sizeof(gpt_entry)); + memset(s_gpt_entry, 0, GPT_ENTRY_NUMBERS * sizeof(gpt_entry)); + + /* protective MBR (LBA0) */ + *(unsigned short *) protective_mbr.signature = MSDOS_MBR_SIGNATURE; + protective_mbr.partition_record[0].sys_ind = EFI_PMBR_OSTYPE_EFI_GPT; + tmp_val = 1UL; + memcpy(protective_mbr.partition_record[0].start_sect, &tmp_val, 4); + tmp_val = (unsigned long) (dev_desc->lba - 1); + memcpy(protective_mbr.partition_record[0].nr_sects, &tmp_val, 4); + dev_desc->block_write(dev_desc->dev, 0, 1, &protective_mbr); + + /* primary GPT header (LBA1) */ + *(unsigned long long *) p_gpt_head.signature = GPT_HEADER_SIGNATURE; + *(unsigned long *) p_gpt_head.revision = GPT_HEADER_REVISION_V1; + *(unsigned long *) p_gpt_head.header_size = sizeof(gpt_header); + *(unsigned long long *) p_gpt_head.my_lba = 1; + *(unsigned long long *) p_gpt_head.alternate_lba = dev_desc->lba - 1; + *(unsigned long long *) p_gpt_head.first_usable_lba = 34; + *(unsigned long long *) p_gpt_head.last_usable_lba = dev_desc->lba - 34; + *(unsigned long long *) p_gpt_head.partition_entry_lba = 2; + *(unsigned long *) p_gpt_head.num_partition_entries = GPT_ENTRY_NUMBERS; + *(unsigned long *) p_gpt_head.sizeof_partition_entry = GPT_ENTRY_SIZE; + *(unsigned long *) p_gpt_head.header_crc32 = 0; + *(unsigned long *) p_gpt_head.partition_entry_array_crc32 = 0; + + /* primary partition entrys (LBA2-33) */ + for (i = 0; i < parts; i++) { + memcpy(p_gpt_entry[i].partition_type_guid.b, + &PARTITION_BASIC_DATA_GUID, 16); + + *(unsigned long long *) p_gpt_entry[i].starting_lba = offset; + /* allocate remaining memory in last partition */ + if (i != parts - 1) + *(unsigned long long *) p_gpt_entry[i].ending_lba = + offset + blocks[i] - 1; + else + *(unsigned long long *) p_gpt_entry[i].ending_lba = + dev_desc->lba - 33; + memset(&p_gpt_entry[i].attributes, 0, + sizeof(gpt_entry_attributes)); + part_offset[i] = offset; + offset += blocks[i]; + } + + crc32_tmp = efi_crc32((const unsigned char *)p_gpt_entry, + le32_to_int(p_gpt_head.num_partition_entries) * + le32_to_int(p_gpt_head.sizeof_partition_entry)); + memcpy(p_gpt_head.partition_entry_array_crc32, &crc32_tmp, + sizeof(crc32_tmp)); + + crc32_tmp = efi_crc32((const unsigned char *)&p_gpt_head, + le32_to_int(p_gpt_head.header_size)); + memcpy(p_gpt_head.header_crc32, &crc32_tmp, sizeof(crc32_tmp)); + + dev_desc->block_write(dev_desc->dev, 1, 1, &p_gpt_head); + dev_desc->block_write(dev_desc->dev, 2, 32, p_gpt_entry); + + /* secondary partition entrys */ + memcpy(s_gpt_entry, p_gpt_entry, + GPT_ENTRY_NUMBERS * sizeof(gpt_entry)); + + /* secondary gpt header */ + memcpy(&s_gpt_head, &p_gpt_head, sizeof(gpt_header)); + *(unsigned long long *) s_gpt_head.my_lba = + le64_to_int(p_gpt_head.alternate_lba); + *(unsigned long long *) s_gpt_head.alternate_lba = + le64_to_int(p_gpt_head.my_lba); + *(unsigned long long *) s_gpt_head.partition_entry_lba = + le64_to_int(p_gpt_head.last_usable_lba) + 1; + *(unsigned long *) s_gpt_head.header_crc32 = 0; + *(unsigned long *) s_gpt_head.partition_entry_array_crc32 = 0; + + crc32_tmp = efi_crc32((const unsigned char *)s_gpt_entry, + le32_to_int(s_gpt_head.num_partition_entries) * + le32_to_int(s_gpt_head.sizeof_partition_entry)); + memcpy(s_gpt_head.partition_entry_array_crc32, &crc32_tmp, + sizeof(unsigned long)); + + crc32_tmp = efi_crc32((const unsigned char *)&s_gpt_head, + le32_to_int(s_gpt_head.header_size)); + memcpy(s_gpt_head.header_crc32, &crc32_tmp, sizeof(unsigned long)); + + dev_desc->block_write(dev_desc->dev, + le64_to_int(s_gpt_head.partition_entry_lba), + 32, s_gpt_entry); + dev_desc->block_write(dev_desc->dev, + le64_to_int(s_gpt_head.partition_entry_lba) + 32, + 1, &s_gpt_head); +} #endif diff --git a/disk/part_efi.h b/disk/part_efi.h index 5903e7c..ddc2a7f 100644 --- a/disk/part_efi.h +++ b/disk/part_efi.h @@ -41,6 +41,8 @@ #define GPT_HEADER_REVISION_V1 0x00010000 #define GPT_PRIMARY_PARTITION_TABLE_LBA 1ULL #define GPT_ENTRY_NAME "gpt" +#define GPT_ENTRY_NUMBERS 128 +#define GPT_ENTRY_SIZE 128 #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \ ((efi_guid_t) \ diff --git a/include/part.h b/include/part.h index 1827767..32c3295 100644 --- a/include/part.h +++ b/include/part.h @@ -161,6 +161,8 @@ int test_part_amiga (block_dev_desc_t *dev_desc); int get_partition_info_efi (block_dev_desc_t * dev_desc, int part, disk_partition_t *info); void print_part_efi (block_dev_desc_t *dev_desc); int test_part_efi (block_dev_desc_t *dev_desc); +void set_gpt_table(block_dev_desc_t *dev_desc, unsigned int part_start_lba, + int parts, unsigned int *blocks, unsigned int *part_offset); #endif #endif /* _PART_H */ -- 1.7.4.1

3 2

[U-Boot] [PATCH 2/5] ehci-hcd: Boost transfer speed
by Benoît Thébaudeau 10 Aug '12

10 Aug '12

This patch takes advantage of the hardware EHCI qTD queuing mechanism to avoid software overhead and to make transfers as fast as possible. The only drawback is a call to memalign. However, this is fast compared to the transfer timings, and the heap size to allocate is small, e.g. a little bit more than 100 kB for a transfer length of 65535 packets of 512 bytes. Tested on i.MX25 and i.MX35. In my test conditions, the speedup was about 15x using page-aligned buffers, which is really appreciable when accessing large files. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Ilya Yanok <ilya.yanok(a)cogentembedded.com> Cc: Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> --- .../drivers/usb/host/ehci-hcd.c | 94 ++++++++++++++------ 1 file changed, 65 insertions(+), 29 deletions(-) diff --git u-boot-usb-1b4bd0e.orig/drivers/usb/host/ehci-hcd.c u-boot-usb-1b4bd0e/drivers/usb/host/ehci-hcd.c index 5b3b906..b5645fa 100644 --- u-boot-usb-1b4bd0e.orig/drivers/usb/host/ehci-hcd.c +++ u-boot-usb-1b4bd0e/drivers/usb/host/ehci-hcd.c @@ -208,7 +208,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, int length, struct devrequest *req) { ALLOC_ALIGN_BUFFER(struct QH, qh, 1, USB_DMA_MINALIGN); - ALLOC_ALIGN_BUFFER(struct qTD, qtd, 3, USB_DMA_MINALIGN); + struct qTD *qtd; + int qtd_count = 0; int qtd_counter = 0; volatile struct qTD *vtd; @@ -229,8 +230,25 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, le16_to_cpu(req->value), le16_to_cpu(req->value), le16_to_cpu(req->index)); + if (req != NULL) /* SETUP + ACK */ + qtd_count += 1 + 1; + if (length > 0 || req == NULL) { /* buffer */ + if ((uint32_t)buffer & 4095) /* page-unaligned */ + qtd_count += (((uint32_t)buffer & 4095) + length + + (QT_BUFFER_CNT - 1) * 4096 - 1) / + ((QT_BUFFER_CNT - 1) * 4096); + else /* page-aligned */ + qtd_count += (length + QT_BUFFER_CNT * 4096 - 1) / + (QT_BUFFER_CNT * 4096); + } + qtd = memalign(USB_DMA_MINALIGN, qtd_count * sizeof(struct qTD)); + if (qtd == NULL) { + printf("unable to allocate TDs\n"); + return -1; + } + memset(qh, 0, sizeof(struct QH)); - memset(qtd, 0, 3 * sizeof(*qtd)); + memset(qtd, 0, qtd_count * sizeof(*qtd)); toggle = usb_gettoggle(dev, usb_pipeendpoint(pipe), usb_pipeout(pipe)); @@ -291,31 +309,46 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, } if (length > 0 || req == NULL) { - /* - * Setup request qTD (3.5 in ehci-r10.pdf) - * - * qt_next ................ 03-00 H - * qt_altnext ............. 07-04 H - * qt_token ............... 0B-08 H - * - * [ buffer, buffer_hi ] loaded with "buffer". - */ - qtd[qtd_counter].qt_next = cpu_to_hc32(QT_NEXT_TERMINATE); - qtd[qtd_counter].qt_altnext = cpu_to_hc32(QT_NEXT_TERMINATE); - token = (toggle << 31) | - (length << 16) | - ((req == NULL ? 1 : 0) << 15) | - (0 << 12) | - (3 << 10) | - ((usb_pipein(pipe) ? 1 : 0) << 8) | (0x80 << 0); - qtd[qtd_counter].qt_token = cpu_to_hc32(token); - if (ehci_td_buffer(&qtd[qtd_counter], buffer, length) != 0) { - printf("unable construct DATA td\n"); - goto fail; - } - /* Update previous qTD! */ - *tdp = cpu_to_hc32((uint32_t)&qtd[qtd_counter]); - tdp = &qtd[qtd_counter++].qt_next; + uint8_t *buf_ptr = buffer; + int left_length = length; + + do { + int xfr_bytes = min(left_length, + (QT_BUFFER_CNT * 4096 - + ((uint32_t)buf_ptr & 4095)) & + ~4095); + + /* + * Setup request qTD (3.5 in ehci-r10.pdf) + * + * qt_next ................ 03-00 H + * qt_altnext ............. 07-04 H + * qt_token ............... 0B-08 H + * + * [ buffer, buffer_hi ] loaded with "buffer". + */ + qtd[qtd_counter].qt_next = + cpu_to_hc32(QT_NEXT_TERMINATE); + qtd[qtd_counter].qt_altnext = + cpu_to_hc32(QT_NEXT_TERMINATE); + token = (toggle << 31) | + (xfr_bytes << 16) | + ((req == NULL ? 1 : 0) << 15) | + (0 << 12) | + (3 << 10) | + ((usb_pipein(pipe) ? 1 : 0) << 8) | (0x80 << 0); + qtd[qtd_counter].qt_token = cpu_to_hc32(token); + if (ehci_td_buffer(&qtd[qtd_counter], buf_ptr, + xfr_bytes) != 0) { + printf("unable construct DATA td\n"); + goto fail; + } + /* Update previous qTD! */ + *tdp = cpu_to_hc32((uint32_t)&qtd[qtd_counter]); + tdp = &qtd[qtd_counter++].qt_next; + buf_ptr += xfr_bytes; + left_length -= xfr_bytes; + } while (left_length > 0); } if (req != NULL) { @@ -346,7 +379,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, flush_dcache_range((uint32_t)qh_list, ALIGN_END_ADDR(struct QH, qh_list, 1)); flush_dcache_range((uint32_t)qh, ALIGN_END_ADDR(struct QH, qh, 1)); - flush_dcache_range((uint32_t)qtd, ALIGN_END_ADDR(struct qTD, qtd, 3)); + flush_dcache_range((uint32_t)qtd, + ALIGN_END_ADDR(struct qTD, qtd, qtd_count)); /* Set async. queue head pointer. */ ehci_writel(&hcor->or_asynclistaddr, (uint32_t)qh_list); @@ -377,7 +411,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, invalidate_dcache_range((uint32_t)qh, ALIGN_END_ADDR(struct QH, qh, 1)); invalidate_dcache_range((uint32_t)qtd, - ALIGN_END_ADDR(struct qTD, qtd, 3)); + ALIGN_END_ADDR(struct qTD, qtd, qtd_count)); token = hc32_to_cpu(vtd->qt_token); if (!(token & 0x80)) @@ -450,9 +484,11 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, ehci_readl(&hcor->or_portsc[1])); } + free(qtd); return (dev->status != USB_ST_NOT_PROC) ? 0 : -1; fail: + free(qtd); return -1; }

3 36

[U-Boot] usb_stor_BBB_transport 5 ms delay - performance
by Jim Shimer 09 Aug '12

09 Aug '12

I'm seeing a 5ms delay in usb_stor_BBB_transport, which occurs every 10K of data for fatload usb or 500ms of delay per 1MB of image size. This adds up to quite a bit of delay if you're loading a large ramdisk. Does anyone know what the reason for the 5ms delay really is? I'm assuming that this delay is to debounce the 5V/100ma USB power up. I made some modification, where the delay is skipped if the device has already been queried as ready. This has save me 500ms/M on fatload times (eg, 140M=70seconds). Is there anything wrong with this tweak? Here's a diff of what I've done to get the performance I need: --- usb_storage.c.orig 2012-07-26 16:06:40.775251000 -0400 +++ usb_storage.c 2012-07-26 13:49:36.000000000 -0400 @@ -132,6 +132,7 @@ static block_dev_desc_t usb_dev_desc[USB struct us_data; typedef int (*trans_cmnd)(ccb *cb, struct us_data *data); typedef int (*trans_reset)(struct us_data *data); +typedef enum us_status { USB_NOT_READY, USB_READY} us_status; struct us_data { struct usb_device *pusb_dev; /* this usb_device */ @@ -154,6 +155,7 @@ struct us_data { ccb *srb; /* current srb */ trans_reset transport_reset; /* reset routine */ trans_cmnd transport; /* transport routine */ + us_status status; }; static struct us_data usb_stor[USB_MAX_STOR_DEV]; @@ -691,7 +693,10 @@ int usb_stor_BBB_transport(ccb *srb, str usb_stor_BBB_reset(us); return USB_STOR_TRANSPORT_FAILED; } - wait_ms(5); + if(us->status != USB_READY) + { + wait_ms(5); + } pipein = usb_rcvbulkpipe(us->pusb_dev, us->ep_in); pipeout = usb_sndbulkpipe(us->pusb_dev, us->ep_out); /* DATA phase + error handling */ @@ -957,7 +962,10 @@ static int usb_test_unit_ready(ccb *srb, srb->datalen = 0; srb->cmdlen = 12; if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD) + { + ss->status = USB_READY; return 0; + } usb_request_sense(srb, ss); wait_ms(100); } while (retries--); @@ -965,6 +973,11 @@ static int usb_test_unit_ready(ccb *srb, return -1; } +static void usb_set_unit_not_ready(struct us_data *ss) +{ + ss->status = USB_NOT_READY; +} + static int usb_read_capacity(ccb *srb, struct us_data *ss) { int retry; @@ -1108,6 +1121,7 @@ retry_it: blks -= smallblks; buf_addr += srb->datalen; } while (blks != 0); + usb_set_unit_not_ready((struct us_data *)dev->privptr); USB_STOR_PRINTF("usb_read: end startblk %lx, blccnt %x buffer %lx\n", start, smallblks, buf_addr); @@ -1188,6 +1202,7 @@ retry_it: blks -= smallblks; buf_addr += srb->datalen; } while (blks != 0); + usb_set_unit_not_ready((struct us_data *)dev->privptr); USB_STOR_PRINTF("usb_write: end startblk %lx, blccnt %x buffer %lx\n", start, smallblks, buf_addr); @@ -1398,6 +1413,7 @@ int usb_stor_get_info(struct usb_device cap[0] = 2880; cap[1] = 0x200; } + usb_set_unit_not_ready((struct us_data *)dev->privptr); USB_STOR_PRINTF("Read Capacity returns: 0x%lx, 0x%lx\n", cap[0], cap[1]); #if 0 I'd appreciate any feedback. Regards -- *James H Shimer* Motorola Mobility T3-12-HH72 900 Chelmsford Street Lowell MA 08151 978-614-3550

3 13

[U-Boot] [PATCH 5/5] usb_storage: Adjust time-outs
by Benoît Thébaudeau 09 Aug '12

09 Aug '12

Adjust time-out value for the new EHCI mechanism. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Ilya Yanok <ilya.yanok(a)cogentembedded.com> Cc: Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> --- .../common/usb_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git u-boot-usb-1b4bd0e.orig/common/usb_storage.c u-boot-usb-1b4bd0e/common/usb_storage.c index 135c940..3cd2e22 100644 --- u-boot-usb-1b4bd0e.orig/common/usb_storage.c +++ u-boot-usb-1b4bd0e/common/usb_storage.c @@ -712,7 +712,7 @@ int usb_stor_BBB_transport(ccb *srb, struct us_data *us) else pipe = pipeout; result = usb_bulk_msg(us->pusb_dev, pipe, srb->pdata, srb->datalen, - &data_actlen, USB_CNTL_TIMEOUT * 5); + &data_actlen, USB_CNTL_TIMEOUT * 100); /* special handling of STALL in DATA phase */ if ((result < 0) && (us->pusb_dev->status & USB_ST_STALLED)) { USB_STOR_PRINTF("DATA:stall\n");

2 3

[U-Boot] [PATCH 3/5] usb_storage: Remove EHCI constraints
by Benoît Thébaudeau 09 Aug '12

09 Aug '12

Now that the EHCI driver allocates its qTDs from the heap, the MSC driver is only limited by the SCSI commands it uses. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Ilya Yanok <ilya.yanok(a)cogentembedded.com> Cc: Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> --- .../common/usb_storage.c | 31 +++++++++----------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git u-boot-usb-1b4bd0e.orig/common/usb_storage.c u-boot-usb-1b4bd0e/common/usb_storage.c index bdc306f..46f6b75 100644 --- u-boot-usb-1b4bd0e.orig/common/usb_storage.c +++ u-boot-usb-1b4bd0e/common/usb_storage.c @@ -156,10 +156,11 @@ struct us_data { }; /* - * The U-Boot EHCI driver cannot handle more than 5 page aligned buffers - * of 4096 bytes in a transfer without running itself out of qt_buffers + * The U-Boot EHCI driver can handle any transfer length as long as there is + * enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are + * limited to 65535 bytes. */ -#define USB_MAX_XFER_BLK(start, blksz) (((4096 * 5) - (start % 4096)) / blksz) +#define USB_MAX_XFER_BLK 65535 static struct us_data usb_stor[USB_MAX_STOR_DEV]; @@ -1046,7 +1047,7 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor, unsigned long usb_stor_read(int device, unsigned long blknr, unsigned long blkcnt, void *buffer) { - unsigned long start, blks, buf_addr, max_xfer_blk; + unsigned long start, blks, buf_addr; unsigned short smallblks; struct usb_device *dev; struct us_data *ss; @@ -1088,14 +1089,12 @@ unsigned long usb_stor_read(int device, unsigned long blknr, /* XXX need some comment here */ retry = 2; srb->pdata = (unsigned char *)buf_addr; - max_xfer_blk = USB_MAX_XFER_BLK(buf_addr, - usb_dev_desc[device].blksz); - if (blks > max_xfer_blk) - smallblks = (unsigned short) max_xfer_blk; + if (blks > USB_MAX_XFER_BLK) + smallblks = USB_MAX_XFER_BLK; else smallblks = (unsigned short) blks; retry_it: - if (smallblks == max_xfer_blk) + if (smallblks == USB_MAX_XFER_BLK) usb_show_progress(); srb->datalen = usb_dev_desc[device].blksz * smallblks; srb->pdata = (unsigned char *)buf_addr; @@ -1116,7 +1115,7 @@ retry_it: start, smallblks, buf_addr); usb_disable_asynch(0); /* asynch transfer allowed */ - if (blkcnt >= max_xfer_blk) + if (blkcnt >= USB_MAX_XFER_BLK) debug("\n"); return blkcnt; } @@ -1124,7 +1123,7 @@ retry_it: unsigned long usb_stor_write(int device, unsigned long blknr, unsigned long blkcnt, const void *buffer) { - unsigned long start, blks, buf_addr, max_xfer_blk; + unsigned long start, blks, buf_addr; unsigned short smallblks; struct usb_device *dev; struct us_data *ss; @@ -1169,14 +1168,12 @@ unsigned long usb_stor_write(int device, unsigned long blknr, */ retry = 2; srb->pdata = (unsigned char *)buf_addr; - max_xfer_blk = USB_MAX_XFER_BLK(buf_addr, - usb_dev_desc[device].blksz); - if (blks > max_xfer_blk) - smallblks = (unsigned short) max_xfer_blk; + if (blks > USB_MAX_XFER_BLK) + smallblks = USB_MAX_XFER_BLK; else smallblks = (unsigned short) blks; retry_it: - if (smallblks == max_xfer_blk) + if (smallblks == USB_MAX_XFER_BLK) usb_show_progress(); srb->datalen = usb_dev_desc[device].blksz * smallblks; srb->pdata = (unsigned char *)buf_addr; @@ -1197,7 +1194,7 @@ retry_it: start, smallblks, buf_addr); usb_disable_asynch(0); /* asynch transfer allowed */ - if (blkcnt >= max_xfer_blk) + if (blkcnt >= USB_MAX_XFER_BLK) debug("\n"); return blkcnt;

1 1

[U-Boot] [PATCH 4/5] usb_storage: Restore non-EHCI support
by Benoît Thébaudeau 09 Aug '12

09 Aug '12

The commit 5dd95cf made the MSC driver EHCI-specific. This patch restores a basic support of non-EHCI HCDs, like before that commit. The fallback transfer size is certainly not optimal, but at least it should work like before. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Ilya Yanok <ilya.yanok(a)cogentembedded.com> Cc: Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> --- .../common/usb_storage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git u-boot-usb-1b4bd0e.orig/common/usb_storage.c u-boot-usb-1b4bd0e/common/usb_storage.c index 46f6b75..135c940 100644 --- u-boot-usb-1b4bd0e.orig/common/usb_storage.c +++ u-boot-usb-1b4bd0e/common/usb_storage.c @@ -155,12 +155,16 @@ struct us_data { trans_cmnd transport; /* transport routine */ }; +#ifdef CONFIG_USB_EHCI /* * The U-Boot EHCI driver can handle any transfer length as long as there is * enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are * limited to 65535 bytes. */ #define USB_MAX_XFER_BLK 65535 +#else +#define USB_MAX_XFER_BLK 20 +#endif static struct us_data usb_stor[USB_MAX_STOR_DEV];

2 3

[U-Boot] [PATCH] openrisc: Work around potential relocation issues
by Julius Baxter 09 Aug '12

09 Aug '12

When reset code is in flash, the jump instructions emitted by the compiler are relative instead of absolute jumps. A fix to the reset code to make correct jumps to the beginning of code relocated to RAM have also been added. Signed-off-by: Julius Baxter <juliusbaxter(a)gmail.com> --- arch/openrisc/cpu/cpu.c | 6 +++++- arch/openrisc/cpu/start.S | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/openrisc/cpu/cpu.c b/arch/openrisc/cpu/cpu.c index 25cd624..73ecc6f 100644 --- a/arch/openrisc/cpu/cpu.c +++ b/arch/openrisc/cpu/cpu.c @@ -151,7 +151,11 @@ extern void __reset(void); int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { disable_interrupts(); - __reset(); + /* Code the jump to __reset here as the compiler is prone to + emitting a bad jump instruction if the function is in flash */ + __asm__("l.movhi r1,hi(__reset); \ + l.ori r1,r1,lo(__reset); \ + l.jr r1"); /* not reached, __reset does not return */ return 0; } diff --git a/arch/openrisc/cpu/start.S b/arch/openrisc/cpu/start.S index 3a42717..39c80e1 100644 --- a/arch/openrisc/cpu/start.S +++ b/arch/openrisc/cpu/start.S @@ -26,8 +26,11 @@ #define HANDLE_EXCEPTION \ l.addi r1, r1, -EXCEPTION_STACK_SIZE ;\ + l.sw 0x00(r1), r2 ;\ l.sw 0x1c(r1), r9 ;\ - l.jal _exception_handler ;\ + l.movhi r2,hi(_exception_handler) ;\ + l.ori r2,r2,lo(_exception_handler) ;\ + l.jalr r2 ;\ l.nop ;\ l.lwz r9, 0x1c(r1) ;\ l.addi r1, r1, EXCEPTION_STACK_SIZE ;\ @@ -79,8 +82,9 @@ __reset: l.bnf .L_relocvectors l.addi r4,r4, 4 #endif - - l.j _start + l.movhi r4,hi(_start) + l.ori r4,r4,lo(_start) + l.jr r4 l.nop /* bus error */ @@ -262,8 +266,7 @@ _start: .type _exception_handler,@function _exception_handler: - /* Store state (r9 already saved)*/ - l.sw 0x00(r1), r2 + /* Store state (r2 and r9 already saved)*/ l.sw 0x04(r1), r3 l.sw 0x08(r1), r4 l.sw 0x0c(r1), r5 -- 1.7.4.1

3 2