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>, 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 v10 09/12] acpi: drop serial/parallel enable bits from dsdt
Date: Fri, 19 Jun 2020 11:19:02 +0200 [thread overview]
Message-ID: <20200619091905.21676-10-kraxel@redhat.com> (raw)
In-Reply-To: <20200619091905.21676-1-kraxel@redhat.com>
The _STA methods for COM+LPT used to reference them,
but that isn't the case any more.
piix4 DSDT changes:
Scope (_SB.PCI0)
{
Device (ISA)
{
Name (_ADR, 0x00010000) // _ADR: Address
OperationRegion (P40C, PCI_Config, 0x60, 0x04)
- Field (^PX13.P13C, AnyAcc, NoLock, Preserve)
- {
- Offset (0x5F),
- , 7,
- LPEN, 1,
- Offset (0x67),
- , 3,
- CAEN, 1,
- , 3,
- CBEN, 1
- }
}
}
ich9 DSDT changes:
Scope (_SB.PCI0)
{
Device (ISA)
{
Name (_ADR, 0x001F0000) // _ADR: Address
OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C)
OperationRegion (LPCD, PCI_Config, 0x80, 0x02)
Field (LPCD, AnyAcc, NoLock, Preserve)
{
COMA, 3,
, 1,
COMB, 3,
Offset (0x01),
LPTD, 2
}
-
- OperationRegion (LPCE, PCI_Config, 0x82, 0x02)
- Field (LPCE, AnyAcc, NoLock, Preserve)
- {
- CAEN, 1,
- CBEN, 1,
- LPEN, 1
- }
}
}
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/acpi-build.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index d27cecc877c4..ffbdbee51aa8 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1360,15 +1360,6 @@ static void build_q35_isa_bridge(Aml *table)
aml_append(field, aml_named_field("LPTD", 2));
aml_append(dev, field);
- aml_append(dev, aml_operation_region("LPCE", AML_PCI_CONFIG,
- aml_int(0x82), 0x02));
- /* enable bits */
- field = aml_field("LPCE", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE);
- aml_append(field, aml_named_field("CAEN", 1));
- aml_append(field, aml_named_field("CBEN", 1));
- aml_append(field, aml_named_field("LPEN", 1));
- aml_append(dev, field);
-
aml_append(scope, dev);
aml_append(table, scope);
}
@@ -1392,7 +1383,6 @@ static void build_piix4_isa_bridge(Aml *table)
{
Aml *dev;
Aml *scope;
- Aml *field;
scope = aml_scope("_SB.PCI0");
dev = aml_device("ISA");
@@ -1401,19 +1391,6 @@ static void build_piix4_isa_bridge(Aml *table)
/* PIIX PCI to ISA irq remapping */
aml_append(dev, aml_operation_region("P40C", AML_PCI_CONFIG,
aml_int(0x60), 0x04));
- /* enable bits */
- field = aml_field("^PX13.P13C", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE);
- /* Offset(0x5f),, 7, */
- aml_append(field, aml_reserved_field(0x2f8));
- aml_append(field, aml_reserved_field(7));
- aml_append(field, aml_named_field("LPEN", 1));
- /* Offset(0x67),, 3, */
- aml_append(field, aml_reserved_field(0x38));
- aml_append(field, aml_reserved_field(3));
- aml_append(field, aml_named_field("CAEN", 1));
- aml_append(field, aml_reserved_field(3));
- aml_append(field, aml_named_field("CBEN", 1));
- aml_append(dev, field);
aml_append(scope, dev);
aml_append(table, scope);
--
2.18.4
next prev parent reply other threads:[~2020-06-19 9:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 9:18 [PATCH v10 00/12] acpi: i386 tweaks Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 01/12] qtest: allow DSDT acpi table changes Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 02/12] acpi: bios-tables-test: show more context on asl diffs Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 03/12] acpi: move aml builder code for floppy device Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 04/12] floppy: make isa_fdc_get_drive_max_chs static Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 05/12] floppy: move cmos_get_fd_drive_type() from pc Gerd Hoffmann
2020-06-19 9:18 ` [PATCH v10 06/12] acpi: move aml builder code for i8042 (kbd+mouse) device Gerd Hoffmann
2020-06-19 9:19 ` [PATCH v10 07/12] acpi: factor out fw_cfg_add_acpi_dsdt() Gerd Hoffmann
2020-06-19 9:19 ` [PATCH v10 08/12] acpi: simplify build_isa_devices_aml() Gerd Hoffmann
2020-06-19 9:19 ` Gerd Hoffmann [this message]
2020-06-19 9:19 ` [PATCH v10 10/12] acpi: drop build_piix4_pm() Gerd Hoffmann
2020-06-19 9:19 ` [PATCH v10 11/12] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion Gerd Hoffmann
2020-06-19 9:19 ` [PATCH v10 12/12] tests/acpi: update expected data files Gerd Hoffmann
2020-06-29 11:54 ` Andrew Jones
2020-06-29 15:08 ` Michael S. Tsirkin
2020-06-19 9:51 ` [PATCH v10 00/12] acpi: i386 tweaks no-reply
2020-06-19 11:37 ` Michael S. Tsirkin
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=20200619091905.21676-10-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=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).