From patchwork Thu Jun 1 17:10:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 100970 Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp863444obc; Thu, 1 Jun 2017 10:26:46 -0700 (PDT) X-Received: by 10.55.137.7 with SMTP id l7mr3330170qkd.122.1496338006200; Thu, 01 Jun 2017 10:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496338006; cv=none; d=google.com; s=arc-20160816; b=jqVOgnwHaz/mFW8rYfNDczjNcwNZkJCKcM9a/AYEEP8l7egyCOVFWkj5QZBiO7XYyJ 9bLltiH+4E7samSXszdcw6Jb30JIHHF4Embggn1g8h5OYuhX5/1A9L3ggC+xyX/pPyFe VUGun5HQiLgctvWUu4x1sCpOrS1BTYk4lOagDCeY3Vf/sRHrFLxT58LF6rCpXPZrnBeL clQPWr9wrzv+Nb/4PuCO/qS6fjgZOoH9O/zZrR/aIc7uK0/2ihN3dCyp96AS4xTm4Ajb soyBrOrFLqyTQg3rU2iGXILtYIgszkzxNBWUyBuEC2dW7lPyf3q10s54QW4Vq3ncTYQ2 OJNA== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=HlBb3GoPUxY7aNVT2X8zRlMw5mPQeMPaYmGqPcsWPlw=; b=CKQgeKQNp+YHrq9U9YWUHYpuOBXsLYonkilBuSZ+EPpVBXGLReiiXS6MzHXFJwOinE K5YY+bGCrrevn9NsS0e5XQmTORQg7kUgIzULWodA+ujaigmYsAb8IdRr5OGyDIT0Eoyb M50oqE2xn9d+rIWE6OLRv6kCZKC7+ARkorCEO6CrBw+K0bPRB7RDfuPBhqfccB8bYObo Jf1RoZ2kJDZt/ryzOmEnrgLlyi/EGhO2A5DlhspTv6nAgwXiiESIi+2mzfme5xq+Lqa/ H2XmSNjfOBINzoEFYG9vi538HIY4OCJ6oeDEDJhfO6SotzlATfYFa6FHHbdeqLf86XXG ASsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t11si20258389qth.148.2017.06.01.10.26.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Jun 2017 10:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGTrv-00070p-Em for patch@linaro.org; Thu, 01 Jun 2017 13:26:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGTcb-0001Ac-W9 for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGTcX-0006Bi-RW for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:53 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37144) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dGTcX-00064g-Ix for qemu-devel@nongnu.org; Thu, 01 Jun 2017 13:10:49 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dGTcM-0007Nx-Cw for qemu-devel@nongnu.org; Thu, 01 Jun 2017 18:10:38 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 1 Jun 2017 18:10:11 +0100 Message-Id: <1496337035-30213-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> References: <1496337035-30213-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 03/27] hw/intc/arm_gicv3_cpuif: Fix reset value for VMCR_EL2.VBPR1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" We were setting the VBPR1 field of VMCR_EL2 to icv_min_vbpr() on reset, but this is not correct. The field should reset to the minimum value of ICV_BPR0_EL1 plus one. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 1493226792-3237-2-git-send-email-peter.maydell@linaro.org --- hw/intc/arm_gicv3_cpuif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index 0b20856..d31eba0 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -2014,7 +2014,7 @@ static void icc_reset(CPUARMState *env, const ARMCPRegInfo *ri) cs->ich_hcr_el2 = 0; memset(cs->ich_lr_el2, 0, sizeof(cs->ich_lr_el2)); cs->ich_vmcr_el2 = ICH_VMCR_EL2_VFIQEN | - (icv_min_vbpr(cs) << ICH_VMCR_EL2_VBPR1_SHIFT) | + ((icv_min_vbpr(cs) + 1) << ICH_VMCR_EL2_VBPR1_SHIFT) | (icv_min_vbpr(cs) << ICH_VMCR_EL2_VBPR0_SHIFT); }