From patchwork Tue May 4 05:52:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 430804 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3489369jao; Mon, 3 May 2021 22:58:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlZuRMUvjPqcNwkcLfvJgUi7MN/vgj6Nq5heABQD8rlusouyCh8eP/Prv4P3vKg1Xdqxq+ X-Received: by 2002:a37:a051:: with SMTP id j78mr6527472qke.216.1620107923191; Mon, 03 May 2021 22:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620107923; cv=none; d=google.com; s=arc-20160816; b=FUOtmyuO9qTF/PW6+5aJQtZ89W+dwWBzHUwRYryzWU8PpP0AqMbwc1ryMePX2BJjH6 2wd0an42OIX6BWmaVHXgfXGd7noXivivQkSlYnhzRNGYFzk7FmnWsGQwA6mXplAlQJYz lXoZiNDWzZQK23TgfS3Xyxfm3uepLyMD340NVk6fkVVPu7prItM9r7l0/+OKpRK/pZQk 9PkGCj35AZ9Kb+0S/LCl6A7m5oUbMnVxSFmTPKPSuLkzHLHU6+JMrd919Qbbqwb3BDe+ 7WzVRWWgsdg0fgQ9glaeMRiA78e4LL7fuKMyno/nxetHBj1pf/GM8oum8LtcQmAWsHJd t/5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=mFpWojEzaS2JiCOjIkqLAB/iismou+0tsGsK2WI4HR4=; b=v+b80d4ozf6Fg5aWzHeQP9W+x5kFwCOiLjuaZgxwUEhf7hiGgzDAKf2tKTar8AYCEw yHSg3EsbQ/d+5xyAOpde6G2+hUs/5RfXA3QS/67P7VpTGRRm+Af3+i/m1KJx/yImORJM yWytN1q/DAwxR6umyiOZ3ufCADS4Co/uCh5YxigFbnG4dHC/ECcLcITuknY5iRaQXEln HTNeMHUfj6uQsDh0WUf+VyUePwmJ+GV1iKBZ8C0JX+tVUTwZciLxUhtxiuwugkiwN+wX D2ULFadGhWKEyJ8Vvv1dbun4ByO/ITrXseMaShYofe4TqIuWURWSZb1Yn9dzkdiV6WpW qDkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=jS+Y1Xgt; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j20si4246392qko.293.2021.05.03.22.58.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 May 2021 22:58:43 -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=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=jS+Y1Xgt; 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" Received: from localhost ([::1]:56162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldo4w-0001Jf-I5 for patch@linaro.org; Tue, 04 May 2021 01:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldnzw-0005DQ-Rj; Tue, 04 May 2021 01:53:34 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:51991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldnzs-0004fX-R4; Tue, 04 May 2021 01:53:31 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FZ8CK1YrWz9sWH; Tue, 4 May 2021 15:53:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1620107597; bh=O5zitTu+nloRXDlrgGA5ooBE2GZ6ePUNtmsAOMIModU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jS+Y1XgtrUo/X4LKu+GcN0TgNn3KEXeWvz981JCyJDnYCXOAy7FdJP2I5J3dfkB/g nwuW/2wg/XpicofvtV8MzYDnaCnJv7AWGT+GVic34OgRrMSeV2QZcPSzvJL2Ir+KnU Hz61gcwsf/uw3yKujxeD40U1z6NYq5zRoQPk7gR4= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 08/46] hw/ppc/pnv_core: Update hflags after setting msr Date: Tue, 4 May 2021 15:52:34 +1000 Message-Id: <20210504055312.306823-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210504055312.306823-1-david@gibson.dropbear.id.au> References: <20210504055312.306823-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Richard Henderson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Message-Id: <20210315184615.1985590-15-richard.henderson@linaro.org> Signed-off-by: David Gibson --- hw/ppc/pnv_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.31.1 diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index bd2bf2e044..8c2a15a0fb 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -29,6 +29,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/xics.h" #include "hw/qdev-properties.h" +#include "helper_regs.h" static const char *pnv_core_cpu_typename(PnvCore *pc) { @@ -55,8 +56,8 @@ static void pnv_core_cpu_reset(PnvCore *pc, PowerPCCPU *cpu) env->gpr[3] = PNV_FDT_ADDR; env->nip = 0x10; env->msr |= MSR_HVB; /* Hypervisor mode */ - env->spr[SPR_HRMOR] = pc->hrmor; + hreg_compute_hflags(env); pcc->intc_reset(pc->chip, cpu); }