From nobody Tue Apr 7 21:45:22 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 ARC-Seal: i=1; a=rsa-sha256; t=1773241802; cv=none; d=zohomail.com; s=zohoarc; b=cwAmJSiUxlvhpMh0H1CkyjWd5QYkf3aVDq2Sf505ZFWn+9j7LgvoXVh5ScWzhhERxKo/+jsvrS/EMSGH+dyUlbufMHTB/7j6YREYDmpt/E43Zta6wKtirJaV/x5/T4R9sYq7h29H7IxL6xZkGl2c8UCJF8D4CzvXrBbjk9Mhpm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773241802; h=Content-Type: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=uYPX5EcW2XMFFFTSWLrXs0CD0H8qjD9DJE4ILv92+p4=; b=VTgk9bxNDOF2Ln87KgsfM1KBvYgVheEGu8vu0kenX+zEMccUiiZx8GiG8oqFrVdbJLB99m8TGkF391DMY5Qm0tw1/yMUb6460H0ZxEc+NXa+J+oCDgyyM1yZmcCrL0hehDZAVW/snL68lWSwtmQFw0PACkexB/HsPca6WD4FIbw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773241802028456.75643274957974; Wed, 11 Mar 2026 08:10:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LBf-0000at-AV; Wed, 11 Mar 2026 11:09:27 -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 1w0L9x-0004Pc-Oc; Wed, 11 Mar 2026 11:07:43 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0L9t-0005Pc-L8; Wed, 11 Mar 2026 11:07:40 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BC9D8191E8E; Wed, 11 Mar 2026 18:04:41 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id A80FF37C2CF; Wed, 11 Mar 2026 18:05:19 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241481; bh=FB4jjS7oGuteuSerXx9FNPqkF7kbcDZLD/fyDh8Zzks=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IxxosI9SSHdyBEiR3wFKx+u+M5UOxfEdjlzcFUmi6Brle804THNBu0Q7/2Ra9RX3R yI9WW3EhV2fnCBi91P6lwD9oVXsSQLg+YUsCzCzRxVsg15bAmVPTlL5Q1wZBTAHf/d 9CKU0FyN4JOfDb8AfH4R+qvVEcB99LYjGJPTtyJ3h9HiijLzOI6YZ13UYiB35vDGA4 azU3J7ZQVXlsWcdWmkRXgdLc+LV+9kqkyS7tCMbPywOVXz7D7mkEJgqdsrfZGsIlkB Q5PI2vBhjfdtyURvyvUBd+0eA1oicIcT8fL/cM5VjeAFPdJf5vefyQR5a+SUnhtvix 9Y0nNn7CDKYOg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Michael Tokarev Subject: [Stable-10.1.5 11/46] target/arm: Account for SME in aarch64_sve_narrow_vq() assertion Date: Wed, 11 Mar 2026 18:02:47 +0300 Message-ID: <20260311150327.1084669-11-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, 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.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 @tls.msk.ru) X-ZM-MESSAGEID: 1773241804039158500 From: Peter Maydell In aarch64_sve_narrow_vq() we assert that the new VQ is within the maximum supported range for the CPU. We forgot to update this to account for SME, which might have a different maximum. Update the assert to permit any VQ which is valid for either SVE or SME. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260202133353.2231685-2-peter.maydell@linaro.org (cherry picked from commit 42eab40a12f12f044a5ca7b7d889d9a1f0d172ee) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index 318452d816..518c0c191f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9660,7 +9660,7 @@ void aarch64_sve_narrow_vq(CPUARMState *env, unsigned= vq) uint64_t pmask; =20 assert(vq >=3D 1 && vq <=3D ARM_MAX_VQ); - assert(vq <=3D env_archcpu(env)->sve_max_vq); + assert(vq <=3D arm_max_vq(env_archcpu(env))); =20 /* Zap the high bits of the zregs. */ for (i =3D 0; i < 32; i++) { diff --git a/target/arm/internals.h b/target/arm/internals.h index 1b3d0244fd..36fa5c3d40 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1881,6 +1881,15 @@ static inline uint64_t arm_mdcr_el2_eff(CPUARMState = *env) ((1 << (1 - 1)) | (1 << (2 - 1)) | \ (1 << (4 - 1)) | (1 << (8 - 1)) | (1 << (16 - 1))) =20 +/* + * Return the maximum SVE/SME VQ for this CPU. This defines + * the maximum possible size of the Zn vector registers. + */ +static inline int arm_max_vq(ARMCPU *cpu) +{ + return MAX(cpu->sve_max_vq, cpu->sme_max_vq); +} + /* * Return true if it is possible to take a fine-grained-trap to EL2. */ --=20 2.47.3