From patchwork Thu Jun 29 21:55:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 9818049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B2E36020A for ; Thu, 29 Jun 2017 21:57:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 711E22846F for ; Thu, 29 Jun 2017 21:57:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65A00284EA; Thu, 29 Jun 2017 21:57:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E23A22846F for ; Thu, 29 Jun 2017 21:57:34 +0000 (UTC) Received: from localhost ([::1]:41409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhRO-0005lN-2u for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 17:57:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhQJ-0005kZ-JC for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQhQF-0000QI-N6 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:27 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:34987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQhQF-0000Po-Fg for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:23 -0400 Received: by mail-lf0-x244.google.com with SMTP id n136so8680200lfn.2 for ; Thu, 29 Jun 2017 14:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ifHzksHpcQAtKreJgCTR1IgYJlmkVrkHX9EUC1WvAJU=; b=SJG3zgad91uErbcqgTzoDOeK6GudojkqVNd0AVbxc5bqyXQtzw/2IBL1H7wiNz+g+M sgKOKfSsC/OrR/QLh0+Bg3cqW68i48bU6ox2ImRPHt9X7hrZjc8dTKcA+6KwI1NRtDaq iWrin6qpmnjHCtHdBSX2X7C894Pvo7h10EgNMO6GV0I79EDXFMfMm8jb0nN8ucmTwT9T lTozuajOcYJKVfFxyrQG4pd/eH6RC5ccwdzF6VHLFa+jug9kXfS1P4EpPOLLeL3uKdNI PIshFnXU0sl9AdVUcrRCW2fnDgHFAvtbZo4gJj9EFttLNqkBmL0ueRxQIE0ugQTeiQKt j3DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ifHzksHpcQAtKreJgCTR1IgYJlmkVrkHX9EUC1WvAJU=; b=JX3ec8PLgSezj8qFYAlJpcT9dX/QwluxBxZxRevvKyWc8SP5DHwJMwp3csPvlCi9yL sfgc+b6dVGNyw9eSwU6+ZkoAvLWDjw/MT/jBl2uqSeThaLLG+wyVtHdgkDhXR2egW3iL 8togfnMQqTSs6GaMVvF3B0yH5Eyqu/x5+m393ScXGVw72dRHPc1V2t1+MphaYnBewM4x +zRjBJDzPa0DGVPoUOW1xXNwe5sP919WArbZqlPc2IBn9HVEaYh2CqiJMlZdNWwfLlZd zYM7GFdRUjeYOLHnNmSaJ/xK/91njGRCuRGSK3AmBvXIgpdpkFGS0m3igWQ9RcFbsvK3 ILpQ== X-Gm-Message-State: AKS2vOyGphSYkPQiZQZ20YAAIy8agjjpyC90L0jqb2GXcExHGEyUx4a2 /YUjdBEW/MUVN+VPwd0= X-Received: by 10.46.82.208 with SMTP id n77mr5936464lje.93.1498773381816; Thu, 29 Jun 2017 14:56:21 -0700 (PDT) Received: from localhost.localdomain (broadband-5-228-183-39.moscow.rt.ru. [5.228.183.39]) by smtp.gmail.com with ESMTPSA id l69sm1532906lfl.10.2017.06.29.14.56.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 14:56:21 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Fri, 30 Jun 2017 00:55:58 +0300 Message-Id: <1498773362-18675-3-git-send-email-zuban32s@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> References: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PATCH RFC 2/6] hw/acpi: simplify dsdt building code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Aleksandr Bezzubikov , pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Aleksandr Bezzubikov --- hw/i386/acpi-build.c | 59 +++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6fce967..b0dcd34 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1886,7 +1886,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine); uint32_t nr_mem = machine->ram_slots; int root_bus_limit = 0xFF; - PCIBus *bus = NULL; + PCIBus *root_bus = NULL; int i; dsdt = init_aml_allocator(); @@ -1927,6 +1927,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, build_q35_pci0_int(dsdt); } + root_bus = PC_MACHINE(machine)->bus; + assert(root_bus); + if (pcmc->legacy_cpu_hotplug) { build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); } else { @@ -1961,8 +1964,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, scope); crs_range_set_init(&crs_range_set); - bus = PC_MACHINE(machine)->bus; - if (bus) { + { + PCIBus *bus = root_bus; QLIST_FOREACH(bus, &bus->child, sibling) { uint8_t bus_num = pci_bus_num(bus); uint8_t numa_node = pci_bus_numa_node(bus); @@ -2206,38 +2209,28 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, sb_scope = aml_scope("\\_SB"); { - Object *pci_host; - PCIBus *bus = NULL; - - pci_host = acpi_get_i386_pci_host(); - if (pci_host) { - bus = PCI_HOST_BRIDGE(pci_host)->bus; + Aml *scope = aml_scope("PCI0"); + /* Scan all PCI buses. Generate tables to support hotplug. */ + build_append_pci_bus_devices(scope, root_bus, pm->pcihp_bridge_en); + + if (misc->tpm_version != TPM_VERSION_UNSPEC) { + dev = aml_device("ISA.TPM"); + aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31"))); + aml_append(dev, aml_name_decl("_STA", aml_int(0xF))); + crs = aml_resource_template(); + aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, + TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); + /* + FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs, + Rewrite to take IRQ from TPM device model and + fix default IRQ value there to use some unused IRQ + */ + /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */ + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); } - if (bus) { - Aml *scope = aml_scope("PCI0"); - /* Scan all PCI buses. Generate tables to support hotplug. */ - build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); - - if (misc->tpm_version != TPM_VERSION_UNSPEC) { - dev = aml_device("ISA.TPM"); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31"))); - aml_append(dev, aml_name_decl("_STA", aml_int(0xF))); - crs = aml_resource_template(); - aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, - TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); - /* - FIXME: TPM_TIS_IRQ=5 conflicts with PNP0C0F irqs, - Rewrite to take IRQ from TPM device model and - fix default IRQ value there to use some unused IRQ - */ - /* aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); */ - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(scope, dev); - } - - aml_append(sb_scope, scope); - } + aml_append(sb_scope, scope); } aml_append(dsdt, sb_scope);