SeaBIOS

seabios@seabios.org

5 participants
3802 discussions

Re: [SeaBIOS] [PATCH] Remove the pmm handle argument from _malloc().
by Don Slutz 30 Dec '13

30 Dec '13

On 12/27/13 11:35, Kevin O'Connor wrote: > The PMM handle argument will almost always be 0xffffffff. Use > separate code for the few rare cases where it may not be the default > value. Gcc produces better code if _malloc() only requires three > parameters. > > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/fw/csm.c | 4 ++-- > src/fw/romfile_loader.c | 2 +- > src/malloc.c | 23 ++++++++++++++++++----- > src/malloc.h | 23 ++++++++++++----------- > src/pmm.c | 19 ++++++++++++------- > 5 files changed, 45 insertions(+), 26 deletions(-) > > diff --git a/src/fw/csm.c b/src/fw/csm.c > index dfb0d12..a44ed26 100644 > --- a/src/fw/csm.c > +++ b/src/fw/csm.c > @@ -257,9 +257,9 @@ handle_csm_0006(struct bregs *regs) > size, align, region); > > if (region & 2) > - chunk = _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, align); > + chunk = _malloc(&ZoneLow, size, align); > if (!chunk && (region & 1)) > - chunk = _malloc(&ZoneFSeg, MALLOC_DEFAULT_HANDLE, size, align); > + chunk = _malloc(&ZoneFSeg, size, align); > > dprintf(3, "Legacy16GetTableAddress size %x align %x region %d yields %p\n", > size, align, region, chunk); > diff --git a/src/fw/romfile_loader.c b/src/fw/romfile_loader.c > index 325a0fa..f4b17ff 100644 > --- a/src/fw/romfile_loader.c > +++ b/src/fw/romfile_loader.c > @@ -57,7 +57,7 @@ static void romfile_loader_allocate(struct romfile_loader_entry_s *entry, > file->file = romfile_find(entry->alloc_file); > if (!file->file || !file->file->size) > return; > - data = _malloc(zone, MALLOC_DEFAULT_HANDLE, file->file->size, alloc_align); > + data = _malloc(zone, file->file->size, alloc_align); > if (!data) { > warn_noalloc(); > return; > diff --git a/src/malloc.c b/src/malloc.c > index 6ef418a..c4cb171 100644 > --- a/src/malloc.c > +++ b/src/malloc.c > @@ -225,7 +225,7 @@ zonelow_expand(u32 size, u32 align, struct allocinfo_s *fill) > > // Allocate memory from the given zone and track it as a PMM allocation > void * __malloc > -_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align) > +_malloc(struct zone_s *zone, u32 size, u32 align) > { > ASSERT32FLAT(); > if (!size) > @@ -240,6 +240,7 @@ _malloc(struct zone_s *zone, u32 handle, u32 size, u32 align) > if (!detail) > return NULL; > } > + detail->handle = MALLOC_DEFAULT_HANDLE; > > // Find and reserve space for main allocation > void *data = allocSpace(zone, size, align, &detail->datainfo); > @@ -250,9 +251,8 @@ _malloc(struct zone_s *zone, u32 handle, u32 size, u32 align) > return NULL; > } > > - dprintf(8, "_malloc zone=%p handle=%x size=%d align=%x ret=%p (detail=%p)\n" > - , zone, handle, size, align, data, detail); > - detail->handle = handle; > + dprintf(8, "_malloc zone=%p size=%d align=%x ret=%p (detail=%p)\n" > + , zone, size, align, data, detail); > > return data; > } > @@ -296,9 +296,22 @@ malloc_getspace(struct zone_s *zone) > return maxspace - reserve; > } > > +// Set a handle associated with an allocation. > +void > +malloc_sethandle(void *data, u32 handle) > +{ > + ASSERT32FLAT(); > + struct allocinfo_s *info = findAlloc(data); > + if (!info || data == (void*)info || data == info->dataend) > + return; > + struct allocdetail_s *detail = container_of( > + info, struct allocdetail_s, datainfo); > + detail->handle = handle; I would think a "dprint(8" should be here like: dprintf(8, "malloc_sethandle handle=%x data=%p (detail=%p)\n" , handle, data, detail); -Don Slutz > +} > + > // Find the data block allocated with _malloc with a given handle. > void * > -malloc_find(u32 handle) > +malloc_findhandle(u32 handle) > { > int i; > for (i=0; i<ARRAY_SIZE(Zones); i++) { > diff --git a/src/malloc.h b/src/malloc.h > index af8a21d..2bcb5bf 100644 > --- a/src/malloc.h > +++ b/src/malloc.h > @@ -15,29 +15,30 @@ void malloc_preinit(void); > extern u32 LegacyRamSize; > void malloc_init(void); > void malloc_prepboot(void); > -void *_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align); > +void *_malloc(struct zone_s *zone, u32 size, u32 align); > int _free(void *data); > u32 malloc_getspace(struct zone_s *zone); > -void *malloc_find(u32 handle); > +void malloc_sethandle(void *data, u32 handle); > +void *malloc_findhandle(u32 handle); > > #define MALLOC_DEFAULT_HANDLE 0xFFFFFFFF > // Minimum alignment of malloc'd memory > #define MALLOC_MIN_ALIGN 16 > // Helper functions for memory allocation. > static inline void *malloc_low(u32 size) { > - return _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); > + return _malloc(&ZoneLow, size, MALLOC_MIN_ALIGN); > } > static inline void *malloc_high(u32 size) { > - return _malloc(&ZoneHigh, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); > + return _malloc(&ZoneHigh, size, MALLOC_MIN_ALIGN); > } > static inline void *malloc_fseg(u32 size) { > - return _malloc(&ZoneFSeg, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); > + return _malloc(&ZoneFSeg, size, MALLOC_MIN_ALIGN); > } > static inline void *malloc_tmplow(u32 size) { > - return _malloc(&ZoneTmpLow, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); > + return _malloc(&ZoneTmpLow, size, MALLOC_MIN_ALIGN); > } > static inline void *malloc_tmphigh(u32 size) { > - return _malloc(&ZoneTmpHigh, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN); > + return _malloc(&ZoneTmpHigh, size, MALLOC_MIN_ALIGN); > } > static inline void *malloc_tmp(u32 size) { > void *ret = malloc_tmphigh(size); > @@ -46,16 +47,16 @@ static inline void *malloc_tmp(u32 size) { > return malloc_tmplow(size); > } > static inline void *memalign_low(u32 align, u32 size) { > - return _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, align); > + return _malloc(&ZoneLow, size, align); > } > static inline void *memalign_high(u32 align, u32 size) { > - return _malloc(&ZoneHigh, MALLOC_DEFAULT_HANDLE, size, align); > + return _malloc(&ZoneHigh, size, align); > } > static inline void *memalign_tmplow(u32 align, u32 size) { > - return _malloc(&ZoneTmpLow, MALLOC_DEFAULT_HANDLE, size, align); > + return _malloc(&ZoneTmpLow, size, align); > } > static inline void *memalign_tmphigh(u32 align, u32 size) { > - return _malloc(&ZoneTmpHigh, MALLOC_DEFAULT_HANDLE, size, align); > + return _malloc(&ZoneTmpHigh, size, align); > } > static inline void *memalign_tmp(u32 align, u32 size) { > void *ret = memalign_tmphigh(align, size); > diff --git a/src/pmm.c b/src/pmm.c > index be03bdb..304faab 100644 > --- a/src/pmm.c > +++ b/src/pmm.c > @@ -65,21 +65,26 @@ handle_pmm00(u16 *args) > if (align < MALLOC_MIN_ALIGN) > align = MALLOC_MIN_ALIGN; > } > + void *data; > switch (flags & 3) { > default: > case 0: > return 0; > case 1: > - return (u32)_malloc(lowzone, handle, size, align); > + data = _malloc(lowzone, size, align); > + break; > case 2: > - return (u32)_malloc(highzone, handle, size, align); > + data = _malloc(highzone, size, align); > + break; > case 3: { > - void *data = _malloc(lowzone, handle, size, align); > - if (data) > - return (u32)data; > - return (u32)_malloc(highzone, handle, size, align); > + data = _malloc(lowzone, size, align); > + if (!data) > + data = _malloc(highzone, size, align); > } > } > + if (data && handle != MALLOC_DEFAULT_HANDLE) > + malloc_sethandle(data, handle); > + return (u32)data; > } > > // PMM - find > @@ -90,7 +95,7 @@ handle_pmm01(u16 *args) > dprintf(3, "pmm01: handle=%x\n", handle); > if (handle == MALLOC_DEFAULT_HANDLE) > return 0; > - return (u32)malloc_find(handle); > + return (u32)malloc_findhandle(handle); > } > > // PMM - deallocate

2 2

xhci controller and slot count
by Kevin O'Connor 30 Dec '13

30 Dec '13

I think I've found the remaining issue with the XHCI controller on my e350m1. The controller doesn't like the dummy context entries count that seabios assigns during a configure event. The patch below allows me to use keyboard and mice on the xhci controller. Interestingly, the xhci controller doesn't seem to care about that field at all when using super speed devices. However, the controller still doesn't work for high speed flash devices. It looks like the controller doesn't like getting two configure events - it accepts the first configure event for the bulkin pipe, but then complains about the second configure event for the bulkout pipe. Unfortunately, it looks like fixing this would require significant changes to the seabios usb code. -Kevin --- a/src/hw/usb-xhci.c +++ b/src/hw/usb-xhci.c @@ -922,7 +922,7 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev goto fail; in->add |= (1 << pipe->epid); struct xhci_slotctx *slot = (void*)&in[1 << xhci->context64]; - slot->ctx[0] |= (31 << 27); // context entries + slot->ctx[0] |= (pipe->epid << 27); // context entries struct xhci_epctx *ep = (void*)&in[(pipe->epid+1) << xhci->context64]; if (eptype == USB_ENDPOINT_XFER_INT)

1 1

Re: [SeaBIOS] [PATCH] xhci: allocate scratch pad buffers
by Idwer Vollering 29 Dec '13

29 Dec '13

Let's recycle this thread. The following output is produced while booting all 10 (rebased) commits from https://github.com/KevinOConnor/seabios/commits/xhci-testing: init usb XHCI init on dev 00:10.0: regs @ 0xf0148000, 4 ports, 32 slots, 32 byte contexts XHCI extcap 0x1 @ f0148500 XHCI protocol USB 3.00, 2 ports (offset 1), def 0 XHCI protocol USB 2.00, 2 ports (offset 3), def 0 configure_xhci: resetting xhci_hub_detect port #1: 0x000002a0, powered, pls 5, speed 0 [ - ] xhci_hub_detect port #2: 0x000002a0, powered, pls 5, speed 0 [ - ] xhci_hub_detect port #3: 0x000202e1, powered, pls 7, speed 0 [ - ] xhci_hub_reset port #3: 0x000202e1, powered, pls 7, speed 0 [ - ] XHCI port #3: 0x00200a03, powered, enabled, pls 0, speed 2 [Low] set_address 0x000edfe0 xhci_alloc_pipe: usbdev 0xbf1025e0, ring 0xbf11eb00, slotid 0, epid 1 xhci_cmd_enable_slot: xhci_trb_queue: ring 0xbf11ed00 [nidx 1, len 0] xhci_process_events: status change port #3 xhci_process_events: status change port #3 xhci_process_events: ring 0xbf11ed00 [trb 0xbf11ed00, evt 0xbf11ee00, type 33, eidx 1, cc 1] xhci_alloc_pipe: enable slot: got slotid 1 xhci_cmd_address_device: slotid 1 xhci_trb_queue: ring 0xbf11ed00 [nidx 2, len 0] xhci_process_events: ring 0xbf11ed00 [trb 0xbf11ed10, evt 0xbf11ee00, type 33, eidx 2, cc 1] xhci_update_pipe: usbdev 0xbf1025e0, ring 0xbf11eb00, slotid 1, epid 1 config_usb: 0xbf11ec20 xhci_trb_queue: ring 0xbf11eb00 [nidx 1, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 2, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 3, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11eb20, evt 0xbf11ec00, type 32, eidx 3, cc 1] device rev=0110 cls=00 sub=00 proto=00 size=08 xhci_update_pipe: usbdev 0xbf1025e0, ring 0xbf11eb00, slotid 1, epid 1 xhci_trb_queue: ring 0xbf11eb00 [nidx 4, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 5, len 9] xhci_trb_queue: ring 0xbf11eb00 [nidx 6, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11eb50, evt 0xbf11ec00, type 32, eidx 6, cc 1] xhci_trb_queue: ring 0xbf11eb00 [nidx 7, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 8, len 59] xhci_trb_queue: ring 0xbf11eb00 [nidx 9, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11eb80, evt 0xbf11ec00, type 32, eidx 9, cc 1] xhci_trb_queue: ring 0xbf11eb00 [nidx 10, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 11, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11eba0, evt 0xbf11ec00, type 32, eidx 11, cc 1] usb_hid_setup 0xbf11ec20 xhci_trb_queue: ring 0xbf11eb00 [nidx 12, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 13, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11ebc0, evt 0xbf11ec00, type 32, eidx 13, cc 1] xhci_trb_queue: ring 0xbf11eb00 [nidx 14, len 8] xhci_trb_queue: ring 0xbf11eb00 [nidx 15, len 0] xhci_xfer_kick: ring 0xbf11eb00, slotid 1, epid 1 xhci_process_events: ring 0xbf11eb00 [trb 0xbf11ebe0, evt 0xbf11ec00, type 32, eidx 15, cc 1] xhci_alloc_pipe: usbdev 0xbf1025e0, ring 0x000edc00, slotid 0, epid 3 binterval=10 maxp=8 i0=00000009 i1=00000000 s0=f8200000 s1=00030000 s2=00000000 s3=00000000 e0=00060000 e1=00080038 e5=0 0000008 cur s0=08200000 s1=00030000 s2=00000000 s3=10000001 e0=00000000 e1=00000000 e5=00000000 xhci_cmd_configure_endpoint: slotid 1, add 0x9, del 0x0 xhci_trb_queue: ring 0xbf11ed00 [nidx 3, len 0] xhci_process_events: ring 0xbf11ed00 [trb 0xbf11ed20, evt 0xbf11ee00, type 33, eidx 3, cc 1] USB keyboard initialized xhci_hub_detect port #4: 0x000002a0, powered, pls 5, speed 0 [ - ] XHCI init on dev 00:10.1: regs @ 0xf014a000, 4 ports, 32 slots, 32 byte contexts XHCI extcap 0x1 @ f014a500 XHCI protocol USB 3.00, 2 ports (offset 1), def 0 XHCI protocol USB 2.00, 2 ports (offset 3), def 0 configure_xhci: resetting xhci_hub_detect port #1: 0x000002a0, powered, pls 5, speed 0 [ - ] xhci_hub_detect port #2: 0x000002a0, powered, pls 5, speed 0 [ - ] xhci_hub_detect port #3: 0x000002a0, powered, pls 5, speed 0 [ - ] xhci_hub_detect port #4: 0x000202e1, powered, pls 7, speed 0 [ - ] xhci_hub_reset port #4: 0x000202e1, powered, pls 7, speed 0 [ - ] XHCI port #4: 0x00200e03, powered, enabled, pls 0, speed 3 [High] set_address 0x000edf60 xhci_alloc_pipe: usbdev 0xbf1025e0, ring 0xbf11e200, slotid 0, epid 1 xhci_cmd_enable_slot: xhci_trb_queue: ring 0xbf11e800 [nidx 1, len 0] xhci_process_events: status change port #4 xhci_process_events: status change port #4 xhci_process_events: ring 0xbf11e800 [trb 0xbf11e800, evt 0xbf11e900, type 33, eidx 1, cc 1] xhci_alloc_pipe: enable slot: got slotid 1 xhci_cmd_address_device: slotid 1 xhci_trb_queue: ring 0xbf11e800 [nidx 2, len 0] xhci_process_events: ring 0xbf11e800 [trb 0xbf11e810, evt 0xbf11e900, type 33, eidx 2, cc 1] xhci_update_pipe: usbdev 0xbf1025e0, ring 0xbf11e200, slotid 1, epid 1 config_usb: 0xbf11e320 xhci_trb_queue: ring 0xbf11e200 [nidx 1, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 2, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 3, len 0] xhci_xfer_kick: ring 0xbf11e200, slotid 1, epid 1 xhci_process_events: ring 0xbf11e200 [trb 0xbf11e220, evt 0xbf11e300, type 32, eidx 3, cc 1] device rev=0200 cls=00 sub=00 proto=00 size=40 xhci_update_pipe: usbdev 0xbf1025e0, ring 0xbf11e200, slotid 1, epid 1 xhci_update_pipe: reconf ctl endpoint pkt size: 8 -> 64 xhci_cmd_evaluate_context: slotid 1, add 0x2, del 0x0 xhci_trb_queue: ring 0xbf11e800 [nidx 3, len 0] xhci_process_events: ring 0xbf11e800 [trb 0xbf11e820, evt 0xbf11e900, type 33, eidx 3, cc 1] xhci_trb_queue: ring 0xbf11e200 [nidx 4, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 5, len 9] xhci_trb_queue: ring 0xbf11e200 [nidx 6, len 0] xhci_xfer_kick: ring 0xbf11e200, slotid 1, epid 1 xhci_process_events: ring 0xbf11e200 [trb 0xbf11e250, evt 0xbf11e300, type 32, eidx 6, cc 1] xhci_trb_queue: ring 0xbf11e200 [nidx 7, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 8, len 32] xhci_trb_queue: ring 0xbf11e200 [nidx 9, len 0] xhci_xfer_kick: ring 0xbf11e200, slotid 1, epid 1 xhci_process_events: ring 0xbf11e200 [trb 0xbf11e280, evt 0xbf11e300, type 32, eidx 9, cc 1] xhci_trb_queue: ring 0xbf11e200 [nidx 10, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 11, len 0] xhci_xfer_kick: ring 0xbf11e200, slotid 1, epid 1 xhci_process_events: ring 0xbf11e200 [trb 0xbf11e2a0, evt 0xbf11e300, type 32, eidx 11, cc 1] xhci_alloc_pipe: usbdev 0xbf1025e0, ring 0x000ed800, slotid 0, epid 3 binterval=0 maxp=512 i0=00000009 i1=00000000 s0=f8300000 s1=00040000 s2=00000000 s3=00000000 e0=00000000 e1=02000030 e5= 00000200 cur s0=08300000 s1=00040000 s2=00000000 s3=10000001 e0=00000000 e1=00000000 e5=00000000 xhci_cmd_configure_endpoint: slotid 1, add 0x9, del 0x0 xhci_trb_queue: ring 0xbf11e800 [nidx 4, len 0] xhci_process_events: ring 0xbf11e800 [trb 0xbf11e830, evt 0xbf11e900, type 33, eidx 4, cc 1] xhci_alloc_pipe: usbdev 0xbf1025e0, ring 0x000ed600, slotid 0, epid 4 binterval=0 maxp=512 i0=00000011 i1=00000000 s0=f8300000 s1=00040000 s2=00000000 s3=00000000 e0=00000000 e1=02000010 e5= 00000200 cur s0=f8300000 s1=00040000 s2=00000000 s3=18000001 e0=00000000 e1=00000000 e5=00000000 xhci_cmd_configure_endpoint: slotid 1, add 0x11, del 0x0 xhci_trb_queue: ring 0xbf11e800 [nidx 5, len 0] xhci_process_events: ring 0xbf11e800 [trb 0xbf11e840, evt 0xbf11e900, type 33, eidx 5, cc 1] xhci_trb_queue: ring 0xbf11e200 [nidx 12, len 8] xhci_trb_queue: ring 0xbf11e200 [nidx 13, len 1] xhci_trb_queue: ring 0xbf11e200 [nidx 14, len 0] xhci_xfer_kick: ring 0xbf11e200, slotid 1, epid 1 xhci_process_events: ring 0xbf11e200 [trb 0xbf11e2d0, evt 0xbf11e300, type 32, eidx 14, cc 1] Searching bootorder for: /pci@i0cf8/usb@10,1/storage@4/*@0/*@0,0 Searching bootorder for: /pci@i0cf8/usb@10,1/usb-*@4 xhci_trb_queue: ring 0x000ed600 [nidx 1, len 31] xhci_xfer_kick: ring 0x000ed600, slotid 1, epid 4 xhci_process_events: ring 0x000ed600 [trb 0x000ed600, evt 0x000ed700, type 32, eidx 1, cc 1] xhci_trb_queue: ring 0x000ed800 [nidx 1, len 36] xhci_xfer_kick: ring 0x000ed800, slotid 1, epid 3 xhci_process_events: ring 0x000ed800 [trb 0x000ed800, evt 0x000ed900, type 32, eidx 1, cc 1] xhci_trb_queue: ring 0x000ed800 [nidx 2, len 13] xhci_xfer_kick: ring 0x000ed800, slotid 1, epid 3 xhci_process_events: ring 0x000ed800 [trb 0x000ed810, evt 0x000ed900, type 32, eidx 2, cc 1] USB MSC vendor='Kingston' product='DataTraveler 2.0' rev='1.00' type=0 removable=1 scsi_is_ready (drive=0x000f4f00) xhci_trb_queue: ring 0x000ed600 [nidx 2, len 31] xhci_xfer_kick: ring 0x000ed600, slotid 1, epid 4 xhci_process_events: ring 0x000ed600 [trb 0x000ed610, evt 0x000ed700, type 32, eidx 2, cc 1] xhci_trb_queue: ring 0x000ed800 [nidx 3, len 13] xhci_xfer_kick: ring 0x000ed800, slotid 1, epid 3 xhci_process_events: ring 0x000ed800 [trb 0x000ed820, evt 0x000ed900, type 32, eidx 3, cc 1] xhci_trb_queue: ring 0x000ed600 [nidx 3, len 31] xhci_xfer_kick: ring 0x000ed600, slotid 1, epid 4 xhci_process_events: ring 0x000ed600 [trb 0x000ed620, evt 0x000ed700, type 32, eidx 3, cc 1] xhci_trb_queue: ring 0x000ed800 [nidx 4, len 8] xhci_xfer_kick: ring 0x000ed800, slotid 1, epid 3 xhci_process_events: ring 0x000ed800 [trb 0x000ed830, evt 0x000ed900, type 32, eidx 4, cc 1] xhci_trb_queue: ring 0x000ed800 [nidx 5, len 13] xhci_xfer_kick: ring 0x000ed800, slotid 1, epid 3 xhci_process_events: ring 0x000ed800 [trb 0x000ed840, evt 0x000ed900, type 32, eidx 5, cc 1] USB MSC blksize=512 sectors=1994752 Registering bootable: USB MSC Drive Kingston DataTraveler 2.0 1.00 (type:2 prio:103 data:f4f00) EHCI init on dev 00:12.2 (regs=0xf014f820) set_address 0xbf1025e0 ehci_alloc_async_pipe 0xbf1025e0 0 ehci_control 0xbf1020d0 (dir=0 cmd=8 data=0) ehci_alloc_async_pipe 0xbf1025e0 0 config_usb: 0xbf1020d0 ehci_control 0xbf1020d0 (dir=128 cmd=8 data=8) device rev=0200 cls=00 sub=00 proto=00 size=40 ehci_alloc_async_pipe 0xbf1025e0 0 ehci_control 0xbf1020d0 (dir=128 cmd=8 data=9) ehci_control 0xbf1020d0 (dir=128 cmd=8 data=46) ehci_free_pipes 0xbf1025e0 EHCI init on dev 00:13.2 (regs=0xf014f920) ehci_free_pipes 0xbf1025e0 OHCI init on dev 00:12.0 (regs=0xf014c000) ohci_free_pipes 0xbf1025e0 OHCI init on dev 00:13.0 (regs=0xf014d000) ohci_free_pipes 0xbf102370 OHCI init on dev 00:14.5 (regs=0xf014e000) ohci_free_pipes 0xbf1021c0 A low speed keyboard and a high speed MSC are attached. Idwer

1 0

Re: [SeaBIOS] [coreboot] Patch number 4 for floppy in SeaBIOS
by Gelip 29 Dec '13

29 Dec '13

Maybe this is realtek ring problem like in iPXE: http://git.ipxe.org/ipxe.git/commitdiff/5d3d62d "realtek_destroy_ring() currently does nothing if the card is operating in legacy (pre-RTL8139C+) mode. In particular, the producer and consumer counters are incorrectly left holding their current values. Virtual hardware (e.g. the emulated RTL8139 in qemu and similar VMs) is tolerant of this behaviour, but real hardware will fail to transmit if the descriptors are not used in the correct order. Fix by resetting the producer and consumer counters in realtek_destroy_ring() even if the card is operating in legacy mode. Reported-by: Gelip <mrgelip(a)gmail.com> Signed-off-by: Michael Brown <mcb30(a)ipxe.org>"

1 0

Re: [SeaBIOS] [coreboot] Patch number 4 for floppy in SeaBIOS
by Gelip 29 Dec '13

29 Dec '13

I think that this is a problem only with chip NIC RTL8139D on coreboot because: - many other floppy works without a problem on coreboot/seabios - BOOT-PROM3 floppy disk image is not damage - BOOT-PROM3 floppy disk is also not damage - tested other floppy disk with BOOT-PROM3 and also working on vendor bios but not in coreboot - BOOT-PROM3 floppy & disk work OK on vendor bios on RTL8139D - BOOT-PROM1 floppy disk work ok with other NIC ISA 3com on coreboot - I was timeout problem with my NIC RTL8139D on iPXE: http://forum.ipxe.org/showthread.php?tid=3671 solved -> http://forum.ipxe.org/showthread.php?tid=3671&pid=9081#pid9081 but not excluded, however, that this may be a problem seabios Regarding seabios it seems to me that the floppy drive sounds are different when working in coreboot / seabios than when working in the BIOS vendor. I noticed that sometimes after select Floppy from menu SeaBIOS, have info that Floppy drive not found while try boot from BOOT-PROM3 disk. I need power down PC then power ON and now floppy found. Is another payload supports a floppy drive for test?

1 0

Re: [SeaBIOS] [PATCH 08/10] xhci: Eliminate 'struct xhci_device'.
by Kevin O'Connor 29 Dec '13

29 Dec '13

On Fri, Dec 27, 2013 at 10:18:02PM -0500, Kevin O'Connor wrote: > Eliminate the xhci_device struct by storing the slotid in usbdevice_s > and in xhci_pipe. The remaining storage in that struct (xhci_devctx) > is available from xhci->devs. This patch missed a few references to xhci_devctx. I've rebased and put the series at: https://github.com/KevinOConnor/seabios/tree/xhci-testing -Kevin From: Kevin O'Connor <kevin(a)koconnor.net> Date: Fri, 27 Dec 2013 21:09:53 -0500 Subject: [PATCH 08/12] xhci: Eliminate 'struct xhci_device'. To: seabios(a)seabios.org Eliminate the xhci_device struct by storing the slotid in usbdevice_s and in xhci_pipe. The remaining storage in that struct (xhci_devctx) is available from xhci->devs. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/usb-xhci.c | 146 +++++++++++++++++++++--------------------------------- src/hw/usb.h | 1 + 2 files changed, 57 insertions(+), 90 deletions(-) diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c index cda0214..6f8f847 100644 --- a/src/hw/usb-xhci.c +++ b/src/hw/usb-xhci.c @@ -242,25 +242,13 @@ struct usb_xhci_s { struct xhci_ring *cmds; struct xhci_ring *evts; struct xhci_er_seg *eseg; - - /* usb devices */ - struct hlist_head list; -}; - -struct xhci_device { - struct xhci_devctx devctx; - - struct usbdevice_s *usbdev; - struct usb_xhci_s *xhci; - u32 slotid; - struct hlist_node next; }; struct xhci_pipe { struct xhci_ring reqs; struct usb_pipe pipe; - struct xhci_device *dev; + u32 slotid; u32 epid; void *buf; int bufused; @@ -458,9 +446,9 @@ static void xhci_xfer_queue(struct xhci_pipe *pipe, static void xhci_xfer_kick(struct xhci_pipe *pipe) { - struct xhci_device *dev = GET_LOWFLAT(pipe->dev); - struct usb_xhci_s *xhci = GET_LOWFLAT(dev->xhci); - u32 slotid = GET_LOWFLAT(dev->slotid); + struct usb_xhci_s *xhci = container_of( + GET_LOWFLAT(pipe->pipe.cntl), struct usb_xhci_s, usb); + u32 slotid = GET_LOWFLAT(pipe->slotid); u32 epid = GET_LOWFLAT(pipe->epid); dprintf(5, "%s: ring %p, slotid %d, epid %d\n", @@ -531,20 +519,22 @@ static int xhci_cmd_enable_slot(struct usb_xhci_s *xhci) return (xhci->cmds->evt.control >> 24) & 0xff; } -static int xhci_cmd_disable_slot(struct xhci_device *dev) +#if 0 +static int xhci_cmd_disable_slot(struct usb_xhci_s *xhci, u32 slotid) { ASSERT32FLAT(); struct xhci_trb cmd = { .ptr_low = 0, .ptr_high = 0, .status = 0, - .control = (dev->slotid << 24) | (CR_DISABLE_SLOT << 10) + .control = (slotid << 24) | (CR_DISABLE_SLOT << 10) }; - dprintf(3, "%s: slotid %d\n", __func__, dev->slotid); - return xhci_cmd_submit(dev->xhci, &cmd); + dprintf(3, "%s: slotid %d\n", __func__, slotid); + return xhci_cmd_submit(xhci, &cmd); } +#endif -static int xhci_cmd_address_device(struct xhci_device *dev +static int xhci_cmd_address_device(struct usb_xhci_s *xhci, u32 slotid , struct xhci_inctx *inctx) { ASSERT32FLAT(); @@ -552,13 +542,13 @@ static int xhci_cmd_address_device(struct xhci_device *dev .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, - .control = (dev->slotid << 24) | (CR_ADDRESS_DEVICE << 10) + .control = (slotid << 24) | (CR_ADDRESS_DEVICE << 10) }; - dprintf(3, "%s: slotid %d\n", __func__, dev->slotid); - return xhci_cmd_submit(dev->xhci, &cmd); + dprintf(3, "%s: slotid %d\n", __func__, slotid); + return xhci_cmd_submit(xhci, &cmd); } -static int xhci_cmd_configure_endpoint(struct xhci_device *dev +static int xhci_cmd_configure_endpoint(struct usb_xhci_s *xhci, u32 slotid , struct xhci_inctx *inctx) { ASSERT32FLAT(); @@ -566,14 +556,14 @@ static int xhci_cmd_configure_endpoint(struct xhci_device *dev .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, - .control = (dev->slotid << 24) | (CR_CONFIGURE_ENDPOINT << 10) + .control = (slotid << 24) | (CR_CONFIGURE_ENDPOINT << 10) }; dprintf(3, "%s: slotid %d, add 0x%x, del 0x%x\n", __func__, - dev->slotid, inctx->add, inctx->del); - return xhci_cmd_submit(dev->xhci, &cmd); + slotid, inctx->add, inctx->del); + return xhci_cmd_submit(xhci, &cmd); } -static int xhci_cmd_evaluate_context(struct xhci_device *dev +static int xhci_cmd_evaluate_context(struct usb_xhci_s *xhci, u32 slotid , struct xhci_inctx *inctx) { ASSERT32FLAT(); @@ -581,11 +571,11 @@ static int xhci_cmd_evaluate_context(struct xhci_device *dev .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, - .control = (dev->slotid << 24) | (CR_EVALUATE_CONTEXT << 10) + .control = (slotid << 24) | (CR_EVALUATE_CONTEXT << 10) }; dprintf(3, "%s: slotid %d, add 0x%x, del 0x%x\n", __func__, - dev->slotid, inctx->add, inctx->del); - return xhci_cmd_submit(dev->xhci, &cmd); + slotid, inctx->add, inctx->del); + return xhci_cmd_submit(xhci, &cmd); } static void xhci_xfer_setup(struct xhci_pipe *pipe, @@ -639,30 +629,6 @@ static void xhci_xfer_status(struct xhci_pipe *pipe, int dir, int datalen) xhci_xfer_kick(pipe); } -static struct xhci_device *xhci_find_alloc_device(struct usb_xhci_s *xhci, - struct usbdevice_s *usbdev) -{ - ASSERT32FLAT(); - struct xhci_device *dev; - - hlist_for_each_entry(dev, &xhci->list, next) { - if (dev->usbdev == usbdev) { - return dev; - } - } - - dev = memalign_low(64, sizeof(*dev)); - if (!dev) { - warn_noalloc(); - return NULL; - } - memset(dev, 0, sizeof(*dev)); - dev->usbdev = usbdev; - dev->xhci = xhci; - hlist_add_head(&dev->next, &xhci->list); - return dev; -} - static void configure_xhci(void *data) { @@ -736,6 +702,7 @@ configure_xhci(void *data) mdelay(100); usb_enumerate(&xhci->hub); + // XXX - should walk list of pipes and free unused pipes. if (xhci->hub.devcount) return; @@ -824,18 +791,7 @@ static void xhci_hub_disconnect(struct usbhub_s *hub, u32 port) { ASSERT32FLAT(); - struct usb_xhci_s *xhci = container_of(hub->cntl, struct usb_xhci_s, usb); - struct xhci_device *dev; - - hlist_for_each_entry(dev, &xhci->list, next) { - if (dev->usbdev->hub == hub && - dev->usbdev->port == port && - dev->slotid != 0) { - xhci_cmd_disable_slot(dev); - hlist_del(&dev->next); - return; - } - } + // XXX - should turn the port power off. } static struct usbhub_op_s xhci_hub_ops = { @@ -849,7 +805,7 @@ static struct usbhub_op_s xhci_hub_ops = { static struct xhci_inctx * -xhci_alloc_inctx(struct xhci_pipe *pipe) +xhci_alloc_inctx(struct usbdevice_s *usbdev) { struct xhci_inctx *in = memalign_tmphigh(4096, sizeof(*in)); if (!in) { @@ -858,7 +814,6 @@ xhci_alloc_inctx(struct xhci_pipe *pipe) } memset(in, 0, sizeof(*in)); - struct usbdevice_s *usbdev = pipe->dev->usbdev; u32 route = 0; while (usbdev->hub->usbdev) { route <<= 4; @@ -868,7 +823,7 @@ xhci_alloc_inctx(struct xhci_pipe *pipe) in->add = 0x01; in->slot.ctx[0] |= (1 << 27); // context entries - in->slot.ctx[0] |= speed_to_xhci[pipe->dev->usbdev->speed] << 20; + in->slot.ctx[0] |= speed_to_xhci[usbdev->speed] << 20; in->slot.ctx[0] |= route; in->slot.ctx[1] |= (usbdev->port+1) << 16; /* TODO ctx0: hub bit */ @@ -907,48 +862,55 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev memset(pipe, 0, sizeof(*pipe)); usb_desc2pipe(&pipe->pipe, usbdev, epdesc); - pipe->dev = xhci_find_alloc_device(xhci, usbdev); - if (!pipe->dev) - goto fail; pipe->epid = epid; pipe->reqs.cs = 1; if (eptype == USB_ENDPOINT_XFER_INT) pipe->buf = malloc_low(pipe->pipe.maxpacket); dprintf(3, "%s: usbdev %p, ring %p, slotid %d, epid %d\n", __func__, - usbdev, &pipe->reqs, pipe->dev->slotid, pipe->epid); + usbdev, &pipe->reqs, pipe->slotid, pipe->epid); if (pipe->epid == 1) { // Enable slot and send set_address command. + struct xhci_slotctx *dev = memalign_high(2048, sizeof(*dev)); + if (!dev) { + warn_noalloc(); + goto fail; + } int slotid = xhci_cmd_enable_slot(xhci); if (slotid < 0) { dprintf(1, "%s: enable slot: failed\n", __func__); + free(dev); goto fail; } dprintf(3, "%s: enable slot: got slotid %d\n", __func__, slotid); - pipe->dev->slotid = slotid; - xhci->devs[slotid].ptr_low = (u32)&pipe->dev->devctx; + + memset(dev, 0, sizeof(*dev)); + pipe->slotid = usbdev->slotid = slotid; + xhci->devs[slotid].ptr_low = (u32)dev; xhci->devs[slotid].ptr_high = 0; - struct xhci_inctx *in = xhci_alloc_inctx(pipe); + struct xhci_inctx *in = xhci_alloc_inctx(usbdev); + if (!in) + goto fail; in->add |= (1 << 1); in->ep[0].ctx[0] |= (3 << 16); // interval: 1ms in->ep[0].ctx[1] |= (4 << 3); // control pipe - in->ep[0].ctx[1] |= (speed_to_ctlsize[pipe->dev->usbdev->speed] << 16); + in->ep[0].ctx[1] |= (speed_to_ctlsize[usbdev->speed] << 16); in->ep[0].deq_low = (u32)&pipe->reqs.ring[0]; in->ep[0].deq_low |= 1; // dcs in->ep[0].deq_high = 0; in->ep[0].length = 8; - int cc = xhci_cmd_address_device(pipe->dev, in); + int cc = xhci_cmd_address_device(xhci, slotid, in); free(in); if (cc != CC_SUCCESS) { dprintf(1, "%s: address device: failed (cc %d)\n", __func__, cc); goto fail; } } else { - struct xhci_inctx *in = xhci_alloc_inctx(pipe); + struct xhci_inctx *in = xhci_alloc_inctx(usbdev); if (!in) goto fail; in->add |= (1 << pipe->epid); @@ -966,7 +928,8 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev in->ep[e].deq_high = 0; in->ep[e].length = pipe->pipe.maxpacket; - int cc = xhci_cmd_configure_endpoint(pipe->dev, in); + pipe->slotid = usbdev->slotid; + int cc = xhci_cmd_configure_endpoint(xhci, pipe->slotid, in); free(in); if (cc != CC_SUCCESS) { dprintf(1, "%s: configure endpoint: failed (cc %d)\n", __func__, cc); @@ -989,19 +952,21 @@ xhci_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe return NULL; u8 eptype = epdesc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; struct xhci_pipe *pipe = container_of(upipe, struct xhci_pipe, pipe); + struct usb_xhci_s *xhci = container_of( + pipe->pipe.cntl, struct usb_xhci_s, usb); dprintf(3, "%s: usbdev %p, ring %p, slotid %d, epid %d\n", __func__, - usbdev, &pipe->reqs, pipe->dev->slotid, pipe->epid); + usbdev, &pipe->reqs, pipe->slotid, pipe->epid); if (eptype == USB_ENDPOINT_XFER_CONTROL && pipe->pipe.maxpacket != epdesc->wMaxPacketSize) { dprintf(1, "%s: reconf ctl endpoint pkt size: %d -> %d\n", __func__, pipe->pipe.maxpacket, epdesc->wMaxPacketSize); pipe->pipe.maxpacket = epdesc->wMaxPacketSize; - struct xhci_inctx *in = xhci_alloc_inctx(pipe); + struct xhci_inctx *in = xhci_alloc_inctx(usbdev); if (!in) return upipe; in->add = (1 << 1); in->ep[0].ctx[1] |= (pipe->pipe.maxpacket << 16); - int cc = xhci_cmd_evaluate_context(pipe->dev, in); + int cc = xhci_cmd_evaluate_context(xhci, pipe->slotid, in); if (cc != CC_SUCCESS) { dprintf(1, "%s: reconf ctl endpoint: failed (cc %d)\n", __func__, cc); @@ -1020,7 +985,8 @@ xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize return -1; const struct usb_ctrlrequest *req = cmd; struct xhci_pipe *pipe = container_of(p, struct xhci_pipe, pipe); - struct usb_xhci_s *xhci = pipe->dev->xhci; + struct usb_xhci_s *xhci = container_of( + pipe->pipe.cntl, struct usb_xhci_s, usb); if (req->bRequest == USB_REQ_SET_ADDRESS) // Set address command sent during xhci_alloc_pipe. @@ -1047,8 +1013,8 @@ xhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datalen) return -1; struct xhci_pipe *pipe = container_of(p, struct xhci_pipe, pipe); - struct xhci_device *dev = GET_LOWFLAT(pipe->dev); - struct usb_xhci_s *xhci = GET_LOWFLAT(dev->xhci); + struct usb_xhci_s *xhci = container_of( + GET_LOWFLAT(pipe->pipe.cntl), struct usb_xhci_s, usb); xhci_xfer_normal(pipe, data, datalen); int cc = xhci_event_wait(xhci, &pipe->reqs, 1000); @@ -1066,8 +1032,8 @@ xhci_poll_intr(struct usb_pipe *p, void *data) return -1; struct xhci_pipe *pipe = container_of(p, struct xhci_pipe, pipe); - struct xhci_device *dev = GET_LOWFLAT(pipe->dev); - struct usb_xhci_s *xhci = GET_LOWFLAT(dev->xhci); + struct usb_xhci_s *xhci = container_of( + GET_LOWFLAT(pipe->pipe.cntl), struct usb_xhci_s, usb); u32 len = GET_LOWFLAT(pipe->pipe.maxpacket); void *buf = GET_LOWFLAT(pipe->buf); int bufused = GET_LOWFLAT(pipe->bufused); diff --git a/src/hw/usb.h b/src/hw/usb.h index 883c608..cb5a05c 100644 --- a/src/hw/usb.h +++ b/src/hw/usb.h @@ -22,6 +22,7 @@ struct usb_pipe { struct usbdevice_s { struct usbhub_s *hub; struct usb_pipe *defpipe; + u32 slotid; u32 port; struct usb_config_descriptor *config; struct usb_interface_descriptor *iface; -- 1.8.3.1

1 0

Re: [SeaBIOS] [PATCH 06/10] xhci: Allocate and free the xhci inctx structure on each use.
by Kevin O'Connor 29 Dec '13

29 Dec '13

On Fri, Dec 27, 2013 at 10:16:23PM -0500, Kevin O'Connor wrote: > The inctx struct isn't long lived, so it doesn't need to be allocated > in permanent memory. This patch was incorrect as it lost the assignment to in->slot.ctx[0] . I've rebased and pushed the new series to: https://github.com/KevinOConnor/seabios/tree/xhci-testing -Kevin From: Kevin O'Connor <kevin(a)koconnor.net> Date: Fri, 27 Dec 2013 18:09:16 -0500 Subject: [PATCH 06/12] xhci: Allocate and free the xhci inctx structure on each use. To: seabios(a)seabios.org The inctx struct isn't long lived, so it doesn't need to be allocated in permanent memory. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/usb-xhci.c | 104 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 43 deletions(-) diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c index ac13c4c..d55a2cf 100644 --- a/src/hw/usb-xhci.c +++ b/src/hw/usb-xhci.c @@ -249,7 +249,6 @@ struct usb_xhci_s { struct xhci_device { struct xhci_devctx devctx; - struct xhci_inctx inctx; struct usbdevice_s *usbdev; struct usb_xhci_s *xhci; @@ -545,11 +544,12 @@ static int xhci_cmd_disable_slot(struct xhci_device *dev) return xhci_cmd_submit(dev->xhci, &cmd); } -static int xhci_cmd_address_device(struct xhci_device *dev) +static int xhci_cmd_address_device(struct xhci_device *dev + , struct xhci_inctx *inctx) { ASSERT32FLAT(); struct xhci_trb cmd = { - .ptr_low = (u32)&dev->inctx, + .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, .control = (dev->slotid << 24) | (CR_ADDRESS_DEVICE << 10) @@ -558,31 +558,33 @@ static int xhci_cmd_address_device(struct xhci_device *dev) return xhci_cmd_submit(dev->xhci, &cmd); } -static int xhci_cmd_configure_endpoint(struct xhci_device *dev) +static int xhci_cmd_configure_endpoint(struct xhci_device *dev + , struct xhci_inctx *inctx) { ASSERT32FLAT(); struct xhci_trb cmd = { - .ptr_low = (u32)&dev->inctx, + .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, .control = (dev->slotid << 24) | (CR_CONFIGURE_ENDPOINT << 10) }; dprintf(3, "%s: slotid %d, add 0x%x, del 0x%x\n", __func__, - dev->slotid, dev->inctx.add, dev->inctx.del); + dev->slotid, inctx->add, inctx->del); return xhci_cmd_submit(dev->xhci, &cmd); } -static int xhci_cmd_evaluate_context(struct xhci_device *dev) +static int xhci_cmd_evaluate_context(struct xhci_device *dev + , struct xhci_inctx *inctx) { ASSERT32FLAT(); struct xhci_trb cmd = { - .ptr_low = (u32)&dev->inctx, + .ptr_low = (u32)inctx, .ptr_high = 0, .status = 0, .control = (dev->slotid << 24) | (CR_EVALUATE_CONTEXT << 10) }; dprintf(3, "%s: slotid %d, add 0x%x, del 0x%x\n", __func__, - dev->slotid, dev->inctx.add, dev->inctx.del); + dev->slotid, inctx->add, inctx->del); return xhci_cmd_submit(dev->xhci, &cmd); } @@ -845,6 +847,35 @@ static struct usbhub_op_s xhci_hub_ops = { // -------------------------------------------------------------- // external interface + +static struct xhci_inctx * +xhci_alloc_inctx(struct xhci_pipe *pipe) +{ + struct xhci_inctx *in = memalign_tmphigh(4096, sizeof(*in)); + if (!in) { + warn_noalloc(); + return NULL; + } + memset(in, 0, sizeof(*in)); + + struct usbdevice_s *usbdev = pipe->dev->usbdev; + u32 route = 0; + while (usbdev->hub->usbdev) { + route <<= 4; + route |= (usbdev->port+1) & 0xf; + usbdev = usbdev->hub->usbdev; + } + + in->add = 0x01; + in->slot.ctx[0] |= (1 << 27); // context entries + in->slot.ctx[0] |= speed_to_xhci[pipe->dev->usbdev->speed] << 20; + in->slot.ctx[0] |= route; + in->slot.ctx[1] |= (usbdev->port+1) << 16; + /* TODO ctx0: hub bit */ + /* TODO ctx1: hub ports */ + return in; +} + struct usb_pipe * xhci_alloc_pipe(struct usbdevice_s *usbdev , struct usb_endpoint_descriptor *epdesc) @@ -877,10 +908,8 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev usb_desc2pipe(&pipe->pipe, usbdev, epdesc); pipe->dev = xhci_find_alloc_device(xhci, usbdev); - if (!pipe->dev) { - free(pipe); - return NULL; - } + if (!pipe->dev) + goto fail; pipe->epid = epid; pipe->reqs.cs = 1; if (eptype == USB_ENDPOINT_XFER_INT) @@ -889,10 +918,10 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev dprintf(3, "%s: usbdev %p, ring %p, slotid %d, epid %d\n", __func__, usbdev, &pipe->reqs, pipe->dev->slotid, pipe->epid); if (pipe->epid > 1 && pipe->dev->slotid) { - struct xhci_inctx *in = &pipe->dev->inctx; - in->add = (1 << pipe->epid) | 1; - in->del = 0; - + struct xhci_inctx *in = xhci_alloc_inctx(pipe); + if (!in) + goto fail; + in->add |= (1 << pipe->epid); in->slot.ctx[0] |= (31 << 27); // context entries int e = pipe->epid-1; @@ -907,15 +936,18 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev in->ep[e].deq_high = 0; in->ep[e].length = pipe->pipe.maxpacket; - int cc = xhci_cmd_configure_endpoint(pipe->dev); + int cc = xhci_cmd_configure_endpoint(pipe->dev, in); + free(in); if (cc != CC_SUCCESS) { dprintf(1, "%s: configure endpoint: failed (cc %d)\n", __func__, cc); - free(pipe); - return NULL; + goto fail; } } return &pipe->pipe; +fail: + free(pipe); + return NULL; } struct usb_pipe * @@ -934,16 +966,17 @@ xhci_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe dprintf(1, "%s: reconf ctl endpoint pkt size: %d -> %d\n", __func__, pipe->pipe.maxpacket, epdesc->wMaxPacketSize); pipe->pipe.maxpacket = epdesc->wMaxPacketSize; - struct xhci_inctx *in = &pipe->dev->inctx; + struct xhci_inctx *in = xhci_alloc_inctx(pipe); + if (!in) + return upipe; in->add = (1 << 1); - in->del = 0; - in->ep[0].ctx[1] &= 0xffff; in->ep[0].ctx[1] |= (pipe->pipe.maxpacket << 16); - int cc = xhci_cmd_evaluate_context(pipe->dev); + int cc = xhci_cmd_evaluate_context(pipe->dev, in); if (cc != CC_SUCCESS) { dprintf(1, "%s: reconf ctl endpoint: failed (cc %d)\n", __func__, cc); } + free(in); } return upipe; } @@ -971,24 +1004,8 @@ xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize xhci->devs[slotid].ptr_low = (u32)&pipe->dev->devctx; xhci->devs[slotid].ptr_high = 0; - struct usbdevice_s *usbdev = pipe->dev->usbdev; - u32 route = 0; - while (usbdev->hub->usbdev) { - route <<= 4; - route |= (usbdev->port+1) & 0xf; - usbdev = usbdev->hub->usbdev; - } - dprintf(3, "%s: root port %d, route 0x%x\n", - __func__, usbdev->port+1, route); - - struct xhci_inctx *in = &pipe->dev->inctx; - in->add = 0x03; - in->slot.ctx[0] |= (1 << 27); // context entries - in->slot.ctx[0] |= speed_to_xhci[pipe->dev->usbdev->speed] << 20; - in->slot.ctx[0] |= route; - in->slot.ctx[1] |= (usbdev->port+1) << 16; - /* TODO ctx0: hub bit */ - /* TODO ctx1: hub ports */ + struct xhci_inctx *in = xhci_alloc_inctx(pipe); + in->add |= (1 << 1); in->ep[0].ctx[0] |= (3 << 16); // interval: 1ms in->ep[0].ctx[1] |= (4 << 3); // control pipe @@ -999,7 +1016,8 @@ xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize in->ep[0].deq_high = 0; in->ep[0].length = 8; - cc = xhci_cmd_address_device(pipe->dev); + cc = xhci_cmd_address_device(pipe->dev, in); + free(in); if (cc != CC_SUCCESS) { dprintf(1, "%s: address device: failed (cc %d)\n", __func__, cc); return -1; -- 1.8.3.1

1 0

Re: [SeaBIOS] [coreboot] Patch number 4 for floppy in SeaBIOS
by Gelip 29 Dec '13

29 Dec '13

Successful qemu: qemu2.log Unsuccessful Abit BF6: abit2.log On Abit is only BOOTP.............. and in PXE server log nothing any data.

2 1

Re: [SeaBIOS] [coreboot] Patch number 4 for floppy in SeaBIOS
by Gelip 28 Dec '13

28 Dec '13

I tested also other NIC ISA and BOOT-PROM1 floppy and PC boot OK Boot Abit BF6 from BOOT-PROM1 floppy on ISA NIC 3com Etherlink III 509 ====================================================================== Booting from Floppy... enter handle_13: a=00000201 b=00000000 c=00000001 d=00000000 ds=0000 es=07c0 ss=e000 si=00000000 di=00000000 bp=00000000 sp=0000ff90 cs=f000 ip=ce33 f=0202 disk_op d=0x000f0a20 lba=0 buf=0x00007c00 count=1 cmd=2 Floppy_drive_recal 0 Floppy_enable_controller Floppy_media_sense on drive 0 found rate 0 Booting from 0000:7c00 enter handle_13: a=00000000 b=00000000 c=00000000 d=00000000 ds=7c00 es=0000 ss=e000 si=00000000 di=00000000 bp=00000000 sp=0000ff90 cs=0000 ip=7cc9 f=0202 disk_op d=0x000f0a20 lba=514 buf=0x0000b1b2 count=0 cmd=0 Floppy_disable_controller Floppy_enable_controller enter handle_13: a=00000800 b=00000000 c=00000000 d=00000000 ds=7c00 es=0000 ss=e000 si=00000000 di=00000000 bp=00000000 sp=0000ff90 cs=0000 ip=7cd1 f=0202 enter handle_13: a=00000204 b=00000000 c=00000001 d=00000000 ds=7c00 es=5000 ss=e000 si=00000000 di=00005b60 bp=00000000 sp=0000ff90 cs=0000 ip=7ce7 f=0202 disk_op d=0x000f0a20 lba=0 buf=0x00050000 count=4 cmd=2 Floppy_drive_recal 0 Floppy_media_sense on drive 0 found rate 0 enter handle_13: a=00000201 b=00000000 c=00000601 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0246 disk_op d=0x000f0a20 lba=216 buf=0x00060000 count=1 cmd=2 enter handle_13: a=00000201 b=00000200 c=00000602 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=217 buf=0x00060200 count=1 cmd=2 enter handle_13: a=00000201 b=00000400 c=00000603 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=218 buf=0x00060400 count=1 cmd=2 enter handle_13: a=00000201 b=00000600 c=00000604 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=219 buf=0x00060600 count=1 cmd=2 enter handle_13: a=00000201 b=00000800 c=00000605 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=220 buf=0x00060800 count=1 cmd=2 enter handle_13: a=00000201 b=00000a00 c=00000606 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=221 buf=0x00060a00 count=1 cmd=2 enter handle_13: a=00000201 b=00000c00 c=00000607 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=222 buf=0x00060c00 count=1 cmd=2 enter handle_13: a=00000201 b=00000e00 c=00000608 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=223 buf=0x00060e00 count=1 cmd=2 enter handle_13: a=00000201 b=00001000 c=00000609 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=224 buf=0x00061000 count=1 cmd=2 enter handle_13: a=00000201 b=00001200 c=0000060a d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=225 buf=0x00061200 count=1 cmd=2 enter handle_13: a=00000201 b=00001400 c=0000060b d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=226 buf=0x00061400 count=1 cmd=2 enter handle_13: a=00000201 b=00001600 c=0000060c d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=227 buf=0x00061600 count=1 cmd=2 enter handle_13: a=00000201 b=00001800 c=0000060d d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=228 buf=0x00061800 count=1 cmd=2 enter handle_13: a=00000201 b=00001a00 c=0000060e d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=229 buf=0x00061a00 count=1 cmd=2 enter handle_13: a=00000201 b=00001c00 c=0000060f d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=230 buf=0x00061c00 count=1 cmd=2 enter handle_13: a=00000201 b=00001e00 c=00000610 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=231 buf=0x00061e00 count=1 cmd=2 enter handle_13: a=00000201 b=00002000 c=00000611 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=232 buf=0x00062000 count=1 cmd=2 enter handle_13: a=00000201 b=00002200 c=00000612 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=233 buf=0x00062200 count=1 cmd=2 enter handle_13: a=00000201 b=00002400 c=00000601 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=234 buf=0x00062400 count=1 cmd=2 enter handle_13: a=00000201 b=00002600 c=00000602 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=235 buf=0x00062600 count=1 cmd=2 enter handle_13: a=00000201 b=00002800 c=00000603 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=236 buf=0x00062800 count=1 cmd=2 enter handle_13: a=00000201 b=00002a00 c=00000604 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=237 buf=0x00062a00 count=1 cmd=2 enter handle_13: a=00000201 b=00002c00 c=00000605 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=238 buf=0x00062c00 count=1 cmd=2 enter handle_13: a=00000201 b=00002e00 c=00000606 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=239 buf=0x00062e00 count=1 cmd=2 enter handle_13: a=00000201 b=00003000 c=00000607 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=240 buf=0x00063000 count=1 cmd=2 enter handle_13: a=00000201 b=00003200 c=00000608 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=241 buf=0x00063200 count=1 cmd=2 enter handle_13: a=00000201 b=00003400 c=00000609 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=242 buf=0x00063400 count=1 cmd=2 enter handle_13: a=00000201 b=00003600 c=0000060a d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=243 buf=0x00063600 count=1 cmd=2 enter handle_13: a=00000201 b=00003800 c=0000060b d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=244 buf=0x00063800 count=1 cmd=2 enter handle_13: a=00000201 b=00003a00 c=0000060c d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=245 buf=0x00063a00 count=1 cmd=2 enter handle_13: a=00000201 b=00003c00 c=0000060d d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=246 buf=0x00063c00 count=1 cmd=2 enter handle_13: a=00000201 b=00003e00 c=0000060e d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=247 buf=0x00063e00 count=1 cmd=2 enter handle_13: a=00000201 b=00004000 c=0000060f d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=248 buf=0x00064000 count=1 cmd=2 enter handle_13: a=00000201 b=00004200 c=00000610 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=249 buf=0x00064200 count=1 cmd=2 enter handle_13: a=00000201 b=00004400 c=00000611 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=250 buf=0x00064400 count=1 cmd=2 enter handle_13: a=00000201 b=00004600 c=00000612 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=251 buf=0x00064600 count=1 cmd=2 enter handle_13: a=00000201 b=00004800 c=00000701 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=252 buf=0x00064800 count=1 cmd=2 enter handle_13: a=00000201 b=00004a00 c=00000702 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=253 buf=0x00064a00 count=1 cmd=2 enter handle_13: a=00000201 b=00004c00 c=00000703 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=254 buf=0x00064c00 count=1 cmd=2 enter handle_13: a=00000201 b=00004e00 c=00000704 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=255 buf=0x00064e00 count=1 cmd=2 enter handle_13: a=00000201 b=00005000 c=00000705 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=256 buf=0x00065000 count=1 cmd=2 enter handle_13: a=00000201 b=00005200 c=00000706 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=257 buf=0x00065200 count=1 cmd=2 enter handle_13: a=00000201 b=00005400 c=00000707 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=258 buf=0x00065400 count=1 cmd=2 enter handle_13: a=00000201 b=00005600 c=00000708 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=259 buf=0x00065600 count=1 cmd=2 enter handle_13: a=00000201 b=00005800 c=00000709 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=260 buf=0x00065800 count=1 cmd=2 enter handle_13: a=00000201 b=00005a00 c=0000070a d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=261 buf=0x00065a00 count=1 cmd=2 enter handle_13: a=00000201 b=00005c00 c=0000070b d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=262 buf=0x00065c00 count=1 cmd=2 enter handle_13: a=00000201 b=00005e00 c=0000070c d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=263 buf=0x00065e00 count=1 cmd=2 enter handle_13: a=00000201 b=00006000 c=0000070d d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=264 buf=0x00066000 count=1 cmd=2 enter handle_13: a=00000201 b=00006200 c=0000070e d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=265 buf=0x00066200 count=1 cmd=2 enter handle_13: a=00000201 b=00006400 c=0000070f d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=266 buf=0x00066400 count=1 cmd=2 enter handle_13: a=00000201 b=00006600 c=00000710 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=267 buf=0x00066600 count=1 cmd=2 enter handle_13: a=00000201 b=00006800 c=00000711 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=268 buf=0x00066800 count=1 cmd=2 enter handle_13: a=00000201 b=00006a00 c=00000712 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=269 buf=0x00066a00 count=1 cmd=2 enter handle_13: a=00000201 b=00006c00 c=00000701 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=270 buf=0x00066c00 count=1 cmd=2 enter handle_13: a=00000201 b=00006e00 c=00000702 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=271 buf=0x00066e00 count=1 cmd=2 enter handle_13: a=00000201 b=00007000 c=00000703 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=272 buf=0x00067000 count=1 cmd=2 enter handle_13: a=00000201 b=00007200 c=00000704 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=273 buf=0x00067200 count=1 cmd=2 enter handle_13: a=00000201 b=00007400 c=00000705 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=274 buf=0x00067400 count=1 cmd=2 enter handle_13: a=00000201 b=00007600 c=00000706 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=275 buf=0x00067600 count=1 cmd=2 enter handle_13: a=00000201 b=00007800 c=00000707 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=276 buf=0x00067800 count=1 cmd=2 enter handle_13: a=00000201 b=00007a00 c=00000708 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=277 buf=0x00067a00 count=1 cmd=2 enter handle_13: a=00000201 b=00007c00 c=00000709 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=278 buf=0x00067c00 count=1 cmd=2 enter handle_13: a=00000201 b=00007e00 c=0000070a d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0206 disk_op d=0x000f0a20 lba=279 buf=0x00067e00 count=1 cmd=2 enter handle_13: a=00000201 b=00008000 c=0000070b d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0a86 disk_op d=0x000f0a20 lba=280 buf=0x00068000 count=1 cmd=2 enter handle_13: a=00000201 b=00008200 c=0000070c d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=281 buf=0x00068200 count=1 cmd=2 enter handle_13: a=00000201 b=00008400 c=0000070d d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=282 buf=0x00068400 count=1 cmd=2 enter handle_13: a=00000201 b=00008600 c=0000070e d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=283 buf=0x00068600 count=1 cmd=2 enter handle_13: a=00000201 b=00008800 c=0000070f d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=284 buf=0x00068800 count=1 cmd=2 enter handle_13: a=00000201 b=00008a00 c=00000710 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=285 buf=0x00068a00 count=1 cmd=2 enter handle_13: a=00000201 b=00008c00 c=00000711 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=286 buf=0x00068c00 count=1 cmd=2 enter handle_13: a=00000201 b=00008e00 c=00000712 d=00000100 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=287 buf=0x00068e00 count=1 cmd=2 enter handle_13: a=00000201 b=00009000 c=00000801 d=00000000 ds=5000 es=6000 ss=e000 si=00000000 di=00005b60 bp=0000002b sp=0000ff90 cs=5000 ip=016c f=0286 disk_op d=0x000f0a20 lba=288 buf=0x00069000 count=1 cmd=2 enter handle_13: a=000015c0 b=00000000 c=000007b6 d=0000ff00 ds=93c0 es=9bc0 ss=e000 si=00000000 di=00005b60 bp=00006f0e sp=0000ff90 cs=9bc0 ip=2704 f=0013 enter handle_13: a=000000c0 b=00000000 c=00000002 d=0000ff00 ds=93c0 es=9bc0 ss=e000 si=00000000 di=00005b60 bp=00006f0e sp=0000ff90 cs=9bc0 ip=271e f=0046 disk_op d=0x000f0a20 lba=70 buf=0x0000b1b2 count=0 cmd=0 Floppy_disable_controller Floppy_enable_controller enter handle_13: a=00000201 b=00007c00 c=00000001 d=00000000 ds=93c0 es=0000 ss=e000 si=00000000 di=00005b60 bp=00006f0e sp=0000ff90 cs=9bc0 ip=2737 f=0046 disk_op d=0x000f0a20 lba=0 buf=0x00007c00 count=1 cmd=2 Floppy_drive_recal 0 Floppy_media_sense on drive 0 found rate 0

1 0

Re: [SeaBIOS] [coreboot] Patch number 4 for floppy in SeaBIOS
by Gelip 28 Dec '13

28 Dec '13

I did a log but I think that there is nothing interesting to put the full log. I put the same end of the log boot from a floppy image and floppy disk. Succesful qemu boot from BOOT-PROM3 floppy image: ================================================= Booting from Floppy... Floppy_drive_recal 0 Floppy_enable_controller i8042_command cmd=ae i8042_wait_write Floppy_media_sense on drive 0 found rate 0 Booting from 0000:7c00 Floppy_disable_controller Floppy_enable_controller Floppy_drive_recal 0 Floppy_media_sense on drive 0 found rate 0 i8042_command cmd=ae i8042_wait_write i8042_command cmd=ae i8042_wait_write Floppy_disable_controller Floppy_enable_controller Floppy_drive_recal 0 Floppy_media_sense on drive 0 found rate 0 ================================================= Unsuccesful boot Abit BF6 from BOOT-PROM3 floppy disk: ========================================================================= Booting from Floppy... Floppy_drive_recal 0 Floppy_enable_controller Floppy_media_sense on drive 0 found rate 0 Booting from 0000:7c00 Floppy_disable_controller Floppy_enable_controller Floppy_drive_recal 0 Floppy_media_sense on drive 0 found rate 0 i8042_command cmd=ae i8042_wait_write i8042_command cmd=ae i8042_wait_write floppy error: 44 20 20 1c 01 0a 02 invalid basic_access:96: a=00000200 b=00000000 c=00001c0a d=00000100 ds=5000 es=6360 ss=df80 si=00000000 di=000057c0 bp=0000001e sp=0000fd20 cs=5000 ip=0188 f=0246 ========================================================================= Recently i make full access for flashrom and now possible flash bios coreboot or vendor bios from linux. After flash vendor BIOS or coreboot bios I noticed problems with timeout while load file pxelinux.0 over gPXE from TFTP server. To reslove this problem after flash vendor bios I need go to CMOS Setup (Del) and load defaults settings. To resolve problem after flash coreboot I need clear CMOS with jumper on board. After clear CMOS have not set RTC date and time and Debian-live over PXE not boot and have error Authentication error, '...respawning too fast: disable for 5 minutes'. This is only from Debian-live over PXE. The same Debian-live from CD boot ok. Also Debian installed on HDD boot OK. After set date and time in debian HDD like this: date -s 2013-12-28 date -s 19:00 and reboot to debian-live from PXE the problem was gone and Debian boot OK. I think the problem floppy error is related to the network adapter and timeout. This is not SeaBIOS fault.

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS