SeaBIOS December 2014

seabios@seabios.org

10 participants
28 discussions

[PATCH] docs: Add info on MODE16/MODESEGMENT compile time flags
by Kevin O'Connor 29 Dec '14

29 Dec '14

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- docs/Memory_Model.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/Memory_Model.md b/docs/Memory_Model.md index c77fc22..196b57b 100644 --- a/docs/Memory_Model.md +++ b/docs/Memory_Model.md @@ -108,6 +108,15 @@ assembled using ".code16gcc". SeaBIOS is careful to use segment registers properly so that the same code can run in the different 16bit modes that it needs to support. +C code mode flags +================= + +Two compile time flags are available to determine the memory model the +code is intended for: MODE16 and MODESEGMENT. When compiling for the +16 bit modes, MODE16 is true and MODESEGMENT is true. In 32bit +segmented mode, MODE16 is false and MODESEGMENT is true. In 32bit flat +mode both MODE16 and MODESEGMENT are false. + Common memory used at run-time ============================== -- 1.9.3

1 0

[RFCv2] Add SeaBIOS wiki documents to git repo
by Kevin O'Connor 29 Dec '14

29 Dec '14

Based on the previous feedback, I've converted the current wiki documents to markdown format (via the pandoc tool) and then touched up the translation. The attached patch shows what moving the wiki documents into the seabios repo might look like. (It creates a new "docs/" directory with files for each page currently on the wiki.) The pandoc tool seams to be able to translate back to mediawiki format without much issue. So, a possible workflow would be to use the git patch submission process to update documentation, and then use pandoc to translate the pages and push them to the wiki. (Or, if at some future point the wiki is decommissioned, then use pandoc or a similar tool to create html directly.) Thoughts? -Kevin Kevin O'Connor (1): Add wiki documentation to repository docs/Build_overview.md | 80 +++++++++++ docs/Debugging.md | 69 +++++++++ docs/Developer_Documentation.md | 24 ++++ docs/Developer_links.md | 86 +++++++++++ docs/Download.md | 25 ++++ docs/Execution_and_code_flow.md | 178 +++++++++++++++++++++++ docs/Mailinglist.md | 8 ++ docs/Memory_Model.md | 244 ++++++++++++++++++++++++++++++++ docs/README | 5 + docs/Releases.md | 305 ++++++++++++++++++++++++++++++++++++++++ docs/SeaBIOS.md | 15 ++ 11 files changed, 1039 insertions(+) create mode 100644 docs/Build_overview.md create mode 100644 docs/Debugging.md create mode 100644 docs/Developer_Documentation.md create mode 100644 docs/Developer_links.md create mode 100644 docs/Download.md create mode 100644 docs/Execution_and_code_flow.md create mode 100644 docs/Mailinglist.md create mode 100644 docs/Memory_Model.md create mode 100644 docs/README create mode 100644 docs/Releases.md create mode 100644 docs/SeaBIOS.md -- 1.9.3

2 3

[PATCH] sdcard: Initial support for SD cards on PCI SDHCI controllers on QEMU
by Kevin O'Connor 29 Dec '14

29 Dec '14

This adds basic read/write support for SD cards emulated by QEMU. This code is not expected to work on real hardware, because the current controller and card initialization is not robust. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- PCI SDHCI support was just added to QEMU git (qemu commit 224d10ff). This SeaBIOS patch adds a very basic SeaBIOS driver for SD cards on QEMU. One can test by adding "-device sdhci-pci -sd my-drive" to the QEMU command line. This patch is not related to the SD card patch sent to the seabios mailing list back in June 2014. This patch implements a very simple PIO mode driver. --- Makefile | 2 +- src/Kconfig | 6 ++ src/block.c | 5 + src/block.h | 1 + src/hw/sdcard.c | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/post.c | 1 + src/util.h | 4 + 7 files changed, 339 insertions(+), 1 deletion(-) create mode 100644 src/hw/sdcard.c diff --git a/Makefile b/Makefile index 1cff1d0..a84a5f7 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ SRCBOTH=misc.c stacks.c output.c string.c block.c cdrom.c disk.c mouse.c kbd.c \ SRC16=$(SRCBOTH) SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c romfile.c x86.c optionroms.c \ pmm.c font.c boot.c bootsplash.c jpeg.c bmp.c \ - hw/ahci.c hw/pvscsi.c hw/usb-xhci.c hw/usb-hub.c \ + hw/ahci.c hw/pvscsi.c hw/usb-xhci.c hw/usb-hub.c hw/sdcard.c \ fw/coreboot.c fw/lzmadecode.c fw/csm.c fw/biostables.c \ fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/smp.c fw/mtrr.c fw/xen.c \ fw/acpi.c fw/mptable.c fw/pirtable.c fw/smbios.c fw/romfile_loader.c diff --git a/src/Kconfig b/src/Kconfig index a1c0c1e..45ca59c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -159,6 +159,12 @@ menu "Hardware support" default y help Support for AHCI disk code. + config SDCARD + depends on DRIVES && QEMU_HARDWARE + bool "SD controllers" + default y + help + Support for SD cards on PCI host controllers. config VIRTIO_BLK depends on DRIVES && QEMU_HARDWARE bool "virtio-blk controllers" diff --git a/src/block.c b/src/block.c index 7892be5..c6d53c1 100644 --- a/src/block.c +++ b/src/block.c @@ -534,6 +534,11 @@ process_op(struct disk_op_s *op) ret = call32(_cfunc32flat_process_atapi_op , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM); break; + case DTYPE_SDCARD: ; + extern void _cfunc32flat_process_sdcard_op(void); + ret = call32(_cfunc32flat_process_sdcard_op + , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM); + break; case DTYPE_USB: case DTYPE_UAS: case DTYPE_VIRTIO_SCSI: diff --git a/src/block.h b/src/block.h index aa01ed7..8182288 100644 --- a/src/block.h +++ b/src/block.h @@ -71,6 +71,7 @@ struct drive_s { #define DTYPE_ESP_SCSI 0x81 #define DTYPE_MEGASAS 0x82 #define DTYPE_PVSCSI 0x83 +#define DTYPE_SDCARD 0x90 #define MAXDESCSIZE 80 diff --git a/src/hw/sdcard.c b/src/hw/sdcard.c new file mode 100644 index 0000000..6ff93c8 --- /dev/null +++ b/src/hw/sdcard.c @@ -0,0 +1,321 @@ +// PCI SD Host Controller Interface +// +// Copyright (C) 2014 Kevin O'Connor <kevin(a)koconnor.net> +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "block.h" // struct drive_s +#include "fw/paravirt.h" // runningOnQEMU +#include "malloc.h" // malloc_fseg +#include "output.h" // znprintf +#include "pci.h" // pci_config_readl +#include "pci_ids.h" // PCI_CLASS_SYSTEM_SDHCI +#include "pci_regs.h" // PCI_BASE_ADDRESS_0 +#include "stacks.h" // wait_preempt +#include "std/disk.h" // DISK_RET_SUCCESS +#include "string.h" // memset +#include "util.h" // boot_add_hd +#include "x86.h" // writel + +// SDHCI MMIO registers +struct sdhci_s { + u32 sdma_addr; + u16 block_size; + u16 block_count; + u32 arg; + u16 transfer_mode; + u16 cmd; + u32 response[4]; + u32 data; + u32 present_state; + u8 host_control; + u8 power_control; + u8 block_gap_control; + u8 wakeup_control; + u16 clock_control; + u8 timeout_control; + u8 software_reset; + u16 irq_status; + u16 error_irq_status; + u16 irq_enable; + u16 error_irq_enable; + u16 irq_signal; + u16 error_signal; + u16 auto_cmd12; + u8 pad_3E[2]; + u64 cap; + u64 max_current; + u16 force_auto_cmd12; + u16 force_error; + u8 adma_error; + u8 pad_55[3]; + u64 adma_addr; + u8 pad_60[156]; + u16 slot_irq; + u16 controller_version; +} PACKED; + +// SDHCI commands +#define SC_ALL_SEND_CID ((2<<8) | 0x21) +#define SC_SEND_RELATIVE_ADDR ((3<<8) | 0x22) +#define SC_SELECT_DESELECT_CARD ((7<<8) | 0x23) +#define SC_READ_SINGLE ((17<<8) | 0x22) +#define SC_READ_MULTIPLE ((18<<8) | 0x22) +#define SC_WRITE_SINGLE ((24<<8) | 0x22) +#define SC_WRITE_MULTIPLE ((25<<8) | 0x22) +#define SC_APP_CMD ((55<<8) | 0x22) +#define SC_APP_SEND_OP_COND ((41<<8) | 0x22) + +// SDHCI irqs +#define SI_CMD_COMPLETE (1<<0) +#define SI_TRANS_DONE (1<<1) +#define SI_WRITE_READY (1<<4) +#define SI_READ_READY (1<<5) + +// SDHCI present_state flags +#define SP_CMD_INHIBIT (1<<0) +#define SP_DAT_INHIBIT (1<<1) + +// SDHCI transfer_mode flags +#define ST_BLOCKCOUNT (1<<1) +#define ST_AUTO_CMD12 (1<<2) +#define ST_READ (1<<4) +#define ST_MULTIPLE (1<<5) + +// SDHCI result flags +#define SR_OCR_CCS (1<<30) + +// SDHCI timeouts +#define SDHCI_PIO_TIMEOUT 1000 // XXX - these are just made up +#define SDHCI_TRANSFER_TIMEOUT 10000 + +// Internal 'struct drive_s' storage for a detected card +struct sddrive_s { + struct drive_s drive; + struct sdhci_s *regs; + int card_type; +}; + +// SD card types +#define SF_MMC 0 +#define SF_SDSC 1 +#define SF_SDHC 2 + +// Repeatedly read a u16 register until the specific value is found +static int +waitw(u16 *reg, u16 mask, u16 value, u32 end) +{ + for (;;) { + u16 v = readw(reg); + if ((v & mask) == value) + return 0; + if (timer_check(end)) { + warn_timeout(); + return -1; + } + yield(); + } +} + +// Send a command to the card. +static int +sdcard_pio(struct sdhci_s *regs, int cmd, u32 *param) +{ + u32 end = timer_calc(SDHCI_PIO_TIMEOUT); + u16 busyf = SP_CMD_INHIBIT | ((cmd & 0x03) == 0x03 ? SP_DAT_INHIBIT : 0); + int ret = waitw((u16*)&regs->present_state, busyf, 0, end); + if (ret) + return ret; + // Send command + writel(&regs->arg, *param); + writew(&regs->cmd, cmd); + ret = waitw(&regs->irq_status, SI_CMD_COMPLETE, SI_CMD_COMPLETE, end); + if (ret) + return ret; + writew(&regs->irq_status, SI_CMD_COMPLETE); + // Read response + memcpy(param, regs->response, sizeof(regs->response)); + return 0; +} + +// Send an "app specific" command to the card. +static int +sdcard_pio_app(struct sdhci_s *regs, int cmd, u32 *param) +{ + u32 aparam[4] = {}; + int ret = sdcard_pio(regs, SC_APP_CMD, aparam); + if (ret) + return ret; + return sdcard_pio(regs, cmd, param); +} + +// Send a command to the card which transfers data. +static int +sdcard_pio_transfer(struct sddrive_s *drive, int cmd, u32 addr + , void *data, int count) +{ + // Send command + writel(&drive->regs->block_size, DISK_SECTOR_SIZE); + writew(&drive->regs->block_count, count); // XXX - SC_SET_BLOCK_COUNT? + int isread = cmd != SC_WRITE_SINGLE && cmd != SC_WRITE_MULTIPLE; + u16 tmode = ((count > 1 ? ST_MULTIPLE|ST_AUTO_CMD12|ST_BLOCKCOUNT : 0) + | (isread ? ST_READ : 0)); + writew(&drive->regs->transfer_mode, tmode); + if (drive->card_type < SF_SDHC) + addr *= DISK_SECTOR_SIZE; + u32 param[4] = { addr }; + int ret = sdcard_pio(drive->regs, cmd, param); + if (ret) + return ret; + // Read/write data + u32 end = timer_calc(SDHCI_TRANSFER_TIMEOUT); + u16 cbit = isread ? SI_READ_READY : SI_WRITE_READY; + while (count--) { + ret = waitw(&drive->regs->irq_status, cbit, cbit, end); + if (ret) + return ret; + writew(&drive->regs->irq_status, cbit); + int i; + for (i=0; i<DISK_SECTOR_SIZE/4; i++) { + if (isread) + *(u32*)data = readl(&drive->regs->data); + else + writel(&drive->regs->data, *(u32*)data); + data += 4; + } + } + // Complete command + // XXX - SC_STOP_TRANSMISSION? + ret = waitw(&drive->regs->irq_status, SI_TRANS_DONE, SI_TRANS_DONE, end); + if (ret) + return ret; + writew(&drive->regs->irq_status, SI_TRANS_DONE); + return 0; +} + +// Read/write a block of data to/from the card. +static int +sdcard_readwrite(struct disk_op_s *op, int iswrite) +{ + struct sddrive_s *drive = container_of( + op->drive_gf, struct sddrive_s, drive); + int cmd = iswrite ? SC_WRITE_SINGLE : SC_READ_SINGLE; + if (op->count > 1) + cmd = iswrite ? SC_WRITE_MULTIPLE : SC_READ_MULTIPLE; + int ret = sdcard_pio_transfer(drive, cmd, op->lba, op->buf_fl, op->count); + if (ret) + return DISK_RET_EBADTRACK; + return DISK_RET_SUCCESS; +} + +int VISIBLE32FLAT +process_sdcard_op(struct disk_op_s *op) +{ + if (!CONFIG_SDCARD) + return 0; + switch (op->command) { + case CMD_READ: + return sdcard_readwrite(op, 0); + case CMD_WRITE: + return sdcard_readwrite(op, 1); + case CMD_FORMAT: + case CMD_RESET: + case CMD_ISREADY: + case CMD_VERIFY: + case CMD_SEEK: + return DISK_RET_SUCCESS; + default: + return DISK_RET_EPARAM; + } +} + + +/**************************************************************** + * Setup + ****************************************************************/ + +// Initialize an SD card +static int +sdcard_card_setup(struct sdhci_s *regs) +{ + // XXX - works on QEMU; probably wont on real hardware! + u32 param[4] = { 0x01 }; + int ret = sdcard_pio_app(regs, SC_APP_SEND_OP_COND, param); + if (ret) + return ret; + int card_type = (param[0] & SR_OCR_CCS) ? SF_SDHC : SF_SDSC; + param[0] = 0x00; + ret = sdcard_pio(regs, SC_ALL_SEND_CID, param); + if (ret) + return ret; + param[0] = 0x01 << 16; + ret = sdcard_pio(regs, SC_SEND_RELATIVE_ADDR, param); + if (ret) + return ret; + u16 rca = param[0] >> 16; + param[0] = rca << 16; + ret = sdcard_pio(regs, SC_SELECT_DESELECT_CARD, param); + if (ret) + return ret; + return card_type; +} + +// Setup and configure an SD card controller +static void +sdcard_controller_setup(void *data) +{ + struct pci_device *pci = data; + u16 bdf = pci->bdf; + wait_preempt(); // Avoid pci_config_readl when preempting + struct sdhci_s *regs = (void*)pci_config_readl(bdf, PCI_BASE_ADDRESS_0); + pci_config_maskw(bdf, PCI_COMMAND, 0, + PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); + + // Initialize controller + if (!runningOnQEMU()) + // XXX - this init logic will probably only work on qemu! + return; + writew(&regs->irq_signal, 0); + writew(&regs->irq_enable, 0xffff); + writew(&regs->error_signal, 0); + writeb(&regs->power_control, 0x0f); + writew(&regs->clock_control, 0x0005); + + // Initialize card + int card_type = sdcard_card_setup(regs); + if (card_type < 0) + return; + + // Register drive + struct sddrive_s *drive = malloc_fseg(sizeof(*drive)); + if (!drive) { + warn_noalloc(); + return; + } + memset(drive, 0, sizeof(*drive)); + drive->drive.type = DTYPE_SDCARD; + drive->drive.blksize = DISK_SECTOR_SIZE; + drive->drive.sectors = (u64)-1; // XXX + drive->regs = regs; + drive->card_type = card_type; + + dprintf(1, "Found SD Card at %02x:%02x.%x\n" + , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf)); + char *desc = znprintf(MAXDESCSIZE, "SD Card"); // XXX + boot_add_hd(&drive->drive, desc, bootprio_find_pci_device(pci)); +} + +void +sdcard_setup(void) +{ + if (!CONFIG_SDCARD) + return; + + struct pci_device *pci; + foreachpci(pci) { + if (pci->class != PCI_CLASS_SYSTEM_SDHCI || pci->prog_if >= 2) + // Not an SDHCI controller following SDHCI spec + continue; + run_thread(sdcard_controller_setup, pci); + } +} diff --git a/src/post.c b/src/post.c index 0fdd28e..9ea5620 100644 --- a/src/post.c +++ b/src/post.c @@ -143,6 +143,7 @@ device_hardware_setup(void) floppy_setup(); ata_setup(); ahci_setup(); + sdcard_setup(); cbfs_payload_setup(); ramdisk_setup(); virtio_blk_setup(); diff --git a/src/util.h b/src/util.h index ed90e03..09bb8a9 100644 --- a/src/util.h +++ b/src/util.h @@ -146,6 +146,10 @@ void floppy_tick(void); void ramdisk_setup(void); int process_ramdisk_op(struct disk_op_s *op); +// hw/sdcard.c +int process_sdcard_op(struct disk_op_s *op); +void sdcard_setup(void); + // hw/timer.c void timer_setup(void); void pmtimer_setup(u16 ioport); -- 1.9.3

1 1

[PATCH] Simplify README files - point to online documentation instead
by Kevin O'Connor 18 Dec '14

18 Dec '14

The README file and README.CSM file have gotten a bit out of date. Instead of maintaining technical information in the README file, point new users to the SeaBIOS wiki. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- README | 187 ++++--------------------------------------------------------- README.CSM | 22 -------- 2 files changed, 11 insertions(+), 198 deletions(-) delete mode 100644 README.CSM diff --git a/README b/README index 1e61e2f..e18be16 100644 --- a/README +++ b/README @@ -1,182 +1,17 @@ -This code implements an X86 legacy bios. It is intended to be -compiled using standard gnu tools (eg, gas and gcc). +Welcome to the SeaBIOS project! This project implements an X86 legacy +bios that is built with standard GNU tools. -To build for QEMU, one should be able to run "make" in the main -directory. The resulting file "out/bios.bin" contains the processed -bios image. To build for coreboot, please see the coreboot wiki. To -build for CSM, please see README.CSM. +Please see build and developer information at: + http://seabios.org/Developer_Documentation -Testing of images: +For the impatient, SeaBIOS is built for QEMU and tested on QEMU with: -To test the bios under bochs, one will need to instruct bochs to use -the new bios image. Use the 'romimage' option - for example: + make + qemu -bios out/bios.bin -bochs -q 'floppya: 1_44=myfdimage.img' 'romimage: file=out/bios.bin' +SeaBIOS can be configured with kconfig. To change the default +configuration one can run "make menuconfig" prior to running "make". -To test under qemu, one will need to create a directory with all the -bios images and then overwrite the main bios image. For example: - -cp /usr/share/qemu/*.bin mybiosdir/ -cp out/bios.bin mybiosdir/ -cp out/*.aml mybiosdir/ - -Once this is setup, one can instruct qemu to use the newly created -directory for rom images. For example: - -qemu -L mybiosdir/ -fda myfdimage.img - - -Overview of files: - -The src/ directory contains the bios source code. Several of the -files are compiled twice - once for 16bit mode and once for 32bit -mode. (The build system will remove code that is not needed for a -particular mode.) - -The vgasrc/ directory contains code for VGA BIOS implementations. -This code is separate from the main BIOS code in the src/ directory. -It produces a VGA BIOS rom in out/vgabios.bin. The VGA BIOS code is -always compiled in 16bit mode. - -The scripts/ directory contains helper utilities for manipulating and -building the final rom. - -The out/ directory is created by the build process - it contains all -temporary and final files. - - -Build overview: - -The 16bit code is compiled via gcc to assembler (file out/ccode.16.s). -The gcc "-fwhole-program" and "-ffunction-sections -fdata-sections" -options are used to optimize the process so that gcc can efficiently -compile and discard unneeded code. (In the code, one can use the -macros 'VISIBLE16' and 'VISIBLE32FLAT' to instruct a symbol to be -outputted in 16bit and 32bit mode respectively.) - -This resulting assembler code is pulled into romlayout.S. The gas -option ".code16gcc" is used prior to including the gcc generated -assembler - this option enables gcc to generate valid 16 bit code. - -The post code (post.c) is entered, via the function handle_post(), in -32bit mode. The 16bit post vector (in romlayout.S) transitions the -cpu into 32 bit mode before calling the post.c code. - -In the last step of compilation, the 32 bit code is merged into the 16 -bit code so that one binary file contains both. Currently, both 16bit -and 32bit code will be located in the memory at 0xe0000-0xfffff. - - -GCC 16 bit limitations: - -Although the 16bit code is compiled with gcc, developers need to be -aware of the environment. In particular, global variables _must_ be -treated specially. - -The code has full access to stack variables and general purpose -registers. The entry code in romlayout.S will push the original -registers on the stack before calling the C code and then pop them off -(including any required changes) before returning from the interrupt. -Changes to CS, DS, and ES segment registers in C code is also safe. -Changes to other segment registers (SS, FS, GS) need to be restored -manually. - -Stack variables (and pointers to stack variables) work as they -normally do in standard C code. - -However, variables stored outside the stack need to be accessed via -the GET_VAR and SET_VAR macros (or one of the helper macros described -below). This is due to the 16bit segment nature of the X86 cpu when -it is in "real mode". The C entry code will set DS and SS to point to -the stack segment. Variables not on the stack need to be accessed via -an explicit segment register. Any other access requires altering one -of the other segment registers (usually ES) and then accessing the -variable via that segment register. - -There are three low-level ways to access a remote variable: -GET/SET_VAR, GET/SET_FARVAR, and GET/SET_FLATPTR. The first set takes -an explicit segment descriptor (eg, "CS") and offset. The second set -will take a segment id and offset, set ES to the segment id, and then -make the access via the ES segment. The last method is similar to the -second, except it takes a pointer that would be valid in 32-bit flat -mode instead of a segment/offset pair. - -Most BIOS variables are stored in global variables, the "BDA", or -"EBDA" memory areas. Because this is common, three sets of helper -macros (GET_GLOBAL, GET/SET_BDA, and GET/SET_EBDA) are available to -simplify these accesses. Also, an area in the 0xc0000-0xf0000 memory -range is made available for internal BIOS run-time variables that are -marked with the VARLOW attribute. These variables can then be -accessed with the GET/SET_LOW macros. - -Global variables defined in the C code can be read in 16bit mode if -the variable declaration is marked with VAR16, VARFSEG, or VAR16FIXED. -The GET_GLOBAL macro will then allow read access to the variable. -Global variables are stored in the 0xf000 segment. Because the -f-segment is marked read-only during run-time, the 16bit code is not -permitted to change the value of 16bit variables. Code running in -32bit mode can not access variables with VAR16, but can access -variables marked with VARFSEG, VARLOW, VAR16FIXED, or with no marking -at all. The 32bit code can use the GET_GLOBAL macros, but they are -not required. - - -GCC 16 bit stack limitations: - -Another limitation of gcc is its use of 32-bit temporaries. Gcc will -allocate 32-bits of space for every variable - even if that variable -is only defined as a 'u8' or 'u16'. If one is not careful, using too -much stack space can break old DOS applications. - -There does not appear to be explicit documentation on the minimum -stack space available for bios calls. However, Freedos has been -observed to call into the bios with less than 150 bytes available. - -Note that the post code and boot code (irq 18/19) do not have a stack -limitation because the entry points for these functions transition the -cpu to 32bit mode and reset the stack to a known state. Only the -general purpose 16-bit service entry points are affected. - -There are some ways to reduce stack usage: making sure functions are -tail-recursive often helps, reducing the number of parameters passed -to functions often helps, sometimes reordering variable declarations -helps, inlining of functions can sometimes help, and passing of packed -structures can also help. It is also possible to transition to/from -an extra stack stored in the EBDA using the stack_hop helper function. - -Some useful stats: the overhead for the entry to a bios handler that -takes a 'struct bregs' is 42 bytes of stack space (6 bytes from -interrupt insn, 32 bytes to store registers, and 4 bytes for call -insn). An entry to an ISR handler without args takes 30 bytes (6 + 20 -+ 4). - - -Debugging the bios: - -The bios will output information messages to a special debug port. -Under qemu, one can view these messages by adding '-chardev -stdio,id=seabios -device isa-debugcon,iobase=0x402,chardev=seabios' to -the qemu command line. Once this is done, one should see status -messages on the console. - -The gdb-server mechanism of qemu is also useful. One can use gdb with -qemu to debug system images. To use this, add '-s -S' to the qemu -command line. For example: - -qemu -L mybiosdir/ -fda myfdimage.img -s -S - -Then, in another session, run gdb with either out/rom16.o (to debug -bios 16bit code) or out/rom32.o (to debug bios 32bit code). For -example: - -gdb out/rom16.o - -Once in gdb, use the command "target remote localhost:1234" to have -gdb connect to qemu. See the qemu documentation for more information -on using gdb and qemu in this mode. Note that gdb seems to get -breakpoints confused when the cpu is in 16-bit real mode. This makes -stepping through the program difficult (though 'step instruction' -still works). Also, one may need to set 16bit break points at both -the cpu address and memory address (eg, break *0x1234 ; break -*0xf1234). +For other types of builds, and for more detailed developer +documentation, please see the online documentation listed above. diff --git a/README.CSM b/README.CSM deleted file mode 100644 index b904e65..0000000 --- a/README.CSM +++ /dev/null @@ -1,22 +0,0 @@ -Enabling CONFIG_CSM allows SeaBIOS to be built as a Compatibility Support -Module for use with the OMVF/EDK-II UEFI firmware. - -It will provide "legacy" BIOS services for booting non-EFI operating -systems and will also allow OVMF to display on otherwise unsupported -video hardware by using the traditional VGA BIOS. - -Windows 2008r2 is known to use INT 10h BIOS calls even when booted via -EFI, and the presence of a CSM makes this work as expected too. - -Having built SeaBIOS with CONFIG_CSM, you should be able to drop the -result (out/Csm16.bin) into your OVMF build tree at -OvmfPkg/Csm/Csm16/Csm16.bin and then build OVMF with 'build -D -CSM_ENABLE'. The SeaBIOS binary will be included as a discrete file -within the 'Flash Volume' which is created, and there are tools which -will extract it and allow it to be replaced; satisfying the -requirements of the LGPL licence. - -A patch to OVMF is required, to prevent it from marking the region from -0xC0000-0xFFFFF as read-only before invoking our Legacy16Boot method. See -http://www.sourceforge.net/mailarchive/forum.php?thread_name=50FD7290.9060003%40redhat.com&forum_name=edk2-devel - -- 1.9.3

1 1

Re: [SeaBIOS] [PATCH] usb: Update USB hub code to support super speed hubs
by Kevin O'Connor 18 Dec '14

18 Dec '14

On Thu, Dec 18, 2014 at 07:47:32AM +0100, Werner Zeh wrote: > Hi Kevin. > > I tried your patch and it works just fine for me. > I made a test with a baytrail based board and the earlier mentioned USB-Hub. > Thanks a lot for the really fast replay, great support! Thanks. I pushed the patch to the seabios repo. -Kevin

1 0

[PATCH] usb: Update USB hub code to support super speed hubs
by Kevin O'Connor 17 Dec '14

17 Dec '14

Super speed hubs (usb3 spec) have specific initialization requirements. Add the code necessary to detect and initialize these hubs. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/usb-hub.c | 36 ++++++++++++++++++++++++++++++++++-- src/hw/usb-hub.h | 6 +++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/hw/usb-hub.c b/src/hw/usb-hub.c index c21cbfb..54e341b 100644 --- a/src/hw/usb-hub.c +++ b/src/hw/usb-hub.c @@ -17,13 +17,28 @@ get_hub_desc(struct usb_pipe *pipe, struct usb_hub_descriptor *desc) struct usb_ctrlrequest req; req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE; req.bRequest = USB_REQ_GET_DESCRIPTOR; - req.wValue = USB_DT_HUB<<8; + if (pipe->speed == USB_SUPERSPEED) + req.wValue = USB_DT_HUB3<<8; + else + req.wValue = USB_DT_HUB<<8; req.wIndex = 0; req.wLength = sizeof(*desc); return usb_send_default_control(pipe, &req, desc); } static int +set_hub_depth(struct usb_pipe *pipe, u16 depth) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_DEVICE; + req.bRequest = HUB_REQ_SET_HUB_DEPTH; + req.wValue = depth; + req.wIndex = 0; + req.wLength = 0; + return usb_send_default_control(pipe, &req, NULL); +} + +static int set_port_feature(struct usbhub_s *hub, int port, int feature) { struct usb_ctrlrequest req; @@ -105,7 +120,9 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) ret = get_port_status(hub, port, &sts); if (ret) goto fail; - if (!(sts.wPortStatus & USB_PORT_STAT_RESET)) + if (!(sts.wPortStatus & USB_PORT_STAT_RESET) + && (hub->usbdev->speed != USB_SUPERSPEED + || !(sts.wPortStatus & USB_PORT_STAT_LINK_MASK))) break; if (timer_check(end)) { warn_timeout(); @@ -119,6 +136,8 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) // Device no longer present return -1; + if (hub->usbdev->speed == USB_SUPERSPEED) + return USB_SUPERSPEED; return ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK) >> USB_PORT_STAT_SPEED_SHIFT); @@ -154,6 +173,19 @@ usb_hub_setup(struct usbdevice_s *usbdev) hub.portcount = desc.bNbrPorts; hub.op = &HubOp; + if (usbdev->speed == USB_SUPERSPEED) { + int depth = 0; + struct usbdevice_s *parent = usbdev->hub->usbdev; + while (parent) { + depth++; + parent = parent->hub->usbdev; + } + + ret = set_hub_depth(usbdev->defpipe, depth); + if (ret) + return ret; + } + // Turn on power to ports. int port; for (port=0; port<desc.bNbrPorts; port++) { diff --git a/src/hw/usb-hub.h b/src/hw/usb-hub.h index 5b09947..880378c 100644 --- a/src/hw/usb-hub.h +++ b/src/hw/usb-hub.h @@ -11,6 +11,9 @@ int usb_hub_setup(struct usbdevice_s *usbdev); ****************************************************************/ #define USB_DT_HUB (USB_TYPE_CLASS | 0x09) +#define USB_DT_HUB3 (USB_TYPE_CLASS | 0x0a) + +#define HUB_REQ_SET_HUB_DEPTH 0x0C struct usb_hub_descriptor { u8 bDescLength; @@ -48,7 +51,8 @@ struct usb_port_status { #define USB_PORT_STAT_SUSPEND 0x0004 #define USB_PORT_STAT_OVERCURRENT 0x0008 #define USB_PORT_STAT_RESET 0x0010 -#define USB_PORT_STAT_L1 0x0020 +#define USB_PORT_STAT_LINK_SHIFT 5 +#define USB_PORT_STAT_LINK_MASK (0x7 << USB_PORT_STAT_LINK_SHIFT) #define USB_PORT_STAT_POWER 0x0100 #define USB_PORT_STAT_SPEED_SHIFT 9 #define USB_PORT_STAT_SPEED_MASK (0x3 << USB_PORT_STAT_SPEED_SHIFT) -- 1.9.3

3 5

[RFC] Add SeaBIOS wiki documents to git repo
by Kevin O'Connor 17 Dec '14

17 Dec '14

I've been thinking of adding the SeaBIOS wiki documents into the SeaBIOS git repo. The following patch shows what that might look like. (It creates a new "docs/" directory with files for each page currently on the wiki.) I'm not sure if doing this is a good idea. It would be nice to have the documents in version control, and it would be good to allow patches to simultaneously update the code and documentation. However, modifying wiki syntax from an editor isn't that easy. Thoughts? -Kevin Kevin O'Connor (1): Add wiki documentation to repository docs/Build_overview | 41 +++++++++ docs/Debugging | 38 ++++++++ docs/Developer_Documentation | 13 +++ docs/Developer_links | 64 +++++++++++++ docs/Download | 18 ++++ docs/Execution_and_code_flow | 66 ++++++++++++++ docs/Mailinglist | 3 + docs/Memory_Model | 76 ++++++++++++++++ docs/README | 5 ++ docs/Releases | 208 +++++++++++++++++++++++++++++++++++++++++++ docs/SeaBIOS | 7 ++ 11 files changed, 539 insertions(+) create mode 100644 docs/Build_overview create mode 100644 docs/Debugging create mode 100644 docs/Developer_Documentation create mode 100644 docs/Developer_links create mode 100644 docs/Download create mode 100644 docs/Execution_and_code_flow create mode 100644 docs/Mailinglist create mode 100644 docs/Memory_Model create mode 100644 docs/README create mode 100644 docs/Releases create mode 100644 docs/SeaBIOS -- 1.9.3

4 8

Next release
by Kevin O'Connor 15 Dec '14

15 Dec '14

I think it is time to start planning the next SeaBIOS release. I'm thinking of targeting a release around the end of January, with a feature freeze in mid-January. I'm thinking of calling the next release v1.8. In previous releases, three numbers were used (eg, v1.7.6), but there does not appear to be a compelling reason to use more than two numbers (eg, v1.8) and the two number approach is more similar to other projects (eg, QEMU and Linux). I'm not planning on pushing out the conversion to full 32bit only drivers in the next release. I maintain a branch with that code at: https://github.com/KevinOConnor/seabios/tree/testing-32bit-drivers Such a change would potentially have backwards compatibility issues, and I think it would be better to push a release with the current enhancements (eg, the USB updates) first. Thoughts? -Kevin

2 1

Re: [SeaBIOS] [coreboot] SeaBIOS wit USB3.0 hub and USB3.0 devide behind the hub
by Kevin O'Connor 15 Dec '14

15 Dec '14

On Mon, Dec 15, 2014 at 09:06:51AM +0100, Werner Zeh wrote: > Hi Kevin. > > I have tried your fix but it doesn't help. > You can find a (huge) log with loglevel 5 here: http://pastebin.com/21rrAhfA > Thanks. I obtained a USB3 hub and it works for me on both my c720 and e350m1 with the updated patch below. Please CC the seabios mailing list on replies. -Kevin >From 9b244e4a887adba2281d46c0fb366823111ba4bc Mon Sep 17 00:00:00 2001 From: Kevin O'Connor <kevin(a)koconnor.net> Date: Fri, 12 Dec 2014 14:16:43 -0500 Subject: [PATCH] usb: Testing of USB3 hub support Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/hw/usb-hub.c | 36 ++++++++++++++++++++++++++++++++++-- src/hw/usb-hub.h | 6 +++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/hw/usb-hub.c b/src/hw/usb-hub.c index c21cbfb..54e341b 100644 --- a/src/hw/usb-hub.c +++ b/src/hw/usb-hub.c @@ -17,13 +17,28 @@ get_hub_desc(struct usb_pipe *pipe, struct usb_hub_descriptor *desc) struct usb_ctrlrequest req; req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE; req.bRequest = USB_REQ_GET_DESCRIPTOR; - req.wValue = USB_DT_HUB<<8; + if (pipe->speed == USB_SUPERSPEED) + req.wValue = USB_DT_HUB3<<8; + else + req.wValue = USB_DT_HUB<<8; req.wIndex = 0; req.wLength = sizeof(*desc); return usb_send_default_control(pipe, &req, desc); } static int +set_hub_depth(struct usb_pipe *pipe, u16 depth) +{ + struct usb_ctrlrequest req; + req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_DEVICE; + req.bRequest = HUB_REQ_SET_HUB_DEPTH; + req.wValue = depth; + req.wIndex = 0; + req.wLength = 0; + return usb_send_default_control(pipe, &req, NULL); +} + +static int set_port_feature(struct usbhub_s *hub, int port, int feature) { struct usb_ctrlrequest req; @@ -105,7 +120,9 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) ret = get_port_status(hub, port, &sts); if (ret) goto fail; - if (!(sts.wPortStatus & USB_PORT_STAT_RESET)) + if (!(sts.wPortStatus & USB_PORT_STAT_RESET) + && (hub->usbdev->speed != USB_SUPERSPEED + || !(sts.wPortStatus & USB_PORT_STAT_LINK_MASK))) break; if (timer_check(end)) { warn_timeout(); @@ -119,6 +136,8 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) // Device no longer present return -1; + if (hub->usbdev->speed == USB_SUPERSPEED) + return USB_SUPERSPEED; return ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK) >> USB_PORT_STAT_SPEED_SHIFT); @@ -154,6 +173,19 @@ usb_hub_setup(struct usbdevice_s *usbdev) hub.portcount = desc.bNbrPorts; hub.op = &HubOp; + if (usbdev->speed == USB_SUPERSPEED) { + int depth = 0; + struct usbdevice_s *parent = usbdev->hub->usbdev; + while (parent) { + depth++; + parent = parent->hub->usbdev; + } + + ret = set_hub_depth(usbdev->defpipe, depth); + if (ret) + return ret; + } + // Turn on power to ports. int port; for (port=0; port<desc.bNbrPorts; port++) { diff --git a/src/hw/usb-hub.h b/src/hw/usb-hub.h index 5b09947..880378c 100644 --- a/src/hw/usb-hub.h +++ b/src/hw/usb-hub.h @@ -11,6 +11,9 @@ int usb_hub_setup(struct usbdevice_s *usbdev); ****************************************************************/ #define USB_DT_HUB (USB_TYPE_CLASS | 0x09) +#define USB_DT_HUB3 (USB_TYPE_CLASS | 0x0a) + +#define HUB_REQ_SET_HUB_DEPTH 0x0C struct usb_hub_descriptor { u8 bDescLength; @@ -48,7 +51,8 @@ struct usb_port_status { #define USB_PORT_STAT_SUSPEND 0x0004 #define USB_PORT_STAT_OVERCURRENT 0x0008 #define USB_PORT_STAT_RESET 0x0010 -#define USB_PORT_STAT_L1 0x0020 +#define USB_PORT_STAT_LINK_SHIFT 5 +#define USB_PORT_STAT_LINK_MASK (0x7 << USB_PORT_STAT_LINK_SHIFT) #define USB_PORT_STAT_POWER 0x0100 #define USB_PORT_STAT_SPEED_SHIFT 9 #define USB_PORT_STAT_SPEED_MASK (0x3 << USB_PORT_STAT_SPEED_SHIFT) -- 1.9.3

1 0

Re: [SeaBIOS] [coreboot] SeaBIOS wit USB3.0 hub and USB3.0 devide behind the hub
by Kevin O'Connor 11 Dec '14

11 Dec '14

On Wed, Dec 10, 2014 at 07:21:54AM +0100, Werner Zeh wrote: > Hi all. > > I have made some tests with SeaBIOS and XHCI and found, that on my board (which is baytrail-based) > a USB3.0 hub won't work. For those who are familar with SeaBIOS I have attached two > logfiles from SeaBIOS. One of them is with the USB3.0 flash drive directly connected to one of the root ports of SoC > (in which case the boot process starts from the flash drive) and the other is with the same flash drive but a USB3.0 hub in between > (I have used a hub from Delock #62534, http://www.delock.de/produkte/F_247_extern_62534/merkmale.html). In the hub-case, I see the > "No bootable device" screen and no boot will happen. > > Maybe someone more experienced can see the cause from the logs. > ?SeaBIOS (version rel-1.7.5-116-g56b252e-dirty-20141210_064921-deerlf0x73) [...] > |1ad7d000| xhci_process_events: ring 0x1adcb200 [trb 0x1adcb200, evt 0x1adcb300, type 32, eidx 1, cc 1] > |1ad7d000| device rev=0300 cls=09 sub=00 proto=03 size=512 > |1ad7d000| xhci_realloc_pipe: usbdev 0x1ad82bc0, ring 0x1adba600, slotid 4, epid 1 [...] > |1ad7f000| xhci_process_events: ring 0x1adba600 [trb 0x1adba6c0, evt 0x1adba700, type 32, eidx 13, cc 6] It looks like the hub is found, but responds with a "stall" error on the get_hub_desc() request. Looks like usb3 hubs use a different descriptor id. You could try the patch below - it's a lot of guess work though. -Kevin diff --git a/src/hw/usb-hub.c b/src/hw/usb-hub.c index c21cbfb..7688ef2 100644 --- a/src/hw/usb-hub.c +++ b/src/hw/usb-hub.c @@ -17,7 +17,10 @@ get_hub_desc(struct usb_pipe *pipe, struct usb_hub_descriptor *desc) struct usb_ctrlrequest req; req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_DEVICE; req.bRequest = USB_REQ_GET_DESCRIPTOR; - req.wValue = USB_DT_HUB<<8; + if (pipe->speed == USB_SUPERSPEED) + req.wValue = USB_DT_HUB3<<8; + else + req.wValue = USB_DT_HUB<<8; req.wIndex = 0; req.wLength = sizeof(*desc); return usb_send_default_control(pipe, &req, desc); @@ -105,7 +108,9 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) ret = get_port_status(hub, port, &sts); if (ret) goto fail; - if (!(sts.wPortStatus & USB_PORT_STAT_RESET)) + if (!(sts.wPortStatus & USB_PORT_STAT_RESET) + && (hub->usbdev->speed != USB_SUPERSPEED + || !(sts.wPortStatus & USB_PORT_STAT_LINK_MASK))) break; if (timer_check(end)) { warn_timeout(); @@ -119,6 +124,8 @@ usb_hub_reset(struct usbhub_s *hub, u32 port) // Device no longer present return -1; + if (hub->usbdev->speed == USB_SUPERSPEED) + return USB_SUPERSPEED; return ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK) >> USB_PORT_STAT_SPEED_SHIFT); diff --git a/src/hw/usb-hub.h b/src/hw/usb-hub.h index 5b09947..f7436a5 100644 --- a/src/hw/usb-hub.h +++ b/src/hw/usb-hub.h @@ -11,6 +11,7 @@ int usb_hub_setup(struct usbdevice_s *usbdev); ****************************************************************/ #define USB_DT_HUB (USB_TYPE_CLASS | 0x09) +#define USB_DT_HUB3 (USB_TYPE_CLASS | 0x0a) struct usb_hub_descriptor { u8 bDescLength; @@ -48,7 +49,8 @@ struct usb_port_status { #define USB_PORT_STAT_SUSPEND 0x0004 #define USB_PORT_STAT_OVERCURRENT 0x0008 #define USB_PORT_STAT_RESET 0x0010 -#define USB_PORT_STAT_L1 0x0020 +#define USB_PORT_STAT_LINK_SHIFT 5 +#define USB_PORT_STAT_LINK_MASK (0x7 << USB_PORT_STAT_LINK_SHIFT) #define USB_PORT_STAT_POWER 0x0100 #define USB_PORT_STAT_SPEED_SHIFT 9 #define USB_PORT_STAT_SPEED_MASK (0x3 << USB_PORT_STAT_SPEED_SHIFT)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS December 2014