From nobody Tue Nov 18 06:04:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1607922925; cv=none; d=zohomail.com; s=zohoarc; b=gFOVs6idT1vIm/K78HjHdR85MptkRltL0GY2zQWv5L1QAhS9PR03JDwS2NcOTFDW0rD2B6WhXxauRPkLPRm4Hk3mLmZYjVeSkfIdL75/Y39E4xAWL+V6p8UfJql8VdOReQTzyGkIcHJBID5sGXpOcQ2cO7Fdmn697qvGAeu+ynE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607922925; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VEGKgyEKkDq/5c9sh/qD3zRfMOhuLCHg6Y3DBcKc4EY=; b=MSZp1SfbLyU9ZyKso9w1dynCGkzfHMLer8RcWvoqKWdOCzJP7OgHMnLuMdJ4tJDJ3jrDiW4mIbRMqM6aIcpvMCExuI+K7Lw8hVQhdaDp24TVudYsx3htkG7xWuk9yJDXQ0xxfSr6xUBhir/oq5oLEshrwRGk+p34iPyklmyKU4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607922924681877.378418018882; Sun, 13 Dec 2020 21:15:24 -0800 (PST) Received: from localhost ([::1]:38932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kogCh-0003uZ-Hn for importer@patchew.org; Mon, 14 Dec 2020 00:15:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwy-0005wE-7L; Sun, 13 Dec 2020 23:59:08 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:52949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwt-0004ta-1L; Sun, 13 Dec 2020 23:59:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CvTft4kGVz9sWg; Mon, 14 Dec 2020 15:58:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1607921894; bh=KXt5m26LRHcKPaeVzJr7A69rPQVXxzcMgxfXZnq3Izs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJVSdc2rFB6YgPqkkGkrlucCCZhyEZ2UsnkNIktZrkyYemABKsJYQvaFYucO7Gh4L dz8Qv5u92DlVB0Zx4UR5ygOAakF4kEgnQRMWdX2Y7tlLwm1TobhKZfbwEdWkX+dEm9 lE+GUcwbYyd15lTQolw8GCZ5omKoXDSQIH9ReyKg= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 25/30] ppc/translate: Use POWERPC_MMU_64 to detect 64-bit MMU models Date: Mon, 14 Dec 2020 15:58:02 +1100 Message-Id: <20201214045807.41003-26-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201214045807.41003-1-david@gibson.dropbear.id.au> References: <20201214045807.41003-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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.249, 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: Stephane Duverger , David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Stephane Duverger The ppc_tr_init_disas_context() function currently checks whether the MMU is 64-bit by ANDing its model type with POWERPC_MMU_64B. This is wrong : POWERPC_MMU_64B isn't a mask, it is the generic MMU model for pre-PowerISA-2.03 64-bit CPUs (ie. PowerPC 970 in QEMU). Use POWERPC_MMU_64 instead of POWERPC_MMU_64B. This should fix a potential bug with some 32-bit CPUs for which 'need_access_type' was mis-computed because (POWERPC_MMU_32B & POWERPC_MMU_64B) happens to be equal to 1. The end result being a crash in ppc_hash32_direct_store() because the access type isn't set: cpu_abort(cs, "ERROR: instruction should not need " "address translation\n"); This doesn't change anything for 'lazy_tlb_flush' since POWERPC_MMU_32B is checked first. Fixes: 5f2a6254522b ("ppc: Don't set access_type on all load/stores on hash= 64") Signed-off-by: Stephane Duverger [groug: - extended patch to address another misuse of POWERPC_MMU_64B - updated title and changelog accordingly] Signed-off-by: Greg Kurz Message-Id: <20201209173536.1437351-2-groug@kaod.org> Signed-off-by: David Gibson --- target/ppc/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 54cac0e6a7..e68dd65ad3 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -7892,7 +7892,7 @@ static void ppc_tr_init_disas_context(DisasContextBas= e *dcbase, CPUState *cs) ctx->insns_flags =3D env->insns_flags; ctx->insns_flags2 =3D env->insns_flags2; ctx->access_type =3D -1; - ctx->need_access_type =3D !(env->mmu_model & POWERPC_MMU_64B); + ctx->need_access_type =3D !(env->mmu_model & POWERPC_MMU_64); ctx->le_mode =3D !!(env->hflags & (1 << MSR_LE)); ctx->default_tcg_memop_mask =3D ctx->le_mode ? MO_LE : MO_BE; ctx->flags =3D env->flags; @@ -7902,7 +7902,7 @@ static void ppc_tr_init_disas_context(DisasContextBas= e *dcbase, CPUState *cs) #endif ctx->lazy_tlb_flush =3D env->mmu_model =3D=3D POWERPC_MMU_32B || env->mmu_model =3D=3D POWERPC_MMU_601 - || (env->mmu_model & POWERPC_MMU_64B); + || env->mmu_model & POWERPC_MMU_64; =20 ctx->fpu_enabled =3D !!msr_fp; if ((env->flags & POWERPC_FLAG_SPE) && msr_spe) { --=20 2.29.2