From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt
Date: Wed, 24 Jun 2020 19:06:52 -0400 [thread overview]
Message-ID: <20200624230609.703104-10-mst@redhat.com> (raw)
In-Reply-To: <20200624230609.703104-1-mst@redhat.com>
From: Gerd Hoffmann <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>
Message-Id: <20200619091905.21676-10-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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 d27cecc877..ffbdbee51a 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);
--
MST
next prev parent reply other threads:[~2020-06-24 23:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 23:06 [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 01/19] qtest: allow DSDT acpi table changes Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 02/19] acpi: bios-tables-test: show more context on asl diffs Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 03/19] acpi: move aml builder code for floppy device Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 05/19] floppy: move cmos_get_fd_drive_type() from pc Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 06/19] acpi: move aml builder code for i8042 (kbd+mouse) device Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 07/19] acpi: factor out fw_cfg_add_acpi_dsdt() Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 08/19] acpi: simplify build_isa_devices_aml() Michael S. Tsirkin
2020-06-24 23:06 ` Michael S. Tsirkin [this message]
2020-06-24 23:06 ` [PULL 10/19] acpi: drop build_piix4_pm() Michael S. Tsirkin
2020-06-24 23:06 ` [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 12/19] tests/acpi: update expected data files Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 13/19] acpi: Some build_tpm2() code reshape Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 14/19] arm/acpi: Add the TPM2.0 device under the DSDT Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 15/19] docs/specs/tpm: ACPI boot now supported for TPM/ARM Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 16/19] Stop vhost-user sending uninitialized mmap_offsets Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 17/19] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled Michael S. Tsirkin
2020-06-24 23:07 ` [PULL 19/19] tests: disassemble-asm.sh: generate AML in readable format Michael S. Tsirkin
2020-06-25 5:47 ` [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools Thomas Huth
2020-06-25 6:49 ` Michael S. Tsirkin
2020-06-25 20:20 ` Peter Maydell
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=20200624230609.703104-10-mst@redhat.com \
--to=mst@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).