coreboot March 2013

coreboot@coreboot.org

46 participants
782 discussions

New patch to review for coreboot: dd8d472 libpayload: If there's no IO space, complain if the serial claims to use it
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2659 -gerrit commit dd8d472e74753b90b77115dc23b25aeecc37f588 Author: Gabe Black <gabeblack(a)google.com> Date: Fri Jan 18 18:24:46 2013 -0800 libpayload: If there's no IO space, complain if the serial claims to use it Change-Id: I36c750d520ff034c9ca9b9af46bd99bd49af7355 Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/serial.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index 0d26750..4ae3e26 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -97,11 +97,19 @@ void serial_init(void) serial_is_mem_mapped = (lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED); - if (!serial_is_mem_mapped && (inb(IOBASE + 0x05) == 0xFF) && - (inb(IOBASE + 0x06) == 0xFF)) { + if (!serial_is_mem_mapped) { +#ifdef CONFIG_IO_ADDRESS_SPACE + if ((inb(IOBASE + 0x05) == 0xFF) && + (inb(IOBASE + 0x06) == 0xFF)) { + return; + } +#else + printf("IO space mapped serial not supported."); return; +#endif } + serial_hardware_is_present = 1; #ifdef CONFIG_SERIAL_SET_SPEED

1 0

New patch to review for coreboot: 01bdb53 libpayload: Make whether or not there's an IO address space configurable
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2658 -gerrit commit 01bdb53394cb2fad1e9223af76002e5cc00806c1 Author: Gabe Black <gabeblack(a)google.com> Date: Fri Jan 18 15:49:00 2013 -0800 libpayload: Make whether or not there's an IO address space configurable Default it to no to be consistent with the other architecture wide options (endianness), and turn it on explicitly for x86 and PowerPC. Change-Id: Idda26d580156bbbf08ea11b28abe75cfa6b594b2 Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/Config.in | 5 +++++ payloads/libpayload/arch/powerpc/Config.in | 1 + payloads/libpayload/arch/x86/Config.in | 1 + 3 files changed, 7 insertions(+) diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index 0a6fbe8..377b7ba 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -410,4 +410,9 @@ config LITTLE_ENDIAN default n bool +# Whether the target system has an IO address space. +config IO_ADDRESS_SPACE + default n + bool + source "arch/Config.in" diff --git a/payloads/libpayload/arch/powerpc/Config.in b/payloads/libpayload/arch/powerpc/Config.in index eb2faa1..f64f006 100644 --- a/payloads/libpayload/arch/powerpc/Config.in +++ b/payloads/libpayload/arch/powerpc/Config.in @@ -32,5 +32,6 @@ if ARCH_POWERPC config ARCH_SPECIFIC_OPTIONS # dummy def_bool y select BIG_ENDIAN + select IO_ADDRESS_SPACE endif diff --git a/payloads/libpayload/arch/x86/Config.in b/payloads/libpayload/arch/x86/Config.in index f4bd882..4a5e6bd 100644 --- a/payloads/libpayload/arch/x86/Config.in +++ b/payloads/libpayload/arch/x86/Config.in @@ -32,5 +32,6 @@ if ARCH_X86 config ARCH_SPECIFIC_OPTIONS # dummy def_bool y select LITTLE_ENDIAN + select IO_ADDRESS_SPACE endif

1 0

New patch to review for coreboot: 16de133 libpayload: Consolidate io vs. mem mapped serial into accessor functions
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2657 -gerrit commit 16de1335c05b2a6aab5c302fdd353a360eb215fc Author: Gabe Black <gabeblack(a)google.com> Date: Fri Jan 18 18:04:44 2013 -0800 libpayload: Consolidate io vs. mem mapped serial into accessor functions This way we won't have two copies of the hardware init function, and three copies of the putchar, havechar, and getchar functions. Change-Id: Ifda7fec5d582244b0e163ee93ffeedeb28ce48da Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/serial.c | 155 +++++++++++------------------------ 1 file changed, 49 insertions(+), 106 deletions(-) diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index cd00a13..0d26750 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -32,68 +32,61 @@ #include <libpayload.h> #define IOBASE lib_sysinfo.serial->baseaddr -#define MEMBASE (phys_to_virt(lib_sysinfo.serial->baseaddr)) -#define DIVISOR(x) (115200 / x) +#define MEMBASE (phys_to_virt(IOBASE)) -static int serial_io_hardware_is_present = 1; +static int serial_hardware_is_present = 0; +static int serial_is_mem_mapped = 0; -#ifdef CONFIG_SERIAL_SET_SPEED -static void serial_io_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits) +static uint8_t serial_read_reg(int offset) { - unsigned char reg; - - /* Disable interrupts. */ - outb(0, port + 0x01); - - /* Assert RTS and DTR. */ - outb(3, port + 0x04); - - /* Set the divisor latch. */ - reg = inb(port + 0x03); - outb(reg | 0x80, port + 0x03); - - /* Write the divisor. */ - outb(DIVISOR(speed) & 0xFF, port); - outb(DIVISOR(speed) >> 8 & 0xFF, port + 1); + if (serial_is_mem_mapped) + return readb(MEMBASE + offset); + else + return inb(IOBASE + offset); +} - /* Restore the previous value of the divisor. - * And set 8 bits per character */ - outb((reg & ~0x80) | 3, port + 0x03); +static void serial_write_reg(uint8_t val, int offset) +{ + if (serial_is_mem_mapped) + writeb(val, MEMBASE + offset); + else + outb(val, IOBASE + offset); } -static void serial_mem_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits) +#ifdef CONFIG_SERIAL_SET_SPEED +static void serial_hardware_init(int speed, int word_bits, + int parity, int stop_bits) { unsigned char reg; - /* We will assume 8n1 for now. Does anyone use anything else these days? */ - /* Disable interrupts. */ - writeb(0, MEMBASE + 0x01); + serial_write_reg(0, 0x01); /* Assert RTS and DTR. */ - writeb(3, MEMBASE + 0x04); + serial_write_reg(3, 0x04); /* Set the divisor latch. */ - reg = readb(MEMBASE + 0x03); - writeb(reg | 0x80, MEMBASE + 0x03); + reg = serial_read_reg(0x03); + serial_write_reg(reg | 0x80, 0x03); /* Write the divisor. */ - writeb(DIVISOR(speed) & 0xFF, MEMBASE); - writeb(DIVISOR(speed) >> 8 & 0xFF, MEMBASE + 1); + uint16_t divisor = 115200 / speed; + serial_write_reg(divisor & 0xFF, 0x00); + serial_write_reg(divisor >> 8, 0x01); /* Restore the previous value of the divisor. * And set 8 bits per character */ - writeb((reg & ~0x80) | 3, MEMBASE + 0x03); + serial_write_reg((reg & ~0x80) | 3, 0x03); } #endif static struct console_input_driver consin = { - .havekey = serial_havechar, - .getchar = serial_getchar + .havekey = &serial_havechar, + .getchar = &serial_getchar }; static struct console_output_driver consout = { - .putchar = serial_putchar + .putchar = &serial_putchar }; void serial_init(void) @@ -101,94 +94,44 @@ void serial_init(void) if (!lib_sysinfo.serial) return; -#ifdef CONFIG_SERIAL_SET_SPEED - if (lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED) - serial_mem_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1); - else - serial_io_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1); -#endif - console_add_input_driver(&consin); - console_add_output_driver(&consout); + serial_is_mem_mapped = + (lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED); - /* check to see if there's actually serial port h/w */ - if (lib_sysinfo.ser_ioport) { - if( (inb(IOBASE + 0x05)==0xFF) && (inb(IOBASE + 0x06)==0xFF) ) - serial_io_hardware_is_present = 0; + if (!serial_is_mem_mapped && (inb(IOBASE + 0x05) == 0xFF) && + (inb(IOBASE + 0x06) == 0xFF)) { + return; } -} - -static void serial_io_putchar(unsigned int c) -{ - c &= 0xff; - while ((inb(IOBASE + 0x05) & 0x20) == 0) ; - outb(c, IOBASE); -} -static int serial_io_havechar(void) -{ - if ( !serial_io_hardware_is_present ) - return 0; - return inb(IOBASE + 0x05) & 0x01; -} - -static int serial_io_getchar(void) -{ - if ( !serial_io_hardware_is_present ) - return -1; - while (!serial_io_havechar()) ; - return (int)inb(IOBASE); -} + serial_hardware_is_present = 1; -static void serial_mem_putchar(unsigned int c) -{ - c &= 0xff; - while ((readb(MEMBASE + 0x05) & 0x20) == 0) ; - writeb(c, MEMBASE); -} - -static int serial_mem_havechar(void) -{ - return readb(MEMBASE + 0x05) & 0x01; -} - -static int serial_mem_getchar(void) -{ - while (!serial_mem_havechar()) ; - return (int)readb(MEMBASE); +#ifdef CONFIG_SERIAL_SET_SPEED + serial_hardware_init(CONFIG_SERIAL_BAUD_RATE, 8, 0, 1); +#endif + console_add_input_driver(&consin); + console_add_output_driver(&consout); } - void serial_putchar(unsigned int c) { - if (!lib_sysinfo.serial) + if (!serial_hardware_is_present) return; - - if (lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED) - serial_mem_putchar(c); - else - serial_io_putchar(c); + while ((serial_read_reg(0x05) & 0x20) == 0) ; + serial_write_reg(c, 0x00); } int serial_havechar(void) { - if (!lib_sysinfo.serial) + if (!serial_hardware_is_present) return 0; - - if (lib_sysinfo.ser_base) - return serial_mem_havechar(); - else - return serial_io_havechar(); + return serial_read_reg(0x05) & 0x01; } int serial_getchar(void) { - if (!lib_sysinfo.serial) + if (!serial_hardware_is_present) return -1; - - if (lib_sysinfo.ser_base) - return serial_mem_getchar(); - else - return serial_io_getchar(); + while (!serial_havechar()) ; + return serial_read_reg(0x00); } /* These are thinly veiled vt100 functions used by curses */ @@ -214,7 +157,7 @@ int serial_getchar(void) static void serial_putcmd(const char *str) { - while(*str) + while (*str) serial_putchar(*(str++)); }

1 0

New patch to review for coreboot: 4ba39bc libpayload: Remove unnecessary include of arch/msr.h
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2656 -gerrit commit 4ba39bc7acb0ccf3c510735464959fc58cb99dd4 Author: Gabe Black <gabeblack(a)google.com> Date: Fri Jan 18 15:14:03 2013 -0800 libpayload: Remove unnecessary include of arch/msr.h The functions defined in that header aren't used anywhere in the actual code, and that include breaks things on ARM. Built for ARM with COREBOOT_VIDEO_CONSOLE turned on and saw compiler errors go away. Change-Id: I56d6fe5e00c8fccda6e31ef8752326bd36398e74 Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/video/corebootfb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c index 5672d1f..faf9e2c 100644 --- a/payloads/libpayload/drivers/video/corebootfb.c +++ b/payloads/libpayload/drivers/video/corebootfb.c @@ -32,7 +32,6 @@ #include <coreboot_tables.h> #include <pci.h> #include <video_console.h> -#include <arch/msr.h> #include "font8x16.h" struct video_console coreboot_video_console;

1 0

New patch to review for coreboot: 8ffaed8 libpayload: Stub out time keeping functions for ARM as well
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2655 -gerrit commit 8ffaed84d9ca16c356a55acd61cd0c98dfac934d Author: Gabe Black <gabeblack(a)google.com> Date: Fri Jan 18 15:04:07 2013 -0800 libpayload: Stub out time keeping functions for ARM as well These were currently stubbed out for PowerPC but not for ARM. Change-Id: I08f45174877bf5751d972078b8c53d82898b7f2b Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/libc/time.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index 91f6296..1503c45 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -111,9 +111,8 @@ static void gettimeofday_init(void) (tm.tm_min * 60) + tm.tm_sec; } #endif // CONFIG_NVRAM -#endif // CONFIG_ARCH_X86 -#ifdef CONFIG_ARCH_ARMV7 +#else static void update_clock(void) { } @@ -121,18 +120,7 @@ static void update_clock(void) static void gettimeofday_init(void) { } -#endif // CONFIG_ARCH_ARMV7 - - -#ifdef CONFIG_ARCH_POWERPC -static void update_clock(void) -{ -} - -static void gettimeofday_init(void) -{ -} -#endif // CONFIG_ARCH_POWERPC +#endif /** * Return the current time broken into a timeval structure.

1 0

New patch to review for coreboot: bdc3e30 libpayload: ARCH-$(CONFIG_ARCH_ARMV7) was defined twice, make one POWERPC
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2654 -gerrit commit bdc3e3095c477aabeb75a55d35c98dea475d6bb1 Author: Gabe Black <gabeblack(a)google.com> Date: Wed Jan 16 03:18:02 2013 -0800 libpayload: ARCH-$(CONFIG_ARCH_ARMV7) was defined twice, make one POWERPC Change-Id: Ia85a7cd6a0b85119cce6b2f9c42a7fc31ffd9f97 Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index cbfd43a..c4a77bf 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -100,7 +100,7 @@ ARCH-y := $(ARCHDIR-y) # If architecture folder name is different from GCC binutils architecture name, # override here. ARCH-$(CONFIG_ARCH_ARMV7) := armv7 -ARCH-$(CONFIG_ARCH_ARMV7) := armv7 +ARCH-$(CONFIG_ARCH_POWERPC) := powerpc ARCH-$(CONFIG_ARCH_X86) := i386 CC := $(CC_$(ARCH-y))

1 0

New patch to review for coreboot: 6760284 libpayload: In the USBMSC read_capacity function, make buf an array of u32.
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2653 -gerrit commit 67602843f673307645a4e5b39772e00548e14c86 Author: Gabe Black <gabeblack(a)google.com> Date: Tue Jan 15 16:22:04 2013 -0800 libpayload: In the USBMSC read_capacity function, make buf an array of u32. That way when it's treated as a u32 when its value is extracted for numblocks and blocksize below, it doesn't make the compiler unhappy, and it ensures that the buffer will be properly aligned on architectures where that sort of thing matters. Built and saw warnings about type punning go away. Change-Id: I254e0b5e70847112d660675b7df0ac9cb52e4051 Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/usb/usbmsc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c index 0032f58..16af448 100644 --- a/payloads/libpayload/drivers/usb/usbmsc.c +++ b/payloads/libpayload/drivers/usb/usbmsc.c @@ -375,14 +375,14 @@ read_capacity (usbdev_t *dev) cmdblock_t cb; memset (&cb, 0, sizeof (cb)); cb.command = 0x25; // read capacity - u8 buf[8]; + u32 buf[2]; usb_debug ("Reading capacity of mass storage device.\n"); int count = 0, ret; while (count++ < 20) { switch (ret = execute_command (dev, cbw_direction_data_in, (u8 *) &cb, - sizeof (cb), buf, 8, 0)) { + sizeof (cb), (u8 *)buf, 8, 0)) { case MSC_COMMAND_OK: break; case MSC_COMMAND_FAIL: @@ -398,8 +398,8 @@ read_capacity (usbdev_t *dev) MSC_INST (dev)->numblocks = 0xffffffff; MSC_INST (dev)->blocksize = 512; } else { - MSC_INST (dev)->numblocks = ntohl (*(u32 *) buf) + 1; - MSC_INST (dev)->blocksize = ntohl (*(u32 *) (buf + 4)); + MSC_INST (dev)->numblocks = ntohl(buf[0]) + 1; + MSC_INST (dev)->blocksize = ntohl(buf[1]); } usb_debug (" %d %d-byte sectors (%d MB)\n", MSC_INST (dev)->numblocks, MSC_INST (dev)->blocksize,

1 0

New patch to review for coreboot: bc706b9 libpayload: If no video drivers initialize in video_init, return 1.
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2652 -gerrit commit bc706b9b024fd3af293cd9e8249230b63028499c Author: Gabe Black <gabeblack(a)google.com> Date: Tue Jan 15 15:48:55 2013 -0800 libpayload: If no video drivers initialize in video_init, return 1. Change-Id: I56f810dfa6654ac1e9d1696ad15e7f1b8bfe59bd Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/video/video.c | 1 + 1 file changed, 1 insertion(+) diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index 61bb02a..b8fe5d9 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -216,6 +216,7 @@ int video_init(void) video_console_fixup_cursor(); return 0; } + return 1; } int video_console_init(void)

1 0

New patch to review for coreboot: 9f93993 libpayload: Split EHCI bulk transfers on packet boundaries over qTDs
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2651 -gerrit commit 9f939937defc6d2fbb8ea82850454995d9e85fd0 Author: Julius Werner <jwerner(a)chromium.org> Date: Fri Jan 11 16:25:52 2013 -0800 libpayload: Split EHCI bulk transfers on packet boundaries over qTDs EHCI controllers see transfers as a queue of transfer descriptors (qTDs), each of which can represent an aligned area of up to 20KB. Each qTD is processed separately, which means that a single USB packet cannot span multiple qTDs. While this should not be a problem according to the specification, some USB storage devices seem to get confused when a packet in the middle of a transfer is smaller than the maximum packet size (512 bytes) due to falling on a qTD boundary. This patch aligns the total transfer length per qTD to 512 bytes to avoid that problem (any excess bytes will simply roll over to the next qTD). Change-Id: I0b5db07507699a3861b30c1a5ee774c45dda7fdd Signed-off-by: Julius Werner <jwerner(a)chromium.org> --- payloads/libpayload/drivers/usb/ehci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index d33fec5..972962c 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -241,6 +241,10 @@ static int fill_td(qtd_t *td, void* data, int datalen) } datalen -= 4096; total_len += 4096; + + /* end TD at a packet boundary if transfer not complete */ + if (page_no == 5) + total_len &= ~511; } } td->token |= total_len << QTD_TOTAL_LEN_SHIFT;

1 0

New patch to review for coreboot: 2585d12 libpayload: add support for 64-bit EHCI controllers
by Stefan Reinauer 12 Mar '13

12 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2650 -gerrit commit 2585d1205a6e7dacfc0b8c0c998eb073fb19f5df Author: Vincent Palatin <vpalatin(a)chromium.org> Date: Thu Oct 25 17:38:43 2012 -0700 libpayload: add support for 64-bit EHCI controllers Initialize the high part of the address and use 64-bit compatible descriptors. (waste a few bytes on 32-bit but should be harmless) Read USB stick on a SandyBridge system which has 64-bit EHCI. Change-Id: I59cc842459acecdde8f8bdd4795ebfeccb842c8f Signed-off-by: Vincent Palatin <vpalatin(a)chromium.org> Signed-off-by: Gabe Black <gabeblack(a)google.com> --- payloads/libpayload/drivers/usb/ehci.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index ec33b18..d33fec5 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -359,7 +359,7 @@ static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) return 1; } - qtd_t *head = memalign(32, sizeof(qtd_t)); + qtd_t *head = memalign(64, sizeof(qtd_t)); qtd_t *cur = head; while (1) { memset((void *)cur, 0, sizeof(qtd_t)); @@ -375,14 +375,14 @@ static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) cur->next_qtd = virt_to_phys(0) | QTD_TERMINATE; break; } else { - qtd_t *next = memalign(32, sizeof(qtd_t)); + qtd_t *next = memalign(64, sizeof(qtd_t)); cur->next_qtd = virt_to_phys(next); cur = next; } } /* create QH */ - ehci_qh_t *qh = memalign(32, sizeof(ehci_qh_t)); + ehci_qh_t *qh = memalign(64, sizeof(ehci_qh_t)); memset((void *)qh, 0, sizeof(ehci_qh_t)); qh->horiz_link_ptr = virt_to_phys(qh) | QH_QH; qh->epchar = ep->dev->address | @@ -428,7 +428,7 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq } /* create qTDs */ - qtd_t *head = memalign(32, sizeof(qtd_t)); + qtd_t *head = memalign(64, sizeof(qtd_t)); qtd_t *cur = head; memset((void *)cur, 0, sizeof(qtd_t)); cur->token = QTD_ACTIVE | @@ -438,7 +438,7 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq if (fill_td(cur, devreq, drlen) != drlen) { usb_debug("ERROR: couldn't send the entire device request\n"); } - qtd_t *next = memalign(32, sizeof(qtd_t)); + qtd_t *next = memalign(64, sizeof(qtd_t)); cur->next_qtd = virt_to_phys(next); cur->alt_next_qtd = QTD_TERMINATE; @@ -455,7 +455,7 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq if (fill_td(cur, data, dalen) != dalen) { usb_debug("ERROR: couldn't send the entire control payload\n"); } - next = memalign(32, sizeof(qtd_t)); + next = memalign(64, sizeof(qtd_t)); cur->next_qtd = virt_to_phys(next); cur->alt_next_qtd = QTD_TERMINATE; } @@ -472,7 +472,7 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq cur->alt_next_qtd = QTD_TERMINATE; /* create QH */ - ehci_qh_t *qh = memalign(32, sizeof(ehci_qh_t)); + ehci_qh_t *qh = memalign(64, sizeof(ehci_qh_t)); memset((void *)qh, 0, sizeof(ehci_qh_t)); qh->horiz_link_ptr = virt_to_phys(qh) | QH_QH; qh->epchar = dev->address | @@ -564,7 +564,7 @@ static void *ehci_create_intr_queue( } intr_queue_t *const intrq = - (intr_queue_t *)memalign(32, sizeof(intr_queue_t)); + (intr_queue_t *)memalign(64, sizeof(intr_queue_t)); /* * reqcount data chunks * plus one more spare, which we'll leave out of queue @@ -577,7 +577,7 @@ static void *ehci_create_intr_queue( intrq->reqsize = reqsize; /* create #reqcount transfer descriptors (qTDs) */ - intrq->head = (intr_qtd_t *)memalign(32, sizeof(intr_qtd_t)); + intrq->head = (intr_qtd_t *)memalign(64, sizeof(intr_qtd_t)); intr_qtd_t *cur_td = intrq->head; for (i = 0; i < reqcount; ++i) { fill_intr_queue_td(intrq, cur_td, data); @@ -585,7 +585,7 @@ static void *ehci_create_intr_queue( if (i < reqcount - 1) { /* create one more qTD */ intr_qtd_t *const next_td = - (intr_qtd_t *)memalign(32, sizeof(intr_qtd_t)); + (intr_qtd_t *)memalign(64, sizeof(intr_qtd_t)); cur_td->td.next_qtd = virt_to_phys(&next_td->td); cur_td->next = next_td; cur_td = next_td; @@ -594,7 +594,7 @@ static void *ehci_create_intr_queue( intrq->tail = cur_td; /* create spare qTD */ - intrq->spare = (intr_qtd_t *)memalign(32, sizeof(intr_qtd_t)); + intrq->spare = (intr_qtd_t *)memalign(64, sizeof(intr_qtd_t)); fill_intr_queue_td(intrq, intrq->spare, data); /* initialize QH */ @@ -761,6 +761,10 @@ ehci_init (pcidev_t addr) /* default value for frame length adjust */ pci_write_config8(addr, FLADJ, FLADJ_framelength(60000)); + /* Set the high address word (aka segment) if controller is 64-bit */ + if (EHCI_INST(controller)->capabilities->hccparams & 1) + EHCI_INST(controller)->operation->ctrldssegment = 0; + /* Enable operation of controller */ controller->start(controller); @@ -778,7 +782,7 @@ ehci_init (pcidev_t addr) * This helps with broken host controllers * and doesn't violate the standard. */ - EHCI_INST(controller)->dummy_qh = (ehci_qh_t *)memalign(32, sizeof(ehci_qh_t)); + EHCI_INST(controller)->dummy_qh = (ehci_qh_t *)memalign(64, sizeof(ehci_qh_t)); memset((void *)EHCI_INST(controller)->dummy_qh, 0, sizeof(*EHCI_INST(controller)->dummy_qh)); EHCI_INST(controller)->dummy_qh->horiz_link_ptr = QH_TERMINATE;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
79
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot March 2013