From nobody Sun Sep 28 17:07:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1758567492; cv=none; d=zohomail.com; s=zohoarc; b=Ymf9dwINR8ADBhcE2SNG5LuiMXhlMQPLg+wxBC5OuZXz3MrTxozRBRgUFST4oe8tQHE3DZyIbrMTaFnOWncMykDVV+UUdsJMB4/qGFfTyswu+Q5DXg1WRbQep13R8GUxtpFhNq/5fRLBZObTU8ypAQZL731CbG4eont8JDahkxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758567492; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aWsV/VltAqzQI9Qb+vYobgK8sydft8j6ZXREEjHA0ks=; b=gceHF2xP4m6lHJ8uKT/ycY4BlKuP3K6ffrFksBObP9mNmD93S8pP+GmW1bfv8oGVIbKnxjs3YgfMkLhBILvBsoBKfeuKSdtHzGJnvCfjfrAicKTO+PFmMTpFB8ITAo7TEyCspjDYPjxi7UezLkP3Vbb/0wCH9m/oeoPKUUIMESM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175856749252285.78384722739884; Mon, 22 Sep 2025 11:58:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v0lhp-0008J3-Re; Mon, 22 Sep 2025 14:56:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v0lgB-0005TP-5Z for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:54:27 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v0lfQ-00050n-0A for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:54:26 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2570bf605b1so61629115ad.2 for ; Mon, 22 Sep 2025 11:53:36 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2698018a472sm138554795ad.58.2025.09.22.11.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 11:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758567215; x=1759172015; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aWsV/VltAqzQI9Qb+vYobgK8sydft8j6ZXREEjHA0ks=; b=t2hCL5ocTJ3eOitoynNz79AjrAFAkEjMvPW+6pYEuilKxIntRkN2PtGPQyNwGnmDUV W5RjEkhSgmitjV+D7aYV1zVeu/kyOj2xAXk1p4kYTleO+PtbYuxyNDySmoJafLIHDV5R +GJE717WII0Irt9IdsiiAwgGd030sLzGiS/HJ5ix3FOSwyz7ufT9PmEhEd04KwEEz758 r9Z7kqRX+biAvqDnQAF+/Abm9h+7BYbzIAagdbon1ZVKrXZ+8+6BgMHJxN7G+k/eUKqD YLgyn2juXAEJPxR/4QXtzJNF40Ke6X3zzzL3psAx0FLyfTOO1vuf2HAL1DLDbVbw3i3P timQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758567215; x=1759172015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aWsV/VltAqzQI9Qb+vYobgK8sydft8j6ZXREEjHA0ks=; b=aofTzsjtNQMOo2vn2UlU4x8CwL+uJNAtoX1MByLaH6yd6tW5fF+MJ90frUA8pX1NHL qle0xNdJ5CoYfM0S0x0rK8RpIGQNFIH3UUlWI1cJyvpWr5INh4cumj3ToHDbGT4r5sa6 VLFxig7LR8Z3sr/MWEsIt01QGMz0DNkTVqkP0uRgxFVCOSaNqUB5DQxc5ovLOTYFlPtu vjh5DQvOnH+pVuoOHHqGMswv+md13qQ3CPG4jNWrMZYUmQpL5Ap4TFx2jW28n1H6sizd M/5mjBbeWsPPH6Uu/tsWsXpE16dRDFb+fbYp8KpR9WCWm9Fh/WpMFhQf24AcUpq5XI4W vgeQ== X-Gm-Message-State: AOJu0Yz8sDTkFiDN9Xw2rGhN96Nx9PKn7xx3w4uY/BZAxTdGoV1TIHD/ +LtRlGTvRpGUFcAC8/6dqWI5Zn0m0CMMWRhwOWC3wQIO02g9NFTprAmNDgzSs+nq6NCK7Gaqgdv iP+vs X-Gm-Gg: ASbGnctsNZX/i/3T91EnP5fHZaAVWKvyB/0BabjWnkv0zLW5n0GAQWjwEmSqZ9AQia+ slxMgB3feluecEZI/NhipFaADEOeAdsUboP0WRwHIwNLtgwSuisZH3SvnMyq7tVGrjnLfnnXXrk 8JR8tnhjSFdm6zPnfIYUDb+OGpf9PbhlcPiov3A1727mdtK57B8LR1Saxi0vlCeOwx1xSdwi108 dWC36hnE4QSgk+GUe/SRiSKT9L8sBPA2qxus35sBtB3InODt0WadOHWnvVeueMdkiP3QXsOI1QQ vAAOyahqvovYkdOKQdrIh97aSWdSEhfyaCxxHhFhOzUFx8jocaBe3WIzDdT8Zj2lYP8opLjI8CM xWHKcOzNM9vJkCDDY0IoJduXCUzdl X-Google-Smtp-Source: AGHT+IEY/9EwH0jOggsEQup5vz1tb0G2DYJAGUzPmIBXnlDpJNHgpTrsZR4WorKcIKo+uOb1ZMbqeQ== X-Received: by 2002:a17:903:2409:b0:274:777b:ca84 with SMTP id d9443c01a7336-274777bf4c4mr85650805ad.21.1758567214776; Mon, 22 Sep 2025 11:53:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v5 63/76] target/arm: Copy EXLOCKEn to EXLOCK on exception to the same EL Date: Mon, 22 Sep 2025 11:49:11 -0700 Message-ID: <20250922184924.2754205-64-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922184924.2754205-1-richard.henderson@linaro.org> References: <20250922184924.2754205-1-richard.henderson@linaro.org> 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=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1758567492769116600 Content-Type: text/plain; charset="utf-8" Per R_WTXBY, PSTATE.EXLOCK is 0 on an exception to a higher EL, and copied from EXLOCKEn otherwise. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index e90398acc9..d98f9b0d70 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9057,8 +9057,13 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *c= s) } else { addr +=3D 0x600; } - } else if (pstate_read(env) & PSTATE_SP) { - addr +=3D 0x200; + } else { + if (pstate_read(env) & PSTATE_SP) { + addr +=3D 0x200; + } + if (is_a64(env) && (env->cp15.gcscr_el[new_el] & GCSCR_EXLOCKEN)) { + new_mode |=3D PSTATE_EXLOCK; + } } =20 switch (cs->exception_index) { --=20 2.43.0