From nobody Thu May 2 01:28:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511972847596499.1001391097227; Wed, 29 Nov 2017 08:27:27 -0800 (PST) Received: from localhost ([::1]:43945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eK5Cj-0007fu-ON for importer@patchew.org; Wed, 29 Nov 2017 11:27:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eK59U-0004at-KQ for qemu-devel@nongnu.org; Wed, 29 Nov 2017 11:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eK59O-0003sf-Th for qemu-devel@nongnu.org; Wed, 29 Nov 2017 11:24:00 -0500 Received: from mail.ispras.ru ([83.149.199.45]:39806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eK59O-0003rv-MQ; Wed, 29 Nov 2017 11:23:54 -0500 Received: from notebook.localdomain (pluton2.ispras.ru [83.149.199.44]) by mail.ispras.ru (Postfix) with ESMTPSA id 1928454006B; Wed, 29 Nov 2017 19:23:54 +0300 (MSK) From: Kurban Mallachiev To: qemu-devel@nongnu.org Date: Wed, 29 Nov 2017 19:22:19 +0300 Message-Id: <20171129162219.16288-2-mallachiev@ispras.ru> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171129162219.16288-1-mallachiev@ispras.ru> References: <20171129162219.16288-1-mallachiev@ispras.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFC PATCH 1/1] target-ppc: Don't invalidate non-supported msr bits 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: , Cc: Kurban Mallachiev , qemu-ppc@nongnu.org, Alexander Graf , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The msr invalidation code (commits 993eb and 2360b) inverts all bits except MSR_TGPR and MSR_HVB. On non PowerPC 601 processors this leads to incorrect change of excp_prefix in hreg_store_msr() function. The problem is that new msr value get multiplied by msr_mask and inverted msr does not, thus values of MSR_EP bit in new msr value and inverted msr are distinct, so that excp_prefix changes but should not. Signed-off-by: Kurban Mallachiev --- target/ppc/machine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 384caee800..96113ee881 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -298,9 +298,9 @@ static int cpu_post_load(void *opaque, int version_id) ppc_store_sdr1(env, env->spr[SPR_SDR1]); } =20 - /* Invalidate all msr bits except MSR_TGPR/MSR_HVB before restoring */ + /* Invalidate all supported msr bits except MSR_TGPR/MSR_HVB before re= storing */ msr =3D env->msr; - env->msr ^=3D ~((1ULL << MSR_TGPR) | MSR_HVB); + env->msr ^=3D env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); ppc_store_msr(env, msr); =20 hreg_compute_mem_idx(env); --=20 2.15.0