From patchwork Wed Jun 17 07:11:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 280273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7914C433DF for ; Wed, 17 Jun 2020 07:15:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1B5D206D8 for ; Wed, 17 Jun 2020 07:15:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ENpJ1Ekx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1B5D206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSI7-0004Z4-R4 for qemu-devel@archiver.kernel.org; Wed, 17 Jun 2020 03:15:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSFF-0007ja-Vc for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:26 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:56175 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jlSFD-0000bQ-1f for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=HFZs1P5/5zLsX+lt9an69Y6trhXT05gIadCW5CyshhA=; b=ENpJ1EkxBye9sivzheEjRXlPxK20ouP35Q7kA7jdGnpVy6f+MpM6Pke3ZMIWU/5uEbc1XV TVcX/a9hHZobavFhZARb3t9CMGkn0j5HNRk3DiuND3xL/Dl+u22cmyXAzD/DmsqCKK0n62 jyZuKlvx3p5hk3EZeLOuSzyWysRuLIw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-301-b6EF9MBmOYKiduXbmnocTA-1; Wed, 17 Jun 2020 03:12:20 -0400 X-MC-Unique: b6EF9MBmOYKiduXbmnocTA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C257E9116D; Wed, 17 Jun 2020 07:12:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id F20D91944D; Wed, 17 Jun 2020 07:11:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E05B29D98; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 08/10] acpi: drop serial/parallel enable bits from dsdt Date: Wed, 17 Jun 2020 09:11:36 +0200 Message-Id: <20200617071138.11159-9-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/17 01:42:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Kevin Wolf , Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 23 ----------------------- tests/data/acpi/pc/DSDT | Bin 5014 -> 4972 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6338 -> 6296 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6873 -> 6831 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5477 -> 5435 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6667 -> 6625 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5086 -> 5044 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6373 -> 6331 bytes tests/data/acpi/pc/DSDT.numamem | Bin 5020 -> 4978 bytes tests/data/acpi/q35/DSDT | Bin 7752 -> 7718 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9076 -> 9042 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7769 -> 7735 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8215 -> 8181 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9405 -> 9371 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7827 -> 7793 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9111 -> 9077 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8882 -> 8848 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7758 -> 7724 bytes tests/data/acpi/q35/DSDT.tis | Bin 8357 -> 8323 bytes 19 files changed, 23 deletions(-) diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index 384a82dbb3cb0e9f47db6f4d08945631c2b72b56..d9074ac8df7ff21f214a5f4a135e3d1ac2c86227 100644 GIT binary patch delta 62 zcmbQH{zi?C diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acpihmat index 47ddfdb027b06dc2daa46be711c3f4640ce68320..8d76c7c01d49087cc5efb9843a2e1d0865145017 100644 GIT binary patch delta 63 zcmX?PIKz<3CD8^! R69Z=^t^_WY&C?j2B>^`q5Gnuw delta 105 zcmZ2)defB4CD^=dmevAwj49w1sAO^Fu6Oh`R!{{st E0E&YcDgXcg diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index 54f481faf1e336c0bbf5e774cd67220fe06e951b..b25bbf7dc5bbabea277d3402b90d376beb038043 100644 GIT binary patch delta 63 zcmaE=wOfnJCDDN4%p;5D!qEA-W;J R#K4(}D}jq;^EAfu!T|Sh4`~1Z delta 105 zcmdn3^;CDN4%p;5D!qEA-W;J R#K4(}D}jq;^EAd%2>=a%4}|~# delta 105 zcmaE8+-<_;66_MfEycjV_-rGW4P$@8%8xXz4&0K_yA{5gXktH&tS)Rj(A6xAReGRLv%xc RiGec{R{|Hy=4p%`LI4lt4_^QP delta 105 zcmdm@eovjtCD R69Z=^t^_WY&C?kD#Q`j#5BC57 delta 105 zcmdmO_|%ZgCDDN4%p;5D!qEA-W;J R#K4(}D}jq;^E5^_ApisS4(tE` delta 105 zcmeyQHb;M1& diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index 6a5e4dd85a7d9a95f7ad0fb95e6a4fa7a8d91adb..dada9bf69fc23ea9c0931029445257657fde90ce 100644 GIT binary patch delta 44 zcmX?Mv&@FeCD)CDb%7 delta 79 zcmexrKiz@LCDz9t(P$&rd`5mh7QOgjr}zM8PlMfEGRg diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64 index 5916c0e9ce0a9607c6230f9dfebe2c1be70b2495..b6c6946ed9812685dd71b51784900480963b54bd 100644 GIT binary patch delta 44 zcmdnwI>D98CDy2+KxCDUoE6~! diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem index cf3fde3449bc8e9bbe683b936cf9866590b0ef82..9b5c962434471d63d65f027c84dfc3e6ac20e10b 100644 GIT binary patch delta 44 zcmX?Sv&M$YCD|* AGynhq delta 79 zcmZ2ubIyj#CDq=^1{E^^ diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis index 56b6fb0c3298517d080e38fea05a748b9f1dba54..7cb8d8b154f3de295669a741c9ec3ec8c67e2b2f 100644 GIT binary patch delta 44 zcmZ4L*zCyV66_MvtiZs)czq++d`5mh7QOgjr}zM8PlMV!Z delta 79 zcmZp6T66_MPRDpqkaqUK~`HcJy?0WIRPVoWGo(9oP&TNx+Fxo3cH~0iNyE1V# eaWO?Vih|e-&W^5rjLuF#!Y2SoZ2r#JBL@I*{}s#t 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);