SeaBIOS December 2014

seabios@seabios.org

10 participants
28 discussions

[PATCH] usb: Add support for OHCI bulk transfers

by Kevin O'Connor

Support bulk transfers (usb drives) on OHCI USB controllers. Now that there is support for 32bit only drive controllers, it is not that hard to support disks on OHCI controllers, and it may be useful for some old hardware. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> -- This patch (along with the previous two patch series) is also available at: https://github.com/KevinOConnor/seabios/tree/testing --- src/hw/usb-ohci.c | 88 ++++++++++++++++++++++++++++++++++++++++++++----------- src/hw/usb-ohci.h | 1 + src/hw/usb.c | 5 +++- 3 files changed, 76 insertions(+), 18 deletions(-) diff --git a/src/hw/usb-ohci.c b/src/hw/usb-ohci.c index 4789768..cc8be7d 100644 --- a/src/hw/usb-ohci.c +++ b/src/hw/usb-ohci.c @@ -7,6 +7,7 @@ #include "biosvar.h" // GET_LOWFLAT #include "config.h" // CONFIG_* #include "malloc.h" // free +#include "memmap.h" // PAGE_SIZE #include "output.h" // dprintf #include "pci.h" // pci_bdf_to_bus #include "pci_ids.h" // PCI_CLASS_SERIAL_USB_OHCI @@ -27,6 +28,7 @@ struct usb_ohci_s { struct ohci_pipe { struct ohci_ed ed; struct usb_pipe pipe; + struct ohci_regs *regs; void *data; int count; struct ohci_td *tds; @@ -118,10 +120,10 @@ check_ohci_ports(struct usb_ohci_s *cntl) // Wait for next USB frame to start - for ensuring safe memory release. static void -ohci_waittick(struct usb_ohci_s *cntl) +ohci_waittick(struct ohci_regs *regs) { barrier(); - struct ohci_hcca *hcca = (void*)cntl->regs->hcca; + struct ohci_hcca *hcca = (void*)regs->hcca; u32 startframe = hcca->frame_no; u32 end = timer_calc(1000 * 5); for (;;) { @@ -143,7 +145,7 @@ ohci_free_pipes(struct usb_ohci_s *cntl) u32 creg = readl(&cntl->regs->control); if (creg & (OHCI_CTRL_CLE|OHCI_CTRL_BLE)) { writel(&cntl->regs->control, creg & ~(OHCI_CTRL_CLE|OHCI_CTRL_BLE)); - ohci_waittick(cntl); + ohci_waittick(cntl->regs); } u32 *pos = &cntl->regs->ed_controlhead; @@ -209,7 +211,7 @@ start_ohci(struct usb_ohci_s *cntl, struct ohci_hcca *hcca) // Go into operational state writel(&cntl->regs->control - , (OHCI_CTRL_CBSR | OHCI_CTRL_CLE | OHCI_CTRL_PLE + , (OHCI_CTRL_CBSR | OHCI_CTRL_CLE | OHCI_CTRL_BLE | OHCI_CTRL_PLE | OHCI_USB_OPER | oldrwc)); readl(&cntl->regs->control); // flush writes @@ -320,6 +322,9 @@ ohci_desc2pipe(struct ohci_pipe *pipe, struct usbdevice_s *usbdev pipe->ed.hwINFO = (ED_SKIP | usbdev->devaddr | (pipe->pipe.ep << 7) | (epdesc->wMaxPacketSize << 16) | (usbdev->speed ? ED_LOWSPEED : 0)); + struct usb_ohci_s *cntl = container_of( + usbdev->hub->cntl, struct usb_ohci_s, usb); + pipe->regs = cntl->regs; } static struct usb_pipe * @@ -398,10 +403,6 @@ ohci_realloc_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe u8 eptype = epdesc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; if (eptype == USB_ENDPOINT_XFER_INT) return ohci_alloc_intr_pipe(usbdev, epdesc); - if (eptype != USB_ENDPOINT_XFER_CONTROL) { - dprintf(1, "OHCI Bulk transfers not supported.\n"); - return NULL; - } struct usb_ohci_s *cntl = container_of( usbdev->hub->cntl, struct usb_ohci_s, usb); dprintf(7, "ohci_alloc_async_pipe %p\n", &cntl->usb); @@ -415,7 +416,11 @@ ohci_realloc_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe } // Allocate a new queue head. - struct ohci_pipe *pipe = malloc_tmphigh(sizeof(*pipe)); + struct ohci_pipe *pipe; + if (eptype == USB_ENDPOINT_XFER_CONTROL) + pipe = malloc_tmphigh(sizeof(*pipe)); + else + pipe = malloc_low(sizeof(*pipe)); if (!pipe) { warn_noalloc(); return NULL; @@ -424,9 +429,12 @@ ohci_realloc_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe ohci_desc2pipe(pipe, usbdev, epdesc); // Add queue head to controller list. - pipe->ed.hwNextED = cntl->regs->ed_controlhead; + u32 *head = &cntl->regs->ed_controlhead; + if (eptype != USB_ENDPOINT_XFER_CONTROL) + head = &cntl->regs->ed_bulkhead; + pipe->ed.hwNextED = *head; barrier(); - cntl->regs->ed_controlhead = (u32)&pipe->ed; + *head = (u32)&pipe->ed; return &pipe->pipe; } @@ -435,10 +443,12 @@ wait_ed(struct ohci_ed *ed, int timeout) { u32 end = timer_calc(timeout); for (;;) { - if (ed->hwHeadP == ed->hwTailP) + if ((ed->hwHeadP & ~(ED_C|ED_H)) == ed->hwTailP) return 0; if (timer_check(end)) { warn_timeout(); + dprintf(1, "ohci ed info=%x tail=%x head=%x next=%x\n" + , ed->hwINFO, ed->hwTailP, ed->hwHeadP, ed->hwNextED); return -1; } yield(); @@ -458,8 +468,6 @@ ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize return -1; } struct ohci_pipe *pipe = container_of(p, struct ohci_pipe, pipe); - struct usb_ohci_s *cntl = container_of( - pipe->pipe.cntl, struct usb_ohci_s, usb); // Setup transfer descriptors struct ohci_td *tds = malloc_tmphigh(sizeof(*tds) * 3); @@ -491,20 +499,66 @@ ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize pipe->ed.hwTailP = (u32)td; barrier(); pipe->ed.hwINFO &= ~ED_SKIP; - writel(&cntl->regs->cmdstatus, OHCI_CLF); + writel(&pipe->regs->cmdstatus, OHCI_CLF); int ret = wait_ed(&pipe->ed, usb_xfer_time(p, datasize)); pipe->ed.hwINFO |= ED_SKIP; if (ret) - ohci_waittick(cntl); + ohci_waittick(pipe->regs); free(tds); return ret; } +#define STACKOTDS 16 +#define OHCI_TD_ALIGN 16 + int ohci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize) { - return -1; + ASSERT32FLAT(); + if (! CONFIG_USB_OHCI) + return -1; + dprintf(5, "ohci_send_bulk %p\n", p); + struct ohci_pipe *pipe = container_of(p, struct ohci_pipe, pipe); + + // Allocate 16 tds on stack (with required alignment) + u8 tdsbuf[sizeof(struct ohci_td) * STACKOTDS + OHCI_TD_ALIGN - 1]; + struct ohci_td *tds = (void*)ALIGN((u32)tdsbuf, OHCI_TD_ALIGN); + memset(tds, 0, sizeof(*tds) * STACKOTDS); + + // Setup transfer descriptors + struct ohci_td *td = tds; + u16 maxpacket = pipe->pipe.maxpacket; + u32 dest = (u32)data, end = dest + datasize - 1; + while (dest <= end) { + if (td >= &tds[STACKOTDS]) { + warn_noalloc(); + return -1; + } + u32 tend = end; + if ((tend / PAGE_SIZE) - (dest / PAGE_SIZE) > 1) + // Transfer must not span two pages in single td + tend = dest+2*PAGE_SIZE - ALIGN(dest & (PAGE_SIZE-1), maxpacket) - 1; + td->hwINFO = (dir ? TD_DP_IN : TD_DP_OUT) | TD_CC; + td->hwCBP = dest; + td->hwNextTD = (u32)&td[1]; + td->hwBE = tend; + td++; + dest = tend+1; + } + + // Transfer data + pipe->ed.hwHeadP = (u32)tds | (pipe->ed.hwHeadP & ED_C); + pipe->ed.hwTailP = (u32)td; + barrier(); + pipe->ed.hwINFO &= ~ED_SKIP; + writel(&pipe->regs->cmdstatus, OHCI_BLF); + + int ret = wait_ed(&pipe->ed, usb_xfer_time(p, datasize)); + pipe->ed.hwINFO |= ED_SKIP; + if (ret) + ohci_waittick(pipe->regs); + return ret; } int diff --git a/src/hw/usb-ohci.h b/src/hw/usb-ohci.h index 5699523..db935ca 100644 --- a/src/hw/usb-ohci.h +++ b/src/hw/usb-ohci.h @@ -107,6 +107,7 @@ struct ohci_regs { #define OHCI_HCR (1 << 0) #define OHCI_CLF (1 << 1) +#define OHCI_BLF (1 << 2) #define OHCI_INTR_MIE (1 << 31) diff --git a/src/hw/usb.c b/src/hw/usb.c index bb646a7..75412f9 100644 --- a/src/hw/usb.c +++ b/src/hw/usb.c @@ -71,6 +71,8 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int dir, void *data, int datasize) case USB_TYPE_UHCI: return uhci_send_bulk(pipe_fl, dir, data, datasize); case USB_TYPE_OHCI: + if (MODESEGMENT) + return -1; return ohci_send_bulk(pipe_fl, dir, data, datasize); case USB_TYPE_EHCI: return ehci_send_bulk(pipe_fl, dir, data, datasize); @@ -102,7 +104,8 @@ usb_poll_intr(struct usb_pipe *pipe_fl, void *data) int usb_32bit_pipe(struct usb_pipe *pipe_fl) { - return CONFIG_USB_XHCI && GET_LOWFLAT(pipe_fl->type) == USB_TYPE_XHCI; + return (CONFIG_USB_XHCI && GET_LOWFLAT(pipe_fl->type) == USB_TYPE_XHCI) + || (CONFIG_USB_OHCI && GET_LOWFLAT(pipe_fl->type) == USB_TYPE_OHCI); } -- 1.9.3

5 years, 9 months

[PATCH 1/2] uhci: Enable "depth" tree traversal for bulk transfers

by Kevin O'Connor

Set the "depth" flag on bulk transactions. Since SeaBIOS doesn't use bandwidth reclamation, without the depth flag the uhci controller will only transfer one bulk packet per 1 ms frame. This results in a maximum of 64 bytes per millisecond, which severely limits the transfer rate. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/usb-uhci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c index 6dcc340..7ef50d1 100644 --- a/src/hw/usb-uhci.c +++ b/src/hw/usb-uhci.c @@ -537,9 +537,9 @@ uhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize) int transfer = datasize; if (transfer > maxpacket) transfer = maxpacket; - struct uhci_td *nexttd_fl = MAKE_FLATPTR(GET_SEG(SS) - , &tds[tdpos % STACKTDS]); - td->link = (transfer==datasize ? UHCI_PTR_TERM : (u32)nexttd_fl); + u32 nexttd = (u32)MAKE_FLATPTR(GET_SEG(SS), &tds[tdpos % STACKTDS]); + td->link = (transfer==datasize + ? UHCI_PTR_TERM : (nexttd | UHCI_PTR_DEPTH)); td->token = (uhci_explen(transfer) | toggle | (devaddr << TD_TOKEN_DEVADDR_SHIFT) | (dir ? USB_PID_IN : USB_PID_OUT)); -- 1.9.3

5 years, 9 months

[PATCH] docs: Add documentation on using readserial.py script

by Kevin O'Connor

Update the debugging documentation with info on timing debug output with readserial.py. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- docs/Debugging.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/Debugging.md b/docs/Debugging.md index d651fc9..1ba56af 100644 --- a/docs/Debugging.md +++ b/docs/Debugging.md @@ -34,6 +34,43 @@ To report an issue, please collect the serial boot log with SeaBIOS set to a debug level of 8 and forward the full log along with a description of the problem to the SeaBIOS [mailing list](Mailinglist). +Timing debug messages +===================== + +The SeaBIOS repository has a tool (**scripts/readserial.py**) that can +timestamp each diagnostic message produced. The timestamps can provide +some additional information on how long internal processes take. It +also provides a simple profiling mechanism. + +The tool can be used on coreboot builds that have diagnostic messages +sent to a serial port. Make sure SeaBIOS is configured with +CONFIG_DEBUG_SERIAL and run the following on the host receiving serial +output: + +`/path/to/seabios/scripts/readserial.py /dev/ttyS0 115200` + +Update the above command with the appropriate serial device and baud +rate. + +The tool can also timestamp the messages from the QEMU debug port. To +use with QEMU run the following: + +`mkfifo qemudebugpipe`\ +`qemu -chardev pipe,path=qemudebugpipe,id=seabios -device isa-debugcon,iobase=0x402,chardev=seabios ...` + +and then in another session: + +`/path/to/seabios/scripts/readserial.py -nf qemudebugpipe` + +The mkfifo command only needs to be run once to create the pipe file. + +When readserial.py is running, it shows a timestamp with millisecond +accuracy of the amount of time since the start of the log. If one +presses the "enter" key in the readserial session it will add a blank +line to the screen and also reset the time back to zero. The +readserial.py program also keeps a log of all output in files that +look like "seriallog-YYYYMMDD_HHMMSS.log". + Debugging with gdb on QEMU ========================== -- 1.9.3

5 years, 9 months

[PATCH] readserial: Enhance pipe support

by Kevin O'Connor

Automatically close and open the pipe if it closes. Also, better document that the -f option is for pipes. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- scripts/readserial.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/scripts/readserial.py b/scripts/readserial.py index 3333e84..a7383e8 100755 --- a/scripts/readserial.py +++ b/scripts/readserial.py @@ -8,10 +8,7 @@ # Usage: # scripts/readserial.py /dev/ttyUSB0 115200 -import sys -import time -import select -import optparse +import sys, os, time, select, optparse from python23compat import as_bytes @@ -65,7 +62,7 @@ def readserial(infile, logfile, byteadjust): res = select.select([infile, sys.stdin], [], []) except KeyboardInterrupt: sys.stdout.write("\n") - break + return -1 if sys.stdin in res[0]: # Got keyboard input - force reset on next serial input sys.stdin.read(1) @@ -74,7 +71,7 @@ def readserial(infile, logfile, byteadjust): continue d = infile.read(4096) if not d: - break + return 0 datatime = time.time() datatime -= len(d) * byteadjust @@ -128,7 +125,7 @@ def main(): opts = optparse.OptionParser(usage) opts.add_option("-f", "--file", action="store_false", dest="serial", default=True, - help="read from file instead of serialdevice") + help="read from unix named pipe instead of serialdevice") opts.add_option("-n", "--no-adjust", action="store_false", dest="adjustbaud", default=True, help="don't adjust times by serial rate") @@ -168,13 +165,6 @@ Or: apt-get install python-serial """) sys.exit(1) ser = serial.Serial(serialport, baud, timeout=0) - else: - # Read from a file - ser = open(serialport, 'rb') - import fcntl - import os - fcntl.fcntl(ser, fcntl.F_SETFL - , fcntl.fcntl(ser, fcntl.F_GETFL) | os.O_NONBLOCK) if options.calibrate_read: calibrateserialread(ser, byteadjust) @@ -185,7 +175,16 @@ Or: apt-get install python-serial logname = time.strftime("seriallog-%Y%m%d_%H%M%S.log") f = open(logname, 'wb') - readserial(ser, f, byteadjust) + if options.serial: + readserial(ser, f, byteadjust) + else: + # Read from a pipe + while 1: + ser = os.fdopen(os.open(serialport, os.O_RDONLY|os.O_NONBLOCK), 'rb') + res = readserial(ser, f, byteadjust) + ser.close() + if res < 0: + break if __name__ == '__main__': main() -- 1.9.3

5 years, 9 months

Jenkins build is back to normal : seabios #143

by Jenkins Build Host

See <http://jenkins.xeni.kraxel.org:8080/job/seabios/143/>

5 years, 9 months

[PATCH] docs: Add page describing SeaBIOS final object linking

by Kevin O'Connor

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- docs/Developer_Documentation.md | 3 + docs/Linking_overview.md | 166 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 docs/Linking_overview.md diff --git a/docs/Developer_Documentation.md b/docs/Developer_Documentation.md index 1d891e9..d50455d 100644 --- a/docs/Developer_Documentation.md +++ b/docs/Developer_Documentation.md @@ -14,6 +14,9 @@ There is also information on the SeaBIOS [Memory Model](Memory Model). Along with information on SeaBIOS [Execution and code flow](Execution and code flow). +A description of the process of linking the final SeaBIOS binary is +available at [Linking overview](Linking overview). + To debug SeaBIOS and report problems see SeaBIOS [debugging](Debugging). diff --git a/docs/Linking_overview.md b/docs/Linking_overview.md new file mode 100644 index 0000000..fb938b6 --- /dev/null +++ b/docs/Linking_overview.md @@ -0,0 +1,166 @@ +This page describes the process that the SeaBIOS build uses to link +the compiled code into the final binary objects. + +Unfortunately, the SeaBIOS linking phase is complex. This complexity +is due to several unusual requirements: + +* Some BIOS entry points must reside at specific hardcoded memory + locations. The build must support positioning code and variables at + specific locations. +* In order to support multiple [memory models](Memory Model) the same + C code can be complied in three modes (16bit mode, 32bit segmented + mode, and 32bit "flat" mode). Binary code from these three modes + must be able to co-exist and on occasion reference each other. +* There is a finite amount of memory available to the BIOS. The build + will attempt to weed out unused code and variables from the final + binary. It also supports self-relocation of one-time initialization + code. + +Code layout +=========== + +To support the unusual build requirements, several +[gcc](http://en.wikipedia.org/wiki/GNU_Compiler_Collection) compiler +options are used. The "-ffunction-sections" and "-fdata-sections" +flags instruct the compiler to place each variable and function into +its own +[ELF](http://en.wikipedia.org/wiki/Executable_and_Linkable_Format) +section. + +The C code is compiled three times into three separate objects for +each of the major supported [memory models](Memory Model): +**code16.o**, **code32seg.o**, and **code32flat.o**. Information on +the sections and symbols of these three objects are extracted (using +**objdump**) and passed in to the **scripts/layoutrom.py** python +script. This script analyzes this information and produces gnu +[ld](http://en.wikipedia.org/wiki/GNU_linker) "linker scripts" which +provide precise location information to the linker. These linker +scripts are then used during the link phase which produces a **rom.o** +object containing all the code. + +Fixed location entry points +--------------------------- + +The build supports placing code entry points and variables at fixed +memory locations. This support is required in order to support the +legacy BIOS standards. For example, a program might execute an "int +0x15" to request system information from the BIOS, but another old +program might use "ljmpw $0xf000, $0xf859" instead. Both must provide +the same results and so the build must position the 0x15 interrupt +entry point in physical memory at 0xff859. + +This support is accomplished by placing the given code/variables into +ELF sections that have a name containing the substring +".fixedaddr.0x1234" (where 0x1234 is the desired address). For +variables in C code this is accomplished by marking the variables with +the VARFSEGFIXED(0x1234) macro. For assembler entry points the ORG +macro is used (see **romlayout.S**). + +During the build, the **layoutrom.py** script will detect sections +that contain the ".fixedaddr." substring and will arrange for the +final linker scripts to specify the desired address for the given +section. + +Due to the sparse nature of these fixed address sections, the +layoutrom.py script will also arrange to pack in other unrelated 16bit +code into the free space between fixed address sections (see +layoutrom.py:fitSections()). This maximizes the space available and +reduces the overall size of the final binary. + +C code in three modes +--------------------- + +SeaBIOS must support multiple [memory models](Memory Model). This is +accomplished by compiling the C code three separate times into three +separate objects. + +The C code within a mode must not accidentally call a C function in +another mode, but multiple modes must all access the same single copy +of global variables. Further, it is occasionally necessary for the C +code in one mode to obtain the address of C code in another mode. + +In order to use the same global variables between all modes, the +layoutrom.py script will detect references to global variables and +emit specific symbol definitions for those global variables in the +linker scripts so that all references use the same physical memory +address (see layoutrom.py:outXRefs()). + +To ensure C code does not accidentally call C code compiled in a +different mode, the build will ensure the symbols for C code in each +mode are isolated from each other during the linking stage. To support +those situations where an address of a C function in another mode is +required the build supports symbols with a special "\_cfuncX_" +prefix. The layoutrom.py script detects these references and will emit +a corresponding symbol definitions in the linker script that points to +the C code of the specified mode. This is typically seen with code +like: + +`extern void _cfunc32flat_process_op(void);`\ +`return call32(_cfunc32flat_process_op, 0, 0);` + +In the above example, when the build finds the symbol +"\_cfunc32flat_process_op" it will emit that symbol with the physical +address of the 32bit "flat" version of the process_op() C function. + +Build garbage collection +------------------------ + +To reduce the overall size of the final SeaBIOS binary the build +supports automatically weeding out of unused code and variables. This +is done with two separate processes: when supported the gcc +"-fwhole-program" compilation flag is used, and the layoutrom.py +script checks for unreferenced ELF sections. The layoutrom.py script +builds the final linker scripts with only referenced ELF sections, and +thus unreferenced sections are weeded out from the final objects. + +When writing C code, it is necessary to mark C functions with the +VISIBLE16, VISIBLE32SEG, or VISIBLE32FLAT macros if the functions are +ever referenced from assembler code. These macros ensure the +corresponding C function is emitted by the C compiler when compiling +for the given memory mode. These macros, however, do not affect the +layoutrom.py reference check, so even a function decorated with one of +the above macros can be weeded out from the final object if it is +never referenced. + +Code relocation +--------------- + +To further reduce the runtime memory size of the BIOS, the build +supports runtime self-relocation. Normally SeaBIOS is loaded into +memory in the memory region at 0xC0000-0x100000. This is convenient +for initial binary deployment, but the space competes with memory +requirements for Option ROMs, BIOS tables, and runtime storage. By +default, SeaBIOS will self-relocate its one-time initialization code +to free up space in this region. + +To support this feature, the build attempts to automatically detect +which C code is exclusively initialization phase code (see +layoutrom.py:checkRuntime()). It does this by finding all functions +decorated with the VISIBLE32INIT macro and all functions only +reachable via functions with that macro. These "init only" functions +are then grouped together and their location and size is stored in the +binary for the runtime code to relocate (see post.c:reloc_preinit()). + +The build also locates all cross section code references along with +all absolute memory addresses in the "init only" code. These addresses +need to be modified with the new run-time address in order for the +code to successfully run at a new address. The build finds the +location of the addresses (see layoutrom.py:getRelocs()) and stores +the information in the final binary. + +Final binary checks +=================== + +At the conclusion of the main linking stage, the code is contained in +the file **rom.o**. This object file contains all of the assembler +code, variables, and the C code from all three memory model modes. + +At this point the **scripts/checkrom.py** script is run to perform +final checks on the code. The script performs some sanity checks, it +may update some tables in the binary, and it reports some size +information. + +After the checkrom.py script is run the final user visible binary is +produced. The name of the final binary is either **bios.bin**, +**Csm16.bin**, or **bios.bin.elf** depending on the SeaBIOS build +requested. -- 1.9.3

5 years, 9 months

Re: [SeaBIOS] Build failed in Jenkins: seabios #142

by Kevin O'Connor

On Mon, Dec 29, 2014 at 03:59:47PM +0100, Jenkins Build Host wrote: > See <http://jenkins.xeni.kraxel.org:8080/job/seabios/142/changes> > > Changes: > > [kevin] sdcard: Initial support for SD cards on PCI SDHCI controllers on QEMU [...] > ROM size (in KB) (ROM_SIZE) [128] 128 [...] > Version: 1.7.5-125.b142.g2c9870f-20141229_155946-jenkins.xeni.kraxel.org > Fixed space: 0xe05b-0x10000 total: 8101 slack: 13 Percent slack: 0.2% > 16bit size: 35196 > 32bit segmented size: 2127 > 32bit flat size: 21109 > 32bit flat init size: 66688 > Lowmem size: 2176 > f-segment var size: 1200 > Linking out/rom16.o > Stripping out/rom16.strip.o > Linking out/rom32seg.o > Stripping out/rom32seg.strip.o > Linking out/rom.o > Prepping out/bios.bin.prep > Error! ROM doesn't fit (132148 > 131072) > You have to either increate the size (CONFIG_ROM_SIZE) > or turn off some features (such as hardware support not > needed) to make it fit. Trying a more recent gcc version > might work too. Looks like the 128K test build will need to turn off SDCARD support (or something similar). -Kevin

5 years, 9 months

[PATCH 1/2] cdrom: Break up very large read requests into smaller requests

by Kevin O'Connor

A cdrom boot image could be over 64K in size, but the low level drivers may not support very large reads. If a large cdrom image is found, issue multiple reads so that a read request over 64K is never issued. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/cdrom.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/cdrom.c b/src/cdrom.c index de0e7de..92f34f4 100644 --- a/src/cdrom.c +++ b/src/cdrom.c @@ -212,12 +212,21 @@ cdrom_boot(struct drive_s *drive) CDEmu.device_spec = drive->cntl_id % 2; // And we read the image in memory + nbsectors = DIV_ROUND_UP(nbsectors, 4); dop.lba = lba; - dop.count = DIV_ROUND_UP(nbsectors, 4); dop.buf_fl = MAKE_FLATPTR(boot_segment, 0); - ret = scsi_process_op(&dop); - if (ret) - return 12; + while (nbsectors) { + int count = nbsectors; + if (count > 64*1024/CDROM_SECTOR_SIZE) + count = 64*1024/CDROM_SECTOR_SIZE; + dop.count = count; + ret = scsi_process_op(&dop); + if (ret) + return 12; + nbsectors -= count; + dop.lba += count; + dop.buf_fl += count*CDROM_SECTOR_SIZE; + } if (media == 0) { // No emulation requested - return success. -- 1.9.3

5 years, 9 months

[PATCH 1/4] scsi: Move cdb_* functions above scsi_* functions

by Kevin O'Connor

This is just code movement - no code changes. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/blockcmd.c | 186 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 88 deletions(-) diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c index eb531d4..bbcc08f 100644 --- a/src/hw/blockcmd.c +++ b/src/hw/blockcmd.c @@ -67,6 +67,104 @@ cdb_is_read(u8 *cdbcmd, u16 blocksize) return blocksize && cdbcmd[0] != CDB_CMD_WRITE_10; } + +/**************************************************************** + * Low level command requests + ****************************************************************/ + +int +cdb_get_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data) +{ + struct cdb_request_sense cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_INQUIRY; + cmd.length = sizeof(*data); + op->count = 1; + op->buf_fl = data; + return cdb_cmd_data(op, &cmd, sizeof(*data)); +} + +// Request SENSE +int +cdb_get_sense(struct disk_op_s *op, struct cdbres_request_sense *data) +{ + struct cdb_request_sense cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_REQUEST_SENSE; + cmd.length = sizeof(*data); + op->count = 1; + op->buf_fl = data; + return cdb_cmd_data(op, &cmd, sizeof(*data)); +} + +// Test unit ready +int +cdb_test_unit_ready(struct disk_op_s *op) +{ + struct cdb_request_sense cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_TEST_UNIT_READY; + op->count = 0; + op->buf_fl = NULL; + return cdb_cmd_data(op, &cmd, 0); +} + +// Request capacity +int +cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data) +{ + struct cdb_read_capacity cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_READ_CAPACITY; + op->count = 1; + op->buf_fl = data; + return cdb_cmd_data(op, &cmd, sizeof(*data)); +} + +// Mode sense, geometry page. +int +cdb_mode_sense_geom(struct disk_op_s *op, struct cdbres_mode_sense_geom *data) +{ + struct cdb_mode_sense cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_MODE_SENSE; + cmd.flags = 8; /* DBD */ + cmd.page = MODE_PAGE_HD_GEOMETRY; + cmd.count = cpu_to_be16(sizeof(*data)); + op->count = 1; + op->buf_fl = data; + return cdb_cmd_data(op, &cmd, sizeof(*data)); +} + +// Read sectors. +int +cdb_read(struct disk_op_s *op) +{ + struct cdb_rwdata_10 cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_READ_10; + cmd.lba = cpu_to_be32(op->lba); + cmd.count = cpu_to_be16(op->count); + return cdb_cmd_data(op, &cmd, GET_GLOBALFLAT(op->drive_gf->blksize)); +} + +// Write sectors. +int +cdb_write(struct disk_op_s *op) +{ + struct cdb_rwdata_10 cmd; + memset(&cmd, 0, sizeof(cmd)); + cmd.command = CDB_CMD_WRITE_10; + cmd.lba = cpu_to_be32(op->lba); + cmd.count = cpu_to_be16(op->count); + return cdb_cmd_data(op, &cmd, GET_GLOBALFLAT(op->drive_gf->blksize)); +} + + +/**************************************************************** + * Main SCSI commands + ****************************************************************/ + int scsi_is_ready(struct disk_op_s *op) { @@ -200,91 +298,3 @@ scsi_drive_setup(struct drive_s *drive, const char *s, int prio) boot_add_hd(drive, desc, prio); return 0; } - -int -cdb_get_inquiry(struct disk_op_s *op, struct cdbres_inquiry *data) -{ - struct cdb_request_sense cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_INQUIRY; - cmd.length = sizeof(*data); - op->count = 1; - op->buf_fl = data; - return cdb_cmd_data(op, &cmd, sizeof(*data)); -} - -// Request SENSE -int -cdb_get_sense(struct disk_op_s *op, struct cdbres_request_sense *data) -{ - struct cdb_request_sense cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_REQUEST_SENSE; - cmd.length = sizeof(*data); - op->count = 1; - op->buf_fl = data; - return cdb_cmd_data(op, &cmd, sizeof(*data)); -} - -// Test unit ready -int -cdb_test_unit_ready(struct disk_op_s *op) -{ - struct cdb_request_sense cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_TEST_UNIT_READY; - op->count = 0; - op->buf_fl = NULL; - return cdb_cmd_data(op, &cmd, 0); -} - -// Request capacity -int -cdb_read_capacity(struct disk_op_s *op, struct cdbres_read_capacity *data) -{ - struct cdb_read_capacity cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_READ_CAPACITY; - op->count = 1; - op->buf_fl = data; - return cdb_cmd_data(op, &cmd, sizeof(*data)); -} - -// Mode sense, geometry page. -int -cdb_mode_sense_geom(struct disk_op_s *op, struct cdbres_mode_sense_geom *data) -{ - struct cdb_mode_sense cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_MODE_SENSE; - cmd.flags = 8; /* DBD */ - cmd.page = MODE_PAGE_HD_GEOMETRY; - cmd.count = cpu_to_be16(sizeof(*data)); - op->count = 1; - op->buf_fl = data; - return cdb_cmd_data(op, &cmd, sizeof(*data)); -} - -// Read sectors. -int -cdb_read(struct disk_op_s *op) -{ - struct cdb_rwdata_10 cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_READ_10; - cmd.lba = cpu_to_be32(op->lba); - cmd.count = cpu_to_be16(op->count); - return cdb_cmd_data(op, &cmd, GET_GLOBALFLAT(op->drive_gf->blksize)); -} - -// Write sectors. -int -cdb_write(struct disk_op_s *op) -{ - struct cdb_rwdata_10 cmd; - memset(&cmd, 0, sizeof(cmd)); - cmd.command = CDB_CMD_WRITE_10; - cmd.lba = cpu_to_be32(op->lba); - cmd.count = cpu_to_be16(op->count); - return cdb_cmd_data(op, &cmd, GET_GLOBALFLAT(op->drive_gf->blksize)); -} -- 1.9.3

5 years, 9 months

Build failed in Jenkins: seabios #142

by Jenkins Build Host

See <http://jenkins.xeni.kraxel.org:8080/job/seabios/142/changes> Changes: [kevin] sdcard: Initial support for SD cards on PCI SDHCI controllers on QEMU [kevin] Add wiki documentation to repository [kevin] docs: Don't point to repo README files [kevin] docs: Add info on MODE16/MODESEGMENT compile time flags [kevin] docs: Add page describing SeaBIOS final object linking ------------------------------------------ [...truncated 94 lines...] + rm -rf out + cp <http://jenkins.xeni.kraxel.org:8080/job/seabios/ws/rpmbuild/config.bios.qemu> .config + yes '' + make oldconfig scripts/kconfig/conf --oldconfig <http://jenkins.xeni.kraxel.org:8080/job/seabios/ws/rpmbuild/rpm/BUILD/seabi…> * * Restart config... * * * General Features * Build Target 1. Build for coreboot (COREBOOT) (NEW) > 2. Build for QEMU/Xen/KVM/Bochs (QEMU) 3. Build as Compatibilty Support Module for EFI BIOS (CSM) (NEW) choice[1-3]: Support Xen HVM (XEN) [N/y/?] n Parallelize hardware init (THREADS) [Y/n/?] (NEW) Copy init code to high memory (RELOCATE_INIT) [Y/n/?] (NEW) Bootmenu (BOOTMENU) [Y/n/?] (NEW) Graphical boot splash screen (BOOTSPLASH) [Y/n/?] (NEW) Boot ordering (BOOTORDER) [Y/n/?] (NEW) Use internal stack for 16bit interrupt entry points (ENTRY_EXTRASTACK) [Y/n/?] (NEW) Allocate memory that needs to be in first Meg above 0xc0000 (MALLOC_UPPERMEMORY) [Y/n/?] (NEW) ROM size (in KB) (ROM_SIZE) [128] 128 * * Hardware support * ATA controllers (ATA) [Y/n/?] (NEW) ATA DMA (ATA_DMA) [N/y/?] (NEW) ATA 32bit PIO (ATA_PIO32) [N/y/?] (NEW) AHCI controllers (AHCI) [Y/n/?] (NEW) SD controllers (SDCARD) [Y/n/?] (NEW) virtio-blk controllers (VIRTIO_BLK) [Y/n/?] (NEW) virtio-scsi controllers (VIRTIO_SCSI) [Y/n/?] (NEW) PVSCSI controllers (PVSCSI) [Y/n/?] (NEW) AMD PCscsi controllers (ESP_SCSI) [Y/n/?] (NEW) lsi53c895a scsi controllers (LSI_SCSI) [Y/n/?] (NEW) LSI MegaRAID SAS controllers (MEGASAS) [Y/n/?] (NEW) Floppy controller (FLOPPY) [Y/n/?] (NEW) PS/2 port (PS2PORT) [Y/n/?] (NEW) USB (USB) [Y/n/?] (NEW) USB UHCI controllers (USB_UHCI) [Y/n/?] (NEW) USB OHCI controllers (USB_OHCI) [Y/n/?] (NEW) USB EHCI controllers (USB_EHCI) [Y/n/?] (NEW) USB XHCI controllers (USB_XHCI) [N/y/?] n USB drives (USB_MSC) [Y/n/?] (NEW) UAS drives (USB_UAS) [N/y/?] n USB hubs (USB_HUB) [Y/n/?] (NEW) USB keyboards (USB_KEYBOARD) [Y/n/?] (NEW) USB mice (USB_MOUSE) [Y/n/?] (NEW) Serial port (SERIAL) [Y/n/?] (NEW) Parallel port (LPT) [Y/n/?] (NEW) System Management Mode (SMM) (USE_SMM) [Y/n/?] (NEW) Initialize MTRRs (MTRR_INIT) [Y/n/?] (NEW) Use ACPI timer (PMTIMER) [Y/n/?] (NEW) * * BIOS interfaces * Drive interface (DRIVES) [Y/n/?] (NEW) DVD/CDROM booting (CDROM_BOOT) [Y/n/?] (NEW) DVD/CDROM boot drive emulation (CDROM_EMU) [Y/n/?] (NEW) PCIBIOS interface (PCIBIOS) [Y/n/?] (NEW) APM interface (APMBIOS) [Y/n/?] (NEW) PnP BIOS interface (PNPBIOS) [Y/n/?] (NEW) Option ROMS (OPTIONROMS) [Y/n/?] (NEW) Option roms are already at 0xc0000-0xf0000 (OPTIONROMS_DEPLOYED) [N/y/?] (NEW) PMM interface (PMM) [Y/n/?] (NEW) Boot interface (BOOT) [Y/n/?] (NEW) Keyboard interface (KEYBOARD) [Y/n/?] (NEW) Keyboard hook interface (KBD_CALL_INT15_4F) [Y/n/?] (NEW) Mouse interface (MOUSE) [Y/n/?] (NEW) S3 resume (S3_RESUME) [Y/n/?] (NEW) Hardware specific VGA helpers (VGAHOOKS) [Y/n/?] (NEW) Disable A20 (DISABLE_A20) [N/y/?] (NEW) Make unused UMB memory read/writeable. (WRITABLE_UPPERMEMORY) [N/y/?] (NEW) * * BIOS Tables * PIR table (PIRTABLE) [Y/n/?] (NEW) MPTable (MPTABLE) [Y/n/?] (NEW) SMBIOS (SMBIOS) [Y/n/?] (NEW) ACPI (ACPI) [Y/n/?] (NEW) Include default ACPI DSDT (ACPI_DSDT) [Y/n/?] (NEW) Load BIOS tables from ROM files (FW_ROMFILE_LOAD) [Y/n/?] (NEW) * * VGA ROM * VGA Hardware Type > 1. None (NO_VGABIOS) (NEW) 2. QEMU/Bochs Original IBM 256K VGA (VGA_STANDARD_VGA) (NEW) 3. QEMU/Bochs Cirrus SVGA (VGA_CIRRUS) (NEW) 4. QEMU/Bochs VBE SVGA (VGA_BOCHS) (NEW) 5. GeodeGX2 (VGA_GEODEGX2) (NEW) 6. GeodeLX (VGA_GEODELX) (NEW) choice[1-6]: * * Debugging * Debug level (DEBUG_LEVEL) [1] (NEW) Serial port debugging (DEBUG_SERIAL) [N/y/?] (NEW) Special IO port debugging (DEBUG_IO) [Y/n/?] (NEW) # # configuration written to <http://jenkins.xeni.kraxel.org:8080/job/seabios/ws/rpmbuild/rpm/BUILD/seabi…> # + make Build Kconfig config file Compile checking out/src/misc.o Compile checking out/src/stacks.o Compile checking out/src/output.o Compile checking out/src/string.o Compile checking out/src/block.o Compile checking out/src/cdrom.o Compile checking out/src/disk.o Compile checking out/src/mouse.o Compile checking out/src/kbd.o Compile checking out/src/system.o Compile checking out/src/serial.o Compile checking out/src/clock.o Compile checking out/src/resume.o Compile checking out/src/pnpbios.o Compile checking out/src/vgahooks.o Compile checking out/src/pcibios.o Compile checking out/src/apm.o Compile checking out/src/hw/pci.o Compile checking out/src/hw/timer.o Compile checking out/src/hw/rtc.o Compile checking out/src/hw/dma.o Compile checking out/src/hw/pic.o Compile checking out/src/hw/ps2port.o Compile checking out/src/hw/serialio.o Compile checking out/src/hw/usb.o Compile checking out/src/hw/usb-uhci.o Compile checking out/src/hw/usb-ohci.o Compile checking out/src/hw/usb-ehci.o Compile checking out/src/hw/usb-hid.o Compile checking out/src/hw/usb-msc.o Compile checking out/src/hw/usb-uas.o Compile checking out/src/hw/blockcmd.o Compile checking out/src/hw/floppy.o Compile checking out/src/hw/ata.o Compile checking out/src/hw/ramdisk.o Compile checking out/src/hw/virtio-ring.o Compile checking out/src/hw/virtio-pci.o Compile checking out/src/hw/virtio-blk.o Compile checking out/src/hw/virtio-scsi.o Compile checking out/src/hw/lsi-scsi.o Compile checking out/src/hw/esp-scsi.o Compile checking out/src/hw/megasas.o Compile checking out/src/post.o Compile checking out/src/memmap.o Compile checking out/src/malloc.o Compile checking out/src/romfile.o Compile checking out/src/x86.o Compile checking out/src/optionroms.o Compile checking out/src/pmm.o Compile checking out/src/font.o Compile checking out/src/boot.o Compile checking out/src/bootsplash.o Compile checking out/src/jpeg.o Compile checking out/src/bmp.o Compile checking out/src/hw/ahci.o Compile checking out/src/hw/pvscsi.o Compile checking out/src/hw/usb-xhci.o Compile checking out/src/hw/usb-hub.o Compile checking out/src/hw/sdcard.o Compile checking out/src/fw/coreboot.o Compile checking out/src/fw/lzmadecode.o Compile checking out/src/fw/csm.o Compile checking out/src/fw/biostables.o Compile checking out/src/fw/paravirt.o Compile checking out/src/fw/shadow.o Compile checking out/src/fw/pciinit.o Compile checking out/src/fw/smm.o Compile checking out/src/fw/smp.o Compile checking out/src/fw/mtrr.o Compile checking out/src/fw/xen.o Compiling IASL out/src/fw/acpi-dsdt.hex ASL Input: out/src/fw/acpi-dsdt.dsl.i - 474 lines, 19153 bytes, 315 keywords AML Output: out/src/fw/acpi-dsdt.aml - 4405 bytes, 159 named objects, 156 executable opcodes Listing File: out/src/fw/acpi-dsdt.lst - 142998 bytes Hex Dump: out/src/fw/acpi-dsdt.hex - 41661 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 245 Optimizations Compiling IASL out/src/fw/ssdt-proc.hex ASL Input: out/src/fw/ssdt-proc.dsl.i - 35 lines, 762 bytes, 8 keywords AML Output: out/src/fw/ssdt-proc.aml - 120 bytes, 6 named objects, 2 executable opcodes Listing File: out/src/fw/ssdt-proc.lst - 2651 bytes Hex Dump: out/src/fw/ssdt-proc.hex - 1459 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/src/fw/ssdt-pcihp.hex ASL Input: out/src/fw/ssdt-pcihp.dsl.i - 36 lines, 758 bytes, 5 keywords AML Output: out/src/fw/ssdt-pcihp.aml - 87 bytes, 5 named objects, 0 executable opcodes Listing File: out/src/fw/ssdt-pcihp.lst - 2347 bytes Hex Dump: out/src/fw/ssdt-pcihp.hex - 1160 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/src/fw/ssdt-misc.hex ASL Input: out/src/fw/ssdt-misc.dsl.i - 101 lines, 2567 bytes, 35 keywords AML Output: out/src/fw/ssdt-misc.aml - 354 bytes, 24 named objects, 11 executable opcodes Listing File: out/src/fw/ssdt-misc.lst - 7656 bytes Hex Dump: out/src/fw/ssdt-misc.hex - 3710 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 2 Optimizations Compiling IASL out/src/fw/q35-acpi-dsdt.hex ASL Input: out/src/fw/q35-acpi-dsdt.dsl.i - 514 lines, 28284 bytes, 413 keywords AML Output: out/src/fw/q35-acpi-dsdt.aml - 7344 bytes, 239 named objects, 174 executable opcodes Listing File: out/src/fw/q35-acpi-dsdt.lst - 255960 bytes Hex Dump: out/src/fw/q35-acpi-dsdt.hex - 69190 bytes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 445 Optimizations Compile checking out/src/fw/acpi.o Compile checking out/src/fw/mptable.o Compile checking out/src/fw/pirtable.o Compile checking out/src/fw/smbios.o Compile checking out/src/fw/romfile_loader.o Compiling whole program out/ccode32flat.o Compiling whole program out/code32seg.o Compiling whole program out/ccode16.o Compiling to assembler out/src/asm-offsets.s Generating offset file out/asm-offsets.h Compiling (16bit) out/romlayout.o Building ld scripts Version: 1.7.5-125.b142.g2c9870f-20141229_155946-jenkins.xeni.kraxel.org Fixed space: 0xe05b-0x10000 total: 8101 slack: 13 Percent slack: 0.2% 16bit size: 35196 32bit segmented size: 2127 32bit flat size: 21109 32bit flat init size: 66688 Lowmem size: 2176 f-segment var size: 1200 Linking out/rom16.o Stripping out/rom16.strip.o Linking out/rom32seg.o Stripping out/rom32seg.strip.o Linking out/rom.o Prepping out/bios.bin.prep Error! ROM doesn't fit (132148 > 131072) You have to either increate the size (CONFIG_ROM_SIZE) or turn off some features (such as hardware support not needed) to make it fit. Trying a more recent gcc version might work too. make: *** [out/bios.bin.prep] Error 1 error: Bad exit status from /var/tmp/rpm-tmp.xIYROn (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.xIYROn (%build) Build step 'Execute shell' marked build as failure Archiving artifacts

5 years, 9 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS December 2014