diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-01-11 19:46:28 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-01-21 05:17:02 +0100 |
| commit | 4d8d5467cd6e324fb49ae97b9d5dcee3973d9a19 (patch) | |
| tree | 9e7a863dc3bd53e1aa58b72f9f789714cd103dca /pc-bios | |
| parent | c9c3c80af71dd2b7813d1ada9b14cb51df584221 (diff) | |
| download | qemu-4d8d5467cd6e324fb49ae97b9d5dcee3973d9a19.zip qemu-4d8d5467cd6e324fb49ae97b9d5dcee3973d9a19.tar.gz qemu-4d8d5467cd6e324fb49ae97b9d5dcee3973d9a19.tar.bz2 | |
pseries: SLOF PCI flag day
Currently on the pseries machine the SLOF firmware is used normally,
but we bypass it when -kernel is specified. Having these two
different boot paths can cause some confusion.
In particular at present we need to "probe" the (emulated) PCI bus and
produce device tree nodes for the PCI devices in qemu, for the -kernel
case. In the SLOF case, it takes the device tree from qemu adds some
stuff to it then passes it on to the kernel.
It's been decided that a better approach is to always boot through
SLOF, even when using -kernel. WIth this approach we can leave PCI
probing and device node creation to SLOF in all cases which removes a
bunch of code in qemu, and avoids iterating the PCI devices from the
machine specific init code which we're not supposed to do.
This patch changes qemu to always boot through SLOF, and not to create
PCI nodes. Simultaneously it updates the included version of SLOF
(submodule and binary image) to one which supports (and requires) the
new approach.
The new SLOF version also includes a number of unrelated enhancements:
support for booting from virtio-pci devices and e1000, greatly
improved FCode support and many bugfixes. It also makes SLOF ready to
be used even when specifying a kernel on the qemu command line.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/README | 2 | ||||
| -rw-r--r-- | pc-bios/slof.bin | bin | 738744 -> 869584 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README index 1cebbbc..5dce355 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -17,7 +17,7 @@ - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware implementation for certain IBM POWER hardware. The sources are at https://github.com/dgibson/SLOF, and the image currently in qemu is - built from git tag qemu-slof-20111013. + built from git tag qemu-slof-20120111.1. - sgabios (the Serial Graphics Adapter option ROM) provides a means for legacy x86 software to communicate with an attached serial console as diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin Binary files differindex 1e84582..8554f54 100644 --- a/pc-bios/slof.bin +++ b/pc-bios/slof.bin |