From patchwork Fri Mar 18 13:22:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 552610 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp2080026mag; Fri, 18 Mar 2022 06:34:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM8PRZxW5509RRmIpxZVP6xl0+M6jlWAP02fM2Gm//bNy+h4B4ABV5aRFAnJ/34RdgK5ZG X-Received: by 2002:ac8:7f42:0:b0:2e1:fd5f:742e with SMTP id g2-20020ac87f42000000b002e1fd5f742emr4493081qtk.123.1647610466798; Fri, 18 Mar 2022 06:34:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647610466; cv=none; d=google.com; s=arc-20160816; b=SbWLTrkgyPu7SMlKwA9Vrqqs15kCBcEuzTmw42JhOsYxkvTor5BIIiWILJet3iVDkm unv/KcnCm2khcmkn3tLRD2EqAO4pWYw7ZsGMmsYEW5yS1zVdBv1nPsx2Mld+8FhFHiEq /nu7F1E17RWqZhLiNpgoBcL4YcwFxtuQH7R1liNukAMZ+BuFWatHW1Qm9HMVBowbpJB+ fx8/CmjE9vDoXciRkzkWGnit0RY04R/tUd+HBDusEySp9DIKw0lyGXjrc1lSqXg0917Y tyKnUNbMbSV/Tt+krBSriOt6mNaWXcvptoRIiZx62j2EW+Ayj6JacZO2MvPDuBNfHD4k o2YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=w+JI1qq6cdVD2iag3w2GaYZANAYR6mX3L0DIG064z08=; b=su2ELQxmnlJomC/DOMjMk2xyvJH2JcejRatKAH5+wn6KGiRP92Ehjk6TVcC3Hhg+4f KBu+l6Tnd040jyLPxTImnLEgh4/hoWJKKS0I4JbM871gRCjhWv4t3K7Qv6DFtzfXUQhy +OliGVznptY3Hzcsn7wBk71X3dxSvfms4JwbssHcta2I0kVKB2C8Yf9BbDa9ZayVe9m+ 3903zr/k40rHP0Ey41ZJsCDQpw90kDCKuLSEQN1bWaSxSr5jJQwwfztruGBFfjdod8go 0LUShHhZjGTSwPEiQ4rg+tvNPOwDwCal1JNs08khlRsEiBUcrDFVj6pzu/BcyEp+hK63 Ic4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oiGoivpK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y6-20020a379606000000b00628a20c3b82si2116786qkd.681.2022.03.18.06.34.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Mar 2022 06:34:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oiGoivpK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVCkM-0006dm-CB for patch@linaro.org; Fri, 18 Mar 2022 09:34:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVCZf-0006V8-8b for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:23 -0400 Received: from [2a00:1450:4864:20::42e] (port=45977 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVCZd-0002Bv-Kc for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:22 -0400 Received: by mail-wr1-x42e.google.com with SMTP id p9so11693951wra.12 for ; Fri, 18 Mar 2022 06:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=w+JI1qq6cdVD2iag3w2GaYZANAYR6mX3L0DIG064z08=; b=oiGoivpKTOpWiJHmlPkw60nFenTkWLNaJs9k2w0TbN3jlzI8ZZDvDs22i26kQZyfMt lFo5GXCEHgl0SSoXz/SuJ8e6EEkPhia+x/+DUrgoVcEBwLDG2ug8N0fdTLk+S0o1uXTo jF+CgnRk3adk7vrHYed9D4H36/dP9QmE/OYHV/juTT8xaYVwrsVg/d3LMb4jrZ/7SXGe pzGAbiA8K5IZJwUiKBRACPENcgOjsN+16YngPlWy++kKgtfRdztBUJFxccPMRVNrv7m8 m6jw/IlL27i6weu9vzVYKGpGb068n8ynJzHZekQZ4cZDJ9tfrwH5pCTsPg52HOfb/faB /zEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w+JI1qq6cdVD2iag3w2GaYZANAYR6mX3L0DIG064z08=; b=ypB9QJkuEs3y7DK7KiPEjVpjEEEd0o6v4KT+yzFw+avzH13keGSmcEZNxy1uzayEM7 /d+kXr4VbRwAtzj1048OV9SApeQCT1gkf57WiGdIaHkYsq9MbXNW1KwwMPOBMnZMzybT GhqTs6QEmZJgJFHJ3rw/7JLmg/+qbl+GhJSxPT33bCeuMJWG3JSxkqkhwc3/SjbfQCIl t55YF/92AQAJbCal3mnDSjTPHuR+jGGh6azyF7XxRRKGJZSM9vMTjtuP6gnwGKMI85lq PombOlJ1qo0tIMW70PAxxAeC6sWwgeF/KQZAzPGK7I8XLFpcI9i2Kbs/IMJQvEmY7ekj bBpQ== X-Gm-Message-State: AOAM5329YdHEMBCn2HnpbA+ITzM7hPPJid/TXtE2nIUH9zwIU/n+ciMv KZq8TTPe48TZdfa+VOXS4WkTxT2t2uxq/A== X-Received: by 2002:a05:6000:1847:b0:203:813a:509e with SMTP id c7-20020a056000184700b00203813a509emr7924405wri.329.1647609800298; Fri, 18 Mar 2022 06:23:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y15-20020a05600015cf00b00203e324347bsm6316599wry.102.2022.03.18.06.23.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:23:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/21] hw/arm/virt: Fix gic-version=max when CONFIG_ARM_GICV3_TCG is unset Date: Fri, 18 Mar 2022 13:22:55 +0000 Message-Id: <20220318132306.3254960-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220318132306.3254960-1-peter.maydell@linaro.org> References: <20220318132306.3254960-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger In TCG mode, if gic-version=max 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=max with CONFIG_ARM_GICV3_TCG unset. Signed-off-by: Eric Auger Reviewed-by: Andrew Jones Message-id: 20220308182452.223473-3-eric.auger@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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 46a42502bc5..d2e5ecd234a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1852,7 +1852,12 @@ static void finalize_gic_version(VirtMachineState *vms) vms->gic_version = VIRT_GIC_VERSION_2; break; case VIRT_GIC_VERSION_MAX: - vms->gic_version = VIRT_GIC_VERSION_3; + if (module_object_class_by_name("arm-gicv3")) { + /* CONFIG_ARM_GICV3_TCG was set */ + vms->gic_version = VIRT_GIC_VERSION_3; + } else { + vms->gic_version = VIRT_GIC_VERSION_2; + } break; case VIRT_GIC_VERSION_HOST: error_report("gic-version=host requires KVM");