From nobody Tue Nov 18 09:19:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1608303458; cv=none; d=zohomail.com; s=zohoarc; b=WNHbIYa1smsNimrwLizTB9NUtI5NUF+TNpN6vwVxKgRNM0JAU9TjdQzS3zvT8sox7lnUh6kAbxZOon2epUQbaqi44mQ0drG5ppc4PBPYEr3XuwlBr//Jfc4CMkI97f85UwIm1BY+Nficta0AJoyH1vaCKgRhWGb2JCHdv2zjKs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608303458; h=Content-Type: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=tQwn4qVMdGLGDq3gfktgy6B9oXejqFnPXqmiWAII9dk=; b=WyhxSaBV9q+oqmJ4w6gTz8vrjAiurhQfW7/f5itRlcAEhSZ7llDDbYyKFfzTq6wCCRdKIFQWwH9qQsbyXo/zPbHvBqjM25R3Imd7HiOpEouz+8FDPOhZ77YOHNr7JxlWt472wftIYA7ag9C/IvOmLwLVpSEyjhI1yaOvse8xdIE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1608303458131876.7133396700248; Fri, 18 Dec 2020 06:57:38 -0800 (PST) Received: from localhost ([::1]:47500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqGtv-0005s9-20 for importer@patchew.org; Fri, 18 Dec 2020 09:38:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqGox-0001VZ-6A; Fri, 18 Dec 2020 09:33:29 -0500 Received: from poy.remlab.net ([2001:41d0:2:5a1a::]:56806 helo=ns207790.ip-94-23-215.eu) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqGov-0007Y9-27; Fri, 18 Dec 2020 09:33:26 -0500 Received: from basile.remlab.net (ip6-localhost [IPv6:::1]) by ns207790.ip-94-23-215.eu (Postfix) with ESMTP id 6BE025FC85; Fri, 18 Dec 2020 15:33:21 +0100 (CET) From: remi.denis.courmont@huawei.com To: qemu-arm@nongnu.org Subject: [PATCH 1/3] target/arm: keep translation start level unsigned Date: Fri, 18 Dec 2020 16:33:19 +0200 Message-Id: <20201218143321.102872-1-remi.denis.courmont@huawei.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <7884934.NyiUUSuA9g@basile.remlab.net> References: <7884934.NyiUUSuA9g@basile.remlab.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2001:41d0:2:5a1a::; envelope-from=remi@remlab.net; helo=ns207790.ip-94-23-215.eu X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: R=C3=A9mi Denis-Courmont Signed-off-by: R=C3=A9mi Denis-Courmont --- target/arm/helper.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index df195c314c..b927e53ab0 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10821,17 +10821,12 @@ do_fault: * Returns true if the suggested S2 translation parameters are OK and * false otherwise. */ -static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, int level, +static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, uint32_t level, int inputsize, int stride) { const int grainsize =3D stride + 3; int startsizecheck; =20 - /* Negative levels are never allowed. */ - if (level < 0) { - return false; - } - startsizecheck =3D inputsize - ((3 - level) * stride + grainsize); if (startsizecheck < 1 || startsizecheck > stride + 4) { return false; @@ -10856,6 +10851,9 @@ static bool check_s2_mmu_setup(ARMCPU *cpu, bool is= _aa64, int level, if (level =3D=3D 0 && pamax <=3D 42) { return false; } + if (level =3D=3D 3) { + return false; + } break; default: g_assert_not_reached(); @@ -10871,7 +10869,7 @@ static bool check_s2_mmu_setup(ARMCPU *cpu, bool is= _aa64, int level, /* AArch32 only supports 4KB pages. Assert on that. */ assert(stride =3D=3D 9); =20 - if (level =3D=3D 0) { + if (level =3D=3D 0 || level >=3D 3) { return false; } } @@ -11203,7 +11201,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, ui= nt64_t address, =20 if (!aarch64 || stride =3D=3D 9) { /* AArch32 or 4KB pages */ - startlevel =3D 2 - sl0; + startlevel =3D (2 - sl0) & 3; } else { /* 16KB or 64KB pages */ startlevel =3D 3 - sl0; --=20 2.29.2