From patchwork Mon Jul 15 09:55:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1131902 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nJpL2c8cz9sNy for ; Mon, 15 Jul 2019 19:56:42 +1000 (AEST) Received: from localhost ([::1]:36442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxip-0000KC-OM for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 05:56:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57857) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxie-00006G-9a for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmxid-0001so-2H for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42214) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmxia-0001qr-Dv; Mon, 15 Jul 2019 05:56:24 -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 mx1.redhat.com (Postfix) with ESMTPS id 7F07583F42; Mon, 15 Jul 2019 09:56:23 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A0DF46013B; Mon, 15 Jul 2019 09:56:13 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 11:55:43 +0200 Message-Id: <20190715095545.28545-2-philmd@redhat.com> In-Reply-To: <20190715095545.28545-1-philmd@redhat.com> References: <20190715095545.28545-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jul 2019 09:56:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 1/3] hw/Kconfig: PCI bus implies PCI_DEVICES 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: Peter Maydell , Thomas Huth , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Bastian Koppelmann , Helge Deller , Palmer Dabbelt , Mark Cave-Ayland , Artyom Tarasenko , qemu-arm@nongnu.org, Alistair Francis , Gerd Hoffmann , Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If a controller device provides a PCI bus, we can plug any PCI daughter card on it. Signed-off-by: Philippe Mathieu-Daudé --- docs/devel/kconfig.rst | 1 - hw/alpha/Kconfig | 1 - hw/arm/Kconfig | 4 ---- hw/hppa/Kconfig | 1 - hw/i386/Kconfig | 1 - hw/pci/Kconfig | 1 + hw/ppc/Kconfig | 6 ------ hw/riscv/Kconfig | 1 - hw/sh4/Kconfig | 1 - hw/sparc64/Kconfig | 1 - 10 files changed, 1 insertion(+), 17 deletions(-) diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index d6f8eb0977..6c010d38d4 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -56,7 +56,6 @@ stanza like the following:: config ARM_VIRT bool - imply PCI_DEVICES imply VFIO_AMD_XGBE imply VFIO_XGMAC select A15MPCORE diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index 15c59ff264..ddac1bf8e5 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -1,6 +1,5 @@ config DP264 bool - imply PCI_DEVICES imply TEST_DEVICES imply E1000_PCI select I82374 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ab65ecd216..51db042a0a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,6 +1,5 @@ config ARM_VIRT bool - imply PCI_DEVICES imply TEST_DEVICES imply VFIO_AMD_XGBE imply VFIO_PLATFORM @@ -159,7 +158,6 @@ config Z2 config REALVIEW bool - imply PCI_DEVICES imply PCI_TESTDEV select SMC91C111 select LAN9118 @@ -186,7 +184,6 @@ config REALVIEW config SBSA_REF bool - imply PCI_DEVICES select AHCI select ARM_SMMUV3 select GPIO_KEY @@ -365,7 +362,6 @@ config MPS2 config FSL_IMX7 bool - imply PCI_DEVICES imply TEST_DEVICES select A15MPCORE select PCI diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 6e5d74a825..13183ff243 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,6 +1,5 @@ config DINO bool - imply PCI_DEVICES imply E1000_PCI imply VIRTIO_VGA select PCI diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 4ddf2a9c55..4eceab2c7c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -10,7 +10,6 @@ config PC imply ISA_IPMI_BT imply ISA_DEBUG imply PARALLEL - imply PCI_DEVICES imply PVPANIC imply QXL imply SEV diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 77f8b005ff..0f7267db35 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -1,5 +1,6 @@ config PCI bool + imply PCI_DEVICES config PCI_EXPRESS bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index f927ec9c74..6a7f06744d 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,6 +1,5 @@ config PSERIES bool - imply PCI_DEVICES imply TEST_DEVICES imply VIRTIO_VGA select DIMM @@ -18,7 +17,6 @@ config SPAPR_RNG config POWERNV bool - imply PCI_DEVICES imply TEST_DEVICES select ISA_IPMI_BT select IPMI_LOCAL @@ -36,7 +34,6 @@ config PPC405 config PPC440 bool - imply PCI_DEVICES imply TEST_DEVICES imply E1000_PCI select PCI_EXPRESS @@ -62,7 +59,6 @@ config SAM460EX config PREP bool - imply PCI_DEVICES imply TEST_DEVICES select CS4231A select PREP_PCI @@ -77,7 +73,6 @@ config RS6000_MC config MAC_OLDWORLD bool - imply PCI_DEVICES imply SUNGEM imply TEST_DEVICES select ADB @@ -87,7 +82,6 @@ config MAC_OLDWORLD config MAC_NEWWORLD bool - imply PCI_DEVICES imply SUNGEM imply TEST_DEVICES select ADB diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 8674211085..636072c7f3 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -27,7 +27,6 @@ config SPIKE config RISCV_VIRT bool - imply PCI_DEVICES imply TEST_DEVICES select PCI select HART diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 4cbce3a0ed..cfde77d04a 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,6 +1,5 @@ config R2D bool - imply PCI_DEVICES imply TEST_DEVICES imply RTL8139_PCI select I82378 if TEST_DEVICES diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index d4d76a89be..125d442d65 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,6 +1,5 @@ config SUN4U bool - imply PCI_DEVICES imply SUNHME imply TEST_DEVICES imply PARALLEL From patchwork Mon Jul 15 09:55:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1131903 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nJpf1N5Qz9sNy for ; Mon, 15 Jul 2019 19:56:58 +1000 (AEST) Received: from localhost ([::1]:36452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxj5-0001KD-Pu for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 05:56:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxit-00017z-K6 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmxir-0001y3-JM for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmxin-0001wJ-Mu; Mon, 15 Jul 2019 05:56:37 -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 mx1.redhat.com (Postfix) with ESMTPS id 931A3307FBCB; Mon, 15 Jul 2019 09:56:36 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 185426012C; Mon, 15 Jul 2019 09:56:23 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 11:55:44 +0200 Message-Id: <20190715095545.28545-3-philmd@redhat.com> In-Reply-To: <20190715095545.28545-1-philmd@redhat.com> References: <20190715095545.28545-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 15 Jul 2019 09:56:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.2 2/3] hw/usb/Kconfig: Add CONFIG_USB_EHCI_PCI 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: Peter Maydell , Thomas Huth , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Bastian Koppelmann , Helge Deller , Palmer Dabbelt , Mark Cave-Ayland , Artyom Tarasenko , qemu-arm@nongnu.org, Alistair Francis , Gerd Hoffmann , Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The USB_EHCI entry currently include PCI code. Since the EHCI implementation is already split in sysbus/PCI, add a new USB_EHCI_PCI. There are no logical changes, but the Kconfig dependencies tree is cleaner. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/usb/Kconfig | 9 ++++++--- hw/usb/Makefile.objs | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 564305e283..495c6f2d48 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -19,13 +19,16 @@ config USB_OHCI_PCI config USB_EHCI bool - default y if PCI_DEVICES - depends on PCI select USB +config USB_EHCI_PCI + bool + default y if PCI_DEVICES + select USB_EHCI + config USB_EHCI_SYSBUS bool - select USB + select USB_EHCI config USB_XHCI bool diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 81688f6e70..303ac084a0 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -6,8 +6,9 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o -common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o +common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o +common-obj-$(CONFIG_USB_EHCI_PCI) += hcd-ehci-pci.o +common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o From patchwork Mon Jul 15 09:55:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1131904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nJpz4QZjz9sNy for ; Mon, 15 Jul 2019 19:57:15 +1000 (AEST) Received: from localhost ([::1]:36474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxjN-0002un-LT for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 05:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58044) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmxj0-0001Zx-MX for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmxiz-00022m-Ma for qemu-devel@nongnu.org; Mon, 15 Jul 2019 05:56:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45180) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmxix-000219-31; Mon, 15 Jul 2019 05:56:47 -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 mx1.redhat.com (Postfix) with ESMTPS id 3DE70308FEC0; Mon, 15 Jul 2019 09:56:46 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C2166012C; Mon, 15 Jul 2019 09:56:37 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 11:55:45 +0200 Message-Id: <20190715095545.28545-4-philmd@redhat.com> In-Reply-To: <20190715095545.28545-1-philmd@redhat.com> References: <20190715095545.28545-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 15 Jul 2019 09:56:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1? 3/3] hw/usb/Kconfig: USB_XHCI_NEC requires USB_XHCI 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: Peter Maydell , Thomas Huth , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Bastian Koppelmann , Helge Deller , Palmer Dabbelt , Mark Cave-Ayland , Artyom Tarasenko , qemu-arm@nongnu.org, Alistair Francis , Gerd Hoffmann , Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" TYPE_NEC_XHCI is child of TYPE_XHCI. Add the missing Kconfig dependency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/usb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 495c6f2d48..555e09377b 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -40,7 +40,7 @@ config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI - select USB + select USB_XHCI config USB_MUSB bool