From nobody Sun May 19 06:04:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646764052; cv=none; d=zohomail.com; s=zohoarc; b=RE+OJDsAkRP7Q1NYJvvyrWobnHX+hVmddR1GiYdmru+qXFUFd0jqANKNkRvXi88h6KpvBo129Dllr8OA4ephP+IK5nC9rQc6dJPnz+kxhrl0VKWk2eqRbVGap/iKPdTBdQOhdQ1OoBSziF28Swv/OXd9LosZR1TRLfzCLPNlBi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646764052; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9eHzE2Oeiv8GnAde9Vlt7vdxFQ1ZbGYXgwrANjAz7Fo=; b=cazdDbgZdmx+wEquaoymJDEC5wUydZ9H+RRGsVJo/mFV1ruZA8upX1qAEUJsVzrUQxLuG9OLXuCD/BpjyPza+hJrcWUxfFZiRDOC7RruXYiqsedzqW0XLTi5H4z/Edz8O8vzdG4bs5sYKWte/W60KJ9X9F6+bc1+JlVAfPIGWdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646764052293868.6326003497464; Tue, 8 Mar 2022 10:27:32 -0800 (PST) Received: from localhost ([::1]:53188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nReYV-0001Vr-1K for importer@patchew.org; Tue, 08 Mar 2022 13:27:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReWA-0007WQ-16 for qemu-devel@nongnu.org; Tue, 08 Mar 2022 13:25:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReW6-0003qP-Lv for qemu-devel@nongnu.org; Tue, 08 Mar 2022 13:25:04 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-fOlLW5j6MVqtDN7bLz3lTA-1; Tue, 08 Mar 2022 13:24:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C37C1800D50; Tue, 8 Mar 2022 18:24:58 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id B902886C44; Tue, 8 Mar 2022 18:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646763901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9eHzE2Oeiv8GnAde9Vlt7vdxFQ1ZbGYXgwrANjAz7Fo=; b=GkM4/6kW8urqhGfdLmrPeKx5+sZGSaFtkbg7co3cQiiCiwdhomuAzXVNR/vAMxcI/k5TOh dnMXho5QTK49e8gdHYCrSLp1s/+IDdcOPR3OB/6uQ5tyQbEGfp6qESx3qv501AkabsmKYh 4gtfCr/qPVKevSh7g8Pgpw8lTCLjneU= X-MC-Unique: fOlLW5j6MVqtDN7bLz3lTA-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, f4bug@amsat.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/intc: Rename CONFIG_ARM_GIC_TCG into CONFIG_ARM_GICV3_TCG Date: Tue, 8 Mar 2022 19:24:51 +0100 Message-Id: <20220308182452.223473-2-eric.auger@redhat.com> In-Reply-To: <20220308182452.223473-1-eric.auger@redhat.com> References: <20220308182452.223473-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646764054125100001 Content-Type: text/plain; charset="utf-8" CONFIG_ARM_GIC_TCG actually guards the compilation of TCG GICv3 specific files. So let's rename it into CONFIG_ARM_GICV3_TCG Signed-off-by: Eric Auger Reviewed-by: Andrew Jones --- hw/intc/Kconfig | 2 +- hw/intc/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index ec8d4cec29..a7cf301eab 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -25,7 +25,7 @@ config APIC select MSI_NONBROKEN select I8259 =20 -config ARM_GIC_TCG +config ARM_GICV3_TCG bool default y depends on ARM_GIC && TCG diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 81ccdb0d78..d6d012fb26 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -6,7 +6,7 @@ softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( 'arm_gicv3_common.c', 'arm_gicv3_its_common.c', )) -softmmu_ss.add(when: 'CONFIG_ARM_GIC_TCG', if_true: files( +softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( 'arm_gicv3.c', 'arm_gicv3_dist.c', 'arm_gicv3_its.c', @@ -28,7 +28,7 @@ softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_PMU', if_true: f= iles('xlnx-pmu-iomod-in specific_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinne= r-a10-pic.c')) specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common= .c')) specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_co= mmon.c')) -specific_ss.add(when: 'CONFIG_ARM_GIC_TCG', if_true: files('arm_gicv3_cpui= f.c')) +specific_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files('arm_gicv3_cp= uif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'= )) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: f= iles('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) --=20 2.26.3 From nobody Sun May 19 06:04:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646764150; cv=none; d=zohomail.com; s=zohoarc; b=K2Ja0kO2wEceQf8IwcZPIeuIgBRchRlijzNe8ogLRbWbJFtJ5GTp6J5touyAHpQzZsf3lrLCU0Cs0IJJovonNv1gtQndJ5LEGFe0SrbGpIEsAMezIhQwXuVp3zg4gwJMMwpdvlBucxAPEH7y9drclP0g+mgSQg3v0YsxYY3fQnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646764150; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ietZbyI29vSajRMQnOuq1MmdCcl/JxjvJCJZnRqbAYI=; b=DmE8IJxVnlbOi2C0Byer6BCNj1bNt8PZkS1kPFZ+2I/24XEVQj5A4g5jL3BQ3c/E9LPGH+2FrNSLUPLjH69gwCd0+U8Pr53JWB+dt4YfDJZlFtxNczIiVKxKfgssPoKTahabwzYz/YIABcrQIOnayni5LrqaqmCwzBhEF2hNPQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646764150303236.39493176126052; Tue, 8 Mar 2022 10:29:10 -0800 (PST) Received: from localhost ([::1]:60820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRea5-0006Zp-Bn for importer@patchew.org; Tue, 08 Mar 2022 13:29:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReWB-0007Zq-KM for qemu-devel@nongnu.org; Tue, 08 Mar 2022 13:25:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nReW8-0003zq-78 for qemu-devel@nongnu.org; Tue, 08 Mar 2022 13:25:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-458-qRDPGujSPdKEew95vIBxqQ-1; Tue, 08 Mar 2022 13:25:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 994DA1800D50; Tue, 8 Mar 2022 18:25:00 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.39.192.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id D606586C53; Tue, 8 Mar 2022 18:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646763903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ietZbyI29vSajRMQnOuq1MmdCcl/JxjvJCJZnRqbAYI=; b=f55WTWo9NmvGwN6fgezHTQ5PWN8mEIkxGrnE+w2DriqX0sSreVy1C36boXUErVnC0k5lXp Ksd4ogsbJwLqo9CyPuPJB4V7ORVaSpMrhgITEWSzDGh8xOkyV6OVKicWZrHsAYgXOWMZH6 aZl0BYY+w+iwSYDlMoAAmSz8IY5JDeM= X-MC-Unique: qRDPGujSPdKEew95vIBxqQ-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, f4bug@amsat.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/arm/virt: Fix gic-version=max when CONFIG_ARM_GICV3_TCG is unset Date: Tue, 8 Mar 2022 19:24:52 +0100 Message-Id: <20220308182452.223473-3-eric.auger@redhat.com> In-Reply-To: <20220308182452.223473-1-eric.auger@redhat.com> References: <20220308182452.223473-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646764150713100001 Content-Type: text/plain; charset="utf-8" In TCG mode, if gic-version=3Dmax we always select GICv3 even if CONFIG_ARM_GICV3_TCG is unset. We shall rather select GICv2. This also brings the benefit of fixing qos tests errors for tests using gic-version=3Dmax with CONFIG_ARM_GICV3_TCG unset. Signed-off-by: Eric Auger Reviewed-by: Andrew Jones --- v2 -> v3: - Use module_object_class_by_name() and refer to the renamed CONFIG_ARM_GICV3_TCG config --- hw/arm/virt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 46bf7ceddf..39790d29d2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1852,7 +1852,12 @@ static void finalize_gic_version(VirtMachineState *v= ms) vms->gic_version =3D VIRT_GIC_VERSION_2; break; case VIRT_GIC_VERSION_MAX: - vms->gic_version =3D VIRT_GIC_VERSION_3; + if (module_object_class_by_name("arm-gicv3")) { + /* CONFIG_ARM_GICV3_TCG was set */ + vms->gic_version =3D VIRT_GIC_VERSION_3; + } else { + vms->gic_version =3D VIRT_GIC_VERSION_2; + } break; case VIRT_GIC_VERSION_HOST: error_report("gic-version=3Dhost requires KVM"); --=20 2.26.3