From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592377996; cv=none; d=zohomail.com; s=zohoarc; b=HKw15NSYOATNZYNAXbGT3YLcJTz3nOoTGS27svzlVOJM1HAONFdhDBOgL0wbqSmlSVEduNZ2EHnhQ8MmoJnXPBQqCvu4PDuFeMMlIlRzqi5Z/6o6g2II+BhK3SeowOYO0FO1Q2ygy0Q+0iAuDiCTzZRaStlQhYNQfzmWKzRfr3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592377996; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=5n5L+rYsZITWAjAX4WgJOLDurbYTO5bt+jagADklpr8=; b=ZemUzQ5e649jUks4qJVqrPWOv0GAAbAn6skQEqutxpognu0jIZGqzi0GVwTOg69x6eY7eWuf+st3+O1N06GWyaiveWBGdoqSHTzstepyD14HLj0iCvqCGinb+Qr+0+eEVW+Vh2QaKrYTXaIfNutZgUjv4EpJJV7b9y6L/bv74SM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592377996647308.2365216577622; Wed, 17 Jun 2020 00:13:16 -0700 (PDT) Received: from localhost ([::1]:55502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSG3-0000Cg-FY for importer@patchew.org; Wed, 17 Jun 2020 03:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSEv-00071T-3g for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34646 helo=us-smtp-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 1jlSEs-0000TD-N0 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:04 -0400 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-385-00Y7si2tNVu5Fk639fdftw-1; Wed, 17 Jun 2020 03:11:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25B10EC1C5; Wed, 17 Jun 2020 07:11:58 +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 B818461462; Wed, 17 Jun 2020 07:11:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 911DF1750C; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377921; 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=5n5L+rYsZITWAjAX4WgJOLDurbYTO5bt+jagADklpr8=; b=QkezIOztRYra1bF+195sEhCLTPgleEDUmV6AOwcEYM1QkZEkU5DHQt6y30PRUzZ8ECwHcU UYhjC36yvfVvd2PVcg73nGbj8N4tADoVWtrg8yV4JrcIKPIKr8akLeNQ+UKyoPsvnMb4o4 qV0FzQcZrhCzmChH5GgbOM7bLFEIEnY= X-MC-Unique: 00Y7si2tNVu5Fk639fdftw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 01/10] acpi: bios-tables-test: show more context on asl diffs Date: Wed, 17 Jun 2020 09:11:29 +0200 Message-Id: <20200617071138.11159-2-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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/17 01:42:04 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_H3=-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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Makes it easier to create good commit messages from the logs. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index b482f76c03d4..c315156858f4 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -469,7 +469,7 @@ static void test_acpi_asl(test_data *data) fflush(stderr); if (getenv("V")) { const char *diff_env =3D getenv("DIFF"); - const char *diff_cmd =3D diff_env ? diff_env : "diff -= u"; + const char *diff_cmd =3D diff_env ? diff_env : "diff -= U 16"; char *diff =3D g_strdup_printf("%s %s %s", diff_cmd, exp_sdt->asl_file, sdt->a= sl_file); int out =3D dup(STDOUT_FILENO); --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378105; cv=none; d=zohomail.com; s=zohoarc; b=cW6n/lfMq05BNB2QMA2vPaSJxjYFs3dW2JRjdh7+HeA6cGxPLCEn8mfflZWssfARqycae0q+egubrDHMB91VmX7+YagYs6zx3Zyp2lJLZx5d/Zbez4ONiO+hFMUpyWACzyrCH/XHtgpu5MbX1nkhWWeKq95so3Rnh1BOBzpz2/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378105; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=H9ziKnWJJMy5DsNeUmnvvxJsOVkOFKpSCM3jtDIGEWM=; b=enfuRg+sU6KVWOTxgKuNuzgnLCSL5g8IXxtSp1Vy0p6T6wTEUZdku0GZfy7gyovb9zjep5C1VFlIO13lAzzjS47E6jhDal/Eva15SdY3P13IfR3sJMzwoDOwIRo91GQa67TKAqqn63L+fxg6LJ4x8ex9dzuD3kMuVoFTT1ZHc0w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378105071494.5307424963288; Wed, 17 Jun 2020 00:15:05 -0700 (PDT) Received: from localhost ([::1]:35174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSHn-0003sL-LT for importer@patchew.org; Wed, 17 Jun 2020 03:15:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSEx-00072Y-25 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:07 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jlSEs-0000TF-Nu for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:06 -0400 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-20-c4dK06EMMGGAa0ziTK9hFA-1; Wed, 17 Jun 2020 03:11:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60ED680F5CF; Wed, 17 Jun 2020 07:11:58 +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 BE44B5C1D2; Wed, 17 Jun 2020 07:11:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9F1AE1753C; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377921; 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=H9ziKnWJJMy5DsNeUmnvvxJsOVkOFKpSCM3jtDIGEWM=; b=DOAamXJdrRCjePS0q9lpl9MEJ8+jqfLDZmvBIp5cop7LWiNDcSzIqwmnV6ewPej0vvppRd s+rt8Mb4NLYvZp4p2hQJ7eLU+utP079Mh4WCIOrshK5hKXzX8R/OReWLIXWy2w7O6VOzcO 4G/09tZXn1TFObcoa3/97WFh9vtYr90= X-MC-Unique: c4dK06EMMGGAa0ziTK9hFA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 02/10] acpi: move aml builder code for floppy device Date: Wed, 17 Jun 2020 09:11:30 +0200 Message-Id: <20200617071138.11159-3-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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/17 02:02:46 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_H3=-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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DSDT change: isa device order changes in case MI1 (ipmi) is present. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov --- hw/block/fdc.c | 83 ++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 83 -------------------------------- stubs/cmos.c | 7 +++ stubs/Makefile.objs | 1 + tests/data/acpi/pc/DSDT.ipmikcs | Bin 5086 -> 5086 bytes 5 files changed, 91 insertions(+), 83 deletions(-) create mode 100644 stubs/cmos.c diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 8528b9a3c722..c92436772292 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -32,6 +32,8 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" +#include "hw/i386/pc.h" +#include "hw/acpi/aml-build.h" #include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" @@ -2765,6 +2767,85 @@ void isa_fdc_get_drive_max_chs(FloppyDriveType type, (*maxc)--; } =20 +static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) +{ + Aml *dev, *fdi; + uint8_t maxc, maxh, maxs; + + isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs); + + dev =3D aml_device("FLP%c", 'A' + idx); + + aml_append(dev, aml_name_decl("_ADR", aml_int(idx))); + + fdi =3D aml_package(16); + aml_append(fdi, aml_int(idx)); /* Drive Number */ + aml_append(fdi, + aml_int(cmos_get_fd_drive_type(type))); /* Device Type */ + /* + * the values below are the limits of the drive, and are thus independ= ent + * of the inserted media + */ + aml_append(fdi, aml_int(maxc)); /* Maximum Cylinder Number */ + aml_append(fdi, aml_int(maxs)); /* Maximum Sector Number */ + aml_append(fdi, aml_int(maxh)); /* Maximum Head Number */ + /* + * SeaBIOS returns the below values for int 0x13 func 0x08 regardless = of + * the drive type, so shall we + */ + aml_append(fdi, aml_int(0xAF)); /* disk_specify_1 */ + aml_append(fdi, aml_int(0x02)); /* disk_specify_2 */ + aml_append(fdi, aml_int(0x25)); /* disk_motor_wait */ + aml_append(fdi, aml_int(0x02)); /* disk_sector_siz */ + aml_append(fdi, aml_int(0x12)); /* disk_eot */ + aml_append(fdi, aml_int(0x1B)); /* disk_rw_gap */ + aml_append(fdi, aml_int(0xFF)); /* disk_dtl */ + aml_append(fdi, aml_int(0x6C)); /* disk_formt_gap */ + aml_append(fdi, aml_int(0xF6)); /* disk_fill */ + aml_append(fdi, aml_int(0x0F)); /* disk_head_sttl */ + aml_append(fdi, aml_int(0x08)); /* disk_motor_strt */ + + aml_append(dev, aml_name_decl("_FDI", fdi)); + return dev; +} + +static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) +{ + Aml *dev; + Aml *crs; + int i; + +#define ACPI_FDE_MAX_FD 4 + uint32_t fde_buf[5] =3D { + 0, 0, 0, 0, /* presence of floppy drives #0 - #3 */ + cpu_to_le32(2) /* tape presence (2 =3D=3D never present) */ + }; + + crs =3D aml_resource_template(); + aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04)); + aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01)); + aml_append(crs, aml_irq_no_flags(6)); + aml_append(crs, + aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); + + dev =3D aml_device("FDC0"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700"))); + aml_append(dev, aml_name_decl("_CRS", crs)); + + for (i =3D 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) { + FloppyDriveType type =3D isa_fdc_get_drive_type(isadev, i); + + if (type < FLOPPY_DRIVE_TYPE_NONE) { + fde_buf[i] =3D cpu_to_le32(1); /* drive present */ + aml_append(dev, build_fdinfo_aml(i, type)); + } + } + aml_append(dev, aml_name_decl("_FDE", + aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf))); + + aml_append(scope, dev); +} + static const VMStateDescription vmstate_isa_fdc =3D{ .name =3D "fdc", .version_id =3D 2, @@ -2798,11 +2879,13 @@ static Property isa_fdc_properties[] =3D { static void isabus_fdc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); =20 dc->realize =3D isabus_fdc_realize; dc->fw_name =3D "fdc"; dc->reset =3D fdctrl_external_reset_isa; dc->vmsd =3D &vmstate_isa_fdc; + isa->build_aml =3D fdc_isa_build_aml; device_class_set_props(dc, isa_fdc_properties); set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 900f786d08de..45297d9a90e7 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -938,85 +938,6 @@ static void build_hpet_aml(Aml *table) aml_append(table, scope); } =20 -static Aml *build_fdinfo_aml(int idx, FloppyDriveType type) -{ - Aml *dev, *fdi; - uint8_t maxc, maxh, maxs; - - isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs); - - dev =3D aml_device("FLP%c", 'A' + idx); - - aml_append(dev, aml_name_decl("_ADR", aml_int(idx))); - - fdi =3D aml_package(16); - aml_append(fdi, aml_int(idx)); /* Drive Number */ - aml_append(fdi, - aml_int(cmos_get_fd_drive_type(type))); /* Device Type */ - /* - * the values below are the limits of the drive, and are thus independ= ent - * of the inserted media - */ - aml_append(fdi, aml_int(maxc)); /* Maximum Cylinder Number */ - aml_append(fdi, aml_int(maxs)); /* Maximum Sector Number */ - aml_append(fdi, aml_int(maxh)); /* Maximum Head Number */ - /* - * SeaBIOS returns the below values for int 0x13 func 0x08 regardless = of - * the drive type, so shall we - */ - aml_append(fdi, aml_int(0xAF)); /* disk_specify_1 */ - aml_append(fdi, aml_int(0x02)); /* disk_specify_2 */ - aml_append(fdi, aml_int(0x25)); /* disk_motor_wait */ - aml_append(fdi, aml_int(0x02)); /* disk_sector_siz */ - aml_append(fdi, aml_int(0x12)); /* disk_eot */ - aml_append(fdi, aml_int(0x1B)); /* disk_rw_gap */ - aml_append(fdi, aml_int(0xFF)); /* disk_dtl */ - aml_append(fdi, aml_int(0x6C)); /* disk_formt_gap */ - aml_append(fdi, aml_int(0xF6)); /* disk_fill */ - aml_append(fdi, aml_int(0x0F)); /* disk_head_sttl */ - aml_append(fdi, aml_int(0x08)); /* disk_motor_strt */ - - aml_append(dev, aml_name_decl("_FDI", fdi)); - return dev; -} - -static Aml *build_fdc_device_aml(ISADevice *fdc) -{ - int i; - Aml *dev; - Aml *crs; - -#define ACPI_FDE_MAX_FD 4 - uint32_t fde_buf[5] =3D { - 0, 0, 0, 0, /* presence of floppy drives #0 - #3 */ - cpu_to_le32(2) /* tape presence (2 =3D=3D never present) */ - }; - - dev =3D aml_device("FDC0"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700"))); - - crs =3D aml_resource_template(); - aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04)); - aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01)); - aml_append(crs, aml_irq_no_flags(6)); - aml_append(crs, - aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2)); - aml_append(dev, aml_name_decl("_CRS", crs)); - - for (i =3D 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) { - FloppyDriveType type =3D isa_fdc_get_drive_type(fdc, i); - - if (type < FLOPPY_DRIVE_TYPE_NONE) { - fde_buf[i] =3D cpu_to_le32(1); /* drive present */ - aml_append(dev, build_fdinfo_aml(i, type)); - } - } - aml_append(dev, aml_name_decl("_FDE", - aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf))); - - return dev; -} - static Aml *build_kbd_device_aml(void) { Aml *dev; @@ -1092,7 +1013,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus= _bridge) =20 static void build_isa_devices_aml(Aml *table) { - ISADevice *fdc =3D pc_find_fdc0(); VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); bool ambiguous; =20 @@ -1101,9 +1021,6 @@ static void build_isa_devices_aml(Aml *table) =20 aml_append(scope, build_kbd_device_aml()); aml_append(scope, build_mouse_device_aml()); - if (fdc) { - aml_append(scope, build_fdc_device_aml(fdc)); - } =20 if (ambiguous) { error_report("Multiple ISA busses, unable to define IPMI ACPI data= "); diff --git a/stubs/cmos.c b/stubs/cmos.c new file mode 100644 index 000000000000..416cbe4055ff --- /dev/null +++ b/stubs/cmos.c @@ -0,0 +1,7 @@ +#include "qemu/osdep.h" +#include "hw/i386/pc.h" + +int cmos_get_fd_drive_type(FloppyDriveType fd0) +{ + return 0; +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 28e48171d1f3..f32b9e47a3d8 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,4 +1,5 @@ stub-obj-y +=3D blk-commit-all.o +stub-obj-y +=3D cmos.o stub-obj-y +=3D cpu-get-clock.o stub-obj-y +=3D cpu-get-icount.o stub-obj-y +=3D dump.o diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmi= kcs index 57b78358744a5bb13639ccddb887be2721240807..c285651131dc2ab8b0f32de750d= 7ac02a8b09936 100644 GIT binary patch delta 20 ccmcboeouV^E7Rl-CXdOiOwF4wF!2cj08$MG=3Dl}o! delta 20 ccmcboeouV^E7N3Orsm14OdgvrF!2cj08ljstpET3 --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378073; cv=none; d=zohomail.com; s=zohoarc; b=O32vGbiiADP3p+QPPdBMxDsWJNC5EIzxReEXe84RZFMYmn6PdeSzGdLmQnmwsVignjfRTXPlaJp3ns8RWBVeP3cv8GRD5smLmCAP9pmVYMtrS76XfylLBmdS10jBDs62XIiZn1G8rqN+hf6/0havkZs7XMDWAt7rUf9gQJhbFRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378073; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DzVjiGHlgwyOc7h8SJ/YIQqZjyI/YoNSwdoAtCxO0Xg=; b=H8wiRipTpLHB/rLN7OKobv2Euby5H0nYzXM69E6oM9GtxYs0Iq+qSr5OTob0NiT1tW5Fwp5bKzNzq7Q/g9sTnN0jfBpLVs9zkdfcNW71H7yASXlfwbq8hzh3keb9RL/UqWtAN3sd3FeCC16xgSIm4dhqpz7M+//iQgEovkVa14Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378073730907.0256845654623; Wed, 17 Jun 2020 00:14:33 -0700 (PDT) Received: from localhost ([::1]:33378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSHI-00031d-F4 for importer@patchew.org; Wed, 17 Jun 2020 03:14:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSEw-00071y-MW for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31768 helo=us-smtp-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 1jlSEs-0000TC-Mt for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:06 -0400 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-115-O0PWcggPPvOrrIUIWSlTQg-1; Wed, 17 Jun 2020 03:11:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62762C7464; Wed, 17 Jun 2020 07:11:57 +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 BFFDB79318; Wed, 17 Jun 2020 07:11:39 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A95841753D; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DzVjiGHlgwyOc7h8SJ/YIQqZjyI/YoNSwdoAtCxO0Xg=; b=Dsq9c27pQavKa8U4jPqkmrLccYAVDVr5CYEYdXmoOAT9GFELvVewi23DQZVMKMgPWe2eRt ti5B5g77RWbeAXkSFMp23tiyyEVjWKAujORl3IFiJ0RJg4fNqVKQH7fpAtlcu/W1Hi1Hn8 SqFVm0gC647E1Mb3QxfTH1L9QGsaJgI= X-MC-Unique: O0PWcggPPvOrrIUIWSlTQg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 03/10] floppy: make isa_fdc_get_drive_max_chs static Date: Wed, 17 Jun 2020 09:11:31 +0200 Message-Id: <20200617071138.11159-4-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/17 01:42:04 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_H3=-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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) acpi aml generator needs this, but it is in floppy code now so we can make the function static. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: John Snow --- include/hw/block/fdc.h | 2 -- hw/block/fdc.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index c15ff4c62315..5d71cf972268 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,7 +16,5 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); =20 FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); -void isa_fdc_get_drive_max_chs(FloppyDriveType type, - uint8_t *maxc, uint8_t *maxh, uint8_t *maxs= ); =20 #endif diff --git a/hw/block/fdc.c b/hw/block/fdc.c index c92436772292..5a634ab46302 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2744,8 +2744,8 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc= , int i) return isa->state.drives[i].drive; } =20 -void isa_fdc_get_drive_max_chs(FloppyDriveType type, - uint8_t *maxc, uint8_t *maxh, uint8_t *maxs) +static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc, + uint8_t *maxh, uint8_t *maxs) { const FDFormat *fdf; =20 --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378245; cv=none; d=zohomail.com; s=zohoarc; b=YeIq8mp+RCi+GbLKnP3YO2tfJUQ115uFcSt45CFzihfvQpGXgQIrbMKkmLdiEuIgV4wFPZJlpRfPR6T7DngBGyBykv7Ch9+kzORjmNSQcf/uIkAKZqYXAYMslGeYyHdzR4NV9HVov1PARXWokSnPs2eQGu9PgIW5DR+9KXfSlxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7jJRJzMVjc00f03VSOp0Q/Xhw2CEnNo4d7UxYrF29xE=; b=nyA7rlN8YhBTbBZw9cYRm1VLMXTmtuk3aIjscX9nW/eLYFXkX9tlr8jiv6tQEdq/9ARYIqfqCFdnIfyzB5qy3hn4BURsBHIhDKQrDJTdqsM7rUaIXIk0HiMfOISGxQYKmp9qeepCoCFez2UTn1GlDo1mziBT/8+DcRBgDFGHU4M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378245338245.88899451687087; Wed, 17 Jun 2020 00:17:25 -0700 (PDT) Received: from localhost ([::1]:41206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSK4-0006PY-59 for importer@patchew.org; Wed, 17 Jun 2020 03:17:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSEx-00073B-Tu for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:08 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24504 helo=us-smtp-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 1jlSEs-0000TY-Sa for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:07 -0400 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-2-fKVR4T6YO-mpgjV7xYHPGg-1; Wed, 17 Jun 2020 03:11:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 879108C31EE; Wed, 17 Jun 2020 07:11:57 +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 C70A679319; Wed, 17 Jun 2020 07:11:39 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B6F429D8F; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7jJRJzMVjc00f03VSOp0Q/Xhw2CEnNo4d7UxYrF29xE=; b=grnDSAonSktDWyGjVvuf1cLjngW+asMybSV1CACv6ICGBwANO4CvCLtp6r9md8ZcWY9Mg7 GSQkJeLTIwwrXqpQxG9ZSFNjloS+kbL7KLa7ND1QrJYEXvv/oPDqGzRzMWtNyQNdCRnI4f kRJvIiI4lMm0PsC4JhgTu2+kwomqtCE= X-MC-Unique: fKVR4T6YO-mpgjV7xYHPGg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 04/10] floppy: move cmos_get_fd_drive_type() from pc Date: Wed, 17 Jun 2020 09:11:32 +0200 Message-Id: <20200617071138.11159-5-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 23:30:45 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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: John Snow --- include/hw/block/fdc.h | 1 + include/hw/i386/pc.h | 1 - hw/block/fdc.c | 26 +++++++++++++++++++++++++- hw/i386/pc.c | 25 ------------------------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 5d71cf972268..479cebc0a330 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,5 +16,6 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); =20 FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); +int cmos_get_fd_drive_type(FloppyDriveType fd0); =20 #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8d764f965cd3..5e3b19ab78fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -176,7 +176,6 @@ typedef void (*cpu_set_smm_t)(int smm, void *arg); void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs); =20 ISADevice *pc_find_fdc0(void); -int cmos_get_fd_drive_type(FloppyDriveType fd0); =20 /* port92.c */ #define PORT92_A20_LINE "a20" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 5a634ab46302..ffe650b17cd5 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/i386/pc.h" #include "hw/acpi/aml-build.h" #include "hw/irq.h" #include "hw/isa/isa.h" @@ -2809,6 +2808,31 @@ static Aml *build_fdinfo_aml(int idx, FloppyDriveTyp= e type) return dev; } =20 +int cmos_get_fd_drive_type(FloppyDriveType fd0) +{ + int val; + + switch (fd0) { + case FLOPPY_DRIVE_TYPE_144: + /* 1.44 Mb 3"5 drive */ + val =3D 4; + break; + case FLOPPY_DRIVE_TYPE_288: + /* 2.88 Mb 3"5 drive */ + val =3D 5; + break; + case FLOPPY_DRIVE_TYPE_120: + /* 1.2 Mb 5"5 drive */ + val =3D 2; + break; + case FLOPPY_DRIVE_TYPE_NONE: + default: + val =3D 0; + break; + } + return val; +} + static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope) { Aml *dev; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ec39741c87ac..7e0ed987b164 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -386,31 +386,6 @@ static uint64_t ioportF0_read(void *opaque, hwaddr add= r, unsigned size) =20 #define REG_EQUIPMENT_BYTE 0x14 =20 -int cmos_get_fd_drive_type(FloppyDriveType fd0) -{ - int val; - - switch (fd0) { - case FLOPPY_DRIVE_TYPE_144: - /* 1.44 Mb 3"5 drive */ - val =3D 4; - break; - case FLOPPY_DRIVE_TYPE_288: - /* 2.88 Mb 3"5 drive */ - val =3D 5; - break; - case FLOPPY_DRIVE_TYPE_120: - /* 1.2 Mb 5"5 drive */ - val =3D 2; - break; - case FLOPPY_DRIVE_TYPE_NONE: - default: - val =3D 0; - break; - } - return val; -} - static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs, int16_t cylinders, int8_t heads, int8_t sectors) { --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378406; cv=none; d=zohomail.com; s=zohoarc; b=dW6Jv87s+qbGVQQhV4Pul9pg1NaR1cJ9RuqO9FGfbRB7BkmnzM9v1tkiuNHGl3KmXlc2fbo9O2Px4hYkLwSi6M7TLYFbQx1k7xmRcIe6W44V8z/1/pYi6L5ki8J7CeQrU6vQLx2vrfTSowXgdsNGCniE27XF5O+wNIriFL8ZdFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378406; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aOrkg4Bq1AyQnWT/LKJuy+2V/sf1OOGgK3vWrtb+27k=; b=NhJtCtA0aLhTuFM/HKa4TH8jETFoidxC0FDW1mJQ5gQT3JKYKlZFbIXKQcqIu5iGrbTOd16bbSwTWKMDc1RMzZ6SaoAi85YPoyTv16hMtfi0mj1r9L7AUjN4txKPmzQSVAH4QkQ2cJKa6WWtT6PkQiHRHXJHhKjt6MBb+hOturE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378406629357.7173778739241; Wed, 17 Jun 2020 00:20:06 -0700 (PDT) Received: from localhost ([::1]:49258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSMf-0001mK-Cm for importer@patchew.org; Wed, 17 Jun 2020 03:20:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSFE-0007gB-Q4 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:24 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35068 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 1jlSFA-0000aa-Vx for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:24 -0400 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-216-RVwpJliRP-KfjFsxCwBAmg-1; Wed, 17 Jun 2020 03:12:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05AE15AEE9; 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 E9FDB5D9D3; Wed, 17 Jun 2020 07:11:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C191B9D92; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aOrkg4Bq1AyQnWT/LKJuy+2V/sf1OOGgK3vWrtb+27k=; b=LaGB91dKcHJRuPhoVKA7scrk/KJFzg7gnnY6ZeeWeggiwcbcO18F69Q7xPpoeZoB7ytI42 8tdbarkYFagYqVGoLxRcHliMImuoInh1k0F33uRUuJo0XYcJEd/9KTZg7X5f35frxEMSgh yuMY+DkH+uq7pRMJLVTKY4YzsDEosSs= X-MC-Unique: RVwpJliRP-KfjFsxCwBAmg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 05/10] acpi: move aml builder code for i8042 (kbd+mouse) device Date: Wed, 17 Jun 2020 09:11:33 +0200 Message-Id: <20200617071138.11159-6-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; 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 02:02:46 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_H3=-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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) DSDT change: isa device order changes in case MI1 (ipmi) is present. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 39 -------------------------------- hw/input/pckbd.c | 31 +++++++++++++++++++++++++ tests/data/acpi/pc/DSDT.ipmikcs | Bin 5086 -> 5086 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7827 -> 7827 bytes 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 45297d9a90e7..13113e83dfe2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -938,42 +938,6 @@ static void build_hpet_aml(Aml *table) aml_append(table, scope); } =20 -static Aml *build_kbd_device_aml(void) -{ - Aml *dev; - Aml *crs; - - dev =3D aml_device("KBD"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0303"))); - - aml_append(dev, aml_name_decl("_STA", aml_int(0xf))); - - crs =3D aml_resource_template(); - aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01)); - aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01)); - aml_append(crs, aml_irq_no_flags(1)); - aml_append(dev, aml_name_decl("_CRS", crs)); - - return dev; -} - -static Aml *build_mouse_device_aml(void) -{ - Aml *dev; - Aml *crs; - - dev =3D aml_device("MOU"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0F13"))); - - aml_append(dev, aml_name_decl("_STA", aml_int(0xf))); - - crs =3D aml_resource_template(); - aml_append(crs, aml_irq_no_flags(12)); - aml_append(dev, aml_name_decl("_CRS", crs)); - - return dev; -} - static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) { Aml *dev; @@ -1019,9 +983,6 @@ static void build_isa_devices_aml(Aml *table) Aml *scope =3D aml_scope("_SB.PCI0.ISA"); Object *obj =3D object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); =20 - aml_append(scope, build_kbd_device_aml()); - aml_append(scope, build_mouse_device_aml()); - if (ambiguous) { error_report("Multiple ISA busses, unable to define IPMI ACPI data= "); } else if (!obj) { diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 60a41303203a..29d633ca9478 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" +#include "hw/acpi/aml-build.h" #include "hw/input/ps2.h" #include "hw/irq.h" #include "hw/input/i8042.h" @@ -561,12 +562,42 @@ static void i8042_realizefn(DeviceState *dev, Error *= *errp) qemu_register_reset(kbd_reset, s); } =20 +static void i8042_build_aml(ISADevice *isadev, Aml *scope) +{ + Aml *kbd; + Aml *mou; + Aml *crs; + + crs =3D aml_resource_template(); + aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01)); + aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01)); + aml_append(crs, aml_irq_no_flags(1)); + + kbd =3D aml_device("KBD"); + aml_append(kbd, aml_name_decl("_HID", aml_eisaid("PNP0303"))); + aml_append(kbd, aml_name_decl("_STA", aml_int(0xf))); + aml_append(kbd, aml_name_decl("_CRS", crs)); + + crs =3D aml_resource_template(); + aml_append(crs, aml_irq_no_flags(12)); + + mou =3D aml_device("MOU"); + aml_append(mou, aml_name_decl("_HID", aml_eisaid("PNP0F13"))); + aml_append(mou, aml_name_decl("_STA", aml_int(0xf))); + aml_append(mou, aml_name_decl("_CRS", crs)); + + aml_append(scope, kbd); + aml_append(scope, mou); +} + static void i8042_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); =20 dc->realize =3D i8042_realizefn; dc->vmsd =3D &vmstate_kbd_isa; + isa->build_aml =3D i8042_build_aml; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } =20 diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmi= kcs index c285651131dc2ab8b0f32de750d7ac02a8b09936..1c19e2f354d022279d7e1343fa7= 212396d8c25a0 100644 GIT binary patch delta 20 ccmcboeouYFO2)~oOdgY0GRAE7Wtu1m09c?0ga7~l delta 20 ccmcboeouYFO2)|_8Dl1|Wc1kV%QR6C0AuwCZvX%Q diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipm= ibt index 38723daef80421ea528b2ad2d411e7357df43956..0173c3668a6cdef80127de7880a= 19cb5c5ea7dc0 100644 GIT binary patch delta 20 ccmbPiJK1)F4%6fgChy5QOfj1;GaZly08TOoX8-^I delta 20 ccmbPiJK1)F4%6gvrkKe(Ox~L>GaZly08Od~RsaA1 --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378003; cv=none; d=zohomail.com; s=zohoarc; b=h7AHVAgec5PIcE+8odVGpnSU+HuW7XsRWq0wir1VBOqVOH9Of2SsyL/IGK/aU2P6v+mvnFu5+zFjeKjxj5KaY17IUHAYXNwbpUJPJA/y87kagW//FLH7c7k745Hl4yfuqfRbxcQLZnKQRDCYPjOY9Q9xOI/qigvvQXg8Qe+OqDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378003; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iUH9yDv0lJaZjK5/fay/OlT7sYzbEibNJ0T2YusntvE=; b=c7f2uU+UQvrJcAh+L1gxSjrgf4YnA6S8LH4l1utnaeKe3C5x1ymdWkaAoYeyKPWZfcLQ21BHwXRJfbF/0NmShpDV3zE96XPOYDlPE29KJFCuAE5VwzPC+zn4o7ZaD6fbqiikmcAiTl3X/9FeRsXcQfpPzfxL4nYbwWFvDrhMUyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159237800334720.403099646674832; Wed, 17 Jun 2020 00:13:23 -0700 (PDT) Received: from localhost ([::1]:56178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSGA-0000Ts-5a for importer@patchew.org; Wed, 17 Jun 2020 03:13:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSF2-0007Cw-Rr for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:12 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:48982 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 1jlSF1-0000Vd-2L for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:12 -0400 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-47-AWr1bz5bMy-VHZtkBbpIPw-1; Wed, 17 Jun 2020 03:12:08 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B2941158AAE; Wed, 17 Jun 2020 07:12:05 +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 ECF1790324; Wed, 17 Jun 2020 07:11:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CDD569D94; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iUH9yDv0lJaZjK5/fay/OlT7sYzbEibNJ0T2YusntvE=; b=Mw2g+zv5snIxz94YPojfGCEy/SN0pjsZmQ9RY0nCq++l5ZwBYyl03c9GsWIEtPGdlGSNHU yLBnNGX/iDv/8hl9hFmNbTw94J4sWRXqpgul2MW07XTSjwCd21oOVa9a390U33aMkWHRfH D3E/pchjIOkiN5ZmMkbEbO43CJzzKbY= X-MC-Unique: AWr1bz5bMy-VHZtkBbpIPw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 06/10] acpi: factor out fw_cfg_add_acpi_dsdt() Date: Wed, 17 Jun 2020 09:11:34 +0200 Message-Id: <20200617071138.11159-7-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add helper function to add fw_cfg device, also move code to hw/i386/fw_cfg.c. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov --- hw/i386/fw_cfg.h | 1 + hw/i386/acpi-build.c | 24 +----------------------- hw/i386/fw_cfg.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/hw/i386/fw_cfg.h b/hw/i386/fw_cfg.h index 9e742787792b..275f15c1c5e8 100644 --- a/hw/i386/fw_cfg.h +++ b/hw/i386/fw_cfg.h @@ -25,5 +25,6 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, uint16_t apic_id_limit); void fw_cfg_build_smbios(MachineState *ms, FWCfgState *fw_cfg); void fw_cfg_build_feature_control(MachineState *ms, FWCfgState *fw_cfg); +void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg); =20 #endif diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 13113e83dfe2..19e9c298dc8f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1802,30 +1802,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, =20 /* create fw_cfg node, unconditionally */ { - /* when using port i/o, the 8-bit data register *always* overlaps - * with half of the 16-bit control register. Hence, the total size - * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the - * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 */ - uint8_t io_size =3D object_property_get_bool(OBJECT(x86ms->fw_cfg), - "dma_enabled", NULL) ? - ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t= ) : - FW_CFG_CTL_SIZE; - scope =3D aml_scope("\\_SB.PCI0"); - dev =3D aml_device("FWCF"); - - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); - - /* device present, functioning, decoding, not shown in UI */ - aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); - - crs =3D aml_resource_template(); - aml_append(crs, - aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, io_= size) - ); - aml_append(dev, aml_name_decl("_CRS", crs)); - - aml_append(scope, dev); + fw_cfg_add_acpi_dsdt(scope, x86ms->fw_cfg); aml_append(dsdt, scope); } =20 diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index da60ada59462..c55abfb01abb 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "sysemu/numa.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" #include "hw/firmware/smbios.h" #include "hw/i386/fw_cfg.h" #include "hw/timer/hpet.h" @@ -179,3 +180,30 @@ void fw_cfg_build_feature_control(MachineState *ms, FW= CfgState *fw_cfg) *val =3D cpu_to_le64(feature_control_bits | FEATURE_CONTROL_LOCKED); fw_cfg_add_file(fw_cfg, "etc/msr_feature_control", val, sizeof(*val)); } + +void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg) +{ + /* + * when using port i/o, the 8-bit data register *always* overlaps + * with half of the 16-bit control register. Hence, the total size + * of the i/o region used is FW_CFG_CTL_SIZE; when using DMA, the + * DMA control register is located at FW_CFG_DMA_IO_BASE + 4 + */ + Object *obj =3D OBJECT(fw_cfg); + uint8_t io_size =3D object_property_get_bool(obj, "dma_enabled", NULL)= ? + ROUND_UP(FW_CFG_CTL_SIZE, 4) + sizeof(dma_addr_t) : + FW_CFG_CTL_SIZE; + Aml *dev =3D aml_device("FWCF"); + Aml *crs =3D aml_resource_template(); + + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); + + /* device present, functioning, decoding, not shown in UI */ + aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); + + aml_append(crs, + aml_io(AML_DECODE16, FW_CFG_IO_BASE, FW_CFG_IO_BASE, 0x01, io_size= )); + + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); +} --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378218; cv=none; d=zohomail.com; s=zohoarc; b=Mo5L1BDY05a5qUUU7k1KzkmGJVSVLUXzC6v+9iANEmrG5J6dklgwD32Lz6S4IUMoKxOdmiOEzITCYhjnZ4Uf564ZREpiUEOV5n4qjdVc3P08Kgqgf2Tuxcq4cUPG5h5320PJ+WusZBBfYNPOAx4JZqwX01dkwotlpC8dNMqCJFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378218; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wYr0bo4lCUYt/KWCu731zOLOU8tcfPXPriQHHjSMKRY=; b=RFmrtLOQzb+gECBxmF3wwEsf7MF+av0u2bqU31k6INjMjOiSxR5NWWIR3X1xzZk+tvm7AYMkNTtp/YZKQe/xr8vxZOo/JqdnSyAQvKcP264e1IBKRr6PCc324VwLtEmds7EN5bvIrvqM8O7iUcso0QbtksuBVc0SyCziRTnUpE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378218450740.5182483640731; Wed, 17 Jun 2020 00:16:58 -0700 (PDT) Received: from localhost ([::1]:40534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSJd-00068N-1Q for importer@patchew.org; Wed, 17 Jun 2020 03:16:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSFB-0007YR-HV for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:21 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60664 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 1jlSF9-0000aG-Tq for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:21 -0400 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-43-Qq0H_LRNOFO-6TV69-pSeg-1; Wed, 17 Jun 2020 03:12:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1FE3102C7EE; Wed, 17 Jun 2020 07:12:10 +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 074171002394; Wed, 17 Jun 2020 07:12:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D6CDB9D95; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wYr0bo4lCUYt/KWCu731zOLOU8tcfPXPriQHHjSMKRY=; b=DA6j90Uz/QlRL7EMXyGeD2ErQFTwFPPf3DvJ+al/pDGUqL68RcVSPpm0djxoOc4gPxHfpP NBTB+Fjd5CoC3ZtEDepBpasonBVrty8W6/b/UzyKgX3mK9yT3CDTpDFGNBLowR8t3mlsjK BwOY1ZSHzYIaXnct2iYIKcG08UQtukc= X-MC-Unique: Qq0H_LRNOFO-6TV69-pSeg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 07/10] acpi: simplify build_isa_devices_aml() Date: Wed, 17 Jun 2020 09:11:35 +0200 Message-Id: <20200617071138.11159-8-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) x86 machines can have a single ISA bus only. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/acpi-build.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 19e9c298dc8f..d27cecc877c4 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -979,18 +979,14 @@ static void build_isa_devices_aml(Aml *table) { VMBusBridge *vmbus_bridge =3D vmbus_bridge_find(); bool ambiguous; - - Aml *scope =3D aml_scope("_SB.PCI0.ISA"); Object *obj =3D object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); + Aml *scope; =20 - if (ambiguous) { - error_report("Multiple ISA busses, unable to define IPMI ACPI data= "); - } else if (!obj) { - error_report("No ISA bus, unable to define IPMI ACPI data"); - } else { - build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); - isa_build_aml(ISA_BUS(obj), scope); - } + assert(obj && !ambiguous); + + scope =3D aml_scope("_SB.PCI0.ISA"); + build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); + isa_build_aml(ISA_BUS(obj), scope); =20 if (vmbus_bridge) { aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378145; cv=none; d=zohomail.com; s=zohoarc; b=Q/0isaEYtjJoMaRN+mq/tVCY1ja7cWxBxa+X1xrPCM1xa++HaE7KsVPDG9W/RTq5bS48wfwCwTyUjdFN2yE8CiMusqgRuPC3EPVt+46FZvM6udSluqFYuJBOlBS40GclfcjoAwA9D9R8zt6Osyu5n0vV/zxZ9yRVDsQPVUAwjXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378145; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HFZs1P5/5zLsX+lt9an69Y6trhXT05gIadCW5CyshhA=; b=Yo9tUeV7U8eVHwgxQ9/FmegwGMf3FqntGazkPpKgPsgnY59jMy8ra20th+O1kbNkq+cQpTIE2ikp40Zifxp4ckogMlRsLRIXvf1S0t7pjENy8FqaF6k9X2jr1JU86CN97IxzIvK3uEtdbMfM8G7Dz0HV6qjVaIFaozymQKgdmlg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378145084290.7756899129139; Wed, 17 Jun 2020 00:15:45 -0700 (PDT) Received: from localhost ([::1]:36852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSIR-0004Z4-KE for importer@patchew.org; Wed, 17 Jun 2020 03:15:43 -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 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 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) 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= X-MC-Unique: b6EF9MBmOYKiduXbmnocTA-1 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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/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); =20 - aml_append(dev, aml_operation_region("LPCE", AML_PCI_CONFIG, - aml_int(0x82), 0x02)); - /* enable bits */ - field =3D 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; =20 scope =3D aml_scope("_SB.PCI0"); dev =3D 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 =3D aml_field("^PX13.P13C", AML_ANY_ACC, AML_NOLOCK, AML_PRESERV= E); - /* 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); =20 aml_append(scope, dev); aml_append(table, scope); diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index 384a82dbb3cb0e9f47db6f4d08945631c2b72b56..d9074ac8df7ff21f214a5f4a135= e3d1ac2c86227 100644 GIT binary patch delta 62 zcmbQH{zi?C diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acp= ihmat index 47ddfdb027b06dc2daa46be711c3f4640ce68320..8d76c7c01d49087cc5efb9843a2= e1d0865145017 100644 GIT binary patch delta 63 zcmX?PIKz<3CD8^! R69Z=3D^t^_WY&C?j2B>^`q5Gnuw delta 105 zcmZ2)defB4CD^=3DdmevAwj49w1sAO^Fu6Oh`R!{{st E0E&YcDgXcg diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index 54f481faf1e336c0bbf5e774cd67220fe06e951b..b25bbf7dc5bbabea277d3402b90= d376beb038043 100644 GIT binary patch delta 63 zcmaE=3DwOfnJCDDN4%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>=3Da%4}|~# delta 105 zcmaE8+-<_;66_MfEycjV_-rGW4P$@8%8xXz4&0K_yA{5gXktH&tS)Rj(A6xAReGRLv%xc RiGec{R{|Hy=3D4p%`LI4lt4_^QP delta 105 zcmdm@eovjtCD R69Z=3D^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..dada9bf69fc23ea9c0931029445= 257657fde90ce 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.mmi= o64 index 5916c0e9ce0a9607c6230f9dfebe2c1be70b2495..b6c6946ed9812685dd71b517849= 00480963b54bd 100644 GIT binary patch delta 44 zcmdnwI>D98CDy2+KxCDUoE6~! diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.nu= mamem index cf3fde3449bc8e9bbe683b936cf9866590b0ef82..9b5c962434471d63d65f027c84d= fc3e6ac20e10b 100644 GIT binary patch delta 44 zcmX?Sv&M$YCD|* AGynhq delta 79 zcmZ2ubIyj#CDq=3D^1{E^^ diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis index 56b6fb0c3298517d080e38fea05a748b9f1dba54..7cb8d8b154f3de295669a741c9e= c3ec8c67e2b2f 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 --=20 2.18.4 From nobody Sun Feb 8 19:21:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592378330; cv=none; d=zohomail.com; s=zohoarc; b=J4fuxVmGae+236ZdBXKRsLSBTMfi9Izij2urqHHIagdrWIxBC55RxyN6EtztDHoQ2VHb/vWz693fejOVCfjw3/bxmYzClcz/Xk76KuVBk0Hke42riwPKoPl/yGmTA4MAyQovOMeLI55mgYDFLtGVflGwToTn8cKvKpr4zJGgJwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592378330; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=9Yghzj5BDEoyZVmuyyKns/SnsdxS39VB1n2rxPWWNy8=; b=Eb7Ge5TPEQiU6O8mC4TeFiWO6OXnWwxQ5whb0/fIYtFU3FUtFEOHwNpjnW3wewmJVnMVxj99cdagJSxwni5Smi3TReb12l31an9oMMeLEHDSbH7g3cTerXVRMQFnzjLNUB5WXaZ1EzwQneySVRuRiCXgqCP9F/p0/MdolNflxAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378330810176.76787455627232; Wed, 17 Jun 2020 00:18:50 -0700 (PDT) Received: from localhost ([::1]:45170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSLR-0008WP-CE for importer@patchew.org; Wed, 17 Jun 2020 03:18:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSFD-0007ce-9f for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:23 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:23183 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 1jlSFA-0000aK-1W for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:22 -0400 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-281-MN-rKeurNtC3EnQluUyz9g-1; Wed, 17 Jun 2020 03:12:18 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D91C58AB3AB; Wed, 17 Jun 2020 07:12:10 +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 4BC221002393; Wed, 17 Jun 2020 07:11:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E9CF99D99; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377939; 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=9Yghzj5BDEoyZVmuyyKns/SnsdxS39VB1n2rxPWWNy8=; b=RNubsqucHg6AUW68eZ0va78VRB5KAtNyjCretJJNLCM3D9ELningwz0SjhhhwhT0MmzKPc JhN/fne9Fh3LpqfR5PZhIBJ9L3VPVReFX7Nd3noFxKPL3+3rOgpEBw1vADV5zoDCuv/LcB BudYV6iSr0Ek7nNzJJe4aoH0p9R7Fds= X-MC-Unique: MN-rKeurNtC3EnQluUyz9g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 09/10] acpi: drop build_piix4_pm() Date: Wed, 17 Jun 2020 09:11:37 +0200 Message-Id: <20200617071138.11159-10-kraxel@redhat.com> In-Reply-To: <20200617071138.11159-1-kraxel@redhat.com> References: <20200617071138.11159-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The _SB.PCI0.PX13.P13C opregion (holds isa device enable bits) is not used any more, remove it from DSDT. piix4 DSDT changes: Scope (_SB.PCI0) { - Device (PX13) - { - Name (_ADR, 0x00010003) // _ADR: Address - OperationRegion (P13C, PCI_Config, Zero, 0xFF) - } - } - - Scope (_SB.PCI0) - { Device (ISA) { Name (_ADR, 0x00010000) // _ADR: Address OperationRegion (P40C, PCI_Config, 0x60, 0x04) } } Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedow --- hw/i386/acpi-build.c | 16 ---------------- tests/data/acpi/pc/DSDT | Bin 4972 -> 4934 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6296 -> 6258 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6831 -> 6793 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5435 -> 5397 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6625 -> 6587 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5044 -> 5006 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6331 -> 6293 bytes tests/data/acpi/pc/DSDT.numamem | Bin 4978 -> 4940 bytes 9 files changed, 16 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ffbdbee51aa8..59f1b4d89000 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1364,21 +1364,6 @@ static void build_q35_isa_bridge(Aml *table) aml_append(table, scope); } =20 -static void build_piix4_pm(Aml *table) -{ - Aml *dev; - Aml *scope; - - scope =3D aml_scope("_SB.PCI0"); - dev =3D aml_device("PX13"); - aml_append(dev, aml_name_decl("_ADR", aml_int(0x00010003))); - - aml_append(dev, aml_operation_region("P13C", AML_PCI_CONFIG, - aml_int(0x00), 0xff)); - aml_append(scope, dev); - aml_append(table, scope); -} - static void build_piix4_isa_bridge(Aml *table) { Aml *dev; @@ -1530,7 +1515,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, sb_scope); =20 build_hpet_aml(dsdt); - build_piix4_pm(dsdt); build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); build_piix4_pci_hotplug(dsdt); diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index d9074ac8df7ff21f214a5f4a135e3d1ac2c86227..6d0aaf729ac7d64cf966621adf2= 76534de5cc555 100644 GIT binary patch delta 24 fcmaE(c1(@SCDZZv3Dbv7~^I)#vpM3TJi>R delta 62 zcmexlFvF0`CDhPk delta 62 zcmbQLwOfnJCDkpp* diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmi= kcs index 5a039ac93c42d4b123e21d51c5799ddb42bf12a0..b8f08f266b5735fe6967d4e105e= e6b3662dad7e6 100644 GIT binary patch delta 24 fcmdm@-lxvx66_MvC(OXW7`%~7jB&FYW1bKIQlth8 delta 62 zcmeBE-=3Dfat66_MPMVNts(QYG`7^AAHUVN}qe1Nm3L3ER3K!l+&N4%p;5Dzm0BSUmU RfT6K769d=3D(&GL--LIC7(4*CE9 diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp index a5b60b0e9c7d77fdc770687e28502b7dc6246dcd..9a9418f4bde5fb18883c244ea95= 6122e371ff01a 100644 GIT binary patch delta 24 fcmdmOIMtBLCD| diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numa= mem index b82e13cd12017c7197cc236d9cc161e28dcfc8b1..6eec385c2ec00544c6eaa7e19d3= 2b2ccd5a51915 100644 GIT binary patch delta 24 fcmeyQc1DfMCD@oA7~^I)MjaslS{4Qu delta 62 zcmX@3_DPM)CD (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592378342841788.7780856007728; Wed, 17 Jun 2020 00:19:02 -0700 (PDT) Received: from localhost ([::1]:45860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlSLd-0000MT-An for importer@patchew.org; Wed, 17 Jun 2020 03:19:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlSF1-0007AQ-QN for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:11 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40925 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 1jlSEz-0000VF-1O for qemu-devel@nongnu.org; Wed, 17 Jun 2020 03:12:11 -0400 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-162-9h3CSqrQMf-DibXelv4YrA-1; Wed, 17 Jun 2020 03:12:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F89681EE51; Wed, 17 Jun 2020 07:12:03 +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 431595C1D2; Wed, 17 Jun 2020 07:11:59 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F32089D9B; Wed, 17 Jun 2020 09:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592377928; 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=CRP5nFic0KQPwNNP6bY2yX+/8sTfxWXbFvBbOXawvuI=; b=WO0UPXrjeaGiB8zqodzOugksTyCqFTbpmfBpkri3gh8aZbnFMQGBgZQxsWekJUW5MGXK3v A8qAQtOu6BEHwEoxHKSm0/hnRu+BIyFjCpBPQv9xXE2grj03f7Ce5KCQTVaVzC6DXqBc4M A91eBNbCqoSenKSbXRfL/bpSWI01mgs= X-MC-Unique: 9h3CSqrQMf-DibXelv4YrA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v9 10/10] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion. Date: Wed, 17 Jun 2020 09:11:38 +0200 Message-Id: <20200617071138.11159-11-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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; 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 02:02:46 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_H3=-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=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Seems to be unused. 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 - } } } Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov --- hw/i386/acpi-build.c | 11 ----------- tests/data/acpi/q35/DSDT | Bin 7718 -> 7678 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9042 -> 9002 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7735 -> 7695 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8181 -> 8141 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9371 -> 9331 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7793 -> 7753 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9077 -> 9037 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8848 -> 8808 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7724 -> 7684 bytes tests/data/acpi/q35/DSDT.tis | Bin 8323 -> 8283 bytes 11 files changed, 11 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 59f1b4d89000..378515df66c5 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1340,7 +1340,6 @@ static void build_q35_isa_bridge(Aml *table) { Aml *dev; Aml *scope; - Aml *field; =20 scope =3D aml_scope("_SB.PCI0"); dev =3D aml_device("ISA"); @@ -1350,16 +1349,6 @@ static void build_q35_isa_bridge(Aml *table) aml_append(dev, aml_operation_region("PIRQ", AML_PCI_CONFIG, aml_int(0x60), 0x0C)); =20 - aml_append(dev, aml_operation_region("LPCD", AML_PCI_CONFIG, - aml_int(0x80), 0x02)); - field =3D aml_field("LPCD", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE); - aml_append(field, aml_named_field("COMA", 3)); - aml_append(field, aml_reserved_field(1)); - aml_append(field, aml_named_field("COMB", 3)); - aml_append(field, aml_reserved_field(1)); - aml_append(field, aml_named_field("LPTD", 2)); - aml_append(dev, field); - aml_append(scope, dev); aml_append(table, scope); } diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index dada9bf69fc23ea9c0931029445257657fde90ce..e63676d7a63afec714debeb465e= e478ea4714337 100644 GIT binary patch delta 63 zcmZ2x^Us>gCDwD*^z5 Cjv1H$ diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bri= dge index 6be4ccde643b3bba57f827c65490fa3a328ca77e..8b0fb497dbbaeba18e9d0e1503d= e4396f1c230b0 100644 GIT binary patch delta 63 zcmdmP({ID&66_MfFUP>Z=3D(Uk+KBJnNUVN}qe1Nm3L3ERpXRu>DN4%p;5Dx=3D`JVSIt SfM-x36ITKk&*txp4l)1&84ut9 delta 103 zcmeCT*>1z-66_LUF2}&YIBz4@d`3S%7QOgjr}zM8PlMdpr diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.di= mmpxm index eeef0a4c15828b3a621aab88eafb3631ff85a960..29f19b22a38f9d8e7dc9870f0c1= aa3d4470643ff 100644 GIT binary patch delta 63 zcmbR3`PqZZCDQviPgW7Q delta 103 zcmezDG24^NCDYQ33#W Cof)_Q diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipm= ibt index 5d89b41a1878bb0c77abda0807bcc833c7538581..e8dea1ea42af765babcb747af99= 8b0d912abdcbd 100644 GIT binary patch delta 63 zcmexpbJB*(CD=3DSWM>P># delta 103 zcmX?U^U;ROCDz9t(P$&rd`3S%7QOgjr}zM8PlM_SKEcCD`oe|FCDyD8Ufx delta 103 zcmaFiGQpM0CD_s C2pQ`D diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.nu= mamem index 9b5c962434471d63d65f027c84dfc3e6ac20e10b..737325dc3082fdf06283857811f= 6f5174e0ff2a9 100644 GIT binary patch delta 63 zcmZ2u(_+Kr66_MfBFDhM7_yOTKBJnNUVN}qe1Nm3L3ERpXRu>DN4%p;5Dx=3D`JVSIt SfM-x36ITKk&*txprZNEhI1j!6 delta 103 zcmZp%S!2WH66_M9BgeqNxMCyMd`3S%7QOgjr}zM8PlMDN4%p;5Dx=3D`JVSIt SfM-x36ITKk&*txpJ#qjggb>yM delta 103 zcmccZ(Co