From patchwork Tue Dec 31 18:32:03 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: 1216817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="NDfi6HzR"; dkim-atps=neutral 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 47nNGf0y9Wz9sP6 for ; Wed, 1 Jan 2020 05:33:30 +1100 (AEDT) Received: from localhost ([::1]:45270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKd-0007Rt-Lj for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:33:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42023) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMJw-0007Ce-F9 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMJu-0006pZ-Uh for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22061 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMJu-0006mw-QY for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LNrbe+4B+umJ4zWOxS26ufKgntytZstSfWcEVuRFYr4=; b=NDfi6HzRABsKNrEAg1cx1Yv1tFQPi/4Qr9+/smBEW3lLA7j1tIcHaywUoe8pVo7zLBIEGH d5A9lvyVY2BsQv+zoECi6JA/7hfbqMT7o1w9UZiFKtIfiQQsyNWyqVgwe8o2aEX3LmAeJQ PWXfgkrDiyoWtGHSNshwKVVedi4Yd10= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-7M8wrOacOneps52M3JOhuQ-1; Tue, 31 Dec 2019 13:32:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A370477; Tue, 31 Dec 2019 18:32:38 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0FEC68207A; Tue, 31 Dec 2019 18:32:32 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 01/14] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled Date: Tue, 31 Dec 2019 19:32:03 +0100 Message-Id: <20191231183216.6781-2-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 7M8wrOacOneps52M3JOhuQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The 'usb-redir' device requires the USB core code to work. Do not link it when there is no USB support. This fixes: $ qemu-system-tricore -M tricore_testboard -device usb-redir qemu-system-tricore: -device usb-redir: No 'usb-bus' bus found for device 'usb-redir' Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/usb/Makefile.objs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 0ab20f9d73..0052d49ce1 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -39,9 +39,11 @@ common-obj-$(CONFIG_USB_STORAGE_MTP) += dev-mtp.o endif # usb redirection +ifeq ($(CONFIG_USB),y) common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o redirect.o-cflags = $(USB_REDIR_CFLAGS) redirect.o-libs = $(USB_REDIR_LIBS) +endif # usb pass-through ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) From patchwork Tue Dec 31 18:32:04 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: 1216819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="aJGad8Bp"; dkim-atps=neutral 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 47nNK41gR5z9sP6 for ; Wed, 1 Jan 2020 05:35:36 +1100 (AEDT) Received: from localhost ([::1]:45338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMMf-000239-MM for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:35:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMK7-0007UF-W0 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMK6-0007TS-UU for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:55 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22143 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMK6-0007ST-Pw for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:32:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A8zT9hMVESj5Eti91E6Xy3QJmXt+rT5wjccs06y86/k=; b=aJGad8BpmvmXoPIWIEwDhZcNQThRFrOYCuUqKkg9M31fyaVmSsg7j8admdjS8hf5TR74Qx pmhlTEURCRlOa7795ky2HfcNSzjuFhcafGqmYTko3ZWmo805MUX7jlV1bZG1+RtFX532xA P4VXXb9GULYbsqRgFsoTz1u0ljFhyrI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-cnp9WkqLM-eaGTP4xNNZ5A-1; Tue, 31 Dec 2019 13:32:53 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1322610054E3; Tue, 31 Dec 2019 18:32:51 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E943267673; Tue, 31 Dec 2019 18:32:38 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 02/14] hw/intc/i8259: Fix Kconfig dependency on ISA bus Date: Tue, 31 Dec 2019 19:32:04 +0100 Message-Id: <20191231183216.6781-3-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: cnp9WkqLM-eaGTP4xNNZ5A-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The 8259 Interrupt Controller sits on a ISA bus. Add the missing dependency to fix: LINK x86_64-softmmu/qemu-system-x86_64 /usr/bin/ld: ../hw/intc/i8259_common.o: in function `pic_common_realize': hw/intc/i8259_common.c:84: undefined reference to `isa_register_ioport' /usr/bin/ld: hw/intc/i8259_common.c:86: undefined reference to `isa_register_ioport' /usr/bin/ld: ../hw/intc/i8259_common.o: in function `i8259_init_chip': hw/intc/i8259_common.c:97: undefined reference to `isa_create' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-x86_64] Error 1 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- Cc: "Michael S. Tsirkin" (supporter:PC Chipset) --- hw/intc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 10a680b53a..a189d6fedd 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -3,6 +3,7 @@ config HEATHROW_PIC config I8259 bool + select ISA_BUS config PL190 bool From patchwork Tue Dec 31 18:32:05 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: 1216823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="QnKPblrw"; dkim-atps=neutral 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 47nNNB3Ntxz9sP6 for ; Wed, 1 Jan 2020 05:38:18 +1100 (AEDT) Received: from localhost ([::1]:45380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMPH-0005e1-Pa for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:38:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43246) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKF-0007g2-R3 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMKE-0007uP-Qc for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:03 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21363 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMKE-0007st-MD for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nXAhfjSLO3aXoXyXTZKRgP1FoH+VJi2UxhjlvOWZwX8=; b=QnKPblrwZ3Q5vk6mSpqmvHqhHEm9v3IMJBNGGcdYx8J0Ci6v4Yjn5bn+o1zUASPijo8HmL BOPl32u7j5ga7tYRMTTYma1qq7ubFA37GJY4KNkbd9TIxKMwtLVkdDJGLTtv+uOspDkuq0 uqDK+2lt0oh2f8gnNdwnDC/yiUgaC20= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-118--jKQVjtiMLWj06ku8NN3NQ-1; Tue, 31 Dec 2019 13:33:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1CEBE107ACC4; Tue, 31 Dec 2019 18:32:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A146282070; Tue, 31 Dec 2019 18:32:51 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 03/14] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config Date: Tue, 31 Dec 2019 19:32:05 +0100 Message-Id: <20191231183216.6781-4-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: -jKQVjtiMLWj06ku8NN3NQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Fam Zheng , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When configured with --without-default-devices, the build fails: LINK x86_64-softmmu/qemu-system-x86_64 /usr/bin/ld: hw/i386/microvm.o: in function `microvm_devices_init': hw/i386/microvm.c:157: undefined reference to `serial_hds_isa_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-x86_64] Error 1 make: *** [Makefile:483: x86_64-softmmu/all] Error 2 While the MicroVM machine only uses the ISA serial port when the MICROVM_MACHINE_ISA_SERIAL property is set, it has to be linked with it. Replace the 'imply' Kconfig rule by a 'select'. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Sergio Lopez --- hw/i386/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index e428322a2c..cbcfb1ce81 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -96,7 +96,7 @@ config Q35 config MICROVM bool - imply SERIAL_ISA + select SERIAL_ISA select ISA_BUS select APIC select IOAPIC From patchwork Tue Dec 31 18:32:06 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: 1216820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="gIms6YX9"; dkim-atps=neutral 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 47nNKR4z9qz9sP6 for ; Wed, 1 Jan 2020 05:35:55 +1100 (AEDT) Received: from localhost ([::1]:45342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMMz-0002M7-2e for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:35:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43964) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKS-00080Q-55 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMKR-000096-3D for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:16 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:39336 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMKQ-000075-VN for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=suRJMyDa4aeB+jIH8Xme7rpKL09yPd7NjRFWjqk8R0k=; b=gIms6YX9gxNVp83oD0A1y0Uk/bLX4NE3P4dvxhfWWciWKZzl4RUFI0guVmtuTM+0hMFg2w g6KQXUfeJFQqcPg47JUrX7SZC1K21xmsGkUP3cXHTz04/oEQPANgteqI4lLYaExzvlHxXj FbgaybODBCoNGOFp5LfrGXeqi0EVnpU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-423-xjLcmU8XPSWJP53R_Jzlsw-1; Tue, 31 Dec 2019 13:33:13 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C644DB20; Tue, 31 Dec 2019 18:33:11 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F92167673; Tue, 31 Dec 2019 18:32:59 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 04/14] hw/i386: Restrict fw_cfg to the PC machines Date: Tue, 31 Dec 2019 19:32:06 +0100 Message-Id: <20191231183216.6781-5-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: xjLcmU8XPSWJP53R_Jzlsw-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Only the PC-based machines use the fw_cfg device. In particular, the MicroVM machine does not use it. Only compile/link it when machines require it. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Sergio Lopez --- hw/i386/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 6ebb6d0cf0..48f2693546 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -5,7 +5,7 @@ obj-$(CONFIG_PC) += pc.o pc_sysfw.o obj-$(CONFIG_I440FX) += pc_piix.o obj-$(CONFIG_Q35) += pc_q35.o obj-$(CONFIG_MICROVM) += microvm.o -obj-y += fw_cfg.o +obj-$(CONFIG_PC) += fw_cfg.o obj-$(CONFIG_X86_IOMMU) += x86-iommu.o obj-$(CONFIG_VTD) += intel_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o From patchwork Tue Dec 31 18:32:07 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: 1216818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="D2bFdwYf"; dkim-atps=neutral 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 47nNHP1kmRz9sP6 for ; Wed, 1 Jan 2020 05:34:09 +1100 (AEDT) Received: from localhost ([::1]:45292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLG-0008JC-DR for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:34:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44501) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKb-0008FC-Rw for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMKa-0000iD-Lu for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49066 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMKa-0000hC-Hn for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IfZLXSfyo3Wvv8uUkjIdymg6nDDM0OpyL5RFATQJF6Q=; b=D2bFdwYfaJI8IQ1LP8mO2Rebh3K7Z1aGQmOP2KhME5IFhVQ+qRM+RpZjmyzGdD2Wnm6pHS eG8SAR22+jGYP+StuwADItmDOtVmvxVfwd6F1t65GmxOWZEjHn2Cw8wbUEwEulcHVektgq PgXHYzJObvvsD7CEMBltkF5b0Q6mm1Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-72-t72Ut1XWPZanw2CwLq0stQ-1; Tue, 31 Dec 2019 13:33:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A710F800D4E; Tue, 31 Dec 2019 18:33:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A975067673; Tue, 31 Dec 2019 18:33:11 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 05/14] hw/i2c/Kconfig: Add an entry for the SMBus Date: Tue, 31 Dec 2019 19:32:07 +0100 Message-Id: <20191231183216.6781-6-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: t72Ut1XWPZanw2CwLq0stQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Corey Minyard , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The System Management Bus is more or less a derivative of the I2C bus, thus the Kconfig entry depends of I2C. Not all boards providing an I2C bus support SMBus. Use two different Kconfig entries to be able to select I2C without selecting SMBus. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Corey Minyard --- Cc: Corey Minyard --- default-configs/mips-softmmu-common.mak | 1 + hw/i2c/Kconfig | 8 ++++++-- hw/i2c/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index da29c6c0b2..ac76d944b8 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -37,6 +37,7 @@ CONFIG_R4K=y CONFIG_MALTA=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y +CONFIG_SMBUS=y CONFIG_ACPI_SMBUS=y CONFIG_SMBUS_EEPROM=y CONFIG_TEST_DEVICES=y diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 2bbd395813..09642a6dcb 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -1,9 +1,13 @@ config I2C bool +config SMBUS + bool + select I2C + config SMBUS_EEPROM bool - depends on I2C + select SMBUS config VERSATILE_I2C bool @@ -11,7 +15,7 @@ config VERSATILE_I2C config ACPI_SMBUS bool - select I2C + select SMBUS config BITBANG_I2C bool diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index d7073a401f..cbbc8507a3 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -1,4 +1,5 @@ -common-obj-$(CONFIG_I2C) += core.o smbus_slave.o smbus_master.o +common-obj-$(CONFIG_I2C) += core.o +common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o From patchwork Tue Dec 31 18:32:08 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: 1216826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="DqKawgPz"; dkim-atps=neutral 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 47nNRB3blPz9sP6 for ; Wed, 1 Jan 2020 05:40:54 +1100 (AEDT) Received: from localhost ([::1]:45418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMRo-00015j-3p for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:40:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45215) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKo-0000A1-HJ for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMKn-0001Mj-Cq for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46042 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMKn-0001Kn-7s for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UIAu7a2EIYqO6Epo2dSB57lqrOGVbfU2rmoXjKF3iOg=; b=DqKawgPz2AZXiReeMssG97BSXNk+Zsqk1SaORF57UbSqctdAXq0jNFun35tCJS/Y0ufwZg yAGU/D/JhFzG/3QQWAHX/n1fS4zPWJem0Cj8m5yImG7azDAdnvCpaA1htP9J6QFI0UqCJ1 UJNVsh8s7YteL6i10OIr+Y4MF2iC4eY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-hq4WiI_uPuGkJEtu8-sfwQ-1; Tue, 31 Dec 2019 13:33:35 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D3B58017DF; Tue, 31 Dec 2019 18:33:33 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2DE3A67673; Tue, 31 Dec 2019 18:33:20 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 06/14] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms Date: Tue, 31 Dec 2019 19:32:08 +0100 Message-Id: <20191231183216.6781-7-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: hq4WiI_uPuGkJEtu8-sfwQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Only the PowerPC e500-based platforms use the MPC I2C controller. Do not build it for the other machines. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- default-configs/ppc-softmmu.mak | 1 - hw/ppc/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index bf86128a0c..61b78b844d 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,7 +1,6 @@ # Default configuration for ppc-softmmu # For embedded PPCs: -CONFIG_MPC_I2C=y CONFIG_DS1338=y CONFIG_E500=y CONFIG_PPC405=y diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index f927ec9c74..0cd8d4053e 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -105,6 +105,7 @@ config E500 select PLATFORM_BUS select PPCE500_PCI select SERIAL + select MPC_I2C config VIRTEX bool From patchwork Tue Dec 31 18:32:09 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: 1216822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="XPsaY9HS"; dkim-atps=neutral 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 47nNLh65zwz9sP6 for ; Wed, 1 Jan 2020 05:37:00 +1100 (AEDT) Received: from localhost ([::1]:45370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMO2-0003pm-8c for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:36:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMKu-0000K2-FW for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMKt-0001gx-DJ for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34476 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMKt-0001f5-85 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KAytLoSSavf68Pl4Cfu3swLeDto0cnLBdpF/4IpjBcQ=; b=XPsaY9HSxkoHY6ADFzcUIxNVVKDHBeex1MSBEaWMI0MwyxwXHA66wEt0MlgEniV2Ivo62H NgVCQHg/Bk69Ikzk5CPAP02zCEjSV+IPC7URvVu+TCeCPgo8wGMh8zDqoJUvb0H/CfzGey gHeDEZbs8muW9jQZe+6+t0hun3Wt7wk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312--aBuzMsEPUeKkZSqjfZbBg-1; Tue, 31 Dec 2019 13:33:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89B63107ACC4; Tue, 31 Dec 2019 18:33:39 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF49267673; Tue, 31 Dec 2019 18:33:33 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 07/14] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices Date: Tue, 31 Dec 2019 19:32:09 +0100 Message-Id: <20191231183216.6781-8-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: -aBuzMsEPUeKkZSqjfZbBg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When configured with --without-default-devices, the build fails: LINK ppc-softmmu/qemu-system-ppc /usr/bin/ld: hw/ppc/sam460ex.o: in function `sam460ex_init': hw/ppc/sam460ex.c:313: undefined reference to `ppc4xx_plb_init' /usr/bin/ld: hw/ppc/sam460ex.c:353: undefined reference to `ppc405_ebc_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-ppc] Error 1 Fix by selecting the PPC405 config. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: BALATON Zoltan Acked-by: David Gibson --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 0cd8d4053e..004b7d5ad5 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -50,6 +50,7 @@ config PPC4XX config SAM460EX bool + select PPC405 select PFLASH_CFI01 select IDE_SII3112 select M41T80 From patchwork Tue Dec 31 18:32:10 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: 1216828 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="hZ3E3WIO"; dkim-atps=neutral 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 47nNTV020fz9sP6 for ; Wed, 1 Jan 2020 05:42:54 +1100 (AEDT) Received: from localhost ([::1]:45448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMTj-0003t7-Ma for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:42:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46264) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imML7-0000fO-AT for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imML6-0002Q2-60 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:57 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:24330 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imML6-0002Oi-2M for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:33:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjHVdP/5ri9UqY1Fmuk97Ss0NV6vSnEanJqzdtKIYwI=; b=hZ3E3WIOlem53JIYwNpU9UEVSkQZICKSwXa8XyG1xQL3TL4tF3UHvC3n0Tu3vw4Xm89KAd mSO+7KSH4JMB5eMVF7w9h2B/DuWHnIh7dL0UuJy1Lrn8bob5TX2DVCwXqmNBDxRmMJvVYN MU1+stdbVhgcg42d+TXSquxw1vRskDk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-431-OfC3hBUjMcS19eAIPukIsQ-1; Tue, 31 Dec 2019 13:33:54 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B23210054E3; Tue, 31 Dec 2019 18:33:52 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DE2067673; Tue, 31 Dec 2019 18:33:39 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 08/14] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices Date: Tue, 31 Dec 2019 19:32:10 +0100 Message-Id: <20191231183216.6781-9-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: OfC3hBUjMcS19eAIPukIsQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When configured with --without-default-devices, the build fails: LINK ppc-softmmu/qemu-system-ppc /usr/bin/ld: hw/ppc/virtex_ml507.o: in function `ppc440_init_xilinx': hw/ppc/virtex_ml507.c:112: undefined reference to `ppcuic_init' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:206: qemu-system-ppc] Error 1 make: *** [Makefile:483: ppc-softmmu/all] Error 2 Fix by selecting the PPC4XX config. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 004b7d5ad5..d8482a5e99 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -110,6 +110,7 @@ config E500 config VIRTEX bool + select PPC4XX select PFLASH_CFI01 select SERIAL select XILINX From patchwork Tue Dec 31 18:32:11 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: 1216825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="cmhsXsye"; dkim-atps=neutral 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 47nNPm15Ymz9sP6 for ; Wed, 1 Jan 2020 05:39:40 +1100 (AEDT) Received: from localhost ([::1]:45402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMQb-0007qU-QJ for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:39:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLC-0000oE-IW for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMLB-0002jc-Eq for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:02 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:54360 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMLB-0002hl-AC for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JXZd2SquiS0EG3VvV3N8IDpXfPy6kYgXfBdN/SKsvKo=; b=cmhsXsyegAPnW0SuzLidR2SC4c7TPxzWdHz/L6YcajwQWaDnNI3Ie+fDUIa/tSd86zyCZF NB7oAe32OyQEcp6+3noAN2JfOoiPbAyTE6n0+vOrl+DhPn2q9KZm4YXh2I+/DtMEtYQ6Ka ErKaWGVd1r6YuLuZxP09v4PymbbwB8o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-BLSZUfFVMcaQXQZ0SrkigQ-1; Tue, 31 Dec 2019 13:33:59 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CC29107ACC7; Tue, 31 Dec 2019 18:33:57 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEDB867673; Tue, 31 Dec 2019 18:33:52 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 09/14] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule Date: Tue, 31 Dec 2019 19:32:11 +0100 Message-Id: <20191231183216.6781-10-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: BLSZUfFVMcaQXQZ0SrkigQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The CONFIG_PSERIES already selects CONFIG_PCI. Simplify the Makefile rules. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- hw/ppc/Makefile.objs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 101e9fc591..79adf06aa3 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -7,14 +7,11 @@ obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o spapr_irq.o obj-$(CONFIG_PSERIES) += spapr_tpm_proxy.o obj-$(CONFIG_SPAPR_RNG) += spapr_rng.o +obj-$(call land,$(CONFIG_PSERIES),$(CONFIG_LINUX)) += spapr_pci_vfio.o spapr_pci_nvlink2.o # IBM PowerNV obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o obj-$(CONFIG_POWERNV) += pnv_homer.o pnv_pnor.o - -ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy) -obj-y += spapr_pci_vfio.o spapr_pci_nvlink2.o -endif obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o # PowerPC 4xx boards obj-$(CONFIG_PPC405) += ppc405_boards.o ppc405_uc.o From patchwork Tue Dec 31 18:32:12 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: 1216827 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ezCA4Zv6"; dkim-atps=neutral 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 47nNST3WLfz9sP6 for ; Wed, 1 Jan 2020 05:42:01 +1100 (AEDT) Received: from localhost ([::1]:45442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMSt-0002p3-5w for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:41:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLJ-0000zD-8D for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMLI-0003Ar-1F for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:59864 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMLH-00038e-TO for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lg58DBeDE0DgziQ2gXpd7IhKj12+wCU6SkcB/vIfZkU=; b=ezCA4Zv6JDaARAqWcboFbE822jm9CH/sfvr7nZtPRorJm8aQR4erb15ohB2YV4T+z++tVL ErrYob7dwE9CJ8xir+QXz33pYg8oh+BaW6n7GHTHv3Ko/FRGoonttthBTDGplJrgm1VDPs JEkiBWPcWSM1Hpir23nx7sLKiqMW9Eg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-B3owXEc1Py2IoZnhnZSlPg-1; Tue, 31 Dec 2019 13:34:05 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A88810054E3; Tue, 31 Dec 2019 18:34:03 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 15EB267673; Tue, 31 Dec 2019 18:33:57 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 10/14] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS Date: Tue, 31 Dec 2019 19:32:12 +0100 Message-Id: <20191231183216.6781-11-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: B3owXEc1Py2IoZnhnZSlPg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The fw_cfg helpers are only used by machines using OpenBIOS. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- Cc: Mark Cave-Ayland Cc: "Hervé Poussineau" --- hw/ppc/Kconfig | 6 ++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index d8482a5e99..e4ca920507 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -72,6 +72,7 @@ config PREP select M48T59 select PC87312 select RS6000_MC + select FW_CFG_PPC config RS6000_MC bool @@ -85,6 +86,7 @@ config MAC_OLDWORLD select GRACKLE_PCI select HEATHROW_PIC select MACIO + select FW_CFG_PPC config MAC_NEWWORLD bool @@ -96,6 +98,7 @@ config MAC_NEWWORLD select MACIO_GPIO select MAC_PMU select UNIN_PCI + select FW_CFG_PPC config E500 bool @@ -130,3 +133,6 @@ config XIVE_KVM bool default y depends on XIVE_SPAPR && KVM + +config FW_CFG_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 79adf06aa3..5c46c68e44 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,6 @@ # shared objects -obj-y += ppc.o ppc_booke.o fdt.o fw_cfg.o +obj-y += ppc.o ppc_booke.o fdt.o +obj-$(CONFIG_FW_CFG_PPC) += fw_cfg.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o From patchwork Tue Dec 31 18:32:13 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: 1216821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="eOAUziJV"; dkim-atps=neutral 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 47nNL017Dvz9sP6 for ; Wed, 1 Jan 2020 05:36:24 +1100 (AEDT) Received: from localhost ([::1]:45360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMNR-0002ww-L1 for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:36:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47915) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLb-0001Qo-Rh for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMLa-0004KG-Kz for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:27 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:20839 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMLa-0004IE-G5 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZSI3N3fJ/6wS+wX4pMnA/gl2W/jxs6r70tpZY/jtCZ0=; b=eOAUziJVFfcAttQaim+fMeyVvmY+f47GRUX8N5wi3MjE6iv1nihVHaSpgKQHtYY+Sd3je9 6sy0H6yXoYgXhTEwxfLos9qIgmszSlVO2YgNJoqKXgt+APxSXjOA8v5ty+Ar1AOdX+4ibV tDWLkicIynDykli3tQlh415spAn81eg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-94-93-T6AU7P3qkThI3Um2ihg-1; Tue, 31 Dec 2019 13:34:23 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C536A18031D3; Tue, 31 Dec 2019 18:34:21 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43F7667673; Tue, 31 Dec 2019 18:34:03 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 11/14] hw/ppc/Kconfig: Only select FDT helper for machines using it Date: Tue, 31 Dec 2019 19:32:13 +0100 Message-Id: <20191231183216.6781-12-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 93-T6AU7P3qkThI3Um2ihg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Not all machines use the ppc_create_page_sizes_prop() helper. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- Can Kconfig can restrict to TARGET_PPC64? --- hw/ppc/Kconfig | 10 ++++++++++ hw/ppc/Makefile.objs | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index e4ca920507..8e62d8f470 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -10,6 +10,7 @@ config PSERIES select XICS_SPAPR select XIVE_SPAPR select MSI_NONBROKEN + select FDT_PPC config SPAPR_RNG bool @@ -26,6 +27,7 @@ config POWERNV select MC146818RTC select XICS select XIVE + select FDT_PPC config PPC405 bool @@ -42,6 +44,7 @@ config PPC440 select PCI_EXPRESS select PPC4XX select SERIAL + select FDT_PPC config PPC4XX bool @@ -60,6 +63,7 @@ config SAM460EX select SMBUS_EEPROM select USB_EHCI_SYSBUS select USB_OHCI + select FDT_PPC config PREP bool @@ -110,6 +114,7 @@ config E500 select PPCE500_PCI select SERIAL select MPC_I2C + select FDT_PPC config VIRTEX bool @@ -118,6 +123,7 @@ config VIRTEX select SERIAL select XILINX select XILINX_ETHLITE + select FDT_PPC config XIVE bool @@ -134,5 +140,9 @@ config XIVE_KVM default y depends on XIVE_SPAPR && KVM +# Only used by 64-bit targets config FW_CFG_PPC bool + +config FDT_PPC + bool diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 5c46c68e44..a4bac57be6 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,5 +1,6 @@ # shared objects -obj-y += ppc.o ppc_booke.o fdt.o +obj-y += ppc.o ppc_booke.o +obj-$(CONFIG_FDT_PPC) += fdt.o obj-$(CONFIG_FW_CFG_PPC) += fw_cfg.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o From patchwork Tue Dec 31 18:32:14 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: 1216885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="URXb58c3"; dkim-atps=neutral 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 47nQm863dDz9sRY for ; Wed, 1 Jan 2020 07:25:44 +1100 (AEDT) Received: from localhost ([::1]:46140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imO5G-0001V5-Jo for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 15:25:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52666) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imO4s-0001Tl-7E for qemu-devel@nongnu.org; Tue, 31 Dec 2019 15:25:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imO4r-0002Tl-2f for qemu-devel@nongnu.org; Tue, 31 Dec 2019 15:25:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47703 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imO4q-0002Da-Q6 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 15:25:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577822853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Azf6l05r1GbAVegiICyFOH+qFZT1sALnKP93sjW0wzg=; b=URXb58c33jssiLl1hUOJKf+8bezASKcZjD8g4qPFJjXXQVoHJlmSHf7juqHUPt4SW3VPeX xJLknPW0OmwRMlBMPBTR7Le312kGs1W9YR5IY/AyMlDNCJ5qpUFvzErToQGOzOSXxSdI7M GD3IYgmNZmsbQ79GjtH6U/gzXrtFvDA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-WrSc4scSOfi-3Eh5CxDi5w-1; Tue, 31 Dec 2019 13:35:35 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A5DC410054E3; Tue, 31 Dec 2019 18:34:28 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 665F667673; Tue, 31 Dec 2019 18:34:22 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 12/14] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM Date: Tue, 31 Dec 2019 19:32:14 +0100 Message-Id: <20191231183216.6781-13-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: WrSc4scSOfi-3Eh5CxDi5w-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Stefan Weil , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The NMC93xx EEPROM is only used by few NIC cards and the Am53C974 SCSI controller. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Stefan Weil --- hw/net/Kconfig | 2 ++ hw/nvram/Kconfig | 4 ++++ hw/nvram/Makefile.objs | 2 +- hw/scsi/Kconfig | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 3856417d42..af6a11baf3 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -14,6 +14,7 @@ config EEPRO100_PCI bool default y if PCI_DEVICES depends on PCI + select NMC93XX_EEPROM config PCNET_PCI bool @@ -28,6 +29,7 @@ config TULIP bool default y if PCI_DEVICES depends on PCI + select NMC93XX_EEPROM config E1000_PCI bool diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index ebaa749ce9..e082a5610c 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -7,3 +7,7 @@ config AT24C config MAC_NVRAM bool + +# NMC93XX uses the NS μWire interface (similar to SPI but less configurable) +config NMC93XX_EEPROM + bool diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index 26f7b4ca35..a4bdfbf187 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -1,5 +1,5 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o -common-obj-y += eeprom93xx.o +common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o common-obj-$(CONFIG_AT24C) += eeprom_at24c.o common-obj-y += fw_cfg.o common-obj-y += chrp_nvram.o diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index b3ba540c17..77d397c949 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -34,6 +34,7 @@ config ESP_PCI default y if PCI_DEVICES depends on PCI select ESP + select NMC93XX_EEPROM config SPAPR_VSCSI bool From patchwork Tue Dec 31 18:32:15 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: 1216829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SI1zYusl"; dkim-atps=neutral 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 47nNW03w3Lz9sP6 for ; Wed, 1 Jan 2020 05:44:12 +1100 (AEDT) Received: from localhost ([::1]:45460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMV0-0005hi-By for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:44:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLu-0001nF-4J for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMLs-00053H-To for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37133 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMLs-00052F-BA for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BCWFO4N6aSA6lg4FzqFWDScvfpnAbsxaIOBUJCAtlAY=; b=SI1zYusl/Y3QkVxPfZnWAXlWywhA5QxiYKllfTR2+j7d/Gu+dSHNGirUVaHo0RPZXNutdb mstjs+/t+gl7QQTPWvuVr+KE2lv+86Y7stApLSkhwH32feJyPaGrANz+XTCxEXVoUlH3GI YK+7MfMhAtLzAf1qTbh9iXkH2r0dEQw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-11-zHxZCLBtNXqDgrW_y4K8QA-1; Tue, 31 Dec 2019 13:34:42 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A49E8017DF; Tue, 31 Dec 2019 18:34:40 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 243F967673; Tue, 31 Dec 2019 18:34:28 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [PATCH 13/14] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF Date: Tue, 31 Dec 2019 19:32:15 +0100 Message-Id: <20191231183216.6781-14-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: zHxZCLBtNXqDgrW_y4K8QA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- hw/nvram/Kconfig | 4 ++++ hw/nvram/Makefile.objs | 2 +- hw/ppc/Kconfig | 1 + hw/sparc/Kconfig | 1 + hw/sparc64/Kconfig | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index e082a5610c..0d2ba531ac 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -7,7 +7,11 @@ config AT24C config MAC_NVRAM bool + select CHRP_NVRAM # NMC93XX uses the NS μWire interface (similar to SPI but less configurable) config NMC93XX_EEPROM bool + +config CHRP_NVRAM + bool diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index a4bdfbf187..090df63fcd 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o common-obj-$(CONFIG_AT24C) += eeprom_at24c.o common-obj-y += fw_cfg.o -common-obj-y += chrp_nvram.o +common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o obj-$(CONFIG_PSERIES) += spapr_nvram.o obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 8e62d8f470..e27efe9a24 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -11,6 +11,7 @@ config PSERIES select XIVE_SPAPR select MSI_NONBROKEN select FDT_PPC + select CHRP_NVRAM config SPAPR_RNG bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 2a83a8010e..22aff2f5b7 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -12,6 +12,7 @@ config SUN4M select LANCE select M48T59 select STP2000 + select CHRP_NVRAM config LEON3 bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index f9f8b0f73a..980a201bb7 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -12,6 +12,7 @@ config SUN4U select IDE_CMD646 select PCKBD select SIMBA + select CHRP_NVRAM config NIAGARA bool From patchwork Tue Dec 31 18:32:16 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: 1216824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="SWE3KiMd"; dkim-atps=neutral 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 47nNP15fw2z9sP6 for ; Wed, 1 Jan 2020 05:39:01 +1100 (AEDT) Received: from localhost ([::1]:45394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMPz-0006j9-2B for incoming@patchwork.ozlabs.org; Tue, 31 Dec 2019 13:38:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48796) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imMLy-0001vU-D8 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imMLx-0005Cp-70 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:50 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28011 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1imMLx-0005Aw-1y for qemu-devel@nongnu.org; Tue, 31 Dec 2019 13:34:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577817288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=you1BNnIeWey8KnPaYhu1Usou9ayEsaOY1T/aNIHy6g=; b=SWE3KiMdwGHufm3wA6lw60OhY33NtTmtJnkuTQ78MWP9Wg/IPhSYqfvmUjvgYeEl8SMxwk utFbCu0vIvaImU2Xa1eYBYE2UpLANTfe8RuCVOjm7LoXVMojZCMTd6IN142SclggQAac17 9xbBGG6I1Id77tfPH1SdQr3ZEuXPHnQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-316-y3TTSorwNJ6XAMJfDvTQUg-1; Tue, 31 Dec 2019 13:34:47 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42D55800EB8; Tue, 31 Dec 2019 18:34:45 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 23B6167673; Tue, 31 Dec 2019 18:34:40 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Subject: [RFC PATCH 14/14] hw/intc/Kconfig: Let APIC select IOAPIC Date: Tue, 31 Dec 2019 19:32:16 +0100 Message-Id: <20191231183216.6781-15-philmd@redhat.com> In-Reply-To: <20191231183216.6781-1-philmd@redhat.com> References: <20191231183216.6781-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: y3TTSorwNJ6XAMJfDvTQUg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Fam Zheng , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Artyom Tarasenko , Aleksandar Markovic , qemu-ppc@nongnu.org, Gerd Hoffmann , Aleksandar Rikalo , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" apic_eoi() calls ioapic_eoi_broadcast(), so APIC has to select the IOAPIC Kconfig. Signed-off-by: Philippe Mathieu-Daudé --- Cc: "Michael S. Tsirkin" RFC because I'm not sure the design is correct (meanwhile the fix is, however). --- hw/intc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index a189d6fedd..82748ae13d 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -24,6 +24,7 @@ config APIC bool select MSI_NONBROKEN select I8259 + select IOAPIC config ARM_GIC_KVM bool