From nobody Mon Feb 9 16:53:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413111266122.45315722072814; Fri, 25 Jan 2019 02:45:11 -0800 (PST) Received: from localhost ([127.0.0.1]:41750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmywg-0001jq-T5 for importer@patchew.org; Fri, 25 Jan 2019 05:42:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP2-0007rB-K4 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOt-00021T-2V for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:53 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOs-00020b-PC for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:50 -0500 Received: by mail-wm1-x341.google.com with SMTP id d15so6163696wmb.3 for ; Fri, 25 Jan 2019 02:07:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=4YwvvJzgwJ6cEYMwbmdT17ztBEesueuxLWzPB5SSmJ8=; b=nPzf51hcPdPtVI5dirpgoG6zMh0vCLuBM2wxK+fb7mhxGhhikLsLH+vI4/Re+NpgCB 6L6wKtiR84plZ0WLTfqYR+p7lotu612IuAQOEsvSofwskMzUVTwYdL9C/IRdv3W75M5v o59qHdg1HN59zZxx0Z3Q1d5lP339khUiDQ7oS90n89O4sXadsiesCa/2pya3wi5qfjfn 8vZiIJZndQYb/QFN3vY7sLtVzO30bbPPb5q6jgo2P3yK3dVDt2vKaoMuClZY3eQV+ta8 erxcsJrorogdYMQw0e+F4IAb+7YnE55X3HPoj86iBW1MPdZyT+sck8+OHpwbxGJSX3mI uuJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=4YwvvJzgwJ6cEYMwbmdT17ztBEesueuxLWzPB5SSmJ8=; b=ucpy3nRIsp3+F3pjp1vwKyBst1TB6vjEDsoO7/yEsV2StpYxkKHj07HTzPAnSDwHct yrzUnTXzj/Az8heJ0DLNX6gUXfp2Gq9StoxpWnDeRn87aLyhuJaSbMRibY7u1/tHgsRg 40/cV6rtCuxNB/DWO//LYaKC6pR5k1wraYNFIOc/Aj4S7MUdwwksHTdPGvwmF7o+Gjt0 VFDc8GWXqR23u+29JP+KHzHT8jtGapmdOmfMqdxo8ANVGLzugqUIS1YiPQlc16S++AgR xe+zcNuEiwIDEIc4ZIkKlev0wxWoaf4Vhb10ml4xRmM7AL/divmyETIhLAcrM4l8DrHF mCHw== X-Gm-Message-State: AJcUukcoxjCwGygyLcOVwpcFHZTTf2rKRebLpDIjZ81KhLv/YSSSDvuh FK3/qLMhnwK/3xv351otOn0JEbWV X-Google-Smtp-Source: ALg8bN4Nj0STg1yVP6JspBpqSQ/rdDBIys8dXoX0LKYriohMT1zUD+inz9KzxGDGjJZeqtpnDW/q9Q== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr5980241wme.84.1548410869431; Fri, 25 Jan 2019 02:07:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:55 +0100 Message-Id: <1548410831-19553-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 36/52] hw/pci/Makefile.objs: make pcie configurable 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, thuth@redhat.com, "Michael S. Tsirkin" 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" From: Yang Zhong Make pcie splited from pci and make it configurable. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-30-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/pci/Kconfig | 4 ++++ hw/pci/Makefile.objs | 9 +++++++-- 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b0995a0..59cf3d2 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -121,6 +121,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 412c8c5..b5281d3 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -44,6 +44,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 9eb1208..c6ad4da 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,5 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 90118cb..47e4177 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -23,6 +23,7 @@ CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy +CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index d3d2205..4ca2537 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -1,2 +1,6 @@ config PCI bool + +config PCI_EXPRESS + bool + select PCI diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..c78f2fb 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -2,8 +2,13 @@ common-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o common-obj-$(CONFIG_PCI) +=3D msix.o msi.o common-obj-$(CONFIG_PCI) +=3D shpc.o common-obj-$(CONFIG_PCI) +=3D slotid_cap.o -common-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o -common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o pcie_port.o +common-obj-$(CONFIG_PCI) +=3D pci_host.o + +# The functions in these modules can be used by devices too. Since we +# allow plugging PCIe devices into PCI buses, include them even if +# CONFIG_PCI_EXPRESS=3Dn. +common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o +common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_host.o =20 common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o common-obj-$(CONFIG_ALL) +=3D pci-stub.o --=20 1.8.3.1