From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDECCC04AAC for ; Tue, 21 May 2019 03:39:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94A1621479 for ; Tue, 21 May 2019 03:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94A1621479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:45878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSvcM-00016x-Se for qemu-devel@archiver.kernel.org; Mon, 20 May 2019 23:39:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSvb5-0000SE-La for qemu-devel@nongnu.org; Mon, 20 May 2019 23:37:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSvb4-0006Bc-4b for qemu-devel@nongnu.org; Mon, 20 May 2019 23:37:51 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:45417) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSvb3-0006BT-Va for qemu-devel@nongnu.org; Mon, 20 May 2019 23:37:50 -0400 Received: by mail-qt1-f194.google.com with SMTP id t1so18853209qtc.12 for ; Mon, 20 May 2019 20:37:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9jfEO/UaIB4SsSEBQj3dsokEf4/BPnL84OiUVqvhclg=; b=nGT9Dg4/O2psMNfOcdb4Mrj5pVw4iMgD2UOrb/atJGyxSCXfDBe+eGE4FtqhXUrqQK 57nbkz47TPlLTa5+1Sst9RrXjZZiSu3nIC4UEhTkZkA8E6gB+FaR3iA+KkxaGzQes89r baMmVlgzjoKtMeZ9oYDdlbuuMIrfXMPI1kOuK/iVB5YEhofMdhvZean/6EuWYhlXE+kG 97vNaEsShvtrS+Gh495ZuorOlx6H80gH/0LKfhGUU2wP3xln6pPw7ehm4wLWWFkC3Ui8 eoUsoLd1LtmHTrfSaqHvna7HeUnoAkxcG6JceSYfZ7LCYYHM7MxjzuJJbq0XCCYhFWZl 0Vrw== X-Gm-Message-State: APjAAAW4vObe8mIPTeejek23Rcyq7MvjtYiqPFFS5cGk4q+xXyzWikxs tkOBmXoCIX87T6nX0XxPBhgjhQ== X-Google-Smtp-Source: APXvYqyAyTVv0eT+ObesCHnxHzFMbsmTqLXzSYuVLq2RtDM8eTO73czS2cteXFGdQEZa+qWZTLkqPw== X-Received: by 2002:aed:224d:: with SMTP id o13mr64788934qtc.56.1558409869537; Mon, 20 May 2019 20:37:49 -0700 (PDT) Received: from redhat.com (pool-173-76-105-71.bstnma.fios.verizon.net. [173.76.105.71]) by smtp.gmail.com with ESMTPSA id u5sm10748739qtj.95.2019.05.20.20.37.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 20 May 2019 20:37:48 -0700 (PDT) Date: Mon, 20 May 2019 23:37:46 -0400 From: "Michael S. Tsirkin" To: Wei Yang Message-ID: <20190520233730-mutt-send-email-mst@kernel.org> References: <20190521033249.1960-1-richardw.yang@linux.intel.com> <20190521033249.1960-2-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190521033249.1960-2-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.194 Subject: Re: [Qemu-devel] [PATCH v5 1/2] hw/acpi: Consolidate build_mcfg to pci.c 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: yang.zhong@intel.com, peter.maydell@linaro.org, thuth@redhat.com, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, imammedo@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, May 21, 2019 at 11:32:48AM +0800, Wei Yang wrote: > Now we have two identical build_mcfg functions. > > Consolidate them in acpi/pci.c. > > Signed-off-by: Wei Yang > > --- > v5: > * ACPI_PCI depends on both ACPI and PCI > * rebase on latest master, adjust arm Kconfig > v3: > * adjust changelog based on Igor's suggestion > --- same as 2/2 - do not use two --- separators pls. > default-configs/i386-softmmu.mak | 1 + > hw/acpi/Kconfig | 4 +++ > hw/acpi/Makefile.objs | 1 + > hw/acpi/pci.c | 46 ++++++++++++++++++++++++++++++++ > hw/arm/Kconfig | 1 + > hw/arm/virt-acpi-build.c | 17 ------------ > hw/i386/acpi-build.c | 18 +------------ > include/hw/acpi/pci.h | 1 + > 8 files changed, 55 insertions(+), 34 deletions(-) > create mode 100644 hw/acpi/pci.c > > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index ba3fb3ff50..cd5ea391e8 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -25,3 +25,4 @@ > CONFIG_ISAPC=y > CONFIG_I440FX=y > CONFIG_Q35=y > +CONFIG_ACPI_PCI=y > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index eca3beed75..7c59cf900b 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -23,6 +23,10 @@ config ACPI_NVDIMM > bool > depends on ACPI > > +config ACPI_PCI > + bool > + depends on ACPI && PCI > + > config ACPI_VMGENID > bool > default y > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 2d46e3789a..661a9b8c2f 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -11,6 +11,7 @@ common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > common-obj-y += acpi_interface.o > common-obj-y += bios-linker-loader.o > common-obj-y += aml-build.o > +common-obj-$(CONFIG_ACPI_PCI) += pci.o > common-obj-$(CONFIG_TPM) += tpm.o > > common-obj-$(CONFIG_IPMI) += ipmi.o > diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c > new file mode 100644 > index 0000000000..fa0fa30bb9 > --- /dev/null > +++ b/hw/acpi/pci.c > @@ -0,0 +1,46 @@ > +/* > + * Support for generating PCI related ACPI tables and passing them to Guests > + * > + * Copyright (C) 2006 Fabrice Bellard > + * Copyright (C) 2008-2010 Kevin O'Connor > + * Copyright (C) 2013-2019 Red Hat Inc > + * Copyright (C) 2019 Intel Corporation > + * > + * Author: Wei Yang > + * Author: Michael S. Tsirkin > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see . > + */ > + > +#include "qemu/osdep.h" > +#include "hw/acpi/aml-build.h" > +#include "hw/acpi/pci.h" > +#include "hw/pci/pcie_host.h" > + > +void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) > +{ > + AcpiTableMcfg *mcfg; > + int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); > + > + mcfg = acpi_data_push(table_data, len); > + mcfg->allocation[0].address = cpu_to_le64(info->base); > + > + /* Only a single allocation so no need to play with segments */ > + mcfg->allocation[0].pci_segment = cpu_to_le16(0); > + mcfg->allocation[0].start_bus_number = 0; > + mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1); > + > + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); > +} > + > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index af8cffde9c..9aced9d54d 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -19,6 +19,7 @@ config ARM_VIRT > select PLATFORM_BUS > select SMBIOS > select VIRTIO_MMIO > + select ACPI_PCI > > config CHEETAH > bool > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index e7c96d658e..4a64f9985c 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -546,23 +546,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > "SRAT", table_data->len - srat_start, 3, NULL, NULL); > } > > -static void > -build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) > -{ > - AcpiTableMcfg *mcfg; > - int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); > - > - mcfg = acpi_data_push(table_data, len); > - mcfg->allocation[0].address = cpu_to_le64(info->base); > - > - /* Only a single allocation so no need to play with segments */ > - mcfg->allocation[0].pci_segment = cpu_to_le16(0); > - mcfg->allocation[0].start_bus_number = 0; > - mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1); > - > - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); > -} > - > /* GTDT */ > static void > build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 0d78d73894..85dc1640bc 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2405,22 +2405,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) > table_data->len - srat_start, 1, NULL, NULL); > } > > -static void > -build_mcfg_q35(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) > -{ > - AcpiTableMcfg *mcfg; > - int len = sizeof(*mcfg) + 1 * sizeof(mcfg->allocation[0]); > - > - mcfg = acpi_data_push(table_data, len); > - mcfg->allocation[0].address = cpu_to_le64(info->base); > - /* Only a single allocation so no need to play with segments */ > - mcfg->allocation[0].pci_segment = cpu_to_le16(0); > - mcfg->allocation[0].start_bus_number = 0; > - mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1); > - > - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); > -} > - > /* > * VT-d spec 8.1 DMA Remapping Reporting Structure > * (version Oct. 2014 or later) > @@ -2690,7 +2674,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > } > if (acpi_get_mcfg(&mcfg)) { > acpi_add_table(table_offsets, tables_blob); > - build_mcfg_q35(tables_blob, tables->linker, &mcfg); > + build_mcfg(tables_blob, tables->linker, &mcfg); > } > if (x86_iommu_get_default()) { > IommuType IOMMUType = x86_iommu_get_type(); > diff --git a/include/hw/acpi/pci.h b/include/hw/acpi/pci.h > index 124af7d32a..8bbd32cf45 100644 > --- a/include/hw/acpi/pci.h > +++ b/include/hw/acpi/pci.h > @@ -30,4 +30,5 @@ typedef struct AcpiMcfgInfo { > uint32_t size; > } AcpiMcfgInfo; > > +void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info); > #endif > -- > 2.19.1