]> xenbits.xensource.com Git - seabios.git/log
seabios.git
12 years agovirtio-scsi: Set _DRIVER_OK flag before scsi target scanning
Asias He [Fri, 15 Mar 2013 01:45:15 +0000 (09:45 +0800)]
virtio-scsi: Set _DRIVER_OK flag before scsi target scanning

Before we start scsi target scanning, we need to set the
VIRTIO_CONFIG_S_DRIVER_OK flag so the device can do setup properly.

This fix a bug when booting tcm_vhost with seabios.

Signed-off-by: Asias He <asias@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
12 years agoFix bug in NUMA node setup - don't create SRAT if NUMA not present.
Kevin O'Connor [Sun, 10 Mar 2013 01:43:00 +0000 (20:43 -0500)]
Fix bug in NUMA node setup - don't create SRAT if NUMA not present.

Make sure to check for the case where there are no NUMA nodes passed
in from QEMU.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor - add missing newline to floppy debug statement.
Kevin O'Connor [Sun, 10 Mar 2013 01:07:38 +0000 (20:07 -0500)]
Minor - add missing newline to floppy debug statement.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agovgabios: Fix cirrus memory clear on mode switch.
Kevin O'Connor [Sat, 9 Mar 2013 18:04:47 +0000 (13:04 -0500)]
vgabios: Fix cirrus memory clear on mode switch.

The cirrus_clear_vram() code wasn't actually doing anything because of
a u8 overflow.  Fix that.

Fill with 0xff when performing a legacy cirrus mode switch (WinXP has
been observed to incorrectly render dialog boxes if the memory is
filled to 0).  This was the behavior of the original LGPL vgabios
code.  To support this, add mechanism (MF_LEGACY) to allow vga drivers
to detect if the mode switch is from vesa or int10.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agovgabios: Fix stdvga_perform_gray_scale_summing().
Kevin O'Connor [Sat, 9 Mar 2013 18:00:40 +0000 (13:00 -0500)]
vgabios: Fix stdvga_perform_gray_scale_summing().

Fix conversion error that resulted in
stdvga_perform_gray_scale_summing not actually writing the new results
back.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoUse VARVERIFY32INIT on global variables that point to "tmp" memory.
Kevin O'Connor [Sat, 9 Mar 2013 00:39:49 +0000 (19:39 -0500)]
Use VARVERIFY32INIT on global variables that point to "tmp" memory.

Enable the recently added build check on global variables that are (or
contain) pointers to memory allocated by malloc_tmp().  This helps
detect cases where temporary memory is accessed after POST.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd VARVERIFY32INIT attribute for variables only available during "init".
Kevin O'Connor [Sat, 9 Mar 2013 00:36:28 +0000 (19:36 -0500)]
Add VARVERIFY32INIT attribute for variables only available during "init".

Add a build check to verify certain variables are only reachable via
the 32bit "init" code.  This can be used as a mechanism to enforce
certain data (and code that accesses that data) as only available
during POST.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agosmm: Don't use PCIDevices list in smm_setup().
Kevin O'Connor [Sat, 9 Mar 2013 00:33:39 +0000 (19:33 -0500)]
smm: Don't use PCIDevices list in smm_setup().

The smm_setup() call is invoked from resume.  The PCIDevices list is
only valid during POST.  Cache the necessary PCI BDF ids so that
PCIDevices isn't needed.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoshadow: Don't use PCIDevices list in make_bios_readonly().
Kevin O'Connor [Sat, 9 Mar 2013 00:31:14 +0000 (19:31 -0500)]
shadow: Don't use PCIDevices list in make_bios_readonly().

The make_bios_readonly() call is invoked from resume.  The PCIDevices
list is only valid during POST.  Cache the necessary PCI BDF ids so
that PCIDevices isn't needed.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoDon't use __FILE__ in virtio-ring.c.
Kevin O'Connor [Sat, 9 Mar 2013 00:28:06 +0000 (19:28 -0500)]
Don't use __FILE__ in virtio-ring.c.

Avoid referencing __FILE__ - that value changes depending on the
user's build setting of OUT.  The function and line number are
sufficient.

Also, use panic() instead of looping forever.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd additional dependency checks to Makefile.
Kevin O'Connor [Sat, 9 Mar 2013 00:23:18 +0000 (19:23 -0500)]
Add additional dependency checks to Makefile.

Generate dependencies on pre-processed ASL files.  This ensures that a
change to an imported dsdt file will cause iasl to be called.

Make .config depend on Kconfig files.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoacpi: Eliminate BDAT parameter passing to DSDT code.
Kevin O'Connor [Thu, 7 Mar 2013 02:50:09 +0000 (21:50 -0500)]
acpi: Eliminate BDAT parameter passing to DSDT code.

The "BDAT" construct is the only ACPI mechanism that relies on SeaBIOS
reserved memory.  Replace it with the SSDT based template system.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoRename src/ssdt-susp.dsl to src/ssdt-misc.dsl.
Kevin O'Connor [Thu, 28 Feb 2013 01:46:40 +0000 (20:46 -0500)]
Rename src/ssdt-susp.dsl to src/ssdt-misc.dsl.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoCache boot-fail-wait to avoid romfile access after POST.
Kevin O'Connor [Tue, 5 Mar 2013 09:52:21 +0000 (17:52 +0800)]
Cache boot-fail-wait to avoid romfile access after POST.

Memory allocated with malloc_tmp() can't be used after the POST phase.
So, access boot-fail-wait in post phase and store it for the boot
phase to use.  This fixes the regression introduced by commit
59d6ca52.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Signed-off-by: Amos Kong <akong@redhat.com>
12 years agoMinor - note that passing QEMU config via cmos is deprecated.
Kevin O'Connor [Sun, 3 Mar 2013 20:46:00 +0000 (15:46 -0500)]
Minor - note that passing QEMU config via cmos is deprecated.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Actually do controller reset in floppy_reset().
Kevin O'Connor [Sun, 3 Mar 2013 20:32:31 +0000 (15:32 -0500)]
floppy: Actually do controller reset in floppy_reset().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Implement media format sensing.
Kevin O'Connor [Sun, 3 Mar 2013 18:59:58 +0000 (13:59 -0500)]
floppy: Implement media format sensing.

Check for lower capacity media in the floppy drive and set the
corresponding controller data rate for it.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Improve floppy_pio() error checking.
Kevin O'Connor [Sun, 3 Mar 2013 16:05:19 +0000 (11:05 -0500)]
floppy: Improve floppy_pio() error checking.

The controller can be busy on a response without it being an error.
Don't spin infinitely if status isn't what is expected.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Move recalibration and results parsing to floppy_cmd().
Kevin O'Connor [Sun, 3 Mar 2013 15:27:30 +0000 (10:27 -0500)]
floppy: Move recalibration and results parsing to floppy_cmd().

Move some prep and error checking into floppy_cmd() from its callers.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Clean up Check Interrupt Status code.
Kevin O'Connor [Sun, 3 Mar 2013 02:26:54 +0000 (21:26 -0500)]
floppy: Clean up Check Interrupt Status code.

Don't run the Check Interrupt Status command from the floppy hardware
interrupt handler.  Instead, run it where it is needed - after
controller startup and after a recalibration command.  Also, use
floppy_pio() to issue the command instead of open coding it.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Cleanup floppy irq wait handling.
Kevin O'Connor [Sun, 3 Mar 2013 01:30:50 +0000 (20:30 -0500)]
floppy: Cleanup floppy irq wait handling.

Rename FRS_TIMEOUT to FRS_IRQ - the flag indicates that an irq has
been received - it isn't directly related to timeouts.

On a timeout event, disable the floppy controller instead of doing a
full reset.  Also, perform the disable directly in floppy_wait_irq().

Always wait for the floppy irq after enabling the controller and after
a recalibrate command.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agofloppy: Introduce 'struct floppy_pio_s' for floppy PIO ops.
Kevin O'Connor [Sat, 2 Mar 2013 23:37:04 +0000 (18:37 -0500)]
floppy: Introduce 'struct floppy_pio_s' for floppy PIO ops.

Populate a struct for the PIO operations and move the PIO manipulation
done in floppy_cmd() to floppy_pio().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor - improve comments and grouping of handle_08().
Kevin O'Connor [Sat, 2 Mar 2013 23:19:31 +0000 (18:19 -0500)]
Minor - improve comments and grouping of handle_08().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoSupport using the "extra stack" for all 16bit irq entry points.
Kevin O'Connor [Sat, 2 Mar 2013 23:14:35 +0000 (18:14 -0500)]
Support using the "extra stack" for all 16bit irq entry points.

Using the internal stack reduces the amount of space that SeaBIOS uses
on the caller's stack.  This is known to help some very old operating
systems (like DOS 1.0).  However, there is a possibility that this
will break any operating systems that calls a legacy 16bit irq in
16bit protected mode (no OSes have yet to be identified as doing
this), so make the ability config dependent.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoSeparate out 16bit PCI-BIOS entry point from regular int 0x1a entry point.
Kevin O'Connor [Sat, 2 Mar 2013 09:02:11 +0000 (04:02 -0500)]
Separate out 16bit PCI-BIOS entry point from regular int 0x1a entry point.

The PCI-BIOS entry point can be called in 16bit protected mode, so
separate its entry code from the legacy 0x1a code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor - introduce numeric defines for the IVT offset of hw irqs.
Kevin O'Connor [Sun, 24 Feb 2013 02:33:36 +0000 (21:33 -0500)]
Minor - introduce numeric defines for the IVT offset of hw irqs.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor - fix confusing final_sec32low_start name in layoutrom.py.
Kevin O'Connor [Sat, 23 Feb 2013 21:07:00 +0000 (16:07 -0500)]
Minor - fix confusing final_sec32low_start name in layoutrom.py.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoTry to detect an unsuccessful hard-reboot to prevent soft-reboot loops.
Kevin O'Connor [Sat, 23 Feb 2013 15:37:58 +0000 (10:37 -0500)]
Try to detect an unsuccessful hard-reboot to prevent soft-reboot loops.

There have been various kvm bugs that prevent reboots from working
properly.  Generalize the existing test for a failed reboot to better
catch these cases.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd acpi_reboot() reset method using RESET_REG
David Woodhouse [Sat, 23 Feb 2013 00:24:49 +0000 (00:24 +0000)]
Add acpi_reboot() reset method using RESET_REG

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoRename find_pmtimer() to find_acpi_features()
David Woodhouse [Sat, 23 Feb 2013 00:24:48 +0000 (00:24 +0000)]
Rename find_pmtimer() to find_acpi_features()

I'm about to make it do more than just the pmtimer...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoFix return type of le64_to_cpu() and be64_to_cpu()
David Woodhouse [Sat, 23 Feb 2013 00:24:47 +0000 (00:24 +0000)]
Fix return type of le64_to_cpu() and be64_to_cpu()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoseabios: Add a dummy PCI slot to irq mapping function
Alex Williamson [Thu, 21 Feb 2013 16:12:23 +0000 (09:12 -0700)]
seabios: Add a dummy PCI slot to irq mapping function

This should never get called, but if we somehow get a new chipset
that fails to implement their own pci_slot_get_irq function, fail
gracefully and add a debug log message.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
12 years agoseabios q35: Add new PCI slot to irq routing function
Alex Williamson [Fri, 15 Feb 2013 21:11:41 +0000 (14:11 -0700)]
seabios q35: Add new PCI slot to irq routing function

q35/ich9 doesn't use the same interrupt mapping function as
i440fx/piix.  PIRQA:D and PIRQE:H are programmed identically, but we
start at index 0, not index -1.  Slots 25 through 31 are also
programmed independently.

When running qemu w/o this patch, a device at address 0:6.0 will have
its PCI interrupt line register programmed with irq 10 (as seen by
info pci), but it actually uses irq 11 (as reported the guest).  Half
of the interrupt lines are misprogrammedi like this.  Functionally, a
fully emulated qemu guest doesn't care much, but when we try to use
device assignment, we really need to know the correct irqs.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
12 years agoUse CONFIG_ prefix for Kconfig variables; use BUILD_ for others.
Kevin O'Connor [Thu, 21 Feb 2013 04:48:22 +0000 (23:48 -0500)]
Use CONFIG_ prefix for Kconfig variables; use BUILD_ for others.

Rename remaining "build" settings in config.h that used the CONFIG_
prefix to use a BUILD_ prefix.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoEliminate separate BiosTableSpace[] space for f-segment allocations.
Kevin O'Connor [Wed, 20 Feb 2013 02:35:20 +0000 (21:35 -0500)]
Eliminate separate BiosTableSpace[] space for f-segment allocations.

The BiosTableSpace variable was used to ensure there was sufficient
space in the f-segment for malloc_fseg() calls.  However, it added 2K
to the final image size to reserve that space.

Update the build to determine where to put the f-segment allocations.
In most cases (when code relocation is enabled) allocations can be
done in the space free'd from the "init" sections and no additional
space needs to be reserved in the final image.  This also has the
benefit of not fragmenting the f-segment allocation space.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoCalculate "RamSize" needed by 16bit interface dynamically.
Kevin O'Connor [Tue, 19 Feb 2013 06:33:45 +0000 (01:33 -0500)]
Calculate "RamSize" needed by 16bit interface dynamically.

Calculate a LegacyRamSize directly from the e820 map for use by
handle_1588() and handle_15e801() (the only two external interfaces
that require "RamSize").  All other users of the existing RamSize (and
RamSizeOver4G) variables are specific to QEMU, so move the
declarations to paravirt.c.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMove malloc's ZoneFSeg and ZoneLow setup to malloc_init.
Kevin O'Connor [Tue, 19 Feb 2013 06:15:36 +0000 (01:15 -0500)]
Move malloc's ZoneFSeg and ZoneLow setup to malloc_init.

This reduces some duplicate code between malloc_preinit() and
csm_malloc_preinit().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoDon't relocate "varlow" variable references at runtime.
Kevin O'Connor [Tue, 19 Feb 2013 06:02:50 +0000 (01:02 -0500)]
Don't relocate "varlow" variable references at runtime.

Since the final location of the "varlow" variables are known at build
time, link the final locations into the binary during the build.  The
16bit code was already done at link time - update the build so the
32bit code is also done at link time.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert VAR16VISIBLE, VAR16EXPORT, and VAR32VISIBLE to VARFSEG.
Kevin O'Connor [Tue, 19 Feb 2013 04:36:03 +0000 (23:36 -0500)]
Convert VAR16VISIBLE, VAR16EXPORT, and VAR32VISIBLE to VARFSEG.

Convert all users of the alternative variable exports to VARFSEG.
There isn't a significant distinction between the existing types of
exports, so it's simpler to just use one type going forward.

The new VARFSEG declaration is only emitting when in 32bit mode, so
update and move some variables as needed.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoIntroduce VARFSEG for variables that will reside in the f-segment.
Kevin O'Connor [Tue, 19 Feb 2013 04:09:01 +0000 (23:09 -0500)]
Introduce VARFSEG for variables that will reside in the f-segment.

Introduce a variable declaration that will force variables (that are
compiled in 32bit mode) to be emitted into the f-segment.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor assembler enhancements to __csm_return.
Kevin O'Connor [Tue, 19 Feb 2013 02:57:26 +0000 (21:57 -0500)]
Minor assembler enhancements to __csm_return.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoRemove unnecessary "export" declarations from assembler functions.
Kevin O'Connor [Tue, 19 Feb 2013 02:50:57 +0000 (21:50 -0500)]
Remove unnecessary "export" declarations from assembler functions.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoseabios q35: Enable all PIRQn IRQs at startup
Alex Williamson [Fri, 15 Feb 2013 21:11:35 +0000 (14:11 -0700)]
seabios q35: Enable all PIRQn IRQs at startup

We seem to use the IRQEN bit of the PIRQn registers interchangeably
to select APIC mode or to disable an IRQ.  I can't decide if we're
intending to disable the IRQ or select APIC mode here, but in either
case it prevents PIC mode assigned devices from working.  When seabios
writes IRQEN to these registers, qemu interprets that as APIC mode,
so while the boot ROM driver is waiting for an interrupt on ISA
compatible IRQ 10 or 11, KVM is injecting interrupts to APIC pins
16 - 23.  Devices on the root bus use PIRQE:H while the root ports
use PIRQA:D.  Enable them all so we don't limit where we support boot
ROMs.  The guest will later disable unused IRQs with the ACPI _DIS
method.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
12 years agoDisable handle_post() on CSM builds.
Kevin O'Connor [Mon, 18 Feb 2013 16:49:53 +0000 (11:49 -0500)]
Disable handle_post() on CSM builds.

This reduces the size of the CSM binary by a few bytes.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoDisable CONFIG_THREAD_OPTIONROMS for CSM build
David Woodhouse [Thu, 14 Feb 2013 08:55:52 +0000 (08:55 +0000)]
Disable CONFIG_THREAD_OPTIONROMS for CSM build

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoVerify CC is valid during build tests.
Kevin O'Connor [Mon, 18 Feb 2013 15:28:55 +0000 (10:28 -0500)]
Verify CC is valid during build tests.

Update test-build.sh to report if it can't run the c compiler at all.
Without this test, a totally non-working build environment will yield
an "invalid LD" message which can be confusing.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoClarify build generated "zone low" values.
Kevin O'Connor [Sun, 17 Feb 2013 18:58:28 +0000 (13:58 -0500)]
Clarify build generated "zone low" values.

Rename datalow_base (and similar) to zonelow_base, and datalow_start
(and similar) to varlow_start.  This helps distinguish between the
bounds for the runtime dynamic memory pool and the compile time global
variables.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoReport on f-segment UMB ram also.
Kevin O'Connor [Sun, 17 Feb 2013 17:46:53 +0000 (12:46 -0500)]
Report on f-segment UMB ram also.

Some old DOS programs can also use f-segment space as Upper Memory
Blocks (UMB), so also report on what space is available in debug
messages.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoRename rom_get_top() to rom_get_max().
Kevin O'Connor [Sun, 17 Feb 2013 17:44:23 +0000 (12:44 -0500)]
Rename rom_get_top() to rom_get_max().

Rename rom_get_top and try to make the difference between it and
rom_get_last more clear.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agobuild: Don't require $(OUT) to be a sub-directory of the main directory.
Kevin O'Connor [Sun, 17 Feb 2013 15:56:10 +0000 (10:56 -0500)]
build: Don't require $(OUT) to be a sub-directory of the main directory.

Remove references to "../" and "out/" from the build so that "make
OUT=/a/b/c/" will work.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoFix Makefile - don't reference "out/" directly, instead use "$(OUT)".
Kevin O'Connor [Sun, 17 Feb 2013 15:18:15 +0000 (10:18 -0500)]
Fix Makefile - don't reference "out/" directly, instead use "$(OUT)".

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoEnable VGA output when setting Cirrus-specific mode
Laszlo Ersek [Thu, 14 Feb 2013 04:43:32 +0000 (05:43 +0100)]
Enable VGA output when setting Cirrus-specific mode

This patch does the same for Cirrus as David's following patch for bochs,
originally posted under
<http://www.seabios.org/pipermail/seabios/2013-February/005434.html>:

  Enable VGA output when settings bochs-specific mode

  When used from OVMF+CSM, we got no video output. It appears that we were
  never enabling the display output except when configuring a text mode.
  Which never happens, in the OVMF+CSM case.

In my testing on RHEL-6.3 with OVMF -D CSM_ENABLE / CONFIG_CSM bios.bin /
CONFIG_QEMU vgabios.bin, using Cirrus, VESA mode 0x115 is selected (Direct
Color, 800x600x24).

According to <http://www.osdever.net/FreeVGA/vga/attrreg.htm>,

  cirrus_switch_mode()
    stdvga_attr_mask()

currently keeps/sets the "Attribute Controller Graphics Enable" bit set in
the "Attribute Mode Control Register". When invoked from OVMF+CSM, that is
not enough however, so let's do the same as for Bochs:

  stdvga_attrindex_write(0x20);

which corresponds to setting the "Palette Address Source" bit in the
"Attribute Address Register":

  "This bit is set to 0 to load color values to the registers in the
  internal palette. It is set to 1 for normal operation of the attribute
  controller. [...]"

clext_set_mode()
  stdvga_set_mode() -- for regular modes
    stdvga_attrindex_write() -- existing call
  cirrus_switch_mode() -- for Cirrus modes
    stdvga_attrindex_write() -- call added by this patch

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoEnable VGA output when settings bochs-specific mode
David Woodhouse [Fri, 8 Feb 2013 15:50:54 +0000 (15:50 +0000)]
Enable VGA output when settings bochs-specific mode

When used from OVMF+CSM, we got no video output. It appears that we were
never enabling the display output except when configuring a text mode.
Which never happens, in the OVMF+CSM case.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agogeodevga: fix wrong define name
Christian Gmeiner [Thu, 14 Feb 2013 09:34:37 +0000 (10:34 +0100)]
geodevga: fix wrong define name

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
12 years agogeodevga: add debug to msr functions
Christian Gmeiner [Thu, 14 Feb 2013 09:34:36 +0000 (10:34 +0100)]
geodevga: add debug to msr functions

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
12 years agogeodevga: move output setup to own function
Christian Gmeiner [Thu, 14 Feb 2013 09:34:35 +0000 (10:34 +0100)]
geodevga: move output setup to own function

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
12 years agogeodevga: move framebuffer setup
Christian Gmeiner [Thu, 14 Feb 2013 09:34:34 +0000 (10:34 +0100)]
geodevga: move framebuffer setup

Framebuffer setup has nothing to do with dc_setup(..) so
move it to  geodevga_init(..).

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
12 years agogeodevga: fix errors in geode_fp_* functions
Christian Gmeiner [Thu, 14 Feb 2013 09:34:32 +0000 (10:34 +0100)]
geodevga: fix errors in geode_fp_* functions

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
12 years agoImplement !CONFIG_BOOT for CSM
David Woodhouse [Thu, 14 Feb 2013 09:17:17 +0000 (09:17 +0000)]
Implement !CONFIG_BOOT for CSM

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoImplement !CONFIG_OPTIONROMS support for CSM
David Woodhouse [Thu, 14 Feb 2013 09:07:35 +0000 (09:07 +0000)]
Implement !CONFIG_OPTIONROMS support for CSM

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoMake CONFIG_OPTIONROMS_DEPLOYED depend on CONFIG_QEMU
David Woodhouse [Thu, 14 Feb 2013 08:56:20 +0000 (08:56 +0000)]
Make CONFIG_OPTIONROMS_DEPLOYED depend on CONFIG_QEMU

Potentially we could even kill it off completely, since it only works
with old versions of Qemu. But it can stay for now as long as it doesn't
offend me in the CSM build...

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoWarn on unaligned PCI ROM structure in option roms.
Kevin O'Connor [Sat, 16 Feb 2013 03:46:09 +0000 (22:46 -0500)]
Warn on unaligned PCI ROM structure in option roms.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoUSB-EHCI: Fix null pointer assignment
Avik Sil [Thu, 14 Feb 2013 05:24:57 +0000 (10:54 +0530)]
USB-EHCI: Fix null pointer assignment

cntl->regs should not be accessed before initializing it.

Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
12 years agovgabios: Bochs/QEMU vgabios support should depend on CONFIG_QEMU.
Kevin O'Connor [Thu, 14 Feb 2013 00:36:02 +0000 (19:36 -0500)]
vgabios: Bochs/QEMU vgabios support should depend on CONFIG_QEMU.

The Cirrus, Standard VGA, and Bochs VGA should depend on CONFIG_QEMU
and not CONFIG_COREBOOT.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoGroup QEMU platform setup together and move to paravirt.c.
Kevin O'Connor [Thu, 14 Feb 2013 00:35:12 +0000 (19:35 -0500)]
Group QEMU platform setup together and move to paravirt.c.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoIntegrate qemu_cfg_preinit() into qemu_romfile_init().
Kevin O'Connor [Sun, 10 Feb 2013 01:09:22 +0000 (20:09 -0500)]
Integrate qemu_cfg_preinit() into qemu_romfile_init().

Now that only qemu_romfile_init() uses the fw_cfg interface, it only
needs to be detected in that function.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoProcess fw_cfg e820 entries during the fw_cfg setup stage.
Kevin O'Connor [Sun, 10 Feb 2013 01:00:06 +0000 (20:00 -0500)]
Process fw_cfg e820 entries during the fw_cfg setup stage.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert fw_cfg NUMA entries into a romfile entry.
Kevin O'Connor [Sun, 10 Feb 2013 00:45:45 +0000 (19:45 -0500)]
Convert fw_cfg NUMA entries into a romfile entry.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert basic integer fw_cfg entries into romfile entries.
Kevin O'Connor [Sun, 10 Feb 2013 00:25:51 +0000 (19:25 -0500)]
Convert basic integer fw_cfg entries into romfile entries.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert fw_cfg SMBIOS entries into romfile entries.
Kevin O'Connor [Sun, 10 Feb 2013 00:09:20 +0000 (19:09 -0500)]
Convert fw_cfg SMBIOS entries into romfile entries.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert fw_cfg ACPI entries into romfile entries.
Kevin O'Connor [Sat, 9 Feb 2013 20:24:08 +0000 (15:24 -0500)]
Convert fw_cfg ACPI entries into romfile entries.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoSupport skipping content when reading from QEMU fw_cfg romfile entries.
Kevin O'Connor [Sat, 9 Feb 2013 19:55:30 +0000 (14:55 -0500)]
Support skipping content when reading from QEMU fw_cfg romfile entries.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoUnify return path for CSM to go via csm_return()
David Woodhouse [Sun, 10 Feb 2013 00:51:56 +0000 (00:51 +0000)]
Unify return path for CSM to go via csm_return()

This allows us to keep the entry_csm code simple, and ensures that we
consistently do things like saving the PIC mask (and later setting
UmbStart) on the way back to UEFI.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoUse find_pmtimer() after copying coreboot ACPI tables
David Woodhouse [Tue, 5 Feb 2013 16:14:20 +0000 (16:14 +0000)]
Use find_pmtimer() after copying coreboot ACPI tables

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoUse find_pmtimer() after copying Xen ACPI tables
David Woodhouse [Tue, 5 Feb 2013 16:14:06 +0000 (16:14 +0000)]
Use find_pmtimer() after copying Xen ACPI tables

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoMove find_pmtimer() to ACPI table setup where it logically belongs
David Woodhouse [Sun, 10 Feb 2013 01:15:01 +0000 (01:15 +0000)]
Move find_pmtimer() to ACPI table setup where it logically belongs

We don't have the ordering dependency with timer_setup() any more.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoDon't calibrate TSC if PMTIMER is already set up
David Woodhouse [Sun, 10 Feb 2013 01:13:56 +0000 (01:13 +0000)]
Don't calibrate TSC if PMTIMER is already set up

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoFix rom_reserve()/rom_confirm() for CSM oprom dispatch
David Woodhouse [Sat, 9 Feb 2013 23:45:02 +0000 (23:45 +0000)]
Fix rom_reserve()/rom_confirm() for CSM oprom dispatch

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoUpdate tools/acpi_extract.py to handle iasl 20130117 release.
Kevin O'Connor [Mon, 11 Feb 2013 02:06:14 +0000 (21:06 -0500)]
Update tools/acpi_extract.py to handle iasl 20130117 release.

The latest iasl release produces "lst" output with "number:  " instead
of "number....".  Update the tool to support both formats.

Reported-by: Bo Yang <boyang@suse.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoThe mathcp setup touches the PIC and thus move to the "setup" phase.
Kevin O'Connor [Sun, 10 Feb 2013 05:35:01 +0000 (00:35 -0500)]
The mathcp setup touches the PIC and thus move to the "setup" phase.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoStart device_hardware_setup in mainint even with CONFIG_THREAD_OPTIONROMS.
Kevin O'Connor [Sun, 10 Feb 2013 05:25:53 +0000 (00:25 -0500)]
Start device_hardware_setup in mainint even with CONFIG_THREAD_OPTIONROMS.

There's no real gain to starting the device_hardware_setup in the
middle of the platform setup.  Always start it just prior to the VGA
rom.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoOnly perform SMP setup on QEMU.
Kevin O'Connor [Sun, 10 Feb 2013 04:58:55 +0000 (23:58 -0500)]
Only perform SMP setup on QEMU.

The SMP setup initializes MTRRs on extra CPUs and populates the
CountCPUs variable.  On coreboot the CPUs should already be
initialized and the CountCPUs variable isn't used anywhere.

There have also been reports of the SIPI does not work on some real
machines.  So, it's best not to invoke one if it isn't needed.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoMinor - move definitions to paravirt.c from paravirt.h.
Kevin O'Connor [Sat, 9 Feb 2013 18:21:08 +0000 (13:21 -0500)]
Minor - move definitions to paravirt.c from paravirt.h.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConvert kvm_para_available() to runningOnKVM().
Kevin O'Connor [Sat, 9 Feb 2013 18:07:23 +0000 (13:07 -0500)]
Convert kvm_para_available() to runningOnKVM().

Make the KVM detection code use the same format as the QEMU/Xen
detection code.

Also, log when KVM is detected.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoConsistently use CONFIG_COREBOOT, CONFIG_QEMU, and runningOnXen().
Kevin O'Connor [Fri, 8 Feb 2013 04:32:48 +0000 (23:32 -0500)]
Consistently use CONFIG_COREBOOT, CONFIG_QEMU, and runningOnXen().

CONFIG_QEMU means compile to start from QEMU (and possibly
Xen/KVM/Bochs) and definitely running under QEMU (or Xen/KVM/Bochs).

CONFIG_COREBOOT means compile for coreboot and definitely running
under coreboot.  Places that used CONFIG_COREBOOT to mean "running on
real hardware" have been changed to use !CONFIG_QEMU.

CONFIG_QEMU_HARDWARE enables support for some virtual hardware devices
even if QEMU didn't start SeaBIOS.

usingXen() is replaced by runningOnXen().

runningOnQEMU() is added to hardware devices that are only safe to
access when we are sure we are running under QEMU (or Xen/KVM/Bochs).
Neither the coreboot nor the csm code currently enable runningOnQEMU,
but future patches may.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd runningOnQEMU() and runningOnXen() for runtime platform detection.
Kevin O'Connor [Fri, 8 Feb 2013 03:42:25 +0000 (22:42 -0500)]
Add runningOnQEMU() and runningOnXen() for runtime platform detection.

Introduce standard for performing and inspecting the run-time
detection of para-virtualized environments.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoNo need to check both CONFIG_THREADS and CONFIG_THREAD_OPTIONROMS.
Kevin O'Connor [Fri, 8 Feb 2013 05:45:44 +0000 (00:45 -0500)]
No need to check both CONFIG_THREADS and CONFIG_THREAD_OPTIONROMS.

CONFIG_THREAD_OPTIONROMS depends on CONFIG_THREADS, so the code can
assume that the two are always on when CONFIG_THREAD_OPTIONROMS is on.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoDetermine century during init and store in VARLOW mem during runtime.
Kevin O'Connor [Fri, 8 Feb 2013 04:41:53 +0000 (23:41 -0500)]
Determine century during init and store in VARLOW mem during runtime.

Avoid reading/writing to cmos at runtime to get the QEMU century
information.  Instead, read it at startup and cache the info.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoEnable PMTIMER for CSM build
David Woodhouse [Thu, 7 Feb 2013 10:23:46 +0000 (10:23 +0000)]
Enable PMTIMER for CSM build

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoAdd find_pmtimer() function
David Woodhouse [Sun, 3 Feb 2013 22:41:41 +0000 (23:41 +0100)]
Add find_pmtimer() function

With CSM (and maybe coreboot) we'll want to find the pmtimer from the ACPI
tables, instead of knowing where it is and *putting* it into the ACPI
tables.

Extract the first part of the existing find_resume_vector() function into
a find_fadt() function, and use it from both find_resume_vector() and our
new find_pmtimer().

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoAdd README.CSM
David Woodhouse [Fri, 8 Feb 2013 15:52:01 +0000 (15:52 +0000)]
Add README.CSM

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoUndo incorrect assumptions about Xen in commit 6ca0460f.
Kevin O'Connor [Sat, 9 Feb 2013 02:00:46 +0000 (21:00 -0500)]
Undo incorrect assumptions about Xen in commit 6ca0460f.

Xen invokes SeaBIOS via entry_post, not entry_elf.  As a result commit
6ca0460f broke Xen.  This change effectively undoes that commit.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoPOST: Move cpu caching and dma setup to platform_hardware_setup().
Kevin O'Connor [Mon, 21 Jan 2013 17:14:29 +0000 (12:14 -0500)]
POST: Move cpu caching and dma setup to platform_hardware_setup().

The CPU cache is enabled and DMA is disabled on all real-world POST
entry situations, so no need to do this in the low-level "pre-init"
phase.  Instead, move it to the platform hardware setup stage.

Also, move the setting of the reboot flags (which control reset-vector
entry point handling) to ivt_init().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoPOST: Reorganize post entry and "preinit" functions.
Kevin O'Connor [Mon, 21 Jan 2013 16:38:49 +0000 (11:38 -0500)]
POST: Reorganize post entry and "preinit" functions.

Unlocking ram in handle_post() is tricky and only needed under qemu.
Separate out that logic from the coreboot/xen paths by invoking
handle_elf_post separately.  This simplifies both the qemu and
non-qemu code paths.

Also, organize all the "pre-init" functions into one section of the
file.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoPOST: Move QEMU specific ramsize and BIOS table setup to paravirt.c.
Kevin O'Connor [Mon, 21 Jan 2013 07:32:48 +0000 (02:32 -0500)]
POST: Move QEMU specific ramsize and BIOS table setup to paravirt.c.

Don't clutter post.c with the gory details of QEMU memory sizing and
BIOS table creation.  Instead, move that code to paravirt.c.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd CSM support
David Woodhouse [Sat, 26 Jan 2013 01:46:25 +0000 (19:46 -0600)]
Add CSM support

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoEnsure exported symbols are visible in the final link
Kevin O'Connor [Wed, 6 Feb 2013 03:36:13 +0000 (22:36 -0500)]
Ensure exported symbols are visible in the final link

I'm about to introduce some post-processing in checkrom.py which will want
access to public symbols. So let's make sure they're defined in the final
link even if they're *not* cross-referenced from a different code section.
build: Define 16bit exported symbols in final rom.o object.

Based on patch by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
12 years agoAdd pic_save_mask() and pic_restore_mask() functions
David Woodhouse [Tue, 5 Feb 2013 16:37:27 +0000 (16:37 +0000)]
Add pic_save_mask() and pic_restore_mask() functions

CSM will (unfortunately) need to use these.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoComplete and checksum EFI_COMPATIBILITY16_TABLE at build time
David Woodhouse [Thu, 17 Jan 2013 21:23:46 +0000 (21:23 +0000)]
Complete and checksum EFI_COMPATIBILITY16_TABLE at build time

GCC, for reasons unknown, will refuse to compile code such as
   extern int bar;
   uint16_t foo = &bar;

The assembler would happily emit a R_386_16 relocation for this if asked
nicely, and all would be well. But instead, GCC complains about the
initialiser not being constant.

So we tend to fill in 16-bit offsets at run-time, which is only
moderately inefficient. But for the CSM table used by EFI, it doesn't
work. We need the offset to be present in the *image*, before a line of
our own code has been run. Likewise the checksum.

This special-cases the table and entry point in checkrom.py rather than
attempting to do something generic. I did have a functional generic
implementation which could be invoked from csm.c along the lines of
 CHECKSUM(csm_compat_table, TableChecksum)
... and which would emit the required offsetof(typeof(\1), \2) into
a special data section which was elided from the final build but parsed
by 'objdump -s' and the location of the table to be checksummed was
inferred from the name of the *variable* that got put into that special
section... seriously, it's better just to special-case it.

It was baroque enough just for the checksums, and filling in the entry
point which required access to *two* symbols was probably going to involve
emitting a *string* into that special build-data section. It had to die.

So yes, we have hard-coded symbol names, and even magic numbers in the
python script for table offsets etc., but that's because this is an ABI.
It doesn't change, and neither do any of the other tables that we might
now consider filling at build time just to avoid having to spend time
on doing so at runtime.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
12 years agoImport LegacyBios.h from OVMF
David Woodhouse [Thu, 17 Jan 2013 21:55:21 +0000 (21:55 +0000)]
Import LegacyBios.h from OVMF

This is under a BSD licence so it's fine to import directly.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>