From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v5 05/15] acpi: move aml builder code for serial device
Date: Thu, 7 May 2020 15:16:30 +0200 [thread overview]
Message-ID: <20200507131640.14041-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200507131640.14041-1-kraxel@redhat.com>
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>
---
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");
--
2.18.4
next prev parent reply other threads:[~2020-05-07 13:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 13:16 [PATCH v5 00/15] acpi: i386 tweaks Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 01/15] qtest: allow DSDT acpi table changes Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 02/15] acpi: move aml builder code for rtc device Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 03/15] acpi: rtc: use a single crs range Gerd Hoffmann
2020-05-11 19:26 ` Igor Mammedov
2020-06-03 23:44 ` Cameron Esfahani
2020-05-07 13:16 ` [PATCH v5 04/15] acpi: serial: don't use _STA method Gerd Hoffmann
2020-05-07 13:16 ` Gerd Hoffmann [this message]
2020-05-07 13:53 ` [PATCH v5 05/15] acpi: move aml builder code for serial device Philippe Mathieu-Daudé
2020-05-07 13:16 ` [PATCH v5 06/15] acpi: parallel: don't use _STA method Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 07/15] acpi: move aml builder code for parallel device Gerd Hoffmann
2020-05-07 13:54 ` Philippe Mathieu-Daudé
2020-05-07 13:16 ` [PATCH v5 08/15] acpi: move aml builder code for floppy device Gerd Hoffmann
2020-05-07 14:05 ` Philippe Mathieu-Daudé
2020-05-13 20:43 ` John Snow
2020-05-14 5:51 ` Thomas Huth
2020-05-15 14:47 ` Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 09/15] acpi: move aml builder code for i8042 (kbd+mouse) device Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 10/15] acpi: factor out fw_cfg_add_acpi_dsdt() Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 11/15] acpi: simplify build_isa_devices_aml() Gerd Hoffmann
2020-05-07 13:16 ` [PATCH v5 12/15] acpi: drop serial/parallel enable bits from dsdt Gerd Hoffmann
2020-05-11 19:33 ` Igor Mammedov
2020-05-07 13:16 ` [PATCH v5 13/15] acpi: drop build_piix4_pm() Gerd Hoffmann
2020-05-11 19:37 ` Igor Mammedov
2020-05-12 11:16 ` Gerd Hoffmann
2020-05-12 15:08 ` Igor Mammedov
2020-05-07 13:16 ` [PATCH v5 14/15] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion Gerd Hoffmann
2020-05-11 19:38 ` Igor Mammedov
2020-05-07 13:16 ` [PATCH v5 15/15] floppy: make isa_fdc_get_drive_max_chs static Gerd Hoffmann
2020-05-07 14:06 ` Philippe Mathieu-Daudé
2020-05-13 20:41 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507131640.14041-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).