From nobody Mon Feb 9 20:31:50 2026 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=1769528979; cv=none; d=zohomail.com; s=zohoarc; b=WYxuM5fny+BzusR56iZrF+b1WyNy2pfLmk7G8kLxU4CMPrO32pP0LVDqMnnqkcduDUMVMFA8KwSAIKFI7eRdLfgsXRUjeM4SE0Bzi0zxqzH+DM2nNKHT8qWLbDw4UBe1voELUJwio98OoYdetcearY5PEA1jPtBrKBJdlloS36U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769528979; 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=QPYP5U+UfNkavTiIH/9PNOqdVOh5XQtwthn7JFvkCcc=; b=RSYeQTXBd1hZLU3AnL5NGULXrGO20wpxEyQenXMKcgDs027pNYMS8JSf25NBH1xj6M8I3aV74aTVzl6kVSy62tOmwXWiRK4c0oNswgPMRw2hERwbjTXfDofs3QMP3yD7dIBi+MfM9RBm/G0KGkHbVTrrAQT9kyjhtj2Zm7LvP7o= 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 1769528979845805.206437691571; Tue, 27 Jan 2026 07:49:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vklJ5-0006iA-QC; Tue, 27 Jan 2026 10:48:43 -0500 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 1vklIi-0006WB-EU for qemu-devel@nongnu.org; Tue, 27 Jan 2026 10:48:20 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vklIg-0004De-Nl for qemu-devel@nongnu.org; Tue, 27 Jan 2026 10:48:20 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-432d2c7dd52so5922390f8f.2 for ; Tue, 27 Jan 2026 07:48:18 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435b1e71503sm43080090f8f.25.2026.01.27.07.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 07:48:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769528897; x=1770133697; 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=QPYP5U+UfNkavTiIH/9PNOqdVOh5XQtwthn7JFvkCcc=; b=mXSywZnyVsOCdJWljSv0xWeVI2z9cayUxw1DQyXy3vIJjhMjal8mDfyPCEXlYOYTs3 Mseys2LCEHERIwfKs3bupyEV/xCpwPZCsYkYRjR4+XhNAKRT4peZdEW73a0pc0R4vCuE PaKdpvOppgZpdO4K4wL15x0w483NxrwhXyFsbV4FhvTdf0XnlWrgdUH96RNrWgv1iLqC etlX9Ji3Y8rtfeSF1U5Sg3epq3//Jhe+3FQKRMAwAasTtF39lqiA7qfKL4BAMpTSBWPK gY7IQNWkVotDBB5+RS/tct0eHh66BkqwaiXvP735BcxZJe4aNpU93edf9o7CW3MsRCf6 UcDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769528897; x=1770133697; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QPYP5U+UfNkavTiIH/9PNOqdVOh5XQtwthn7JFvkCcc=; b=YZUickbk1WfZczmx8o1rX3M2QqHmJAgfqvfU23+v1WEoG/gxht6o7qxNHZ9ywitkf8 CM6b7NHGBJtl6ys3SULgl8RBn/VfYlWDfGbWDivwzGz1B+wa/2qDmyL3EAvtIAeE8Oun U84nLvlSajIrmbYqlkMb8GzedWUv/6sqtyTqJUC94qtQ/CQGHk+HXVY2zL5i3YKF/4xE vjyzM0mtbm9mxPvijvrjBHsBFALVC7uEokzq86qSQc2DMjgSD56fFlA81wKCuiFqmIBY CBenxz6aS5bWkxDKkAEyZEtAxeM8IliSTDWZ7PXgkkDsOOn23E8He941Uea5KheAsoO5 +5cQ== X-Forwarded-Encrypted: i=1; AJvYcCWn2wOxE8LasDFYCBwAoIS0StP4WsVonTZAzbKILuaRj3BQ2X0JbxNq1YogO3MBycYNe5UwvREkhqwB@nongnu.org X-Gm-Message-State: AOJu0YzCC5u/+Yz02ioeeCOtWsUJPzdKFBD1AnMAiOhWx+iJqwnbK5w4 JRgPZppN60Ie6yNdzuUbUZzH8/b/mCCMk9XFqAKqsLUDspOy5yGY56k7SC9HR6lNjyE= X-Gm-Gg: AZuq6aLRYxdDo3pqZKcCCdwYhMh0/vmFoVoIs1ctduIDwB71zBadY5PccjuAqvkXjps z9Oaf991aR18XtLdU6LSzlHy4tVdD9iYEsEUQi+m18C4115AvPet6ZPxOHf4WJgZT1DbeSQHc76 rp5mP5rjZUUMz6DycUD31bBO6smPniqpfVriEPqiNpV0If+TuRnPXRSryo0HJU8IP/E23QlmhXT IKbxx0ns4jWX6tQKhGkZRz9FOVk9TpbG5lcP/gzQ/E3INVMsJcZtVuArGXkVdouQcAudF/ybiYq 0N5NKmIvbddgZBqvIn8Fk8HemjYEeDTTPfZtRVbfMYkmtX8m62iTlBq95R4Jq57fRM+5jajEMH8 BKiyXkHba+mWfUXBleb8aIyph6+RuimqzUIGMKsxjomqEpBvYa8Lwz6iug9Geqmsokcv599QKeo o36zrf2PBo3YnWm7Nn6yzTdd69bjgZZw== X-Received: by 2002:a05:6000:248a:b0:435:a363:f2a4 with SMTP id ffacd0b85a97d-435dd1c0c98mr3090459f8f.34.1769528896814; Tue, 27 Jan 2026 07:48:16 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Richard Henderson , Manos Pitsidianakis Subject: [RFC PATCH 1/3] target/arm: Make smcr_write() handle SME-without-SVE Date: Tue, 27 Jan 2026 15:48:11 +0000 Message-ID: <20260127154813.591744-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260127154813.591744-1-peter.maydell@linaro.org> References: <20260127154813.591744-1-peter.maydell@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=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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: qemu development 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: 1769528980362158500 Content-Type: text/plain; charset="utf-8" Currently smcr_write() implicitly assumes that SME implies SVE, because it will call sve_vqm1_sve_for_el() when SMCR.SM is 0, and sve_vqm1_sve_for_el() will assert in that situation. This is the only place where we call that function without it being guarded by a check on whether SVE is implemented. Adjust smcr_write() so that it also avoids asking for the SVE vector length when SVE is not implemented. Signed-off-by: Peter Maydell --- I did think about making sve_vqm1_sve_for_el() return some value rather than asserting, but (a) what would be the right value? and (b) this was the only place that needed fixing. --- target/arm/helper.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index dce648b482..a3dd84a2d6 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4936,12 +4936,12 @@ static void smcr_write(CPUARMState *env, const ARMC= PRegInfo *ri, uint64_t value) { int cur_el =3D arm_current_el(env); - int old_len =3D sve_vqm1_for_el(env, cur_el); + ARMCPU *cpu =3D env_archcpu(env); + int old_len =3D cpu_isar_feature(aa64_sve, cpu) ? sve_vqm1_for_el(env,= cur_el) : 0; uint64_t valid_mask =3D R_SMCR_LEN_MASK | R_SMCR_FA64_MASK; - int new_len; =20 QEMU_BUILD_BUG_ON(ARM_MAX_VQ > R_SMCR_LEN_MASK + 1); - if (cpu_isar_feature(aa64_sme2, env_archcpu(env))) { + if (cpu_isar_feature(aa64_sme2, cpu)) { valid_mask |=3D R_SMCR_EZT0_MASK; } value &=3D valid_mask; @@ -4953,10 +4953,17 @@ static void smcr_write(CPUARMState *env, const ARMC= PRegInfo *ri, * current values for simplicity. But for QEMU internals, we must sti= ll * apply the narrower SVL to the Zregs and Pregs -- see the comment * above aarch64_sve_narrow_vq. + * + * If the CPU has only SME and not SVE, then turning streaming mode + * on and off can't ever change the SVL; we must avoid calling + * sve_vqm1_for_el() to ask for the SVE vector length when SM is 0 + * because it will assert. */ - new_len =3D sve_vqm1_for_el(env, cur_el); - if (new_len < old_len) { - aarch64_sve_narrow_vq(env, new_len + 1); + if (cpu_isar_feature(aa64_sve, cpu)) { + int new_len =3D sve_vqm1_for_el(env, cur_el); + if (new_len < old_len) { + aarch64_sve_narrow_vq(env, new_len + 1); + } } } =20 --=20 2.43.0