SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acpi: move aml builder code for serial device

Browse Source 
The code uses the isa_serial_io array to figure what the device uid is.
Side effect is that acpi antries are not limited to port 1+2 any more,
we'll also get entries for ports 3+4.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200515150421.25479-6-kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2020-05-15 17:04:10 +02:00 committed by Michael S. Tsirkin
parent 4b8e369b91
commit dcdbfaafe9
2 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/char/serial-isa.c
View File

@ -27,6 +27,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/acpi/aml-build.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -81,6 +82,25 @@ static void serial_isa_realizefn(DeviceState *dev, Error **errp)
isa_register_ioport(isadev, &s->io, isa->iobase); isa_register_ioport(isadev, &s->io, isa->iobase);
} }
static void serial_isa_build_aml(ISADevice *isadev, Aml *scope)
{
ISASerialState *isa = ISA_SERIAL(isadev);
Aml *dev;
Aml *crs;
crs = aml_resource_template();
aml_append(crs, aml_io(AML_DECODE16, isa->iobase, isa->iobase, 0x00, 0x08));
aml_append(crs, aml_irq_no_flags(isa->isairq));
dev = aml_device("COM%d", isa->index + 1);
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0501")));
aml_append(dev, aml_name_decl("_UID", aml_int(isa->index + 1)));
aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev);
}
static const VMStateDescription vmstate_isa_serial = { static const VMStateDescription vmstate_isa_serial = {
.name = "serial", .name = "serial",
.version_id = 3, .version_id = 3,
@ -103,9 +123,11 @@ static Property serial_isa_properties[] = {
static void serial_isa_class_initfn(ObjectClass *klass, void *data) static void serial_isa_class_initfn(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
dc->realize = serial_isa_realizefn; dc->realize = serial_isa_realizefn;
dc->vmsd = &vmstate_isa_serial; dc->vmsd = &vmstate_isa_serial;
isa->build_aml = serial_isa_build_aml;
device_class_set_props(dc, serial_isa_properties); device_class_set_props(dc, serial_isa_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories); set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
} }

32
hw/i386/acpi-build.c
View File

@ -1208,36 +1208,6 @@ static Aml *build_lpt_device_aml(void)
return dev; return dev;
} }
static void build_com_device_aml(Aml *scope, uint8_t uid)
{
Aml *dev;
Aml *crs;
uint8_t irq = 4;
uint16_t io_port = 0x03F8;
assert(uid == 1 || uid == 2);
if (uid == 2) {
irq = 3;
io_port = 0x02F8;
}
if (!memory_region_present(get_system_io(), io_port)) {
return;
}
dev = aml_device("COM%d", uid);
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0501")));
aml_append(dev, aml_name_decl("_UID", aml_int(uid)));
aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
crs = aml_resource_template();
aml_append(crs, aml_io(AML_DECODE16, io_port, io_port, 0x00, 0x08));
aml_append(crs, aml_irq_no_flags(irq));
aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev);
}
static void build_isa_devices_aml(Aml *table) static void build_isa_devices_aml(Aml *table)
{ {
ISADevice *fdc = pc_find_fdc0(); ISADevice *fdc = pc_find_fdc0();
@ -1252,8 +1222,6 @@ static void build_isa_devices_aml(Aml *table)
aml_append(scope, build_fdc_device_aml(fdc)); aml_append(scope, build_fdc_device_aml(fdc));
} }
aml_append(scope, build_lpt_device_aml()); aml_append(scope, build_lpt_device_aml());
build_com_device_aml(scope, 1);
build_com_device_aml(scope, 2);
if (ambiguous) { if (ambiguous) {
error_report("Multiple ISA busses, unable to define IPMI ACPI data"); error_report("Multiple ISA busses, unable to define IPMI ACPI data");