qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
	Sergio Lopez <slp@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH 11/13] microvm/acpi: add serial
Date: Thu, 19 Mar 2020 09:01:15 +0100	[thread overview]
Message-ID: <20200319080117.7725-12-kraxel@redhat.com> (raw)
In-Reply-To: <20200319080117.7725-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/acpi-build.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 928e0ee2deeb..b765c31c80b0 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1226,7 +1226,7 @@ static Aml *build_lpt_device_aml(void)
     return dev;
 }
 
-static Aml *build_com_device_aml(uint8_t uid)
+static Aml *build_com_device_aml(uint8_t uid, bool sta)
 {
     Aml *dev;
     Aml *crs;
@@ -1250,19 +1250,22 @@ static Aml *build_com_device_aml(uint8_t uid)
     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0501")));
     aml_append(dev, aml_name_decl("_UID", aml_int(uid)));
 
-    method = aml_method("_STA", 0, AML_NOTSERIALIZED);
-    aml_append(method, aml_store(aml_name("%s", enabled_field), is_present));
-    if_ctx = aml_if(aml_equal(is_present, zero));
-    {
-        aml_append(if_ctx, aml_return(aml_int(0x00)));
+    if (sta) {
+        method = aml_method("_STA", 0, AML_NOTSERIALIZED);
+        aml_append(method, aml_store(aml_name("%s", enabled_field),
+                                         is_present));
+        if_ctx = aml_if(aml_equal(is_present, zero));
+        {
+            aml_append(if_ctx, aml_return(aml_int(0x00)));
+        }
+        aml_append(method, if_ctx);
+        else_ctx = aml_else();
+        {
+            aml_append(else_ctx, aml_return(aml_int(0x0f)));
+        }
+        aml_append(method, else_ctx);
+        aml_append(dev, method);
     }
-    aml_append(method, if_ctx);
-    else_ctx = aml_else();
-    {
-        aml_append(else_ctx, aml_return(aml_int(0x0f)));
-    }
-    aml_append(method, else_ctx);
-    aml_append(dev, method);
 
     crs = aml_resource_template();
     aml_append(crs, aml_io(AML_DECODE16, io_port, io_port, 0x00, 0x08));
@@ -1287,8 +1290,8 @@ static void build_isa_devices_aml(Aml *table)
         aml_append(scope, build_fdc_device_aml(fdc));
     }
     aml_append(scope, build_lpt_device_aml());
-    aml_append(scope, build_com_device_aml(1));
-    aml_append(scope, build_com_device_aml(2));
+    aml_append(scope, build_com_device_aml(1, true));
+    aml_append(scope, build_com_device_aml(2, true));
 
     if (ambiguous) {
         error_report("Multiple ISA busses, unable to define IPMI ACPI data");
@@ -2818,6 +2821,9 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
     if (mms->rtc_state) {
         aml_append(sb_scope, build_rtc_device_aml());
     }
+    if (mms->isa_serial) {
+        aml_append(sb_scope, build_com_device_aml(1, false));
+    }
     acpi_dsdt_add_fw_cfg(sb_scope, OBJECT(x86ms->fw_cfg));
     acpi_dsdt_add_virtio(sb_scope);
     aml_append(dsdt, sb_scope);
-- 
2.18.2



  parent reply	other threads:[~2020-03-19  8:04 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19  8:01 [PATCH 00/13] microvm: add acpi support Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 01/13] acpi: make build_madt() more generic Gerd Hoffmann
2020-03-19  9:34   ` Philippe Mathieu-Daudé
2020-03-19  8:01 ` [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg() Gerd Hoffmann
2020-03-19  9:36   ` Philippe Mathieu-Daudé
2020-03-19 12:16   ` Igor Mammedov
2020-03-19  8:01 ` [PATCH 03/13] microvm: add isa-acpi device Gerd Hoffmann
2020-03-19 13:42   ` Igor Mammedov
2020-03-20  8:22     ` Gerd Hoffmann
2020-03-20 14:54       ` Igor Mammedov
2020-03-19  8:01 ` [PATCH 04/13] microvm: add minimal acpi support Gerd Hoffmann
2020-03-19 14:00   ` Igor Mammedov
2020-03-25  9:04     ` Gerd Hoffmann
2020-03-25 18:59       ` Igor Mammedov
2020-03-19  8:01 ` [PATCH 05/13] microvm: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-03-19 14:30   ` Igor Mammedov
2020-03-20  8:19     ` Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 06/13] microvm: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 07/13] [testing] seabios: update submodule to experimental microvm branch Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 08/13] [testing] seabios: update config & build rules Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 09/13] [testing] seabios: update binaries to experimental microvm branch Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 10/13] microvm/acpi: add rtc Gerd Hoffmann
2020-03-19  8:01 ` Gerd Hoffmann [this message]
2020-03-19  8:01 ` [PATCH 12/13] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-03-19  8:01 ` [PATCH 13/13] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-03-20 15:30   ` Konrad Rzeszutek Wilk
2020-03-23 10:23     ` Gerd Hoffmann
2020-03-19  8:19 ` [PATCH 00/13] microvm: add acpi support no-reply
2020-03-19  8:23 ` no-reply
2020-03-19  8:24 ` no-reply
2020-03-19  8:49 ` Paolo Bonzini
2020-03-19  9:33   ` Gerd Hoffmann
2020-03-19  9:59     ` Paolo Bonzini
2020-03-19 11:28       ` Gerd Hoffmann
2020-03-19 13:40   ` Gerd Hoffmann
2020-03-19 17:34     ` Paolo Bonzini
2020-03-20  8:32       ` Gerd Hoffmann
2020-03-20 10:41         ` Paolo Bonzini
2020-03-23 10:51 ` Michael S. Tsirkin
2020-03-23 12:09   ` Gerd Hoffmann
2020-03-23 12:16     ` Igor Mammedov
2020-03-25  9:16       ` Gerd Hoffmann
2020-03-25  9:53         ` Igor Mammedov
2020-03-25 18:56         ` Igor Mammedov
2020-03-25 12:32 ` Igor Mammedov
2020-03-25 15:03   ` Gerd Hoffmann
2020-03-25 18:44     ` Igor Mammedov
2020-03-26  7:33       ` Michael S. Tsirkin
2020-03-26 10:59         ` Igor Mammedov
2020-03-27 12:06       ` Gerd Hoffmann
2020-03-27 14:05         ` Igor Mammedov

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=20200319080117.7725-12-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=slp@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).