On 5/7/20 3:16 PM, Gerd Hoffmann wrote:
> 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>
> ---
> hw/char/serial-isa.c | 22 ++++++++++++++++++++++
> hw/i386/acpi-build.c | 32 --------------------------------
> 2 files changed, 22 insertions(+), 32 deletions(-)
>
> diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
> index f9b6eed7833d..165e320e65f0 100644
> --- a/hw/char/serial-isa.c
> +++ b/hw/char/serial-isa.c
> @@ -27,6 +27,7 @@
> #include "qapi/error.h"
> #include "qemu/module.h"
> #include "sysemu/sysemu.h"
> +#include "hw/acpi/aml-build.h"
> #include "hw/char/serial.h"
> #include "hw/isa/isa.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);
> }
>
> +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 = {
> .name = "serial",
> .version_id = 3,
> @@ -103,9 +123,11 @@ static Property serial_isa_properties[] = {
> static void serial_isa_class_initfn(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> + ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
>
> dc->realize = serial_isa_realizefn;
> dc->vmsd = &vmstate_isa_serial;
> + isa->build_aml = serial_isa_build_aml;
> device_class_set_props(dc, serial_isa_properties);
> set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
> }
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 3a82730a0d19..0e6a5151f4c3 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1208,36 +1208,6 @@ static Aml *build_lpt_device_aml(void)
> 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)
> {
> 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_lpt_device_aml());
> - build_com_device_aml(scope, 1);
> - build_com_device_aml(scope, 2);
>
> if (ambiguous) {
> error_report("Multiple ISA busses, unable to define IPMI ACPI data");
>