From nobody Sun Oct 5 01:45:05 2025 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551726766070494.5068358870716; Mon, 4 Mar 2019 11:12:46 -0800 (PST) Received: from localhost ([127.0.0.1]:59392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t0z-0003jW-6p for importer@patchew.org; Mon, 04 Mar 2019 14:12:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCV-0001rH-4O for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCU-0003uj-1g for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:31 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCT-0003sw-PC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:29 -0500 Received: by mail-wm1-x331.google.com with SMTP id n19so140420wmi.1 for ; Mon, 04 Mar 2019 10:20:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:27 -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=v7s6MY5AITZB0rextK+gQrnMM092HQg/Q6l9JaSmEiA=; b=eUpVrdikIIs3UDeG4LIuzEMrGqGw+/4r8jlFt2JqPbk4Ffbel+9i8TtdmDbdWotFqj QKqaBmeALX3FjsCekRCKMJwiBrBh3lqWY1WfdYsSnRmKTM00bV7E4Ma5s4RvSv91fGCd Rr4Bn6cc6Xe33lZVv/Vg/K2XZKEfSi1Hu2HuXqvVvbwKzvedMAoHabJWCKUvz99yQK8/ bM2yu/41Qf3kPlZuLkNd6uPiyzJTTPDtrDkv4daVdsGUmc90lgbA2Bhz97MgBu0Jxrsj L8QX8/pFhVHnmFhsttt5rGQBd5UT2GdFR8lmM+6/Ks7tOaSbjX1PybsveyRr9b922hJs UZVQ== 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=v7s6MY5AITZB0rextK+gQrnMM092HQg/Q6l9JaSmEiA=; b=DlG0TK817zrLr8sxy6pJoNXHBHYEAQ6TFWYWEVz7ciAtYamjwnC6vMd5SlZRHuT1rr zEXduUjkjHrq6b/t9D6T0yV2mN0MT7ESp1f922kB0TfJFG7EF83fjknGXcC7IPj8/CZt B2K3mRmEO0XkQCj3Qi5NojCgXqcdUF5xYaz6Bs+ghzzRUk2l+Xbu5JJRySS48oaS82Zc 0Nh8nOSVOujeWgyL2VYQGHVMUD9kUe5urwNFWiArOb4ViklA0bG0mowWHnwC5w0cAL+Y 6h1HSHycbVuHmioQr4uQY23AmIf59PQpT4jWKN80yvKlpNRTyaAwLipVnssarI2fxlXe WAMg== X-Gm-Message-State: APjAAAUy2Lhk0f928QxvOBSM3bPYrM1t682a/hhjkuNLNcgnv2WCAwS1 7BWT4Etc4qEY4fbFxhX5hb+2rs4n X-Google-Smtp-Source: APXvYqyejCIeZkikHrGoszfGUixqz+d0DejWmThmYwsAi5GFfT9VUPZX0IRFY43PIQqhSYaxhIWSGw== X-Received: by 2002:a1c:a74a:: with SMTP id q71mr21033wme.45.1551723628408; Mon, 04 Mar 2019 10:20:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:33 +0100 Message-Id: <1551723614-1823-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-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::331 Subject: [Qemu-devel] [PULL 13/54] 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 , 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 797bfa5..b430be5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -124,6 +124,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_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 1d43fb2..256443e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -45,6 +45,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 a58d81a..5c576fe 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -24,6 +24,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