From nobody Fri Dec 19 06:57:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1563573103; cv=none; d=zoho.com; s=zohoarc; b=YAUux1sGhg6J5hk7tffNNGy9981R2v8tXCXo2SKIP0TkOrWs25abnabCx0koXX9RM0ZSDzw4TFWkB28Tm2ZiWgh41LVUNWYX3EqutSybXMTnX8nZc5jAxQLQBpRi/icNvUmuEOh/aQg0UJ0sZQLAH9BsjKfc81tSU9X1p7kaXYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563573103; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qk9GipHOYNw6KZI4F5q4n7Nxd19EnnKx5R5hRD58GS0=; b=OHSszt+nqoUwjBhVWDFhMJaATQaeFcUpowkbq9X0ZKeKPnvPb8nIIbPDgrm+/5N/4vZtVRq01BOsXRGgmcrXc2ZhjMAwhfzOMYXNH68WeOGnLgDt17eBc29wzCqjrioHHt533aDEUsnCqvCA08s/E82JKLPMN3sN6QjkbesfLRo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563573103925870.6600394496165; Fri, 19 Jul 2019 14:51:43 -0700 (PDT) Received: from localhost ([::1]:48256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa5T-0006ka-E5 for importer@patchew.org; Fri, 19 Jul 2019 17:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55350) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoa3h-0000Ab-2p for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoa3f-0005eT-59 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:52 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:40142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hoa3e-0005Dx-BA for qemu-devel@nongnu.org; Fri, 19 Jul 2019 17:04:50 -0400 Received: by mail-pl1-x642.google.com with SMTP id a93so16143133pla.7 for ; Fri, 19 Jul 2019 14:03:56 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id i6sm32724751pgi.40.2019.07.19.14.03.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 19 Jul 2019 14:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qk9GipHOYNw6KZI4F5q4n7Nxd19EnnKx5R5hRD58GS0=; b=kA7nCogzBq55OAVpDWbuClTYj92FI9iJjlxZz2aRmuEXvdfU1+zQX7NqWSZ1S1jO6k lnRsC+F1HpX5OJruDSiWWdc9p+wOX5egnkN+GY2nwRRY6bQDb3J0zVzLoUbd2u+J8ft9 jqoeZWuWUUa9Qv9zkEEuz/dz2XhevWRskkQ9AbLyoF+Ll67AKFrd59NC8Gk2SxKqLU/Z CfBVr7WS5HeoC991tZLSHvQQ0Iy5GBj0Dtgz1CHbiQ4pQ0EHxyy2Jxm2yEIzzAORHHDy ei1Z9Z1uAQEfK9yIKuo6URelRKkVnD1NZVTeYrWpZV1uqAwbMZizQ03YiehPeNhxeSAe uX/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qk9GipHOYNw6KZI4F5q4n7Nxd19EnnKx5R5hRD58GS0=; b=RVvm+BoQBYsQuUZXQIBwDnAXVZ/4i1jhVV95icnlsdeMFqn5bLcqommx6sc7TfKo/5 gnkfaBQB9o8v/HzK00DmrifD09pL46f0jH0wEcvgOemQUQTEJUpQt2fB9hUZBrrZ0JOD FiLeiTH1YPspZelQfeqr0axqmxaLSioYlbMQV3JlBSyl+E+juVBtJOOUy1NI6X77IgzE DLBRsLTU99ysKRW1GkL+CAs2xSRBhRUsbM0iYRZUC46KANimTSCu0H28YMtyb6RAXjd4 okIYDhMHjH95/R7S+xgQLous45dh2KbU7MyVszUvaElgsAyiS0Fpyhs7SwR52ubJaKm0 15CA== X-Gm-Message-State: APjAAAV3Z+VD7nAwhb3vnqlunwvnbe3M4ndBndNDlughMZMOx/0ojovc alSGhXyyhkuzs9Oz5LJjgATG4LUI1OY= X-Google-Smtp-Source: APXvYqxUIQE1tA8PuT0lCcEWh7Q661tHuQ7v+tQrBKM5nezsETmIb6u0jzuF3q8qcJrTYd7ywp3OrQ== X-Received: by 2002:a17:902:934a:: with SMTP id g10mr60234914plp.18.1563570235782; Fri, 19 Jul 2019 14:03:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 19 Jul 2019 14:03:25 -0700 Message-Id: <20190719210326.15466-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190719210326.15466-1-richard.henderson@linaro.org> References: <20190719210326.15466-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 Subject: [Qemu-devel] [PATCH for-4.2 23/24] target/arm: Update {fp, sve}_exception_el for VHE 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: peter.maydell@linaro.org, beata.michalska@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When TGE+E2H are both set, CPACR_EL1 is ignored. Signed-off-by: Richard Henderson --- target/arm/helper.c | 53 ++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index ae3ec9ea67..bbe36eb3a9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5501,7 +5501,9 @@ static const ARMCPRegInfo debug_lpae_cp_reginfo[] =3D= { int sve_exception_el(CPUARMState *env, int el) { #ifndef CONFIG_USER_ONLY - if (el <=3D 1) { + uint64_t hcr_el2 =3D arm_hcr_el2_eff(env); + + if (el <=3D 1 && (hcr_el2 & (HCR_E2H | HCR_TGE)) !=3D (HCR_E2H | HCR_T= GE)) { bool disabled =3D false; =20 /* The CPACR.ZEN controls traps to EL1: @@ -5516,8 +5518,7 @@ int sve_exception_el(CPUARMState *env, int el) } if (disabled) { /* route_to_el2 */ - return (arm_feature(env, ARM_FEATURE_EL2) - && (arm_hcr_el2_eff(env) & HCR_TGE) ? 2 : 1); + return hcr_el2 & HCR_TGE ? 2 : 1; } =20 /* Check CPACR.FPEN. */ @@ -11212,8 +11213,6 @@ uint32_t HELPER(crc32c)(uint32_t acc, uint32_t val,= uint32_t bytes) int fp_exception_el(CPUARMState *env, int cur_el) { #ifndef CONFIG_USER_ONLY - int fpen; - /* CPACR and the CPTR registers don't exist before v6, so FP is * always accessible */ @@ -11241,30 +11240,34 @@ int fp_exception_el(CPUARMState *env, int cur_el) * 0, 2 : trap EL0 and EL1/PL1 accesses * 1 : trap only EL0 accesses * 3 : trap no accesses + * This register is ignored if E2H+TGE are both set. */ - fpen =3D extract32(env->cp15.cpacr_el1, 20, 2); - switch (fpen) { - case 0: - case 2: - if (cur_el =3D=3D 0 || cur_el =3D=3D 1) { - /* Trap to PL1, which might be EL1 or EL3 */ - if (arm_is_secure(env) && !arm_el_is_aa64(env, 3)) { + if ((arm_hcr_el2_eff(env) & (HCR_E2H | HCR_TGE)) !=3D (HCR_E2H | HCR_T= GE)) { + int fpen =3D extract32(env->cp15.cpacr_el1, 20, 2); + + switch (fpen) { + case 0: + case 2: + if (cur_el =3D=3D 0 || cur_el =3D=3D 1) { + /* Trap to PL1, which might be EL1 or EL3 */ + if (arm_is_secure(env) && !arm_el_is_aa64(env, 3)) { + return 3; + } + return 1; + } + if (cur_el =3D=3D 3 && !is_a64(env)) { + /* Secure PL1 running at EL3 */ return 3; } - return 1; + break; + case 1: + if (cur_el =3D=3D 0) { + return 1; + } + break; + case 3: + break; } - if (cur_el =3D=3D 3 && !is_a64(env)) { - /* Secure PL1 running at EL3 */ - return 3; - } - break; - case 1: - if (cur_el =3D=3D 0) { - return 1; - } - break; - case 3: - break; } =20 /* --=20 2.17.1