January 2009 - U-Boot

[U-Boot] [PATCH 4/4] usb : OMAP3 : Enabling USB MSC and Keyboard support for TI OMAP3530 EVM platform
by Thomas Abraham 04 Jan '09

04 Jan '09

This patch enables USB MSC and USB Keyboard support for TI OMAP3530 EVM platform. Signed-off-by: Ravi Babu <ravibabu(a)ti.com> Signed-off-by: Swaminathan S <swami.iyer(a)ti.com> Signed-off-by: Thomas Abraham <t-abraham(a)ti.com> Signed-off-by: Ajay Kumar Gupta <ajay.gupta(a)ti.com> --- include/configs/omap3_evm.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f4498a9..92f5b51 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -156,6 +156,26 @@ /* Environment information */ #define CONFIG_BOOTDELAY 10 +/* + * USB MSC and Keyboard support + */ +#define CONFIG_USB_OMAP3530 +#define CONFIG_MUSB_HCD + +#ifdef CONFIG_USB_OMAP3530 +#define CONFIG_CMD_USB +#ifdef CONFIG_MUSB_HCD +#define CONFIG_USB_STORAGE +#define CONGIG_CMD_STORAGE +#define CONFIG_CMD_FAT +#define CONFIG_USB_KEYBOARD +#endif +#ifdef CONFIG_USB_KEYBOARD +#define CONFIG_SYS_USB_EVENT_POLL +#define CONFIG_PREBOOT "usb start" +#endif +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS2,115200n8\0" \ -- 1.5.6

2 1

[U-Boot] [PATCH] usb : usb_kbd : Populating 'priv' member of USB keyboard device_t structure
by Thomas Abraham 04 Jan '09

04 Jan '09

This patch populates the 'priv' field of the USB keyboard device_t structure. The 'priv' field is populated with the address of the 'struct usb_device' structure that represents the USB device. The 'priv' field can then be used in the 'usb_event_poll' function to determine the USB device that requires to be polled. An example of its usage in 'usb_event_poll' function is as below. device_t *dev; struct usb_device *usb_kbd_dev; <snip> dev = device_get_by_name("usbkbd"); usb_kbd_dev = (struct usb_device *)dev->priv; iface = &usb_kbd_dev->config.if_desc[0]; Signed-off-by: Thomas Abraham <t-abraham(a)ti.com> --- common/usb_kbd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 89e6ee7..fe1e789 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -183,6 +183,7 @@ int drv_usb_kbd_init(void) usb_kbd_dev.puts = NULL; usb_kbd_dev.getc = usb_kbd_getc; usb_kbd_dev.tstc = usb_kbd_testc; + usb_kbd_dev.priv = (void *)dev; error = device_register (&usb_kbd_dev); if(error==0) { /* check if this is the standard input device */ -- 1.5.6

2 1

[U-Boot] [PATCH] usb.h: use standard __LITTLE_ENDIAN from Linux headers
by Mike Frysinger 04 Jan '09

04 Jan '09

Rather than forcing people to define a custom "LITTLEENDIAN", just use the __LITTLE_ENDIAN one from the Linux byteorder headers that every arch is already setting up. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/usb_storage.c | 2 -- include/usb.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 94f659f..bb468aa 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -45,8 +45,6 @@ * New Note: * Support for USB Mass Storage Devices (BBB) has been added. It has * only been tested with USB memory sticks. - * Nota bene: if you are using the BBB support with a little-endian - * CPU then you MUST define LITTLEENDIAN in the configuration file! */ diff --git a/include/usb.h b/include/usb.h index 510df95..e7ede32 100644 --- a/include/usb.h +++ b/include/usb.h @@ -263,13 +263,13 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate); ((x_ & 0xFF000000UL) >> 24)); \ }) -#ifdef LITTLEENDIAN +#if __LITTLE_ENDIAN # define swap_16(x) (x) # define swap_32(x) (x) #else # define swap_16(x) __swap_16(x) # define swap_32(x) __swap_32(x) -#endif /* LITTLEENDIAN */ +#endif /* * Calling this entity a "pipe" is glorifying it. A USB pipe -- 1.6.0.6

2 4

[U-Boot] [USB PATCH] USB change speed
by Michael Trimarchi 04 Jan '09

04 Jan '09

USB changes the speed according to the port status Signed-off-by: Michael Trimarchi <trimarchimichael(a)yahoo.it> --- diff --git a/common/usb.c b/common/usb.c index 3138452..0c11746 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1061,10 +1061,12 @@ static int hub_port_reset(struct usb_device *dev, int port, } portstatus = le16_to_cpu(portsts.wPortStatus); portchange = le16_to_cpu(portsts.wPortChange); + USB_HUB_PRINTF("portstatus %x, change %x, %s\n", portstatus, portchange, - portstatus&(1<<USB_PORT_FEAT_LOWSPEED) ? \ + portstatus & (1 << USB_PORT_FEAT_LOWSPEED) ? \ "Low Speed" : "High Speed"); + USB_HUB_PRINTF("STAT_C_CONNECTION = %d STAT_CONNECTION = %d" \ " USB_PORT_STAT_ENABLE %d\n", (portchange & USB_PORT_STAT_C_CONNECTION) ? 1 : 0, @@ -1136,7 +1138,13 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port) /* Allocate a new device struct for it */ usb = usb_alloc_new_device(); - usb->speed = (portstatus & USB_PORT_STAT_LOW_SPEED) ? 1 : 0; + + if (portstatus & USB_PORT_STAT_HIGH_SPEED) + usb->speed = USB_SPEED_HIGH; + else if (portstatus & USB_PORT_STAT_LOW_SPEED) + usb->speed = USB_SPEED_LOW; + else + usb->speed = USB_SPEED_FULL; dev->children[port] = usb; usb->parent = dev;

2 1

[U-Boot] [USB EHCI V2 PATCH 0/2] Add initial support for USB ehci pci
by Michael Trimarchi 04 Jan '09

04 Jan '09

Add USB ehci pci support. This patch doesn't include any pci_ids and it is not tested on real hardware. Signed-off-by: Michael Trimarchi <trimarchimichael(a)yahoo.it> --- drivers/usb/Makefile | 1 + drivers/usb/usb_ehci_pci.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 drivers/usb/usb_ehci_pci.c diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 6ba154b..26189b6 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o COBJS-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o COBJS-$(CONFIG_USB_EHCI_FSL) += usb_ehci_fsl.o +COBJS-$(CONFIG_USB_EHCI_PCI) += usb_ehci_pci.o # device ifdef CONFIG_USB_DEVICE diff --git a/drivers/usb/usb_ehci_pci.c b/drivers/usb/usb_ehci_pci.c new file mode 100644 index 0000000..3e7143c --- /dev/null +++ b/drivers/usb/usb_ehci_pci.c @@ -0,0 +1,64 @@ +/*- + * Copyright (c) 2007-2008, Juniper Networks, Inc. + * All rights reserved. + * + * 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 version 2 of + * the License. + * + * 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 <pci.h> +#include <usb.h> +#include "usb_ehci.h" +#include "usb_ehci_core.h" + +#ifdef CONFIG_PCI_EHCI_DEVICE +static struct pci_device_id ehci_pci_ids[] = { + /* Please add supported PCI EHCI controller ids here */ + {0, 0} +}; +#endif + +/* + * Create the appropriate control structures to manage + * a new EHCI host controller. + */ +int ehci_hcd_init(void) +{ + pci_dev_t pdev; + uint32_t addr; + + pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE); + if (pdev == -1) { + printf("EHCI host controller not found\n"); + return -1; + } + + pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &addr); + hccr = (struct ehci_hccr *)addr; + hcor = (struct ehci_hcor *)((uint32_t) hccr + + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); + + return 0; +} + +/* + * Destroy the appropriate control structures corresponding + * the the EHCI host controller. + */ +int ehci_hcd_stop(void) +{ + return 0; +} -- 1.5.6.5

3 3

[U-Boot] Seeking PPC BDM resources for MPC860, docs for old MPC860 Eval Board
by Alex Perez 04 Jan '09

04 Jan '09

Hi folks! I've recently acquired two MPC860-based eval boards made by EST Corp (now part of Wind River Systems for the last handful of years), and I'm looking to get it booting Linux via u-boot. Additionally, I'm also looking for MPC860 BDM hardware I can make on my own. Does anyone have any suggestions? I got these boards sans ANY documentation, and they have a boatload of DIP switches as well as a dozen or so jumpers scattered across the board. If someone would like a photo of the board, I'll reply with a URL. Thanks in advance, Alex

4 5

[U-Boot] the result of get_timer(0) or get_ticks() does not change
by Lance Zhang 04 Jan '09

04 Jan '09

Hi all, I change some codes in u boot, and I want to calculate the time So I write codes like follows: Ulong begin = get_ticks(); for (i = 0; i < 100; i ++) { udelay(1000); } Ulong end = get_ticks(); But the value of begin and end are always same? I also tried get_timer(0). Does anyone have uncounted this problem? Thanks

1 0

[U-Boot] [PATCH] pxa: fixing get_timer to return time in miliseconds.
by Micha Kalfon 04 Jan '09

04 Jan '09

Fixing the get_timer function to return time in miliseconds instead of ticks. Also fixed PXA boards to use the conventional value of 1000 for CONFIG_SYS_HZ. Signed-off-by: Micha Kalfon <smichak.uv(a)gmail.com> --- cpu/pxa/interrupts.c | 25 ++++++++++++++++++------- include/configs/cerf250.h | 2 +- include/configs/cradle.h | 2 +- include/configs/csb226.h | 2 +- include/configs/delta.h | 2 +- include/configs/innokom.h | 2 +- include/configs/logodl.h | 2 +- include/configs/lubbock.h | 2 +- include/configs/pleb2.h | 2 +- include/configs/pxa255_idp.h | 2 +- include/configs/trizepsiv.h | 2 +- include/configs/wepep250.h | 2 +- include/configs/xaeniax.h | 2 +- include/configs/xm250.h | 2 +- include/configs/xsengine.h | 5 +---- include/configs/zylonite.h | 2 +- 16 files changed, 33 insertions(+), 25 deletions(-) diff --git a/cpu/pxa/interrupts.c b/cpu/pxa/interrupts.c index ec8fb9e..38af850 100644 --- a/cpu/pxa/interrupts.c +++ b/cpu/pxa/interrupts.c @@ -33,6 +33,14 @@ #error: interrupts not implemented yet #endif +#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) +#define TIMER_FREQ_HZ 3250000 +#elif defined(CONFIG_PXA250) +#define TIMER_FREQ_HZ 3686400 +#else +#error "Timer frequency unknown - please config PXA CPU type" +#endif + int interrupt_init (void) { /* nothing happens here - we don't setup any IRQs */ @@ -67,7 +75,10 @@ void reset_timer_masked (void) ulong get_timer_masked (void) { - return OSCR; + unsigned long long ticks = get_ticks(); + + return (((ticks / TIMER_FREQ_HZ) * 1000) + + ((ticks % TIMER_FREQ_HZ) * 1000) / TIMER_FREQ_HZ); } void udelay_masked (unsigned long usec) @@ -78,17 +89,17 @@ void udelay_masked (unsigned long usec) if (usec >= 1000) { tmo = usec / 1000; - tmo *= CONFIG_SYS_HZ; + tmo *= TIMER_FREQ_HZ; tmo /= 1000; } else { - tmo = usec * CONFIG_SYS_HZ; + tmo = usec * TIMER_FREQ_HZ; tmo /= (1000*1000); } - endtime = get_timer_masked () + tmo; + endtime = get_ticks() + tmo; do { - ulong now = get_timer_masked (); + ulong now = get_ticks(); diff = endtime - now; } while (diff >= 0); } @@ -99,7 +110,7 @@ void udelay_masked (unsigned long usec) */ unsigned long long get_ticks(void) { - return get_timer(0); + return OSCR; } /* @@ -109,6 +120,6 @@ unsigned long long get_ticks(void) ulong get_tbclk (void) { ulong tbclk; - tbclk = CONFIG_SYS_HZ; + tbclk = TIMER_FREQ_HZ; return tbclk; } diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h index 71e5b58..376d3bf 100644 --- a/include/configs/cerf250.h +++ b/include/configs/cerf250.h @@ -117,7 +117,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/cradle.h b/include/configs/cradle.h index e80504a..c15d13c 100644 --- a/include/configs/cradle.h +++ b/include/configs/cradle.h @@ -103,7 +103,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ /* valid baudrates */ diff --git a/include/configs/csb226.h b/include/configs/csb226.h index a24e34a..2e39925 100644 --- a/include/configs/csb226.h +++ b/include/configs/csb226.h @@ -131,7 +131,7 @@ /* RS: is this where U-Boot is */ /* RS: relocated to in RAM? */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 /* RS: the oscillator is actually 3680130?? */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ /* 0101000001 */ diff --git a/include/configs/delta.h b/include/configs/delta.h index 08b28ca..c520106 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -173,7 +173,7 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ -#define CONFIG_SYS_HZ 3250000 /* incrementer freq: 3.25 MHz */ +#define CONFIG_SYS_HZ 1000 /* Monahans Core Frequency */ #define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */ diff --git a/include/configs/innokom.h b/include/configs/innokom.h index 1b05b80..0e178ab 100644 --- a/include/configs/innokom.h +++ b/include/configs/innokom.h @@ -119,7 +119,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* load kernel to this address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 /* RS: the oscillator is actually 3680130?? */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ diff --git a/include/configs/logodl.h b/include/configs/logodl.h index bb6f943..34f92d0 100644 --- a/include/configs/logodl.h +++ b/include/configs/logodl.h @@ -112,7 +112,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x08000000 /* load kernel to this address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 /* RS: the oscillator is actually 3680130?? */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 208910e..80cf44f 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -127,7 +127,7 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ /* valid baudrates */ diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h index 14f8917..23398e3 100644 --- a/include/configs/pleb2.h +++ b/include/configs/pleb2.h @@ -126,7 +126,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ /* valid baudrates */ diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index f81103b..fa53cf4 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -241,7 +241,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define RTC 1 /* enable 32KHz osc */ diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index b2065ee..93e4215 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ /* valid baudrates */ diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h index b70a531..a8e2829 100644 --- a/include/configs/wepep250.h +++ b/include/configs/wepep250.h @@ -81,7 +81,7 @@ #undef CONFIG_SYS_CLKS_IN_HZ /* use HZ for freq. display */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x141 /* core clock - register value */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 324f03e..250247c 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -138,7 +138,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */ /* diff --git a/include/configs/xm250.h b/include/configs/xm250.h index 16af845..8e9d5ab 100644 --- a/include/configs/xm250.h +++ b/include/configs/xm250.h @@ -121,7 +121,7 @@ #define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/400/100 MHz */ /* valid baudrates */ diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h index b727413..2fca956 100644 --- a/include/configs/xsengine.h +++ b/include/configs/xsengine.h @@ -35,10 +35,7 @@ #define CONFIG_DOS_PARTITION 1 #define BOARD_LATE_INIT 1 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ - -#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ +#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h index 53397d8..5ab71a7 100644 --- a/include/configs/zylonite.h +++ b/include/configs/zylonite.h @@ -143,7 +143,7 @@ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ -#define CONFIG_SYS_HZ 3250000 /* incrementer freq: 3.25 MHz */ +#define CONFIG_SYS_HZ 1000 /* Monahans Core Frequency */ #define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */ -- 1.5.6.4

2 1

[U-Boot] [PATCH] IXP425: make cmd_go handle caches correctly Part 1/1
by Stefan Althoefer 04 Jan '09

04 Jan '09

[PATCH] IXP425: make cmd_go handle caches correctly This patch adds icache_invalidate() and dcache_flush() to cpu/ixp/cpu.c. Also it adds do_go_exec() which is called from do_go(). This private implementation performs cache handling before jumping into the code. Without this cache handling, you will jump into stale code if you download a program several times. The patch is against "latest" u-boot git-repository Please (still) be patient if style of submission or patches are offending. Signed-off-by: Stefan Althoefer <stefan.althoefer(a)web.de> ---- diff -uprN u-boot-orig//cpu/ixp/cpu.c u-boot/cpu/ixp/cpu.c --- u-boot-orig//cpu/ixp/cpu.c 2008-12-02 17:25:31.000000000 +0100 +++ u-boot/cpu/ixp/cpu.c 2008-12-03 11:35:37.000000000 +0100 @@ -171,6 +207,22 @@ int icache_status (void) return (i & 0x1000); } +void icache_invalidate (void) +{ + register u32 i; + + /* FIXME: Required to check if icache is enabled before we do this? */ + + /* invalidate I-cache (i is ignored)*/ + i = 0; + asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (i)); + + /* cpwait */ + asm ("mrc p15,0,%0,c2,c0,0;\ + mov %0,%0;\ + sub pc,pc,#4" : : "r" (i) ); +} + /* we will never enable dcache, because we have to setup MMU first */ void dcache_enable (void) { @@ -187,6 +239,11 @@ int dcache_status (void) return 0; /* always off */ } +void dcache_flush (void) +{ + return; +} + /* FIXME */ /* void pci_init(void) @@ -195,6 +252,17 @@ void pci_init(void) } */ +/* With IXP (and ARM generally) we need to handle caches to avoid + stale data. */ +unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[]) +{ + dcache_flush(); + icache_invalidate(); + + return entry (argc, argv); +} + + #ifdef CONFIG_BOOTCOUNT_LIMIT void bootcount_store (ulong a)

3 3

[U-Boot] [PATCH] IDE: Improving speed on reading data Part 1/1
by Stefan Althoefer 04 Jan '09

04 Jan '09

[PATCH] IDE: Improving speed on reading data This patch improves the speed when reading blocks from IDE devices by reading more than one block at a time. Up to 128 blocks are requested in one read command. On my testplatform (Janz emPC-A400 with CompactFLASH card) this nearly doubled speed. Also the ide_wait() code was rewritten to have lower latency by polling more frequently for status. The patch is against "latest" u-boot git-repository Please (still) be patient if style of submission or patches are offending. Signed-off-by: Stefan Althoefer <stefan.althoefer(a)web.de> ---- diff -uprN u-boot-orig//common/cmd_ide.c u-boot/common/cmd_ide.c --- u-boot-orig//common/cmd_ide.c 2008-12-02 17:25:31.000000000 +0100 +++ u-boot/common/cmd_ide.c 2008-12-03 09:22:29.000000000 +0100 @@ -1302,6 +1361,7 @@ ulong ide_read (int device, lbaint_t blk ulong n = 0; unsigned char c; unsigned char pwrsave=0; /* power save */ + ulong scnt; #ifdef CONFIG_LBA48 unsigned char lba48 = 0; @@ -1346,7 +1406,7 @@ ulong ide_read (int device, lbaint_t blk } - while (blkcnt-- > 0) { + while (blkcnt > 0) { c = ide_wait (device, IDE_TIME_OUT); @@ -1368,7 +1428,8 @@ ulong ide_read (int device, lbaint_t blk #endif } #endif - ide_outb (device, ATA_SECT_CNT, 1); + scnt = (blkcnt > 128) ? 128 : blkcnt; + ide_outb (device, ATA_SECT_CNT, scnt); ide_outb (device, ATA_LBA_LOW, (blknr >> 0) & 0xFF); ide_outb (device, ATA_LBA_MID, (blknr >> 8) & 0xFF); ide_outb (device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF); @@ -1387,32 +1448,36 @@ ulong ide_read (int device, lbaint_t blk ide_outb (device, ATA_COMMAND, ATA_CMD_READ); } - udelay (50); + while (scnt > 0) { + udelay (50); - if(pwrsave) { - c = ide_wait (device, IDE_SPIN_UP_TIME_OUT); /* may take up to 4 sec */ - pwrsave=0; - } else { - c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */ - } + if(pwrsave) { + c = ide_wait (device, IDE_SPIN_UP_TIME_OUT); /* may take up to 4 sec */ + pwrsave=0; + } else { + c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */ + } - if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) { + if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) { #if defined(CONFIG_SYS_64BIT_LBA) && defined(CONFIG_SYS_64BIT_VSPRINTF) - printf ("Error (no IRQ) dev %d blk %qd: status 0x%02x\n", - device, blknr, c); + printf ("Error (no IRQ) dev %d blk %qd: status 0x%02x\n", + device, blknr, c); #else - printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n", - device, (ulong)blknr, c); + printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n", + device, (ulong)blknr, c); #endif - break; - } + break; + } - input_data (device, buffer, ATA_SECTORWORDS); - (void) ide_inb (device, ATA_STATUS); /* clear IRQ */ - - ++n; - ++blknr; - buffer += ATA_BLOCKSIZE; + input_data (device, buffer, ATA_SECTORWORDS); + (void) ide_inb (device, ATA_STATUS); /* clear IRQ */ + + ++n; + ++blknr; + --blkcnt; + --scnt; + buffer += ATA_BLOCKSIZE; + } } IDE_READ_E: ide_led (DEVICE_LED(device), 0); /* LED off */ @@ -1548,11 +1613,11 @@ OUT: */ static uchar ide_wait (int dev, ulong t) { - ulong delay = 10 * t; /* poll every 100 us */ + ulong delay = (1000/5) * t; /* poll every 5 us */ uchar c; while ((c = ide_inb(dev, ATA_STATUS)) & ATA_STAT_BUSY) { - udelay (100); + udelay (5); if (delay-- == 0) { break; }

3 3