From patchwork Thu May 12 15:14:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 571802 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp755244mal; Thu, 12 May 2022 08:19:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztvOm3kZssn//UIGckTZ6Chh/8Bi4diwD5d2pT0CmWP5nemAhI8jO2fLGF2+BKHWHOVrw/ X-Received: by 2002:a05:622a:1015:b0:2f3:b8d1:3cd9 with SMTP id d21-20020a05622a101500b002f3b8d13cd9mr243369qte.674.1652368748046; Thu, 12 May 2022 08:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652368748; cv=none; d=google.com; s=arc-20160816; b=ukgR379G7um0lGa5XhJjzbUapTR7iTkSbQ4furLWbg1EE8DtJ5DnhioiKs4kHJ19CU d/KvjmuJVo3DjkSfNHbVTTctSqLf8La8pxRCdYIrMUAesfuUmbyzns2I+4oxQC9uSVat kEKgATh3lw4N2Qymp39fBruj3RYRNJQA/G5y8CEZAQCd7ngDRvgO4PM7XijDYUkf6Rxd 2nHdobv/t6y3Oc52Q0siyi0W4C85AFfgm1Hh2c0BUkuqBT5Natd5cJJ7k3MHJRVdQhQv cXulujYJwhqjjFuxT7cb9n+Tl6CC2PXVA1uof0nRGaks0iOw+NvES5TnJWkVExDVO0xe eI8A== 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:cc:to :from:dkim-signature; bh=jO5+b2JhjvqPhcf+OmcGXbwSQuZxOSdmxxpR3rXGCoc=; b=LOhI9e+w3a/0bAuAreg5oEVnSY1Z7XViEJ8DBVdyGfHc6BFcGEeLMxxIA9jHuq+uv/ LKbfTl0/2dCsTr5UEw6JMy4RLGi0G4aR/pFNSMH7YDrp28ZZWT7b/DqJbwnlPdVgzXts XqETaC0ZAuRtTwOwfOuap0+jh43/w+RiXFx6o/ZYT/rOFx5OMuadOoVnJql3to+NuyOo 5w1ipyBc+VFxTiY7aoi6cdOeMndGUEtEU/UOe9frCT4eCpT4wLxq1d/13t+WyGXDPxVD 5JSG5lFE+nTn2M5DOefPSxEpwmfbXfEWJ7kccYWGXu95ehpa4+bDGngxvi572HoX3KCZ gu+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YbT/71kU"; 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 n1-20020a05622a11c100b002f3ec970fc8si3113760qtk.585.2022.05.12.08.19.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 May 2022 08:19:08 -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="YbT/71kU"; 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]:52644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npAap-0007vC-Dm for patch@linaro.org; Thu, 12 May 2022 11:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npAWu-00032s-42 for qemu-devel@nongnu.org; Thu, 12 May 2022 11:15:05 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npAWs-0000BQ-A3 for qemu-devel@nongnu.org; Thu, 12 May 2022 11:15:03 -0400 Received: by mail-wr1-x434.google.com with SMTP id f2so698508wrc.0 for ; Thu, 12 May 2022 08:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jO5+b2JhjvqPhcf+OmcGXbwSQuZxOSdmxxpR3rXGCoc=; b=YbT/71kUR7LJzoa0chD4nHh1u+sUOaIKv0xF2ddz3mgvSvHw1f2g9wFubtkvy0bAqF 3GjpX0rLdf4EVvhRF7JvNiWeRnmlEQwcSdlpvUegSn63EMun3YxHjzveJYHQUwX2YhRJ 37ywqQyB3T1e5ZgjCf0l/U/HBVXxzKF1TXZ63KYSMibsFwP0y3bsxVsv4nfN8+gYZ2h8 2WXhroAmRDtUGwXN1GuNueHd4QBmE3LUgssJxzFEMyDsFVToXqhGqXCpWAWbzzTrEQ+X Xx0K8feVYTNzZXuVBPGUxWG0NSjgDvutODTmlLwiv8TZLFSns6HisotbZ7+x0+HHL2YH 6UGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jO5+b2JhjvqPhcf+OmcGXbwSQuZxOSdmxxpR3rXGCoc=; b=p/WlBQ2ikEft+qDkCGGkWESu0zodndHpZDkxW70u1FuKdyBjEK1YWKo9SDQzyRJbza +5Fs0u6tsS/TL9SRNqiqBLnAKp8Qlw4yl7SjBw49YTBc+H2iXekQQX5q2lzEiK6xRTe8 puyuoTZTVZEB+SlU/0xVKeDS66ZM0wFVWqeaeX2laT45jjaYrWnRVudDAX7FPvqfA8jB 6qmEM4Um7vT3LgwYjUbfSYqQvNk7pG61/vuBj9Y+p+bc1Ixg8Ms+8C5Q20ls8utuXp1v ZiFGMjT/GFcJYsE3W0ZBTWknpT2oBXKgiIz1SyBG2jAskBXfUbswAeVXf3um8rCbEhyq avsw== X-Gm-Message-State: AOAM532A36pK6lFYMEgChKrhTyuSuyb0bgjXqWTHjwFhRL71IPzyXqMs jO1CyoQil2COp6A8+liCu6lc3g== X-Received: by 2002:adf:f38a:0:b0:20a:bc71:fe3f with SMTP id m10-20020adff38a000000b0020abc71fe3fmr126283wro.47.1652368500880; Thu, 12 May 2022 08:15:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ay41-20020a05600c1e2900b003942a244f51sm3048378wmb.42.2022.05.12.08.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 08:15:00 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PATCH v2 2/6] hw/intc/arm_gicv3: report correct PRIbits field in ICV_CTLR_EL1 Date: Thu, 12 May 2022 16:14:53 +0100 Message-Id: <20220512151457.3899052-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220512151457.3899052-1-peter.maydell@linaro.org> References: <20220512151457.3899052-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As noted in the comment, the PRIbits field in ICV_CTLR_EL1 is supposed to match the ICH_VTR_EL2 PRIbits setting; that is, it is the virtual priority bit setting, not the physical priority bit setting. (For QEMU currently we always implement 8 bits of physical priority, so the PRIbits field was previously 7, since it is defined to be "priority bits - 1".) Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20220506162129.2896966-2-peter.maydell@linaro.org --- hw/intc/arm_gicv3_cpuif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index df2f8583564..ebf269b73a4 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -657,7 +657,7 @@ static uint64_t icv_ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri) * should match the ones reported in ich_vtr_read(). */ value = ICC_CTLR_EL1_A3V | (1 << ICC_CTLR_EL1_IDBITS_SHIFT) | - (7 << ICC_CTLR_EL1_PRIBITS_SHIFT); + ((cs->vpribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT); if (cs->ich_vmcr_el2 & ICH_VMCR_EL2_VEOIM) { value |= ICC_CTLR_EL1_EOIMODE;