[PATCH v3 0/3] usb: add xhci support
by Gerd Hoffmann
Hi,
Next version of the xhci support patch series. Changed xhci device
list to use standard hlist macros. Delete devices from list in
disconnect() callback, so we should not have inactive/freed devices
in the list.
cheers,
Gerd
Gerd Hoffmann (3):
uas: add (temporary) superspeed stopgap
usb: add usb_update_pipe()
usb: add xhci support
Makefile | 2 +-
src/Kconfig | 6 +
src/pci_ids.h | 1 +
src/usb-uas.c | 4 +
src/usb-xhci.c | 1124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/usb-xhci.h | 144 ++++++++
src/usb.c | 35 +-
src/usb.h | 17 +-
8 files changed, 1320 insertions(+), 13 deletions(-)
create mode 100644 src/usb-xhci.c
create mode 100644 src/usb-xhci.h
--
1.8.3.1
5 years, 4 months
[PATCH v2] build: explicitly set ROM size
by Gerd Hoffmann
Add a config option to specify the rom size wanted. Default is zero,
which will automatically figure the needed size.
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
Makefile | 3 ++-
scripts/checkrom.py | 21 +++++++++++++++------
src/Kconfig | 11 +++++++++++
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 806aa54..5639e9f 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,8 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o scripts/checkrom.py
@echo " Prepping $@"
$(Q)$(OBJDUMP) -thr $< > $<.objdump
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
- $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(OUT)bios.bin.raw $(OUT)bios.bin
+ $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(CONFIG_ROM_SIZE) \
+ $(OUT)bios.bin.raw $(OUT)bios.bin
$(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf
diff --git a/scripts/checkrom.py b/scripts/checkrom.py
index 6f07ac8..aa3dd0d 100755
--- a/scripts/checkrom.py
+++ b/scripts/checkrom.py
@@ -21,7 +21,7 @@ def checksum(data, start, size, csum):
def main():
# Get args
- objinfo, rawfile, outfile = sys.argv[1:]
+ objinfo, finalsize, rawfile, outfile = sys.argv[1:]
# Read in symbols
objinfofile = open(objinfo, 'rb')
@@ -32,11 +32,20 @@ def main():
rawdata = f.read()
f.close()
datasize = len(rawdata)
- finalsize = 64*1024
- if datasize > 64*1024:
- finalsize = 128*1024
- if datasize > 128*1024:
- finalsize = 256*1024
+ finalsize = int(finalsize) * 1024
+ if finalsize == 0:
+ finalsize = 64*1024
+ if datasize > 64*1024:
+ finalsize = 128*1024
+ if datasize > 128*1024:
+ finalsize = 256*1024
+ if datasize > finalsize:
+ print "Error! ROM doesn't fit (%d > %d)" % (datasize, finalsize)
+ print " You have to either increate the size (CONFIG_ROM_SIZE)"
+ print " or turn off some features (such as hardware support not"
+ print " needed) to make it fit. Trying a more recent gcc version"
+ print " might work too."
+ sys.exit(1)
# Sanity checks
start = symbols['code32flat_start'].offset
diff --git a/src/Kconfig b/src/Kconfig
index c40cc61..20d2a3e 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -122,6 +122,17 @@ endchoice
selected, the memory is instead allocated from the
"9-segment" (0x90000-0xa0000).
+ config ROM_SIZE
+ int "ROM size (in KB)"
+ default 0
+ help
+ Set the ROM size. Say '0' here to make seabios figure the
+ needed size automatically.
+
+ Currently SeaBIOS will easily fit into 256 KB. To make it fit
+ it into 128 KB (which was big enouth for a long time) you'll
+ probably have to disable some featues such as xhci support.
+
endmenu
menu "Hardware support"
--
1.8.3.1
5 years, 5 months
[PATCH] build: create output dirs in do-kconfig
by Gerd Hoffmann
Unbreaks parallel builds.
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index cdda3d5..5639e9f 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ endif
# Default targets
-include $(KCONFIG_CONFIG)
-target-y = $(OUT) $(addprefix $(OUT), $(DIRS)) $(OUT)bios.bin
+target-y = $(OUT)bios.bin
target-$(CONFIG_BUILD_VGABIOS) += $(OUT)vgabios.bin
all: $(target-y)
@@ -239,6 +239,7 @@ $(OUT)src/fw/acpi.o: $(OUT)src/fw/acpi-dsdt.hex $(OUT)src/fw/ssdt-proc.hex $(OUT
define do-kconfig
$(Q)mkdir -p $(OUT)/scripts/kconfig/lxdialog
$(Q)mkdir -p $(OUT)/include/config
+$(Q)mkdir -p $(addprefix $(OUT), $(DIRS))
$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/scripts/kconfig/Makefile srctree=$(CURDIR) src=scripts/kconfig obj=scripts/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
endef
@@ -256,7 +257,4 @@ clean:
distclean: clean
$(Q)rm -f .config .config.old
-$(OUT) $(addprefix $(OUT), $(DIRS)):
- $(Q)mkdir $@
-
-include $(patsubst %,$(OUT)%/*.d,$(DIRS))
--
1.8.3.1
5 years, 5 months
[PATCH] tools/kconfig/{m,n}conf.c: Fix typo »This interface let*s*«
by Paul Menzel
Date: Mon, 4 Mar 2013 12:56:56 +0100
When Kconfig was introduced in SeaBIOS with
commit a4c5daf0e2545361fadcad3015e10f8b23e53926
Author: Kevin O'Connor <kevin(a)koconnor.net>
Date: Mon Jan 24 22:13:58 2011 -0500
Initial commit of Kconfig build tool.
this typo was copied from Kconfig in Linux v2.6.38-rc2. In the meantime
Linux commit »kconfig: nconf: rewrite help texts« (0b616500) [1] rewrote
the texts for `nconf.c` – which might be ported too to SeaBIOS – and the
typo was fixed there. But it is still present in `mconf.c` as of Linux
3.8.
[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id...
---
tools/kconfig/mconf.c | 2 +-
tools/kconfig/nconf.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/kconfig/mconf.c b/tools/kconfig/mconf.c
index d433c7a..2a24c42 100644
--- a/tools/kconfig/mconf.c
+++ b/tools/kconfig/mconf.c
@@ -25,7 +25,7 @@
static const char mconf_readme[] = N_(
"Overview\n"
"--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets you select features and parameters for the build.\n"
"Features can either be built-in, modularized, or ignored. Parameters\n"
"must be entered in as decimal or hexadecimal numbers or text.\n"
"\n"
diff --git a/tools/kconfig/nconf.c b/tools/kconfig/nconf.c
index db56377..bb797c9 100644
--- a/tools/kconfig/nconf.c
+++ b/tools/kconfig/nconf.c
@@ -15,7 +15,7 @@
static const char nconf_readme[] = N_(
"Overview\n"
"--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets you select features and parameters for the build.\n"
"Features can either be built-in, modularized, or ignored. Parameters\n"
"must be entered in as decimal or hexadecimal numbers or text.\n"
"\n"
--
1.7.10.4
5 years, 5 months
[PATCH v6 0/3] seabios: load acpi tables from qemu
by Michael S. Tsirkin
This is the seabios code that adds support for loading
acpi tables from QEMU.
Changes from v5:
- address Kevin's comments:
move code to find rsdp to biostables.c
scan for RSDP at 0x10 intervals
Changes from v4:
- address Kevin's comments:
move loader to src/fw/
simplify some code
drop some unused code chunks
load from ROM even if !ACPI
rename option to make it non ACPI specific
Changes from v3:
- updated to latest bits
- add option to disable loading from QEMU
Changes from v2:
- addressed comments from Kevin: fixed coding style,
minimized changes to existing code
Changes from v1:
- simplified linker interfaces along the lines suggested
by Kevin
- fixed lots of bugs
Michael S. Tsirkin (3):
biostables: support looking up RSDP
romfile_loader: utility to patch in-memory ROM files
acpi: load and link tables through romfile loader
Makefile | 2 +-
src/fw/romfile_loader.h | 72 ++++++++++++++++++++
src/util.h | 1 +
src/fw/acpi.c | 21 ++++++
src/fw/biostables.c | 40 +++++++++--
src/fw/romfile_loader.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++
src/Kconfig | 11 +++
7 files changed, 316 insertions(+), 8 deletions(-)
create mode 100644 src/fw/romfile_loader.h
create mode 100644 src/fw/romfile_loader.c
--
MST
5 years, 5 months
Easy to add time stamps?
by Paul Menzel
Dear SeaBIOS folks,
both coreboot and GRUB 2 (from Bazaar) currently allow to record time
stamps, for example for benchmarking.
SeaBIOS seems to have a clock implementation in `src/clock.c` already,
which is also used for threading, I guess. Could that be used for time
stamps too or is there something in SeaBIOS, that would cause problems?
I would like to know how much time, SeaBIOS takes to execute, how long
it takes for block devices to be discovered and how long the VGA option
ROM takes to be executed for example.
Thanks,
Paul
5 years, 5 months
[PATCH 0/3] add option to generate small bios
by Michael S. Tsirkin
This adds an option to generate a small bios,
so that it's easy for people who want to
generate binary compatible with QEMU 1.6
and earlier (which used a 128K buffer).
Default is 256K (for future QEMU).
Michael S. Tsirkin (3):
Kconfig: add explicit QEMU 128/QEMU 256 targets
xhci: disable for QEMU_128K
acpi rom file loading: disable for QEMU 128K
src/Kconfig | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
--
MST
5 years, 5 months
[PATCH v5 0/4] seabios: load acpi tables from qemu
by Michael S. Tsirkin
This is the seabios code that adds support for loading
acpi tables from QEMU.
Changes from v4:
- address Kevin's comments:
move loader to src/fw/
simplify some code
drop some unused code chunks
load from ROM even if !ACPI
rename option to make it non ACPI specific
Changes from v3:
- updated to latest bits
- add option to disable loading from QEMU
Changes from v2:
- addressed comments from Kevin: fixed coding style,
minimized changes to existing code
Changes from v1:
- simplified linker interfaces along the lines suggested
by Kevin
- fixed lots of bugs
Michael S. Tsirkin (4):
romfile_loader: utility to patch in-memory ROM files
malloc: support looking up a given pattern in FSEG
acpi: pack rsdp
acpi: load and link tables through romfile loader
Makefile | 2 +-
src/fw/romfile_loader.h | 72 ++++++++++++++++++++
src/malloc.h | 1 +
src/std/acpi.h | 2 +-
src/fw/acpi.c | 30 ++++++++
src/fw/romfile_loader.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++
src/malloc.c | 19 +++++-
src/Kconfig | 11 +++
8 files changed, 311 insertions(+), 3 deletions(-)
create mode 100644 src/fw/romfile_loader.h
create mode 100644 src/fw/romfile_loader.c
--
MST
5 years, 5 months
[PATCH 0/4] Move more hardware definitions to hw/ sub-directory
by Kevin O'Connor
This series moves some additional hardware driver code from the main
src/ directory to files in the src/hw/ directory. This is a minor
cleanup to gather more hardware driver code together.
This series is also at:
https://github.com/KevinOConnor/seabios/tree/testing
-Kevin
Kevin O'Connor (4):
Move PIT setup from clock.c to hw/timer.c.
Rename hw/cmos.h to hw/rtc.h and copy RTC code from clock.c to
hw/rtc.c.
Move dma code to new file hw/dma.c.
Remove ioport.h; disperse its contents to other header files.
Makefile | 2 +-
src/apm.c | 2 +-
src/block.c | 4 +-
src/boot.c | 8 +--
src/clock.c | 168 ++++++++++++++++-------------------------------
src/farptr.h | 2 +-
src/fw/acpi.c | 1 -
src/fw/paravirt.c | 17 +++--
src/fw/paravirt.h | 9 +++
src/fw/pciinit.c | 3 +-
src/fw/smm.c | 2 +-
src/fw/smp.c | 4 +-
src/hw/ahci.c | 2 +-
src/hw/ata.c | 3 +-
src/hw/ata.h | 5 ++
src/hw/dma.c | 67 +++++++++++++++++++
src/hw/floppy.c | 50 ++++----------
src/hw/pci.c | 1 -
src/hw/pci.h | 4 ++
src/hw/pic.h | 7 +-
src/hw/pit.h | 29 --------
src/hw/ps2port.c | 2 +-
src/hw/ps2port.h | 14 +++-
src/hw/rtc.c | 93 ++++++++++++++++++++++++++
src/hw/{cmos.h => rtc.h} | 59 ++++++++---------
src/hw/serialio.h | 21 ++++++
src/hw/timer.c | 67 +++++++++++--------
src/hw/usb-ehci.c | 1 -
src/hw/usb-uhci.c | 2 +-
src/hw/virtio-pci.h | 2 +-
src/ioport.h | 136 --------------------------------------
src/misc.c | 2 +
src/output.c | 1 +
src/post.c | 4 +-
src/resume.c | 20 +-----
src/romlayout.S | 8 +--
src/serial.c | 1 +
src/stacks.c | 5 +-
src/system.c | 3 +-
src/util.h | 14 ++--
src/x86.h | 51 ++++++++++++++
vgasrc/bochsvga.c | 12 ++++
vgasrc/bochsvga.h | 12 ----
vgasrc/stdvga.c | 8 +--
vgasrc/stdvgaio.c | 4 +-
45 files changed, 480 insertions(+), 452 deletions(-)
create mode 100644 src/hw/dma.c
delete mode 100644 src/hw/pit.h
create mode 100644 src/hw/rtc.c
rename src/hw/{cmos.h => rtc.h} (67%)
create mode 100644 src/hw/serialio.h
delete mode 100644 src/ioport.h
--
1.8.3.1
5 years, 5 months
Re: [SeaBIOS] Booting Linux, FreeBSD off AHCI takes longer than expected
by Kevin O'Connor
On Sat, Sep 28, 2013 at 02:49:20AM +0200, Idwer Vollering wrote:
> 2013/9/27 Idwer Vollering <vidwer(a)gmail.com>:
> > Linux takes somewhere between 30 to 60 seconds from the grub menu to
> > show early bootup console output, FreeBSD takes over 10 minutes to
> > just load boot0, boot2 and kernel (and every module from
> > /boot/loader.conf), then shows its boot menu [1].
>
> So, after digging into this deeper I came to the conclusion that
> setting CONFIG_DEBUG_SERIAL=n in SeaBIOS' .config was the culprit.
>
> Could setting CONFIG_DEBUG_SERIAL=y be blocking?
SeaBIOS will try to wait for space in the serial buffer when it
reports that it is full. If you don't actually have a serial port, or
if the serial port thinks it is blocked, then it could cause a delay.
-Kevin
5 years, 5 months