May 2013 - SeaBIOS - mail.coreboot.org

[QEMU PATCH v2] pci: set firmware name of q35 to pci
by Amos Kong May 30, 2013

May 30, 2013

In QEMU, we set the firmware name of pc-i440fx to 'pci', and the typename 'q35-pcihost' is set to the firmware name of q35 by default. The seabios matches pci devices by "/pci/@i0cf8", so q35 device could not be identified, seabios fails to adjust the boot priority of q35 devices. This patch sets firmware name of q35 to 'pci'. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Amos Kong <akong(a)redhat.com> --- v2: just set the fw_name, no need to change seabios --- hw/pci-host/q35.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 8467f86..24df6b5 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -76,6 +76,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data) k->init = q35_host_init; dc->props = mch_props; + dc->fw_name = "pci"; } static void q35_host_initfn(Object *obj) -- 1.8.1.4

2 2

[PATCH] pci: change typename of q35 to pci-q35
by Amos Kong May 30, 2013

May 30, 2013

In QEMU, we set the firmware name of pc-i440fx is 'pci', and set the firmware name of q35 is 'q35-pcihost'. The seabios pattern matching code isn't sophisticated, and we want to match those two devices with exact pattern. This patch changes the typename of q35 to 'pci-q35', all pci devices use same prefix 'pci' in fireware name. And I will change pattern in seabios to "/pci*@i0cf8". Signed-off-by: Amos Kong <akong(a)redhat.com> --- include/hw/pci-host/q35.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index e182c82..3579fb0 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -34,7 +34,7 @@ #include "hw/acpi/ich9.h" #include "hw/pci-host/pam.h" -#define TYPE_Q35_HOST_DEVICE "q35-pcihost" +#define TYPE_Q35_HOST_DEVICE "pci-q35" #define Q35_HOST_DEVICE(obj) \ OBJECT_CHECK(Q35PCIHost, (obj), TYPE_Q35_HOST_DEVICE) -- 1.8.1.4

2 3

EC space vs SystemIO for cpu hotplug
by li guang May 30, 2013

May 30, 2013

Hi, Igor and all based on the patches "pass cpu online/offline event bewteen QEMU", http://lists.nongnu.org/archive/html/qemu-devel/2013-05/msg04135.html I'd like to go further, IMHO, too many specific operation regions of SystemIO have been created for specific usage, like pci-hotplug, cpu-hotplug, pvpanic, debugcon, and so on, are not so good thing, in real world, obviously none of them, and more worse, they themselves and operations are scattered in several code snippets. but via EC's ACPI space, the *created* SystemIOs can be totally removed, and we got a centrally controlled and rational and flexible approach for OS and platform communication, because EC is standard and it really exists in real world(hardware platform). may you think of it, if we can use EC space instead of specific SystemIO for cpu hotplug case, I append a simple patch for seabios. diff --git a/src/acpi-dsdt-cpu-hotplug.dsl b/src/acpi-dsdt-cpu-hotplug.dsl index 0f3e83b..869373b 100644 --- a/src/acpi-dsdt-cpu-hotplug.dsl +++ b/src/acpi-dsdt-cpu-hotplug.dsl @@ -6,6 +6,7 @@ Scope(\_SB) { /* Objects filled in by run-time generated SSDT */ External(NTFY, MethodObj) External(CPON, PkgObj) + External(PRS, BuffObj) /* Methods called by run-time generated SSDT Processor objects */ Method(CPMA, 1, NotSerialized) { @@ -38,10 +39,10 @@ Scope(\_SB) { } /* CPU hotplug notify method */ - OperationRegion(PRST, SystemIO, 0xaf00, 32) - Field(PRST, ByteAcc, NoLock, Preserve) { - PRS, 256 - } +// OperationRegion(PRST, SystemIO, 0xaf00, 32) +// Field(PRST, ByteAcc, NoLock, Preserve) { +// PRS, 256 +// } Method(PRSC, 0) { // Local5 = active cpu bitmap Store(PRS, Local5) diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl index 2b9c3a0..4567edb 100644 --- a/src/acpi-dsdt-isa.dsl +++ b/src/acpi-dsdt-isa.dsl @@ -117,6 +117,7 @@ Scope(\_SB.PCI0.ISA) { Offset(1), CPUS, 8, // 1, CPU plug/unplug status map CPUN, 8, // 2, CPU index + PRS, 256, // 3. CPU status map } Name(_GPE, 3)

1 0

Next release
by Kevin O'Connor May 30, 2013

May 30, 2013

I'd like to start preparing for the next SeaBIOS release - v1.7.3. If there are significant features being worked on that should go into the next release, please let me know. I'd like to freeze by June 14th and make the next release by June 30th. -Kevin

1 0

SeaBIOS v1.7.2.2 stable release
by Kevin O'Connor May 30, 2013

May 30, 2013

A new stable release of SeaBIOS (version 1.7.2.2) has been tagged. This release contains bug fixes. The release is available via git: git clone git://git.seabios.org/seabios -b 1.7.2-stable -Kevin Asias He (2): virtio-scsi: Pack struct virtio_scsi_{req_cmd,resp_cmd} virtio-scsi: Set _DRIVER_OK flag before scsi target scanning Kevin O'Connor (1): Cache boot-fail-wait to avoid romfile access after POST. boot.c | 15 +++++++++------ virtio-scsi.c | 5 +++-- virtio-scsi.h | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-)

4 6

[PATCH v2] config: allow CONSOLE_IO for !QEMU
by Gerd Hoffmann May 29, 2013

May 29, 2013

Allow selecting CONSOLE_IO for non-qemu configurations, which is useful when running coreboot+seabios on coreboot. [ v2: QEMU_HARDWARE is even better as CONSOLE_IO default value ] Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 3c80132..2695017 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -425,9 +425,9 @@ menu "Debugging" Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8. config DEBUG_IO - depends on QEMU && DEBUG_LEVEL != 0 + depends on DEBUG_LEVEL != 0 bool "Special IO port debugging" - default y + default QEMU_HARDWARE help Some emulators or hypervisors provide with a way to output debug information by outputing strings in a special port present in the -- 1.7.9.7

2 2

[PATCH] config: allow CONSOLE_IO for !QEMU
by Gerd Hoffmann May 29, 2013

May 29, 2013

Allow selecting CONSOLE_IO for non-qemu configurations, which is useful when running coreboot+seabios on coreboot. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 3c80132..3374198 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -425,9 +425,9 @@ menu "Debugging" Base port for serial - generally 0x3f8, 0x2f8, 0x3e8, or 0x2e8. config DEBUG_IO - depends on QEMU && DEBUG_LEVEL != 0 + depends on DEBUG_LEVEL != 0 bool "Special IO port debugging" - default y + default QEMU help Some emulators or hypervisors provide with a way to output debug information by outputing strings in a special port present in the -- 1.7.9.7

1 0

[PATCH v2] qdev: don't add typename to fw_dev_path when get_fw_dev_path isn't implemented
by Amos Kong May 29, 2013

May 29, 2013

Recent virtio refactoring in QEMU made virtio-bus become the parent bus of scsi-bus, and virtio-bus doesn't have get_fw_dev_path implementation, so redundant typename will be added to fw_dev_path. It causes that bootindex parameter of scsi device doesn't work. This patch changes qdev_get_fw_dev_path_helper() to add nothing if implemented get_fw_dev_path() returns NULL. Signed-off-by: Amos Kong <akong(a)redhat.com> -- v2: only add nothing to fw_dev_path when get_fw_dev_path() is implemented and return NULL. then it will not effect other devices don't have get_fw_dev_path() implementation. --- hw/core/qdev.c | 5 +++++ hw/virtio/virtio-bus.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6985ad8..2a08368 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -509,11 +509,16 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) if (dev && dev->parent_bus) { char *d; + BusClass *parent_bc = BUS_GET_CLASS(dev->parent_bus); + l = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size); d = bus_get_fw_dev_path(dev->parent_bus, dev); + if (d) { l += snprintf(p + l, size - l, "%s", d); g_free(d); + } else if (parent_bc->get_fw_dev_path) { + return l; } else { l += snprintf(p + l, size - l, "%s", object_get_typename(OBJECT(dev))); } diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index ea2e11a..6849a01 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -161,10 +161,16 @@ static char *virtio_bus_get_dev_path(DeviceState *dev) return qdev_get_dev_path(proxy); } +static char *virtio_bus_get_fw_dev_path(DeviceState *dev) +{ + return NULL; +} + static void virtio_bus_class_init(ObjectClass *klass, void *data) { BusClass *bus_class = BUS_CLASS(klass); bus_class->get_dev_path = virtio_bus_get_dev_path; + bus_class->get_fw_dev_path = virtio_bus_get_fw_dev_path; } static const TypeInfo virtio_bus_info = { -- 1.8.1.4

2 4

[PATCH][seabios] ec: add ASL for ACPI Embedded Controller
by liguang May 29, 2013

May 29, 2013

Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/acpi-dsdt-isa.dsl | 26 ++++++++++++++++++++++++++ src/q35-acpi-dsdt.dsl | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl index 23761db..2b9c3a0 100644 --- a/src/acpi-dsdt-isa.dsl +++ b/src/acpi-dsdt-isa.dsl @@ -99,4 +99,30 @@ Scope(\_SB.PCI0.ISA) { IRQNoFlags() { 3 } }) } + + Device (EC0) { + Name(_HID, EISAID ("PNP0C09")) + Name(_UID, 1) + + Method(_CRS, 0) { + Name(BFFR, ResourceTemplate() { + IO(Decode16, 0x62, 0x62, 0, 1) // ACPI DATA IN/OUT + IO(Decode16, 0x66, 0x66, 0, 1) // CMD/STS + }) + Return(BFFR) + } + + OperationRegion(ECFD, EmbeddedControl, 0, 0xFF) + Field(ECFD, ByteAcc, Lock, Preserve) { + Offset(1), + CPUS, 8, // 1, CPU plug/unplug status map + CPUN, 8, // 2, CPU index + } + + Name(_GPE, 3) + + Method(_Q01) { + } + } + } diff --git a/src/q35-acpi-dsdt.dsl b/src/q35-acpi-dsdt.dsl index c031d83..056b4f8 100644 --- a/src/q35-acpi-dsdt.dsl +++ b/src/q35-acpi-dsdt.dsl @@ -167,6 +167,7 @@ DefinitionBlock ( FDEN, 1 } } +#include "ec.dsl" } #include "acpi-dsdt-isa.dsl" -- 1.7.2.5

1 0

[PATCH] boot: fix path pattern of scsi device
by Amos Kong May 28, 2013

May 28, 2013

bootindex parameter of scsi device doesn't work, it causes by wrong pattern in seabios. qemu passes the following firmware dev_path to seabios: /pci@i0cf8/scsi@4/virtio-scsi-device/channel@0/disk@0,0 Signed-off-by: Amos Kong <akong(a)redhat.com> --- src/boot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/boot.c b/src/boot.c index c308602..cd9d784 100644 --- a/src/boot.c +++ b/src/boot.c @@ -138,10 +138,11 @@ int bootprio_find_scsi_device(struct pci_device *pci, int target, int lun) if (!pci) // support only pci machine for now return -1; - // Find scsi drive - for example: /pci@i0cf8/scsi@5/channel@0/disk@1,0 + /* Find scsi drive - for example: + /pci@i0cf8/scsi@5/virtio-scsi-device/channel@0/disk@1,0 */ char desc[256], *p; p = build_pci_path(desc, sizeof(desc), "*", pci); - snprintf(p, desc+sizeof(desc)-p, "/*@0/*@%d,%d", target, lun); + snprintf(p, desc+sizeof(desc)-p, "/*/*@0/*@%d,%d", target, lun); return find_prio(desc); } -- 1.8.1.4

3 5