From nobody Sat May 30 17:44:40 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=1779805771; cv=none; d=zohomail.com; s=zohoarc; b=F/5iY2BzSRlv6BuofYMIAoDtKrcK2X9Dp3iXs9N6tJ/Rb92banyNOlbtd3NomOLsmvs5PW/XVyCiCOpuWKnSnKjrKpEqAlyaX31nbD2s+WDamCY/dTU9yhjwX/qG4pgXMdlisAcZIE8IAHe9YbxkDamoUZEMTLtH1VcWzFU1K0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805771; h=Content-Transfer-Encoding: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:Cc; bh=/KgAY2h/Yy1zBpIiJ5q5I7MtIjIP6RET+61+dyCLqLM=; b=cZ3hLf7Z6g9acy90LIA4fG6VzwoExqn7dQlWqUPt5wPvqLUjYTJqDT67onODoyMQbKH1MtgFC0mGQydDNmr/vrfyQM+StKgUIPA+aYJEZwNo1H4KEmaIl75qNJM9p19zUIhVAjRyo9prL8Q2qFFEiI1fy+HhuOUSwlEq5+k3cv0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805771935922.5474885358119; Tue, 26 May 2026 07:29:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsm9-0008Cj-Ho; Tue, 26 May 2026 10:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsm7-0008CB-Ue for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:55 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsm6-0001CG-Gp for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:55 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-459bf19e87bso6313689f8f.1 for ; Tue, 26 May 2026 07:28:54 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805733; x=1780410533; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/KgAY2h/Yy1zBpIiJ5q5I7MtIjIP6RET+61+dyCLqLM=; b=B119jlov/N99DjPXDPBTNzYNcsrnwm/kZnVKU5jv3iwwP6soX3NX7QDc7MAykhkixy QEIL0a8XudOHLvNxjeSPlHvo9vaZ/GF8hBXQJK29Hx82SvUWNjJN42hc+ah3rGNYH7zC HddDJaS/QlYlATLFTpBTL1XQv5+7fFoYnGPqMZIADlNmUHGPFv7ueUupHsSDt2vLIWDw dXztwY8kMjo77nxq2mwdLfFOpZx4XZ2IY3Uu/Dgb3/bmLEjlQgcjq+zOvsPrYIoujsR2 c9Cjf+zGVFmMCuAgDV845CocwsBLNCzI8tYGo5avD12zBBPCifPfkp3c5KTH49sD0zfs meuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805733; x=1780410533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=/KgAY2h/Yy1zBpIiJ5q5I7MtIjIP6RET+61+dyCLqLM=; b=ZIF8Exq5TfgzBd+rGZawknfaXFVNMpdevLmGT85/aWCulInUiG9NjSo0mbGKPkmMdS C3QCzZjBfdrAAApAjwu0VKom2zNrNP4tr5FPIUFgJOQH8teDKERJFkUQCwsOLCFwW09T B3KMFbK78ElZ4Q2w4AJbccznuEXzK67Vp9GyL1mQV9p24ovznwlz30VMTgKuXakPjv1+ Aii4U0KnDrohIzPzIFb/8WPw4hUIwGIYwYY/E5498l3FuDB0HoKME1J5b5ecCuYK0dGl pX2k3F74YbqbBTZ0+GKV9QP9IToQgTGYuBJiI+EgCNVcVVVDK/TYOeIql+xSIJiS4pxH 4HGw== X-Gm-Message-State: AOJu0YwdYK9B0Q6CJufaB27BCHSZN1TPlQYB/ys8WIB9wga/1HZwU0Uv BKswrsDvawLmO+XpaNI12FwtWjbc8prjKqsxSosG1WSJnHBalWGSbjYWGzgI2eCmmnMr8w+aEGI ISGfc X-Gm-Gg: Acq92OEPmjHNag9YW2qYybQlRBahjmdyjQIKrhsCbe10Fvni93DsFPSxqHJkQvgm8At CcIFWUTxItFgycbLDDvuqs/uoZGTUc7wJmvlumdEvt2KcjUywSinQdfOaGkUOH5UhhDTXwpx4R8 A0+benaU6CWdwqp95ZFfXmY8gov8gW7YLv2d21m2KZQga84dUcSBziJ0uMgBjP0ZoHs4FZIZ/4k ok8vFd1SF69ZVDhQyQpSvl34XNA8v6UdJ7VjKorGDAUkwsQIlq6GVr2Ee/FBxVul9ki7UxcQ5AT CfXr9lQ62Hn7CgXI0ZLTjNj5VOqMx8dD4glT2YUleVTO0qXf9VFt0xgj1LgFkw52WZRvv+QsC8H 0fNDej54yr5vAO58nIqQpn9/eMDxKMJ9xgsyotLc3aPM7zh6ZevtiQV3qSvWvGBcGKRc4GYqj5d L3qhcLKB+/9Wx6E4dgkNpFk7eCDc182+tCT0u0Ma7LSer72XZCi+ShnW4T/ML8HVi+586V5xP3M Ktk1fUDjSg45NTecXRrF7uTp/VfMR8= X-Received: by 2002:a05:6000:26d1:b0:43d:7275:c1eb with SMTP id ffacd0b85a97d-45eb38e4a5cmr32654426f8f.39.1779805732965; Tue, 26 May 2026 07:28:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/54] hw/timer/mss_timer: Remove dead code in timer_write() Date: Tue, 26 May 2026 15:27:57 +0100 Message-ID: <20260526142850.2326589-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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=ham 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: 1779805772424158500 Content-Type: text/plain; charset="utf-8" In timer_write(), we switch() on the address offset to handle registers that need special-casing, with a default case that handles both "unsupported (64-bit mode) register" and "can just write value to st->regs[]". However, as Coverity points out, every register is covered by the special-casing, so the "write to st->regs[]" code path is dead. (timer_read() has a similar structure but there several registers do go through the default code path.) Replace the dead code with an assertion. CID: 1613905 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512134750.3543639-1-peter.maydell@linaro.org --- hw/timer/mss-timer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index bd3f3e845f..25fcf42aa0 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -189,14 +189,11 @@ timer_write(void *opaque, hwaddr offset, break; =20 default: - if (addr < R_TIM1_MAX) { - st->regs[addr] =3D value; - } else { - qemu_log_mask(LOG_GUEST_ERROR, - TYPE_MSS_TIMER": 64-bit mode not supported\n"); - return; - } - break; + /* All non-64-bit regs covered by the switch cases */ + assert(addr >=3D R_TIM1_MAX); + qemu_log_mask(LOG_GUEST_ERROR, + TYPE_MSS_TIMER": 64-bit mode not supported\n"); + return; } timer_update_irq(st); } --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805772; cv=none; d=zohomail.com; s=zohoarc; b=Qyq035GMiPFal7uSb8HdWiMTwk6Use3ukmhjdiv61JBs4gamSDr5pZrbjKXhoLST9mg5bA4ax5cZEvu9KOHeZZ09jXiKayC83m+aKOKKQaVzk8hLynEBqMl+9T117E+fGdQmKbi9aJokBDCjTkRTVcCPqJBOvuH0rv4eKc42B1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805772; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=me2XmrRjUesDxOInqcpkPUtfa6VUQxT18GPxCVrkirY=; b=ZQPnS9j1bSMOpR1ngEMFBwc/JpHBksZiwDzc3P72F0UUTaS0XC7YCQj/qHBDG1h6NrzXcyq/QDHQHRcyQgjB07xbt/BdGaanp9npir9e4r/82QMc9qxQ/aVDbCCZKjYjbZtM0eVID9j9rcuGOcHSaSLZYFco59R1wDu0BC8aHnQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805772257717.2555048924156; Tue, 26 May 2026 07:29:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmD-0008E1-4T; Tue, 26 May 2026 10:29:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsm9-0008Ch-DG for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:57 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsm7-0001CO-9L for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:57 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-490686877a1so14847225e9.0 for ; Tue, 26 May 2026 07:28:54 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805734; x=1780410534; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=me2XmrRjUesDxOInqcpkPUtfa6VUQxT18GPxCVrkirY=; b=E7bLW1mQ5QK5XbFaEOLSxJTnak5hH9bBx06nU+ZLmxR1dHSA/CgKj8+SIowwX0p9Ob RXoBzaRC/pMi08qz7P7Ku0ezMCDFgRcsIoSTjgKVfOc0OadiolDEdFa3TVfTQWX/atmD 3oyIYlRv0CKiIM8N0io39Pd8vm22yNJe/EmkYf9xMyhHyEkyP1jCikJAQElGdONcPCI/ 4kosxePclMOFzu3zbAVF3xVOiS4WNjVSbyZDtUqpcJotZ/zaqrGEoKzHMTKoItTQl44D RAETivXhs2rqq37Fiv7K7GvvpwnfsXUOPx4yFZkZLKtTUme+1XgYtqHINHj2iKcRXCK6 rC5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805734; x=1780410534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=me2XmrRjUesDxOInqcpkPUtfa6VUQxT18GPxCVrkirY=; b=KOWUKIS5n2VAapC0NQSUyGBQO4I60no7ObGuNYen8f4BjdM4N4b3lQrKKB0rX/ZRY/ kjIB5LyxSqP3j2Opqz+5moPNwqpSF2PpfIndAoxxhkntF4lD6uVg3Cf22sgtc/XclK0F xf7eJ6TsDLUWsJdt/FyZ7zX19d04hlc9dzZgYKzHfAMufv0WJu4oG3tHSw9rDHShakoE m7cmC4DLzRYE8hTVZ7jH6oA2tWsWLq/KZfR9LlGIMI8ttYOq2J++2yvtGZHi9dCBAuEX zXX9tWpZDgxvGL2wQ2YQiZ8A/beQ/soSpVNNnB/2BCSlOxEo8bYOSJKOD3wNBTF0yMtr tk1A== X-Gm-Message-State: AOJu0YyDvW269C9kkrbgfKK5FmwAiDF764Yf6fqa1xxLvi7YHbi2+lYE j9MKdOiOlpk+L/H1hkVKEHkwurwfE7Unw3gZe1kQlVrF/+OIOdQk8N9iP8T17/k4YYRQU/iq2OM Ip69q X-Gm-Gg: Acq92OFugvNPrkgYp6rmX8re9sRYBqFlC1lMEmC9dceiwnBzQRPFbWURpztQPsyk2n/ IUPxfvZmYIDwmg92Awjiz564OR+5oUWhkXsCZ53+jSPPLN23D3qeUlllASqIoj54khI0iYMI14l Vh48I3zFN26psPevSZenov7q2MaGkB78eTsskYsC7xHfp3Nn082nKQZMbuMknslNb5DHHS5JrNN VoVLEcabw9YBjbDzncxnFP+SL5Gp2ECNA4dWXwkp9Ni/eKAYjJOFUoNhNVg94NraZgFWE8K4M/6 pUjJD9vVnPpOpT1QYbxFmmyrB0o8EwUeZ3EAt85lWaiB4ec52zlLjMt/SWmBINgLwJaSKEpHHmn 2J/1QePQ/+1fRRrxIIWKgAMziwunD238FqUmrv7TCwfVtPHOlqPElZkOJ2IknL6zIMWC1KkRQiy N8DY9b0CP/uTNl/Kye8knnlMCTrFE6CDeiunQNVvmxVlpLS8n7r6RmfmT5EBWJy2kkVqIHRm2ks qmx/21J2UPPb+SPBBFWfL1kCgHtxG9RPy0nGiy/+A== X-Received: by 2002:a05:600c:4ec8:b0:490:3b8a:b0c with SMTP id 5b1f17b1804b1-4903b8a1c34mr308971585e9.3.1779805733791; Tue, 26 May 2026 07:28:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/54] hw/arm/omap: Remove omap_mpu_model remnants Date: Tue, 26 May 2026 15:27:58 +0100 Message-ID: <20260526142850.2326589-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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=ham 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: 1779805775127154100 The omap1.c code has handling for an mpu_model field which is an enum of which OMAP SoC model it is. We removed most of our OMAP support some time ago, and now the only OMAP SoC we implement is the OMAP310, which sets s->mpu_model =3D omap310 in omap310_mpu_init(). That makes all the handling for other settings of mpu_model dead code; remove them. This includes the omap GPIO device's mpu_model property which we set but which the device makes no use of, and the omap-id-e20 memory region (because the OMAP310 satisfies cpu_is_omap15xx(), so never executed the old if() block). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-2-peter.maydell@linaro.org --- hw/arm/omap1.c | 28 ++-------------------------- hw/gpio/omap_gpio.c | 6 ------ hw/misc/omap_clk.c | 9 +-------- include/hw/arm/omap.h | 18 ------------------ 4 files changed, 3 insertions(+), 58 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 980959166d..c9f9c3ef40 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -948,8 +948,6 @@ static void omap_pin_cfg_init(MemoryRegion *system_memo= ry, static uint64_t omap_id_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D opaque; - if (size !=3D 4) { qemu_log_mask(LOG_GUEST_ERROR, "%s: read at offset 0x%" HWADDR_PRIx " with bad width %d\n", __func__, addr, size); @@ -968,25 +966,10 @@ static uint64_t omap_id_read(void *opaque, hwaddr add= r, return 0xcafeb574; =20 case 0xfffed400: /* JTAG_ID_LSB */ - switch (s->mpu_model) { - case omap310: - return 0x03310315; - case omap1510: - return 0x03310115; - default: - hw_error("%s: bad mpu model\n", __func__); - } - break; + return 0x03310315; /* omap310 */ =20 case 0xfffed404: /* JTAG_ID_MSB */ - switch (s->mpu_model) { - case omap310: - return 0xfb57402f; - case omap1510: - return 0xfb47002f; - default: - hw_error("%s: bad mpu model\n", __func__); - } + return 0xfb57402f; /* omap310 */ break; } =20 @@ -1022,11 +1005,6 @@ static void omap_id_init(MemoryRegion *memory, struc= t omap_mpu_state_s *mpu) memory_region_init_alias(&mpu->id_iomem_ed4, NULL, "omap-id-ed4", &mpu= ->id_iomem, 0xfffed400, 0x100); memory_region_add_subregion(memory, 0xfffed400, &mpu->id_iomem_ed4); - if (!cpu_is_omap15xx(mpu)) { - memory_region_init_alias(&mpu->id_iomem_ed4, NULL, "omap-id-e20", - &mpu->id_iomem, 0xfffe2000, 0x800); - memory_region_add_subregion(memory, 0xfffe2000, &mpu->id_iomem_e20= ); - } } =20 /* MPUI Control (Dummy) */ @@ -3819,7 +3797,6 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, MemoryRegion *system_memory =3D get_system_memory(); =20 /* Core */ - s->mpu_model =3D omap310; s->cpu =3D ARM_CPU(cpu_create(cpu_type)); s->sdram_size =3D memory_region_size(dram); s->sram_size =3D OMAP15XX_SRAM_SIZE; @@ -3974,7 +3951,6 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, s->wakeup, omap_findclk(s, "clk32-kHz")); =20 s->gpio =3D qdev_new("omap-gpio"); - qdev_prop_set_int32(s->gpio, "mpu_model", s->mpu_model); omap_gpio_set_clk(OMAP1_GPIO(s->gpio), omap_findclk(s, "arm_gpio_ck")); sysbus_realize_and_unref(SYS_BUS_DEVICE(s->gpio), &error_fatal); sysbus_connect_irq(SYS_BUS_DEVICE(s->gpio), 0, diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index ee3ddb09e3..16da9a88d9 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -45,7 +45,6 @@ struct Omap1GpioState { SysBusDevice parent_obj; =20 MemoryRegion iomem; - int mpu_model; void *clk; struct omap_gpio_s omap1; }; @@ -228,17 +227,12 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk= clk) gpio->clk =3D clk; } =20 -static const Property omap_gpio_properties[] =3D { - DEFINE_PROP_INT32("mpu_model", Omap1GpioState, mpu_model, 0), -}; - static void omap_gpio_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D omap_gpio_realize; device_class_set_legacy_reset(dc, omap_gpif_reset); - device_class_set_props(dc, omap_gpio_properties); /* Reason: pointer property "clk" */ dc->user_creatable =3D false; } diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index e927ef22a0..dc398570ac 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -707,14 +707,7 @@ void omap_clk_init(struct omap_mpu_state_s *mpu) { struct clk **i, *j, *k; int count; - int flag; - - if (cpu_is_omap310(mpu)) - flag =3D CLOCK_IN_OMAP310; - else if (cpu_is_omap1510(mpu)) - flag =3D CLOCK_IN_OMAP1510; - else - return; + int flag =3D CLOCK_IN_OMAP310; =20 for (i =3D onchip_clks, count =3D 0; *i; i ++) if ((*i)->flags & flag) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 66a435a3d7..6ea47293a6 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -542,24 +542,7 @@ void omap_mmc_set_clk(DeviceState *dev, omap_clk clk); /* omap_i2c.c */ I2CBus *omap_i2c_bus(DeviceState *omap_i2c); =20 -#define cpu_is_omap310(cpu) (cpu->mpu_model =3D=3D omap310) -#define cpu_is_omap1510(cpu) (cpu->mpu_model =3D=3D omap1510) -#define cpu_is_omap1610(cpu) (cpu->mpu_model =3D=3D omap1610) -#define cpu_is_omap1710(cpu) (cpu->mpu_model =3D=3D omap1710) - -#define cpu_is_omap15xx(cpu) \ - (cpu_is_omap310(cpu) || cpu_is_omap1510(cpu)) -#define cpu_is_omap16xx(cpu) \ - (cpu_is_omap1610(cpu) || cpu_is_omap1710(cpu)) - struct omap_mpu_state_s { - enum omap_mpu_model { - omap310, - omap1510, - omap1610, - omap1710, - } mpu_model; - ARMCPU *cpu; =20 qemu_irq *drq; @@ -571,7 +554,6 @@ struct omap_mpu_state_s { MemoryRegion id_iomem; MemoryRegion id_iomem_e18; MemoryRegion id_iomem_ed4; - MemoryRegion id_iomem_e20; MemoryRegion mpui_iomem; MemoryRegion tcmi_iomem; MemoryRegion clkm_iomem; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805895; cv=none; d=zohomail.com; s=zohoarc; b=gSlvd8q3xHVQFayg1rfEpJMUhJ/X6h/AS+UWSwQBuX1BO1386k4vCb4eR2uSMmH1SCYmpG0CPG/Jp19ta/noeqPHiyPlTvCeQ3McipFHPfaRbR0e1vD8XYWc1Dp21OtVRJzXIl1YyGOL4wIs41hD7o/2l13uewwkWJOsRO9b+D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805895; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=UdjTHLYBetoc9TKYb2f7ANqXYXx1r+CPBHy+H/sXTwU=; b=B34HhrWXT2XgdZLSnxdq54EtqCTc2+MCeEPopHnOL/YSZnBM+006WM7dlNwG25MGr2IKD8Gh4j/VgkMBmTj0Qz4q73n6JpjifDUrMe3tjD7h6KmF+5BrlzJuBSlvauR83+PCG38vVqGohuFwiygHErw/x2HS/ZTpksahB0aCNLQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805895213376.4892375789465; Tue, 26 May 2026 07:31:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmE-0008Ed-5u; Tue, 26 May 2026 10:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmA-0008D8-1M for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:58 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsm8-0001CU-H4 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:57 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-459bf19e87bso6313709f8f.1 for ; Tue, 26 May 2026 07:28:56 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805735; x=1780410535; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UdjTHLYBetoc9TKYb2f7ANqXYXx1r+CPBHy+H/sXTwU=; b=V+z7ajN1Y+vmpzG9JHEBkOuFkosSHAigufDohtOVruoss5NVymRfKV/9lS9H1A4HTP OFhwLg2KpJ3Ko8peBtgZu7/lkzCfcTj2nklY9Kpim9NpC7I2RY6r14SIWihzMsayt+IF S490VBlP3CpxAfKA/Rl8JUYxSJrg6vBgs/SyMCzWCGqrpddyKDdZmUtWBb3ywZlhwENN DOVmF9slbIAYN9tM2XWwMiZLg3KvWBqrK5KV6Z/6DSqlp25sucuKeybffhrBbN9JC4YF +JNKMjDFzp4VAWjkBF9JxvnYhVGcqQNn2ugOok+0k6hHN//4AR5ccxFdLlvGJBkoaIfm X0Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805735; x=1780410535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UdjTHLYBetoc9TKYb2f7ANqXYXx1r+CPBHy+H/sXTwU=; b=lSchERdshCOKEnBBKAcVofScdgXCbr5vKt0axKDHP+hcb14E11OLUDaaA1uQgv3Crv URwP4Z54KCzuHmlW8BQAXu5Yz9pPv/y1/ibQ2qocaNQjypg80xHd5dVF7OwMDs82SOW/ x6FOQMJzhel+gSeMLZAYZ8e3BLXzLsxLRMCSXjSYbxkCZu3YRv66/1YzKv6sdsU+5oJN wHL9l+iUdySINnkmwnSpFDRHUNw9uDBVvsReAcKTaynFlXelcc2r6pw3ynrkyrcSzNtq 5ww9m1Av0X9FVTrHlV/HfLu96juBFKZ9fJhToYdpnCkmq0qk7MQo8+YGq+vE0FWbwEV4 bPbw== X-Gm-Message-State: AOJu0YwHiH1yE6uT69lnCbXeO/0f+0qQ8O3jeEl1vzDnOhWNjDAthrEd EaWftgkPDLGYDumKnOyNTvVs8E873t1jmgP9JXJ+zEjgRJkK6dpb8sEvRbIAYq/5rBEP2CnOmQr I3XQ7 X-Gm-Gg: Acq92OFDaMw/wx8CvfzRJgJ/qNAVkCDbP5BmTRdOC/ZAtGU51Dr6hcKO+YREebrW6zJ kwG3diMMoUCKBHqQajjd9CtbrAiAUeBBcEuaTy93Q7Mk2A8EO8ST6Sx/i70qHBNbQTpQts5kfjJ KmcS7T6/qv6JYnBtms0L8UfAtRlM8cvmeUWsS1ljSn8TByCr90O9F6jxD6wn0GjaZWbS0EbIBuR O9ziqlyJkG5G+45YDhMjbUbFo+d7kmJJKzflquaEzsKPrIaAFxDKdDwlZHm6vnB6gMYLCxzQib7 pNRAGX+Gsmm237ycA2IyhHA0fyT4CMOkkEXpi+9tvUkfxnxs/tOR04WVKaSChHOB5wRFwitQbK6 nqrAew0isJp0yYnjRXkrtymSgJQdvImAeK9qUQ4AiIQiyVdvPBsolt8o3V3X/+XcHgaj+kt1ZwX Le7yl8AWMXMkqiMF4nWO2ElvkuZB6R+5m+EK1tfMfXo+irN87PNoFsePuemzsS5OqLOec5hMFQE 9zdPzHjhiQtz08jXB1Vsv9hIbOzBWo= X-Received: by 2002:a05:6000:2384:b0:441:3144:efc5 with SMTP id ffacd0b85a97d-45eb38e4fd0mr32446382f8f.42.1779805734838; Tue, 26 May 2026 07:28:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/54] hw/arm/omap: Remove unused omap_mpuio functions Date: Tue, 26 May 2026 15:27:59 +0100 Message-ID: <20260526142850.2326589-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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=ham 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: 1779805897288154100 The omap1.c file includes some functions which used to be used by the other OMAP SoC variants which we removed a while ago, but which we missed when doing that removal. They have no callers, so we can delete them. This code was the last user of hw_error() in this file, so we can also remove the hw-error.h include. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-3-peter.maydell@linaro.org --- hw/arm/omap1.c | 26 -------------------------- include/hw/arm/omap.h | 3 --- 2 files changed, 29 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index c9f9c3ef40..15087ba03e 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -25,7 +25,6 @@ #include "target/arm/cpu.h" #include "system/address-spaces.h" #include "exec/cpu-common.h" -#include "hw/core/hw-error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" @@ -2095,31 +2094,6 @@ static struct omap_mpuio_s *omap_mpuio_init(MemoryRe= gion *memory, return s; } =20 -qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s) -{ - return s->in; -} - -void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler) -{ - if (line >=3D 16 || line < 0) - hw_error("%s: No GPIO line %i\n", __func__, line); - s->handler[line] =3D handler; -} - -void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down) -{ - if (row >=3D 5 || row < 0) - hw_error("%s: No key %i-%i\n", __func__, col, row); - - if (down) - s->buttons[row] |=3D 1 << col; - else - s->buttons[row] &=3D ~(1 << col); - - omap_mpuio_kbd_update(s); -} - /* MicroWire Interface */ struct omap_uwire_s { MemoryRegion iomem; diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 6ea47293a6..dc63323210 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -486,9 +486,6 @@ struct omap_uart_s *omap_uart_init(hwaddr base, void omap_uart_reset(struct omap_uart_s *s); =20 struct omap_mpuio_s; -qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s); -void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler= ); -void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down); =20 struct omap_uwire_s; =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805803; cv=none; d=zohomail.com; s=zohoarc; b=CKwwKh9UCAOFVZ4PMWV2w9ZJqQlqXQh5qaUskuZFPwSUHycPDAqVHzrdZJk86nE23lUbmaKOMiOSWTivVjODDLNbcDASwL45N5Nd6C3QHELFY2R1hnF0jNJGffHlJ/eCrqMid1HGkWLy/p0wqC+QkxzMs4qWEFsdcUOr+m7MRDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805803; h=Content-Transfer-Encoding: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:Cc; bh=WmSJAPow+YW2bigyZhXGopkY/S/FugrDTMkszzNRmr4=; b=lK3ugtUBVxQcb7dsm6x12YBjyqWFaMbv3Zvks/+RyrXuB3Uxr+3BOt832iZvZuwe8DADaf8ytRWLn/uI9PlxD/dn9og8mwuCoyUUVDCfugE9WCf5t1WfGbyApPK20TDj7zPF/sgC3dMQVafbB3ROb/eEwNoHWQOHtsVejH2e6ac= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805803748548.5340874303506; Tue, 26 May 2026 07:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmB-0008Du-PV; Tue, 26 May 2026 10:28:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmA-0008Db-Qc for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsm9-0001Cp-B2 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4906238c62eso21302605e9.3 for ; Tue, 26 May 2026 07:28:56 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805736; x=1780410536; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WmSJAPow+YW2bigyZhXGopkY/S/FugrDTMkszzNRmr4=; b=lL3vVHiOOxTPLPpa4nDsmb5AJ60wT3CO8tu+VmOR16JK+BBPPkYoONaokcdk+1wUmB 0jDpsMZGfmyGsHBf228JUc1y8v70prKTvlR7QHbrwmn/TyB9KsVfFpd2vytUFpNSViYi OfiJQlsXBJ8Dmy4t4tFkkCcdgFGgtDpVuoPvkbYTUIPHJcWWzB5lX3FjiOvqe0l1KDUJ Ji0wjPHm6Le86S9GmK5XWwGqMTmi1jYcWSKWPu0SKttV/BzQI1uOI8EMido3WWSicmzr ElgQExrcHfRAHz1wsyc4LrZmzWyasn1u46dirScj3U38qS/g8k0TaVN/bNMircGXzJ3F cAig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805736; x=1780410536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WmSJAPow+YW2bigyZhXGopkY/S/FugrDTMkszzNRmr4=; b=BVMTltmK7k8dqqub3iHJJ/YYW7mkCiOCbnYm5NaTm9/xt2dWQsols3T/7YvnInj9g1 r+Z+P+4eyt1I4ADxQohBoC6hO0Uf3S017BLn/74cRF1RVhJPfSyWEi/F2q41bVmfIiDI PP33lqoF51OMNCEpbTc+GQ6vb0j/TH6HOdlNyMVzLCoK3Eeo9VnLHtwPsQsDmJ50zv5T VHsUjrFJygyB+8nEScAMjRNjQZy0kQ6vLJIN4E0cUZiqGHoXInSBFMwM6C897BPfDRyL 3Erkp7ldg86eo7yMgINwUG8AN1fnyaviYow6Qe+c9PrO25g83ZdwJbjV6EcXqohOZj14 rNJA== X-Gm-Message-State: AOJu0YyEQXPKfsdRQDceVuvqWph12OL/wpkjVk/2nx+IX39ZYqYj/cdN 6e/IkbydohQY/99Axk18h3ZvrcKnqNkEqKBT0+iSv8OxvgvC1rJkwlQW0B8E2OfxNKynOUc+irM fzL5f X-Gm-Gg: Acq92OHTFhED5njESGzft1jDkZnHxZDfPL92nJ9ug8gAa3j5oW0rJHmQ8cGgs7HEUE7 DV8co3YSymxhk4NHoRh+ACfWy1irlCIt12AXPXzif+kdHQvILk2MXLk7eGFUjlLyTP5TR/rfFfa wpmGOpIqQdM4fdOSnMtbUjG7T3otfRR0irHKaoclEUAGSWEyLzFT2bZE40Nv0BtIc4U7NxHf/3V QgBri5uuF/nBHGU5joMT1SGKzwIsdXYWy5FH9qlxFvToOmOJ8HdAM1pY7kF8SMhIJ2MgV+jeRAj gR0/27fIvgl/Ay7EcTcl7vIU0ke/K6hLaewIPk8pLIIT1YmftW/KGpGTXkpd+SdAfkEDJUYFYBX cB1kH/jKy4YUf8SoqLZmyhe3hGByL/Pxvqc4Sk2eD4ZyKTxUlwZF/tZU7JalaogLAw69DF6JI3z gzq2Mk1FdQ0lQoJ7kINW1hgJc0L8WBFeBGbKeWrRFIjfF/LAI7F/NJM+s/DLIuwfIy5xDyML4KE K1aS3sP3cNEmd4AuEbFOQC8USSwk5wr+KcRk45F3w== X-Received: by 2002:a05:600c:46cb:b0:489:1c1f:35f1 with SMTP id 5b1f17b1804b1-49042482762mr323974865e9.4.1779805735966; Tue, 26 May 2026 07:28:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/54] hw/arm/omap: Remove stray unused prototype Date: Tue, 26 May 2026 15:28:00 +0100 Message-ID: <20260526142850.2326589-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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=ham 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: 1779805805600154101 Content-Type: text/plain; charset="utf-8" When we removed the support for most of the OMAP SoCs, we missed deleting a function prototype that was for a function defined in removed code. Delete it now. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-4-peter.maydell@linaro.org --- include/hw/arm/omap.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index dc63323210..96a52d280c 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -338,10 +338,6 @@ struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq = *irqs, MemoryRegion *sysmem, qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk c= lk, enum omap_dma_model model); -struct soc_dma_s *omap_dma4_init(hwaddr base, qemu_irq *irqs, - MemoryRegion *sysmem, - struct omap_mpu_state_s *mpu, int fifo, - int chans, omap_clk iclk, omap_clk fclk); void omap_dma_reset(struct soc_dma_s *s); =20 struct dma_irq_map { --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805901; cv=none; d=zohomail.com; s=zohoarc; b=QNlvLaWyhTfnSumWTXwkOzNKFBqooIouxvlYyzFpwIlTIUOYv/HwyRZJnL4l7Lz8QUfNJAztqLCEchgVS1xFhwk8QQD2aZeHK4p9u9yLZpvbgtyAh9svv0uxWt2UPXwwK3Pnpjyusy9S75DFuWgeefVKQ8Kjr4xzaZM/zTjjDRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805901; h=Content-Transfer-Encoding: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:Cc; bh=qMeAAySKM8Ob/XB+juiZkU7uyGySsRerpqUnl91/6Mw=; b=ZlAZNio/1/DZmvXTDe9D9OnZFfXME5ineYWMlPriOQJfG16wu3/ENNqcnbTDC2PqG6ybkjgwL+FBmaSL/F4mz1BccGF07SbChTCcrmfkZsFy4CZVWTgycJhtwGWQyHLbDSW0M9k9d76HOT68xkSPHd2ZitpOmBgdGnNxhvmc47M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17798059011891023.6531619622956; Tue, 26 May 2026 07:31:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmD-0008E0-3r; Tue, 26 May 2026 10:29:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmB-0008Dm-EO for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:59 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmA-0001Cz-2L for qemu-devel@nongnu.org; Tue, 26 May 2026 10:28:59 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-45e8a834cc2so6036319f8f.1 for ; Tue, 26 May 2026 07:28:57 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805737; x=1780410537; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qMeAAySKM8Ob/XB+juiZkU7uyGySsRerpqUnl91/6Mw=; b=PXd6Oml9kjEZk1CcMRMDlOgi0cLsmZNh2eMbdPsV1DiZzMl7vMx4Xd3wZIB5PmQv/L SSN3sUpI/OMLbuSSF4ZOc/V6ERlehEEOXne/c1Z7JxGQ/xIJguk1l+ubyL2KbkQYv/Cu jw3i8wg230lOqZQkAwpTrM8KbghrNSEmncbxthteGn8fovDolSwTds1qxMacgGYAz+9N 9VyWlotdcZxFtncliS2CHy5+iujP/+uO6swIp9vKancopZErwZPZyPBrcgEHCWSOsrWv uJR+cqW6giUQYtlQ3dX62gjuf2cL5VwIE6UwjU856ZjAb9K7sBCS/+RLfCW30y9dS2f6 cCLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805737; x=1780410537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qMeAAySKM8Ob/XB+juiZkU7uyGySsRerpqUnl91/6Mw=; b=jpusC7UVynRmql7yeeHzKLqC4jr8bIeKxmjGWohmODrlkwCz/8K5QgakccJpWZjfWo 4zlj5dsr5wn2I7VAsTMcH6YgQoTdgE3/j42v3zQk3AqEu5VnoDwHW7mmpviuC3mcUQPJ tA9WrkHN+DZK8VwsE1FQZ80De+bByVgYvzKa+wUpyYjktTh+YWUnFdUaCMt4kxbnQkYE 4/lqvd3zW1veyHHn9/QyLUJxYmpVFrDSNaIm5LygiFnDwmJ3x0ZSLjELZvzPs7nDxhtg 9ukQhSBftLxK59iXEzdgOShSMOXb5N89OiW+u1SFwtz3Z++E7GazRaYOnXjHzznpYcmo 41tA== X-Gm-Message-State: AOJu0Ywtgi9NOqq1JRymaGXnRkyfHMhWlF45WCQwOxj7g/9XNp47EoaR ndKY+BI5O44KaZeN7ntPGOJwjDtdhdYw5m2FtT2WjnnrLoMFEKjwi2HZo4m2f0ZMHmFryqhlhTq MCaNA X-Gm-Gg: Acq92OH0nJDZdTJnDmvd43YzOUtTZ/UAUd+9q2MDVG64Y+Vzxbzb49qeTLqKlDvrRc0 87J8ekVQg4iGxEzLdRTMOo9gNeoTDqV8GR9MOW8jkx1fAeEZN+bXIs+UGgIjxliLd1izTYInW1M tD+MAVSj5YkgpUhLo7qzgyPsDNZqGHy6RTgNdEJUTMIVXGrl/WBMEoAMqRRlaCKhW4ILgWt1m9C ekORxdpf/hx93Fdtd1s0S/L6ROYVVYQxLAFIJ4sAorKfX80x2oe/XhqXi/YvX78hHVZu3k7E0/1 flLvsZUOD1j9dsZdmE41KksZwnkS3o/qJnn5PxguRQH7HpJVn9M1LXFf8PjPUusU76nm20sw8jh WOu4HApEwNKNdjH7O+sKzKcmpos0n7qxNaa7wK3qMSBq50S718fT6EnJ6F9YWvCM3G044JmETQH 9y+2N3L01Q/njlUmOH6mtXVH8suE1Nett976F63Zwnqb8Nh9fBz2cFKY7Ar6WF8atOBQgWzugEf NtpgHoMBy3mgiLNhJhnL9j9+pDknyZe/IbTxHSxhA== X-Received: by 2002:a05:6000:461b:b0:43d:1c21:ead5 with SMTP id ffacd0b85a97d-45eb38b31aamr30032590f8f.22.1779805736768; Tue, 26 May 2026 07:28:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/54] hw/arm/omap: Remove unused omap1_dma_irq_map[] entries Date: Tue, 26 May 2026 15:28:01 +0100 Message-ID: <20260526142850.2326589-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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=ham 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: 1779805903330154100 Content-Type: text/plain; charset="utf-8" For the one remaining OMAP board, we use only the first 6 entries in the omap1_dma_irq_map[] array; the rest were for OMAP1610. Delete the now-unused elements. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-5-peter.maydell@linaro.org --- hw/arm/omap1.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 15087ba03e..40ca8c9890 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -3710,16 +3710,6 @@ static const struct dma_irq_map omap1_dma_irq_map[] = =3D { { 0, OMAP_INT_DMA_CH3 }, { 0, OMAP_INT_DMA_CH4 }, { 0, OMAP_INT_DMA_CH5 }, - { 1, OMAP_INT_1610_DMA_CH6 }, - { 1, OMAP_INT_1610_DMA_CH7 }, - { 1, OMAP_INT_1610_DMA_CH8 }, - { 1, OMAP_INT_1610_DMA_CH9 }, - { 1, OMAP_INT_1610_DMA_CH10 }, - { 1, OMAP_INT_1610_DMA_CH11 }, - { 1, OMAP_INT_1610_DMA_CH12 }, - { 1, OMAP_INT_1610_DMA_CH13 }, - { 1, OMAP_INT_1610_DMA_CH14 }, - { 1, OMAP_INT_1610_DMA_CH15 } }; =20 /* DMA ports for OMAP1 */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805847; cv=none; d=zohomail.com; s=zohoarc; b=OBPhDr7r0LowBwY8IVgb7wgI+4NXVrMaDeNdrFbCnm3AJrrM308TTPPBrNhrdmensh6A/eqMefXb/uSuD5whJb8xpgcbwKEdsxrEtlsS7q4XUn7U2uSYv1Lzbv1UGwwGO9cDEKtTByTHdFnqnP7H5gjMvenA/tTQWZ3IJX5U6NE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805847; h=Content-Transfer-Encoding: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:Cc; bh=UUSLoSdfOsc/N+LdpmFz6f24s0YEUSsv6hjm1D7lnC8=; b=VUAHhfjfUeEJHvDFQF53h6bKyv06pZ/OWG4G7Y6+RSrcC1C7xR93keu+2kSGaYiBOwVF60eD97ZVzYyhhJ99AbMQWZ3XN0yVkTa8UcaXlNja+9HqFWzuwOkD/mSwAlJj5Ely+IqBTfF1M2Kfqd+hy1iQ7+ix4INUQ8Q30PAYoVY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805847380676.7991296689128; Tue, 26 May 2026 07:30:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmF-0008Es-0S; Tue, 26 May 2026 10:29:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmD-0008EA-9I for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:01 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmB-0001DF-9z for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:01 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-490388fd0dbso51196305e9.0 for ; Tue, 26 May 2026 07:28:58 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805738; x=1780410538; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UUSLoSdfOsc/N+LdpmFz6f24s0YEUSsv6hjm1D7lnC8=; b=D9ODwZsHcezzsnZlDM+Ts30Yr3HVncP43DWsousKdTnQxm7OF8nTHfEyru1v1+gT4w RhaygQQaiUnrCnzn7d9d2o0zDd2O5rGtNHJtEbw/s5KIV5wSy4UK80UDkjaQHK/WXCxz owuoHHAX+i7fWOjW8c4gP6IjWpaC3Kp4wydY9BGA5J95dSqVIL3iprySHCI1uvNVSona 5FxBzLW2wZV00yLKURfliXeON9/qdl7QJGWooak9EoSsCPlq5M1NGlkl8wqpZw1YNwT0 f72E3rCHnfmEFba0FvvFVizDLofukd2x2in4LjWmb0iUB6nijEw9ktq1KKkDh1L/jqKj eqyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805738; x=1780410538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UUSLoSdfOsc/N+LdpmFz6f24s0YEUSsv6hjm1D7lnC8=; b=iWWoysfQTgPtKXmxjmoRH02pyK7CdB/O5wY7a1Fm6cMgnwdDiLQKmJ8QcAbK5MK0jJ YZ1k4guoCbyiWpBsi/lxHbef0WioHAfSMVAZTtH4+EkkgQeM4D7qjKePdn3LahANM6wI 66m8QtG/ZD9L0alNE8b7vyRHoKlvqv99siIqFAZEf3rv8FzdK4EzSUqtIMmxIVfxgbzj FOmQeZi2X34bR8Qv2SmG1Jy34P7RBtCH+mzHQ8QbHj4zoPIcanW6TvmHZviu6n/IpMve mUsjJIdnUaM8a64bLTYjBJ1FaBWnr1uczPdG+2487scygN4QTKnmyIzDNHxoVYnj9jQe 2e0A== X-Gm-Message-State: AOJu0Yy9B5M21+9y9wc2QR4dQb2+Sdz832/fwOweiWc/Yv7+XTvc+8QP JCyq8ky9qaa8wGomoIpDqBq4gM1jLMiWa7ZoJeKLQz7zEf/jfRzXxKPh6cIQqS3Z/tkXZEKhCV4 68aVx X-Gm-Gg: Acq92OEw3Kady6j7SP0FVJx+jDbaR765eO9KVDKzfloxGvFz2mxSdsLmvKqJWX9QYy6 eivND4XHFn9a/0fVF6dEw7Y2ibWmICsLoN5tvGNffSBhHJz7q950IrJr+rYxCxdYpGmBwxXfGzg QYj++5OKWF+so/hrL4juZWBx8zDgVXRZ02IL599k7kZ5TU6r3OtrwSaH2CW/7umBuiPtj7rpC6y QApZVuXp03DS6QmW5aExSRoypCQokOXK7VJg5ejOfMAPNJ0kza5eDmClW9Jxo9JYkbsCwfEV642 vLLNVyfRIlPusOIzcbK/1A2DjIerJTU5iplweAxqWPmO+s8ivl3rwqP5uyVdGWXZ7V1+XYdWZB6 5Es8OomoBSdqnuu3ARIbqjZyJrRpS/9eUa6HH5o0oknYLmrMAKV35cD830hnKDQ0toFQmtuB7j3 aQiCRFBjjp43oF0AsZRjbE4fqfcOcGfyt5Wri/o5etyHYcmKnsSyfI61QSWzvJ0QwG3/7qUcKAj 0+FnDQD99PrPRlScVlBKRqJOxdN+H4= X-Received: by 2002:a05:600c:6095:b0:490:51b9:2309 with SMTP id 5b1f17b1804b1-49051b924b1mr257290235e9.29.1779805737589; Tue, 26 May 2026 07:28:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/54] hw/arm/omap: Delete unused #defines Date: Tue, 26 May 2026 15:28:02 +0100 Message-ID: <20260526142850.2326589-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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=ham 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: 1779805849104158500 Content-Type: text/plain; charset="utf-8" Delete some #defines which we no longer use because they are for OMAP SoCs which we dropped support for. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-6-peter.maydell@linaro.org --- include/hw/arm/omap.h | 185 ------------------------------------------ 1 file changed, 185 deletions(-) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 96a52d280c..14d6e9d214 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -35,10 +35,7 @@ #define OMAP_LOCALBUS_BASE 0x30000000 #define OMAP_MPUI_BASE 0xe1000000 =20 -#define OMAP730_SRAM_SIZE 0x00032000 #define OMAP15XX_SRAM_SIZE 0x00030000 -#define OMAP16XX_SRAM_SIZE 0x00004000 -#define OMAP1611_SRAM_SIZE 0x0003e800 #define OMAP_CS0_SIZE 0x04000000 #define OMAP_CS1_SIZE 0x04000000 #define OMAP_CS2_SIZE 0x04000000 @@ -130,16 +127,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk = clk); * Common OMAP-15xx IRQ numbers for level 1 interrupt handler */ #define OMAP_INT_15XX_IH2_IRQ 0 -#define OMAP_INT_15XX_LB_MMU 17 -#define OMAP_INT_15XX_LOCAL_BUS 29 - -/* - * OMAP-1510 specific IRQ numbers for level 1 interrupt handler - */ -#define OMAP_INT_1510_SPI_TX 4 -#define OMAP_INT_1510_SPI_RX 5 -#define OMAP_INT_1510_DSP_MAILBOX1 10 -#define OMAP_INT_1510_DSP_MAILBOX2 11 =20 /* * OMAP-310 specific IRQ numbers for level 1 interrupt handler @@ -149,42 +136,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk = clk); #define OMAP_INT_310_HSB_MAILBOX1 12 #define OMAP_INT_310_HSAB_MMU 18 =20 -/* - * OMAP-1610 specific IRQ numbers for level 1 interrupt handler - */ -#define OMAP_INT_1610_IH2_IRQ 0 -#define OMAP_INT_1610_IH2_FIQ 2 -#define OMAP_INT_1610_McBSP2_TX 4 -#define OMAP_INT_1610_McBSP2_RX 5 -#define OMAP_INT_1610_DSP_MAILBOX1 10 -#define OMAP_INT_1610_DSP_MAILBOX2 11 -#define OMAP_INT_1610_LCD_LINE 12 -#define OMAP_INT_1610_GPTIMER1 17 -#define OMAP_INT_1610_GPTIMER2 18 -#define OMAP_INT_1610_SSR_FIFO_0 29 - -/* - * OMAP-730 specific IRQ numbers for level 1 interrupt handler - */ -#define OMAP_INT_730_IH2_FIQ 0 -#define OMAP_INT_730_IH2_IRQ 1 -#define OMAP_INT_730_USB_NON_ISO 2 -#define OMAP_INT_730_USB_ISO 3 -#define OMAP_INT_730_ICR 4 -#define OMAP_INT_730_EAC 5 -#define OMAP_INT_730_GPIO_BANK1 6 -#define OMAP_INT_730_GPIO_BANK2 7 -#define OMAP_INT_730_GPIO_BANK3 8 -#define OMAP_INT_730_McBSP2TX 10 -#define OMAP_INT_730_McBSP2RX 11 -#define OMAP_INT_730_McBSP2RX_OVF 12 -#define OMAP_INT_730_LCD_LINE 14 -#define OMAP_INT_730_GSM_PROTECT 15 -#define OMAP_INT_730_TIMER3 16 -#define OMAP_INT_730_GPIO_BANK5 17 -#define OMAP_INT_730_GPIO_BANK6 18 -#define OMAP_INT_730_SPGIO_WR 29 - /* * Common IRQ numbers for level 2 interrupt handler */ @@ -209,15 +160,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk = clk); #define OMAP_INT_RTC_ALARM 26 #define OMAP_INT_DSP_MMU 28 =20 -/* - * OMAP-1510 specific IRQ numbers for level 2 interrupt handler - */ -#define OMAP_INT_1510_BT_MCSI1TX 16 -#define OMAP_INT_1510_BT_MCSI1RX 17 -#define OMAP_INT_1510_SoSSI_MATCH 19 -#define OMAP_INT_1510_MEM_STICK 27 -#define OMAP_INT_1510_COM_SPI_RO 31 - /* * OMAP-310 specific IRQ numbers for level 2 interrupt handler */ @@ -229,103 +171,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk= clk); #define OMAP_INT_310_USB_W2FC_NON_ISO 30 #define OMAP_INT_310_McBSP2RX_OF 31 =20 -/* - * OMAP-1610 specific IRQ numbers for level 2 interrupt handler - */ -#define OMAP_INT_1610_FAC 0 -#define OMAP_INT_1610_USB_HHC_2 7 -#define OMAP_INT_1610_USB_OTG 8 -#define OMAP_INT_1610_SoSSI 9 -#define OMAP_INT_1610_BT_MCSI1TX 16 -#define OMAP_INT_1610_BT_MCSI1RX 17 -#define OMAP_INT_1610_SoSSI_MATCH 19 -#define OMAP_INT_1610_MEM_STICK 27 -#define OMAP_INT_1610_McBSP2RX_OF 31 -#define OMAP_INT_1610_STI 32 -#define OMAP_INT_1610_STI_WAKEUP 33 -#define OMAP_INT_1610_GPTIMER3 34 -#define OMAP_INT_1610_GPTIMER4 35 -#define OMAP_INT_1610_GPTIMER5 36 -#define OMAP_INT_1610_GPTIMER6 37 -#define OMAP_INT_1610_GPTIMER7 38 -#define OMAP_INT_1610_GPTIMER8 39 -#define OMAP_INT_1610_GPIO_BANK2 40 -#define OMAP_INT_1610_GPIO_BANK3 41 -#define OMAP_INT_1610_MMC2 42 -#define OMAP_INT_1610_CF 43 -#define OMAP_INT_1610_WAKE_UP_REQ 46 -#define OMAP_INT_1610_GPIO_BANK4 48 -#define OMAP_INT_1610_SPI 49 -#define OMAP_INT_1610_DMA_CH6 53 -#define OMAP_INT_1610_DMA_CH7 54 -#define OMAP_INT_1610_DMA_CH8 55 -#define OMAP_INT_1610_DMA_CH9 56 -#define OMAP_INT_1610_DMA_CH10 57 -#define OMAP_INT_1610_DMA_CH11 58 -#define OMAP_INT_1610_DMA_CH12 59 -#define OMAP_INT_1610_DMA_CH13 60 -#define OMAP_INT_1610_DMA_CH14 61 -#define OMAP_INT_1610_DMA_CH15 62 -#define OMAP_INT_1610_NAND 63 - -/* - * OMAP-730 specific IRQ numbers for level 2 interrupt handler - */ -#define OMAP_INT_730_HW_ERRORS 0 -#define OMAP_INT_730_NFIQ_PWR_FAIL 1 -#define OMAP_INT_730_CFCD 2 -#define OMAP_INT_730_CFIREQ 3 -#define OMAP_INT_730_I2C 4 -#define OMAP_INT_730_PCC 5 -#define OMAP_INT_730_MPU_EXT_NIRQ 6 -#define OMAP_INT_730_SPI_100K_1 7 -#define OMAP_INT_730_SYREN_SPI 8 -#define OMAP_INT_730_VLYNQ 9 -#define OMAP_INT_730_GPIO_BANK4 10 -#define OMAP_INT_730_McBSP1TX 11 -#define OMAP_INT_730_McBSP1RX 12 -#define OMAP_INT_730_McBSP1RX_OF 13 -#define OMAP_INT_730_UART_MODEM_IRDA_2 14 -#define OMAP_INT_730_UART_MODEM_1 15 -#define OMAP_INT_730_MCSI 16 -#define OMAP_INT_730_uWireTX 17 -#define OMAP_INT_730_uWireRX 18 -#define OMAP_INT_730_SMC_CD 19 -#define OMAP_INT_730_SMC_IREQ 20 -#define OMAP_INT_730_HDQ_1WIRE 21 -#define OMAP_INT_730_TIMER32K 22 -#define OMAP_INT_730_MMC_SDIO 23 -#define OMAP_INT_730_UPLD 24 -#define OMAP_INT_730_USB_HHC_1 27 -#define OMAP_INT_730_USB_HHC_2 28 -#define OMAP_INT_730_USB_GENI 29 -#define OMAP_INT_730_USB_OTG 30 -#define OMAP_INT_730_CAMERA_IF 31 -#define OMAP_INT_730_RNG 32 -#define OMAP_INT_730_DUAL_MODE_TIMER 33 -#define OMAP_INT_730_DBB_RF_EN 34 -#define OMAP_INT_730_MPUIO_KEYPAD 35 -#define OMAP_INT_730_SHA1_MD5 36 -#define OMAP_INT_730_SPI_100K_2 37 -#define OMAP_INT_730_RNG_IDLE 38 -#define OMAP_INT_730_MPUIO 39 -#define OMAP_INT_730_LLPC_LCD_CTRL_OFF 40 -#define OMAP_INT_730_LLPC_OE_FALLING 41 -#define OMAP_INT_730_LLPC_OE_RISING 42 -#define OMAP_INT_730_LLPC_VSYNC 43 -#define OMAP_INT_730_WAKE_UP_REQ 46 -#define OMAP_INT_730_DMA_CH6 53 -#define OMAP_INT_730_DMA_CH7 54 -#define OMAP_INT_730_DMA_CH8 55 -#define OMAP_INT_730_DMA_CH9 56 -#define OMAP_INT_730_DMA_CH10 57 -#define OMAP_INT_730_DMA_CH11 58 -#define OMAP_INT_730_DMA_CH12 59 -#define OMAP_INT_730_DMA_CH13 60 -#define OMAP_INT_730_DMA_CH14 61 -#define OMAP_INT_730_DMA_CH15 62 -#define OMAP_INT_730_NAND 63 - /* omap_dma.c */ enum omap_dma_model { omap_dma_3_0, @@ -437,9 +282,6 @@ struct omap_dma_lcd_channel_s { #define OMAP_DMA_CAMERA_IF_RX 20 #define OMAP_DMA_MMC_TX 21 #define OMAP_DMA_MMC_RX 22 -#define OMAP_DMA_NAND 23 /* Not in OMAP310 */ -#define OMAP_DMA_IRQ_LCD_LINE 24 /* Not in OMAP310 */ -#define OMAP_DMA_MEMORY_STICK 25 /* Not in OMAP310 */ #define OMAP_DMA_USB_W2FC_RX0 26 #define OMAP_DMA_USB_W2FC_RX1 27 #define OMAP_DMA_USB_W2FC_RX2 28 @@ -447,33 +289,6 @@ struct omap_dma_lcd_channel_s { #define OMAP_DMA_USB_W2FC_TX1 30 #define OMAP_DMA_USB_W2FC_TX2 31 =20 -/* These are only for 1610 */ -#define OMAP_DMA_CRYPTO_DES_IN 32 -#define OMAP_DMA_SPI_TX 33 -#define OMAP_DMA_SPI_RX 34 -#define OMAP_DMA_CRYPTO_HASH 35 -#define OMAP_DMA_CCP_ATTN 36 -#define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37 -#define OMAP_DMA_CMT_APE_TX_CHAN_0 38 -#define OMAP_DMA_CMT_APE_RV_CHAN_0 39 -#define OMAP_DMA_CMT_APE_TX_CHAN_1 40 -#define OMAP_DMA_CMT_APE_RV_CHAN_1 41 -#define OMAP_DMA_CMT_APE_TX_CHAN_2 42 -#define OMAP_DMA_CMT_APE_RV_CHAN_2 43 -#define OMAP_DMA_CMT_APE_TX_CHAN_3 44 -#define OMAP_DMA_CMT_APE_RV_CHAN_3 45 -#define OMAP_DMA_CMT_APE_TX_CHAN_4 46 -#define OMAP_DMA_CMT_APE_RV_CHAN_4 47 -#define OMAP_DMA_CMT_APE_TX_CHAN_5 48 -#define OMAP_DMA_CMT_APE_RV_CHAN_5 49 -#define OMAP_DMA_CMT_APE_TX_CHAN_6 50 -#define OMAP_DMA_CMT_APE_RV_CHAN_6 51 -#define OMAP_DMA_CMT_APE_TX_CHAN_7 52 -#define OMAP_DMA_CMT_APE_RV_CHAN_7 53 -#define OMAP_DMA_MMC2_TX 54 -#define OMAP_DMA_MMC2_RX 55 -#define OMAP_DMA_CRYPTO_DES_OUT 56 - struct omap_uart_s; struct omap_uart_s *omap_uart_init(hwaddr base, qemu_irq irq, omap_clk fclk, omap_clk iclk, --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806057; cv=none; d=zohomail.com; s=zohoarc; b=QJYTENfNZ6Cpu9mUmFS2sNOIRMtwqGc3cbHpG1GnPsfncDeQ8V8sdc6oLSqA0lYKkOzI6oZ7JXXKpBATE07kmbiSl8dHbDu1iys3gV2WAARBUy9Xl0PcSYhPXXfV6XMlDXh7eOF8PDORX4p/mvhSD/DECjiWnv3GEPHIpZGYH+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806057; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=WDOMQi4BCdtFH39y4Uw1CTj59WhkNb3bAUovvCrdX7A=; b=WeTCYbaXiZsOH/nj6vuSO7WaCn+r2KNgA/YrYHplm9//emdkcdSiZigMEjaw23rQBBuPq5N1r8brdVEmOel0QBQx9AdOR6vqbj5z39rgHL/xWoo47534l2Pq7gqxu7FxM9CAHK9Gvq7tDJp3hpS413aX3W+sWiQy+WS0hYl1pBo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806057310701.1267882029334; Tue, 26 May 2026 07:34:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmT-0008Mu-7O; Tue, 26 May 2026 10:29:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmD-0008Ef-VT for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:02 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmC-0001DR-AV for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:01 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43d73422431so7551375f8f.2 for ; Tue, 26 May 2026 07:28:59 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805738; x=1780410538; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WDOMQi4BCdtFH39y4Uw1CTj59WhkNb3bAUovvCrdX7A=; b=dak6Up5RcmhAJx0O5ndhdH2KvZfxJEzvRlBqLaG/GvKmrox8CUElgA+eiffu1cW/P0 qakLjnO5v+9R4JIvq3CpAb/zEVTVJbTocK5AB9aZt6aX2PltMB/u3MHANKld2gemw2AQ TkAIbh2+Opw6B+MbSHHOxcOiHRC+0KzEEiCYxTv6TSdRHNIZr7AKmIIPycuxa887+iY4 J2LprHjndKevl+2IK7R1VsL5trwXHfjC4RYIeyIi40YY/Bd0ecR/B8I2xeUO9Ql92KA+ cFLXTBdaoxaOhDRe6wLaigJqeES7Fq3+yM7Ipuj3yp/VUmXnRoc6Plag777Imgp6lERf l76g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805738; x=1780410538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WDOMQi4BCdtFH39y4Uw1CTj59WhkNb3bAUovvCrdX7A=; b=NRn8pFL/R9yTfCRBoQuu/Ss92n83E4UqhScOwBN93/2O6i74UEQgd3oAvu72FAqwJy wV3975neC8qUXV61ioXKOxhUqVPVtuuB/fXY2M/ACyM18ERbeIN6Q3JvM1HqXGQ0E7Lv n9Fzu/yMv7NTyw5gY8UZiM539PJ+crq2f0amYLLhRup2FXV2IPF6Yiq27aR5eQIfNFSk hYkZWpsTKrNErMSZpDhmYGALUVQevrW9lTxpJibrQ4C/YSFjUx5XZ2VyD893sqAm546w da9iihOWaHJMbBHonpx0jcYiDreUjPCYIk8cF+Zewtqr27b+D7I5AbOtRa3gJN07rrjY eeBQ== X-Gm-Message-State: AOJu0YzPxt3kRzpSAXQViA0VwXGbIs671bSLkuo7zzIkGf+rpyoratRz PO4w+PuD0+sLZnqq7WQsAPYL8V7WNlqZfIcnsViNDZ45l+tmjT4AAzCtctlQX6OQrTmXF15yzUB 6AvOY X-Gm-Gg: Acq92OHc0+5dTNQSw+7mQvz9mWAW/2mnOo5+5NZ0Pg+5PaNqG6fz5OEY+lDZDrIj2EO 3vuDdWZiMJbaYAxnKsnroB9yTJTVnJFSVu51miYdb95eOAUIGUGkW68UCPE0uq1DxvI5L/PFcW0 ddmVqUG7a+K4f3+QGOQcmeigljDBayCGD6tIIzk7rMsObFB2JkJ2LwLiEjXJWWTdJi5oMQ91FqT Qg5sUhTuUFbHmprbD3AGZ/vCQSuU1uvbR720ir3NcjU3bYSPoZNCGwZf3X926DAkHM8yPKc55x1 6C5C/6PXevnno7/+A4FnNHJuhhqV0NvqJTia9ZyiWEQ81rTwMSQ4hnFZTEkEEYNJjhLqWZIX2VZ EKNJDtXFGb21zu4vRPYgk9reQyA0eujuDd0L2wmzPeLMH/saR5rutsRmXS8JKTyu5Zq3baqMLJ2 x2LMMZIT4djLmeuzFE8Mjj8777RIeTjRjq6AnJNCb/iEb5vgojRExvAgGKDSbwxFoih1dvfbB5H RxzsEZ7NyM4SIgIaR7OgMkDvlI0fnM= X-Received: by 2002:a05:6000:26c4:b0:44a:2555:f8a9 with SMTP id ffacd0b85a97d-45eb369072emr31072369f8f.10.1779805738384; Tue, 26 May 2026 07:28:58 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/54] hw/arm/omap: Remove unused wakeup irq Date: Tue, 26 May 2026 15:28:03 +0100 Message-ID: <20260526142850.2326589-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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=ham 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: 1779806058928158500 The OMAP code creates a qemu_irq whose set function is omap_mpu_wakeup(), and passes that irq into omap_mpuio_init(), which saves it in its omap_mpuio_s::wakeup field. However nothing ever touches that qemu_irq again, so omap_mpu_wakeup() is never called. Remove all this as dead code. This lets us remove a direct call to cpu_interrupt(cpu, CPU_INTERRUPT_EXITTB) from within board/SoC code, which is pretty ugly and might not even do the right thing these days. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-7-peter.maydell@linaro.org --- hw/arm/omap1.c | 18 ++---------------- include/hw/arm/omap.h | 2 -- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 40ca8c9890..80168644ce 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -1846,7 +1846,6 @@ struct omap_mpuio_s { qemu_irq kbd_irq; qemu_irq *in; qemu_irq handler[16]; - qemu_irq wakeup; MemoryRegion iomem; =20 uint16_t inputs; @@ -2074,14 +2073,13 @@ static void omap_mpuio_onoff(void *opaque, int line= , int on) =20 static struct omap_mpuio_s *omap_mpuio_init(MemoryRegion *memory, hwaddr base, - qemu_irq kbd_int, qemu_irq gpio_int, qemu_irq wakeup, + qemu_irq kbd_int, qemu_irq gpio_int, omap_clk clk) { struct omap_mpuio_s *s =3D g_new0(struct omap_mpuio_s, 1); =20 s->irq =3D gpio_int; s->kbd_irq =3D kbd_int; - s->wakeup =3D wakeup; s->in =3D qemu_allocate_irqs(omap_mpuio_set, s, 16); omap_mpuio_reset(s); =20 @@ -3693,16 +3691,6 @@ static void omap_setup_dsp_mapping(MemoryRegion *sys= tem_memory, } } =20 -void omap_mpu_wakeup(void *opaque, int irq, int req) -{ - struct omap_mpu_state_s *mpu =3D opaque; - CPUState *cpu =3D CPU(mpu->cpu); - - if (cpu->halted) { - cpu_interrupt(cpu, CPU_INTERRUPT_EXITTB); - } -} - static const struct dma_irq_map omap1_dma_irq_map[] =3D { { 0, OMAP_INT_DMA_CH0_6 }, { 0, OMAP_INT_DMA_CH1_7 }, @@ -3765,8 +3753,6 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, s->sdram_size =3D memory_region_size(dram); s->sram_size =3D OMAP15XX_SRAM_SIZE; =20 - s->wakeup =3D qemu_allocate_irq(omap_mpu_wakeup, s, 0); - /* Clocks */ omap_clk_init(s); =20 @@ -3912,7 +3898,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, s->mpuio =3D omap_mpuio_init(system_memory, 0xfffb5000, qdev_get_gpio_in(s->ih[1], OMAP_INT_KEYBOAR= D), qdev_get_gpio_in(s->ih[1], OMAP_INT_MPUIO), - s->wakeup, omap_findclk(s, "clk32-kHz")); + omap_findclk(s, "clk32-kHz")); =20 s->gpio =3D qdev_new("omap-gpio"); omap_gpio_set_clk(OMAP1_GPIO(s->gpio), omap_findclk(s, "arm_gpio_ck")); diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 14d6e9d214..ea5c0eff8b 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -463,8 +463,6 @@ struct omap_mpu_state_s { struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *sdram, const char *core); =20 -void omap_mpu_wakeup(void *opaque, int irq, int req); - #define OMAP_BAD_REG(paddr) \ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad register %#08"HWADDR_PRIx"= \n", \ __func__, paddr) --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806011; cv=none; d=zohomail.com; s=zohoarc; b=iXV7Ef1GBoE/i9sUYQp0rexFCBhXSdj1IStClC5cV5P3b7W2kGU5l7R5aineG4sHBJ+EItS0i+MJ7J3ky6uYHjQYjgdrBr9tTfCwaq4wkJWimB/TuQrja4dj/kxfElDcP5hm42VR5VHzlON29yWpXJkA4zNLH24aaYb0D6i2468= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806011; h=Content-Transfer-Encoding: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:Cc; bh=EOC7VbbJb0LqgDAM41t/rnAPXOgnOtxdsdEmcYnt9KU=; b=n8d5CrhXKr45Eng2CUqhmufUeJEWmIafsjGZlnmeLsJYVic9ZCXyzy6RpuuMMoli9kGxBoHtfEE3Y2rYcaywyyxQEhQi8+D9K5FoSpAotIUbDC3ZkNfzRGMMBe7yaWNwXvS3FvsuL70stgfFuXdOoYtQIEGS9/2GyB2wWqhSUPU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806011074287.2915289558006; Tue, 26 May 2026 07:33:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmY-00008c-V5; Tue, 26 May 2026 10:29:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmF-0008FF-Qx for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:05 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmD-0001Df-D7 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:03 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so112129105e9.0 for ; Tue, 26 May 2026 07:29:00 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805740; x=1780410540; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EOC7VbbJb0LqgDAM41t/rnAPXOgnOtxdsdEmcYnt9KU=; b=xx+4KJoJQ7YgRlOuzAh96oBreG7bu1tAf3fY/zuSDM8y4RHT3uXLWwvGwMXIRuNK9p ZWcJGNUvkU7DackD49BrgXElcPJoIFM3Kn/tjPhuLrrqzy1Uk660A0I2YrRrUG9GWRF7 MbRDqNX+46hnqOjK++LQLwg/jfGE+DkeFMK+fzKUkE+G1p5f42NiBeSU6/hdcKX5WWci +tcakujgqqLoPyZmp4cuxaFQgh4D9aa4rJAQpFO2QKuF94ZrIBdVhSjbtRcaR7fSY3EG YXNhKIL/dXUjO02Q5YMEuBymvRgZJ8K/mkRrkkY0GgyvxGYZ0dKDbChzchyCT5OpybK9 1+7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805740; x=1780410540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EOC7VbbJb0LqgDAM41t/rnAPXOgnOtxdsdEmcYnt9KU=; b=cei5tNWShlmxkFaxkgFDCPvkPeI+1TDqUjGqZV+cEAL8Wgf84X8+8cIAHw0YUjwnSM IyUz5mE8EvQOvoDOtAykFCA5hBCBDbidP1PWilXYtFHR5pq9LkPYlVxDz0/M9R94fIAL yiVJiYdbBDtfyBekemHnGfX8yPOhoXugZP922CR1mCWbZKwkxbiZwBhW0h2mrQekzKoG 59H1fzQM6VFa2IQpIognWDtTM9R7CCUNPBs8QWkDPFZPGkWE8MMjgr8d9io0/oVLzCb3 hyViWXSlnivjdcRYdwCagIcb+iyHPLgELRikM+Yup1sF1QtL3DkX98sOdLhsVAUW/ZkJ qwHg== X-Gm-Message-State: AOJu0YyUPrrrfHgo4vHWHuASl2CKN6irZnI12l+MbC1xftpTvZ9J9xAW xp9FwD9o0fMoCAGbD+DmKgCDZEHHSDYw2bbkjpxFWUG5wQv1jdNbRsjQRAQxV4jN3t2yUw9T9BB MloUl X-Gm-Gg: Acq92OHgFxH0V6OVrmeaKYKQYW+Pma+u7t6AQRe/oGM/NiORqgzwWOqifpbnfnTjuMK rKvT9MbfLXLDjaqJ2Bj9+IdH3nF3mGy0PSpDWuEBBI136++zOBFim50WwBQRJpRFQvPMcR1si9N JyymxUaVMw0YkSZeMA4gY/fIeM/IUhtmJV8VrpJXza1vs3QRE+uxCKoXnzMfhm7Tm+dmzXX7lRQ u63xUnpo3OkkIvBg2+FxqzMtB0Z4uBAMwafi2nN0KjdZKJwcT6zRZnwPI+EK5nm6W7HWK3M0Md8 VaAmYjroX7L00DqaKMcA3xrHymeVm9dOsfgO/UZeiAAU1KLnm+Rgm9615qBeimMFZR+FzHMEmsw x9xLmbA31UM1jGF+183I/vTlB2I3ZdpWN6HV59LKzbop9LZu375C3/jnz/cFC1qQ2qtFYk0kY7g u6PlQnFEUFXetNAYEYs/FHEY8ldTt7tc5khIrf788pyMkTeooE1fovruXHVsbyZ7EYIQs3kzKxH GXc6u7tfwh+zCEc6ykJXFyT0TN+ZC4= X-Received: by 2002:a05:600c:5298:b0:48f:e230:2a26 with SMTP id 5b1f17b1804b1-490428e16bamr318961375e9.33.1779805739430; Tue, 26 May 2026 07:28:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/54] hw/dma/omap_dma: Remove support for dma_3_0 and dma_3_2 Date: Tue, 26 May 2026 15:28:04 +0100 Message-ID: <20260526142850.2326589-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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=ham 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: 1779806013555154100 Content-Type: text/plain; charset="utf-8" The omap_dma device has support for modelling different variants of the DMA block, as enumerated by the omap_dma_model enum: 3_0, 3_1 and 3_2. However, our one remaining OMAP SoC always passes omap_dma_3_1 into the omap_dma_init() function, so the handling for 3_0 and 3_2 is never used. Remove the support for the other versions; this lets us delete entirely two large functions that were specific to 3.2 DMA to the LCD controller, and all their associated fields in the omap_dma_lcd_channel_s struct. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-8-peter.maydell@linaro.org --- hw/dma/omap_dma.c | 348 ++---------------------------------------- include/hw/arm/omap.h | 28 ---- 2 files changed, 15 insertions(+), 361 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 784a3a4f7f..9a86d90b4e 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -110,7 +110,6 @@ struct omap_dma_s { omap_clk clk; qemu_irq irq[4]; void (*intr_update)(struct omap_dma_s *s); - enum omap_dma_model model; int omap_3_1_mapping_disabled; =20 uint32_t gcr; @@ -752,10 +751,7 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, break; =20 case 0x02: /* SYS_DMA_CCR_CH0 */ - if (s->model <=3D omap_dma_3_1) - *value =3D 0 << 10; /* FIFO_FLUSH reads as 0 */ - else - *value =3D ch->omap_3_1_compatible_disable << 10; + *value =3D 0 << 10; /* FIFO_FLUSH reads as 0 */ *value |=3D (ch->mode[1] << 14) | (ch->mode[0] << 12) | (ch->end_prog << 11) | @@ -892,8 +888,6 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, ch->mode[1] =3D (omap_dma_addressing_t) ((value & 0xc000) >> 14); ch->mode[0] =3D (omap_dma_addressing_t) ((value & 0x3000) >> 12); ch->end_prog =3D (value & 0x0800) >> 11; - if (s->model >=3D omap_dma_3_2) - ch->omap_3_1_compatible_disable =3D (value >> 10) & 0x1; ch->repeat =3D (value & 0x0200) >> 9; ch->auto_init =3D (value & 0x0100) >> 8; ch->priority =3D (value & 0x0040) >> 6; @@ -1002,250 +996,6 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *= s, return 0; } =20 -static int omap_dma_3_2_lcd_write(struct omap_dma_lcd_channel_s *s, int of= fset, - uint16_t value) -{ - switch (offset) { - case 0xbc0: /* DMA_LCD_CSDP */ - s->brust_f2 =3D (value >> 14) & 0x3; - s->pack_f2 =3D (value >> 13) & 0x1; - s->data_type_f2 =3D (1 << ((value >> 11) & 0x3)); - s->brust_f1 =3D (value >> 7) & 0x3; - s->pack_f1 =3D (value >> 6) & 0x1; - s->data_type_f1 =3D (1 << ((value >> 0) & 0x3)); - break; - - case 0xbc2: /* DMA_LCD_CCR */ - s->mode_f2 =3D (value >> 14) & 0x3; - s->mode_f1 =3D (value >> 12) & 0x3; - s->end_prog =3D (value >> 11) & 0x1; - s->omap_3_1_compatible_disable =3D (value >> 10) & 0x1; - s->repeat =3D (value >> 9) & 0x1; - s->auto_init =3D (value >> 8) & 0x1; - s->running =3D (value >> 7) & 0x1; - s->priority =3D (value >> 6) & 0x1; - s->bs =3D (value >> 4) & 0x1; - break; - - case 0xbc4: /* DMA_LCD_CTRL */ - s->dst =3D (value >> 8) & 0x1; - s->src =3D ((value >> 6) & 0x3) << 1; - s->condition =3D 0; - /* Assume no bus errors and thus no BUS_ERROR irq bits. */ - s->interrupts =3D (value >> 1) & 1; - s->dual =3D value & 1; - break; - - case 0xbc8: /* TOP_B1_L */ - s->src_f1_top &=3D 0xffff0000; - s->src_f1_top |=3D 0x0000ffff & value; - break; - - case 0xbca: /* TOP_B1_U */ - s->src_f1_top &=3D 0x0000ffff; - s->src_f1_top |=3D (uint32_t)value << 16; - break; - - case 0xbcc: /* BOT_B1_L */ - s->src_f1_bottom &=3D 0xffff0000; - s->src_f1_bottom |=3D 0x0000ffff & value; - break; - - case 0xbce: /* BOT_B1_U */ - s->src_f1_bottom &=3D 0x0000ffff; - s->src_f1_bottom |=3D (uint32_t) value << 16; - break; - - case 0xbd0: /* TOP_B2_L */ - s->src_f2_top &=3D 0xffff0000; - s->src_f2_top |=3D 0x0000ffff & value; - break; - - case 0xbd2: /* TOP_B2_U */ - s->src_f2_top &=3D 0x0000ffff; - s->src_f2_top |=3D (uint32_t) value << 16; - break; - - case 0xbd4: /* BOT_B2_L */ - s->src_f2_bottom &=3D 0xffff0000; - s->src_f2_bottom |=3D 0x0000ffff & value; - break; - - case 0xbd6: /* BOT_B2_U */ - s->src_f2_bottom &=3D 0x0000ffff; - s->src_f2_bottom |=3D (uint32_t) value << 16; - break; - - case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ - s->element_index_f1 =3D value; - break; - - case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ - s->frame_index_f1 &=3D 0xffff0000; - s->frame_index_f1 |=3D 0x0000ffff & value; - break; - - case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ - s->frame_index_f1 &=3D 0x0000ffff; - s->frame_index_f1 |=3D (uint32_t) value << 16; - break; - - case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ - s->element_index_f2 =3D value; - break; - - case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ - s->frame_index_f2 &=3D 0xffff0000; - s->frame_index_f2 |=3D 0x0000ffff & value; - break; - - case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ - s->frame_index_f2 &=3D 0x0000ffff; - s->frame_index_f2 |=3D (uint32_t) value << 16; - break; - - case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ - s->elements_f1 =3D value; - break; - - case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ - s->frames_f1 =3D value; - break; - - case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ - s->elements_f2 =3D value; - break; - - case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ - s->frames_f2 =3D value; - break; - - case 0xbea: /* DMA_LCD_LCH_CTRL */ - s->lch_type =3D value & 0xf; - break; - - default: - return 1; - } - return 0; -} - -static int omap_dma_3_2_lcd_read(struct omap_dma_lcd_channel_s *s, int off= set, - uint16_t *ret) -{ - switch (offset) { - case 0xbc0: /* DMA_LCD_CSDP */ - *ret =3D (s->brust_f2 << 14) | - (s->pack_f2 << 13) | - ((s->data_type_f2 >> 1) << 11) | - (s->brust_f1 << 7) | - (s->pack_f1 << 6) | - ((s->data_type_f1 >> 1) << 0); - break; - - case 0xbc2: /* DMA_LCD_CCR */ - *ret =3D (s->mode_f2 << 14) | - (s->mode_f1 << 12) | - (s->end_prog << 11) | - (s->omap_3_1_compatible_disable << 10) | - (s->repeat << 9) | - (s->auto_init << 8) | - (s->running << 7) | - (s->priority << 6) | - (s->bs << 4); - break; - - case 0xbc4: /* DMA_LCD_CTRL */ - qemu_irq_lower(s->irq); - *ret =3D (s->dst << 8) | - ((s->src & 0x6) << 5) | - (s->condition << 3) | - (s->interrupts << 1) | - s->dual; - break; - - case 0xbc8: /* TOP_B1_L */ - *ret =3D s->src_f1_top & 0xffff; - break; - - case 0xbca: /* TOP_B1_U */ - *ret =3D s->src_f1_top >> 16; - break; - - case 0xbcc: /* BOT_B1_L */ - *ret =3D s->src_f1_bottom & 0xffff; - break; - - case 0xbce: /* BOT_B1_U */ - *ret =3D s->src_f1_bottom >> 16; - break; - - case 0xbd0: /* TOP_B2_L */ - *ret =3D s->src_f2_top & 0xffff; - break; - - case 0xbd2: /* TOP_B2_U */ - *ret =3D s->src_f2_top >> 16; - break; - - case 0xbd4: /* BOT_B2_L */ - *ret =3D s->src_f2_bottom & 0xffff; - break; - - case 0xbd6: /* BOT_B2_U */ - *ret =3D s->src_f2_bottom >> 16; - break; - - case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ - *ret =3D s->element_index_f1; - break; - - case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ - *ret =3D s->frame_index_f1 & 0xffff; - break; - - case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ - *ret =3D s->frame_index_f1 >> 16; - break; - - case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ - *ret =3D s->element_index_f2; - break; - - case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ - *ret =3D s->frame_index_f2 & 0xffff; - break; - - case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ - *ret =3D s->frame_index_f2 >> 16; - break; - - case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ - *ret =3D s->elements_f1; - break; - - case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ - *ret =3D s->frames_f1; - break; - - case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ - *ret =3D s->elements_f2; - break; - - case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ - *ret =3D s->frames_f2; - break; - - case 0xbea: /* DMA_LCD_LCH_CTRL */ - *ret =3D s->lch_type; - break; - - default: - return 1; - } - return 0; -} - static int omap_dma_3_1_lcd_write(struct omap_dma_lcd_channel_s *s, int of= fset, uint16_t value) { @@ -1462,12 +1212,10 @@ static uint64_t omap_dma_read(void *opaque, hwaddr = addr, unsigned size) =20 switch (addr) { case 0x300 ... 0x3fe: - if (s->model <=3D omap_dma_3_1 || !s->omap_3_1_mapping_disabled) { - if (omap_dma_3_1_lcd_read(&s->lcd_ch, addr, &ret)) - break; - return ret; + if (omap_dma_3_1_lcd_read(&s->lcd_ch, addr, &ret)) { + break; } - /* Fall through. */ + return ret; case 0x000 ... 0x2fe: reg =3D addr & 0x3f; ch =3D (addr >> 6) & 0x0f; @@ -1476,20 +1224,13 @@ static uint64_t omap_dma_read(void *opaque, hwaddr = addr, unsigned size) return ret; =20 case 0x404 ... 0x4fe: - if (s->model <=3D omap_dma_3_1) - break; - /* Fall through. */ + break; case 0x400: if (omap_dma_sys_read(s, addr, &ret)) break; return ret; =20 case 0xb00 ... 0xbfe: - if (s->model =3D=3D omap_dma_3_2 && s->omap_3_1_mapping_disabled) { - if (omap_dma_3_2_lcd_read(&s->lcd_ch, addr, &ret)) - break; - return ret; - } break; } =20 @@ -1511,12 +1252,10 @@ static void omap_dma_write(void *opaque, hwaddr add= r, =20 switch (addr) { case 0x300 ... 0x3fe: - if (s->model <=3D omap_dma_3_1 || !s->omap_3_1_mapping_disabled) { - if (omap_dma_3_1_lcd_write(&s->lcd_ch, addr, value)) - break; - return; + if (omap_dma_3_1_lcd_write(&s->lcd_ch, addr, value)) { + break; } - /* Fall through. */ + return; case 0x000 ... 0x2fe: reg =3D addr & 0x3f; ch =3D (addr >> 6) & 0x0f; @@ -1525,20 +1264,13 @@ static void omap_dma_write(void *opaque, hwaddr add= r, return; =20 case 0x404 ... 0x4fe: - if (s->model <=3D omap_dma_3_1) - break; - /* fall through */ + break; case 0x400: if (omap_dma_sys_write(s, addr, value)) break; return; =20 case 0xb00 ... 0xbfe: - if (s->model =3D=3D omap_dma_3_2 && s->omap_3_1_mapping_disabled) { - if (omap_dma_3_2_lcd_write(&s->lcd_ch, addr, value)) - break; - return; - } break; } =20 @@ -1577,51 +1309,6 @@ static void omap_dma_clk_update(void *opaque, int li= ne, int on) soc_dma_set_request(s->ch[i].dma, on); } =20 -static void omap_dma_setcaps(struct omap_dma_s *s) -{ - switch (s->model) { - default: - case omap_dma_3_1: - break; - case omap_dma_3_2: - /* XXX Only available for sDMA */ - s->caps[0] =3D - (1 << 19) | /* Constant Fill Capability */ - (1 << 18); /* Transparent BLT Capability */ - s->caps[1] =3D - (1 << 1); /* 1-bit palettized capability (DMA 3.2 only) = */ - s->caps[2] =3D - (1 << 8) | /* SEPARATE_SRC_AND_DST_INDEX_CPBLTY */ - (1 << 7) | /* DST_DOUBLE_INDEX_ADRS_CPBLTY */ - (1 << 6) | /* DST_SINGLE_INDEX_ADRS_CPBLTY */ - (1 << 5) | /* DST_POST_INCRMNT_ADRS_CPBLTY */ - (1 << 4) | /* DST_CONST_ADRS_CPBLTY */ - (1 << 3) | /* SRC_DOUBLE_INDEX_ADRS_CPBLTY */ - (1 << 2) | /* SRC_SINGLE_INDEX_ADRS_CPBLTY */ - (1 << 1) | /* SRC_POST_INCRMNT_ADRS_CPBLTY */ - (1 << 0); /* SRC_CONST_ADRS_CPBLTY */ - s->caps[3] =3D - (1 << 6) | /* BLOCK_SYNCHR_CPBLTY (DMA 4 only) */ - (1 << 7) | /* PKT_SYNCHR_CPBLTY (DMA 4 only) */ - (1 << 5) | /* CHANNEL_CHAINING_CPBLTY */ - (1 << 4) | /* LCh_INTERLEAVE_CPBLTY */ - (1 << 3) | /* AUTOINIT_REPEAT_CPBLTY (DMA 3.2 only) */ - (1 << 2) | /* AUTOINIT_ENDPROG_CPBLTY (DMA 3.2 only) */ - (1 << 1) | /* FRAME_SYNCHR_CPBLTY */ - (1 << 0); /* ELMNT_SYNCHR_CPBLTY */ - s->caps[4] =3D - (1 << 7) | /* PKT_INTERRUPT_CPBLTY (DMA 4 only) */ - (1 << 6) | /* SYNC_STATUS_CPBLTY */ - (1 << 5) | /* BLOCK_INTERRUPT_CPBLTY */ - (1 << 4) | /* LAST_FRAME_INTERRUPT_CPBLTY */ - (1 << 3) | /* FRAME_INTERRUPT_CPBLTY */ - (1 << 2) | /* HALF_FRAME_INTERRUPT_CPBLTY */ - (1 << 1) | /* EVENT_DROP_INTERRUPT_CPBLTY */ - (1 << 0); /* TIMEOUT_INTERRUPT_CPBLTY (DMA 3.2 only) */ - break; - } -} - struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs, MemoryRegion *sysmem, qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk c= lk, @@ -1630,20 +1317,16 @@ struct soc_dma_s *omap_dma_init(hwaddr base, qemu_i= rq *irqs, int num_irqs, memsize, i; struct omap_dma_s *s =3D g_new0(struct omap_dma_s, 1); =20 - if (model <=3D omap_dma_3_1) { - num_irqs =3D 6; - memsize =3D 0x800; - } else { - num_irqs =3D 16; - memsize =3D 0xc00; - } - s->model =3D model; + assert(model =3D=3D omap_dma_3_1); + + num_irqs =3D 6; + memsize =3D 0x800; s->mpu =3D mpu; s->clk =3D clk; s->lcd_ch.irq =3D lcd_irq; s->lcd_ch.mpu =3D mpu; =20 - s->dma =3D soc_dma_init((model <=3D omap_dma_3_1) ? 9 : 16); + s->dma =3D soc_dma_init(9); s->dma->freq =3D omap_clk_getrate(clk); s->dma->transfer_fn =3D omap_dma_transfer_generic; s->dma->setup_fn =3D omap_dma_transfer_setup; @@ -1656,12 +1339,11 @@ struct soc_dma_s *omap_dma_init(hwaddr base, qemu_i= rq *irqs, s->ch[i].sibling =3D &s->ch[i + 6]; s->ch[i + 6].sibling =3D &s->ch[i]; } - for (i =3D (model <=3D omap_dma_3_1) ? 8 : 15; i >=3D 0; i --) { + for (i =3D 8; i >=3D 0; i--) { s->ch[i].dma =3D &s->dma->ch[i]; s->dma->ch[i].opaque =3D &s->ch[i]; } =20 - omap_dma_setcaps(s); omap_clk_adduser(s->clk, qemu_allocate_irq(omap_dma_clk_update, s, 0)); omap_dma_reset(s->dma); omap_dma_clk_update(s, 0, 1); diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index ea5c0eff8b..36569815e8 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -216,34 +216,6 @@ struct omap_dma_lcd_channel_s { hwaddr src_f2_top; hwaddr src_f2_bottom; =20 - /* Used in OMAP DMA 3.2 gigacell */ - unsigned char brust_f1; - unsigned char pack_f1; - unsigned char data_type_f1; - unsigned char brust_f2; - unsigned char pack_f2; - unsigned char data_type_f2; - unsigned char end_prog; - unsigned char repeat; - unsigned char auto_init; - unsigned char priority; - unsigned char fs; - unsigned char running; - unsigned char bs; - unsigned char omap_3_1_compatible_disable; - unsigned char dst; - unsigned char lch_type; - int16_t element_index_f1; - int16_t element_index_f2; - int32_t frame_index_f1; - int32_t frame_index_f2; - uint16_t elements_f1; - uint16_t frames_f1; - uint16_t elements_f2; - uint16_t frames_f2; - omap_dma_addressing_t mode_f1; - omap_dma_addressing_t mode_f2; - /* Destination port is fixed. */ int interrupts; int condition; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806094; cv=none; d=zohomail.com; s=zohoarc; b=O6nGDCtgLoNFcOxwy01ShZ9Mc36YjA68sOtDUm9ohdP3Xy8PY7GqAdDs6AgIHsWEhm+VUMypp8pCED94TQDxk2UCPogCHEfsERYuXdPVvdW+5oK6RKA40uV4lvl7bWuFPZ7+GxEY8Ra2mtX3fYXy3KsiJYJOv24x1WWjk72YpKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806094; h=Content-Transfer-Encoding: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:Cc; bh=iKoI6jb4oPXbwYLz4nwwqaE8QARRc2bglnNlB7mB23c=; b=KSjFK0LZlsh0xut2BTP0gD6jzsagrZijGxrWxmhWXtdtwvbBQK6V+sYOh2H9vyuSQ8XCmlfxuiL8GMe3Vt+Voib+5M+DqdUaHKjwHzW193AoTuDDEXN1gDHfCVruFQ3dZWjGU091TnJLc21vMm/YcWi4Q8hBIvCNVWmRd9ayvag= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806094257486.6203373538325; Tue, 26 May 2026 07:34:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0000FU-LN; Tue, 26 May 2026 10:29:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmF-0008FE-LN for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:05 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmE-0001Dm-0q for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:03 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-45ed9336049so488925f8f.0 for ; Tue, 26 May 2026 07:29:01 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.28.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805740; x=1780410540; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iKoI6jb4oPXbwYLz4nwwqaE8QARRc2bglnNlB7mB23c=; b=W3oaxyBrk7/m+Clr/mq5wcH/vkauAiCbJzlazFZKxudSPwA1Cpsd+WEkw9fm0blwuS aFXRdyKO88rwtNjB8owKUEcEp0ZhJQERQx6OUwT9Tejz5PB9kPOHIhbqvho3XrUJfkoH R1sZWJR+lyKbt6Unkt8uMRel0/HcSKRDFiYckY/su9ryqoRkN79PqfQfQmcXlJ3auwCr W3QQQq5pib0VYQdBBDSdAcU7uzc5XIH+qHoiAe7u2LxX82grPnqzS5AyMt8YJnXtknLC Y6tUa4CvxnFUC0BLxU6/tXqcGC2weaWiJ5w4b6OuSyjV8uH7h6tdhFpJGe+dJsAM0Sqp qBHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805740; x=1780410540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iKoI6jb4oPXbwYLz4nwwqaE8QARRc2bglnNlB7mB23c=; b=WuquzBQ/oTTaEFlPSN5XioezadBXEaq2o6bO7EhHuQ3QKOHiJf7l+PJccsXgOvnFms e7tah/MN11rE8zHOtq8OgCk9h9ce/Qc4rW06j4z/w7eqgf3vIC/pFS/mjxr5maXIA6XX 29hjyXO3wJjfOcIDvLLB0WS+8pdS3c8w+DybNG0w8V0XvYpJ5BKixVAmgh8n9x9KY9GN deuo/MmTXrTQnvY4SZCbSxtoSEE9CAKFbx2rkXeKfBOuTwA3J8Mz9BZOmP1IVXVoVI66 09hJhd5oeFhmvYQCZaP3zUkgEerH2QYIzxNYYgo6uQH786NDlc+OpPy0W8D43w0vGNbd LcBw== X-Gm-Message-State: AOJu0YwBTxehYHlWMjStjkQKOdpuynB6Zn4XHCXcbX1++5TEO76oPcRb S2ht0gtlmr4T5hcCrQYRlfaEjgZXQWQXtMMO3sSyeIGa3+EQAIzD5nA+M4xjff7eqOHNlohBSty toceQ X-Gm-Gg: Acq92OFrC1/v6xnU0e515BScSXpS1xgUNwwcyqLHzyTa/OXmYCW2O/qT7jDP4Dlj5kL QnvFT/sCk/ZUf0qPdAmKwXeuzycCQtboRmux4H3uMG9iz8uU/qFKuQKXoondE0HTQjVIb4hPoxb aCtJt6YWR8GyT1w5qo7fVZHhfWx9Dzri3Gnuif55NH68nBxZTczseNPR2gEWDU8o8jbFMFHnWmu RELgjwpkSOK4qYZm6IZaer1VqUO8+XkZOYsU0OfZ/3bOUWz1ugikaFNQNW9sOCc0I9HL5LDYE7M IXkRAA7J4BJPljn1Hf/xks6UJnz2yLegTJr8fuOeysKJjAtl6uW6jSi5L9JQJ/rPC5y8VSwcTzM XJ1Adk6LEoeoE2cww+waP5Veht2IuCAkjReDT129D25kaeC0JEXCevDlcQOSz7uIBiVaCzk4EO3 yhzI+IQKBJhYO6iDxGeu0Jkxa0Jq33oC9BV+7m0T+ZoTsUor5KmDnMTSEa1Q3Lnl2zUazMAETHa zQsjm5y/TER8/sjKJWYjDlu4niIJww= X-Received: by 2002:a05:6000:2688:b0:43d:309b:9c4f with SMTP id ffacd0b85a97d-45eb3670427mr31446204f8f.6.1779805740479; Tue, 26 May 2026 07:29:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/54] hw/dma/omap_dma: Fold omap_dma_sys_read() and omap_dma_sys_write() into callers Date: Tue, 26 May 2026 15:28:05 +0100 Message-ID: <20260526142850.2326589-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=ham 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: 1779806094825154101 Content-Type: text/plain; charset="utf-8" Now we have removed the DMA 3.2 support, we call omap_dma_sys_read() only for the single address offset 0x400, and similarly for omap_dma_sys_write(). The other cases in those functions are DMA 3.2-only and now dead code. Fold the 0x400 register directly into the callers, and remove the rest. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-9-peter.maydell@linaro.org --- hw/dma/omap_dma.c | 121 ++-------------------------------------------- 1 file changed, 5 insertions(+), 116 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 9a86d90b4e..49348f40c5 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -317,16 +317,6 @@ static void omap_dma_interrupts_3_1_update(struct omap= _dma_s *s) qemu_irq_raise(ch[5].irq); } =20 -static void omap_dma_interrupts_3_2_update(struct omap_dma_s *s) -{ - struct omap_dma_channel_s *ch =3D s->ch; - int i; - - for (i =3D s->chans; i; ch ++, i --) - if (ch->status) - qemu_irq_raise(ch->irq); -} - static void omap_dma_enable_3_1_mapping(struct omap_dma_s *s) { s->omap_3_1_mapping_disabled =3D 0; @@ -334,13 +324,6 @@ static void omap_dma_enable_3_1_mapping(struct omap_dm= a_s *s) s->intr_update =3D omap_dma_interrupts_3_1_update; } =20 -static void omap_dma_disable_3_1_mapping(struct omap_dma_s *s) -{ - s->omap_3_1_mapping_disabled =3D 1; - s->chans =3D 16; - s->intr_update =3D omap_dma_interrupts_3_2_update; -} - static void omap_dma_process_request(struct omap_dma_s *s, int request) { int channel; @@ -1106,98 +1089,6 @@ static int omap_dma_3_1_lcd_read(struct omap_dma_lcd= _channel_s *s, int offset, return 0; } =20 -static int omap_dma_sys_write(struct omap_dma_s *s, int offset, uint16_t v= alue) -{ - switch (offset) { - case 0x400: /* SYS_DMA_GCR */ - s->gcr =3D value; - break; - - case 0x404: /* DMA_GSCR */ - if (value & 0x8) - omap_dma_disable_3_1_mapping(s); - else - omap_dma_enable_3_1_mapping(s); - break; - - case 0x408: /* DMA_GRST */ - if (value & 0x1) - omap_dma_reset(s->dma); - break; - - default: - return 1; - } - return 0; -} - -static int omap_dma_sys_read(struct omap_dma_s *s, int offset, - uint16_t *ret) -{ - switch (offset) { - case 0x400: /* SYS_DMA_GCR */ - *ret =3D s->gcr; - break; - - case 0x404: /* DMA_GSCR */ - *ret =3D s->omap_3_1_mapping_disabled << 3; - break; - - case 0x408: /* DMA_GRST */ - *ret =3D 0; - break; - - case 0x442: /* DMA_HW_ID */ - case 0x444: /* DMA_PCh2_ID */ - case 0x446: /* DMA_PCh0_ID */ - case 0x448: /* DMA_PCh1_ID */ - case 0x44a: /* DMA_PChG_ID */ - case 0x44c: /* DMA_PChD_ID */ - *ret =3D 1; - break; - - case 0x44e: /* DMA_CAPS_0_U */ - *ret =3D (s->caps[0] >> 16) & 0xffff; - break; - case 0x450: /* DMA_CAPS_0_L */ - *ret =3D (s->caps[0] >> 0) & 0xffff; - break; - - case 0x452: /* DMA_CAPS_1_U */ - *ret =3D (s->caps[1] >> 16) & 0xffff; - break; - case 0x454: /* DMA_CAPS_1_L */ - *ret =3D (s->caps[1] >> 0) & 0xffff; - break; - - case 0x456: /* DMA_CAPS_2 */ - *ret =3D s->caps[2]; - break; - - case 0x458: /* DMA_CAPS_3 */ - *ret =3D s->caps[3]; - break; - - case 0x45a: /* DMA_CAPS_4 */ - *ret =3D s->caps[4]; - break; - - case 0x460: /* DMA_PCh2_SR */ - case 0x480: /* DMA_PCh0_SR */ - case 0x482: /* DMA_PCh1_SR */ - case 0x4c0: /* DMA_PChD_SR_0 */ - qemu_log_mask(LOG_UNIMP, - "%s: Physical Channel Status Registers not implement= ed\n", - __func__); - *ret =3D 0xff; - break; - - default: - return 1; - } - return 0; -} - static uint64_t omap_dma_read(void *opaque, hwaddr addr, unsigned size) { struct omap_dma_s *s =3D opaque; @@ -1225,10 +1116,9 @@ static uint64_t omap_dma_read(void *opaque, hwaddr a= ddr, unsigned size) =20 case 0x404 ... 0x4fe: break; - case 0x400: - if (omap_dma_sys_read(s, addr, &ret)) - break; - return ret; + case 0x400: /* SYS_DMA_GCR */ + return s->gcr; + break; =20 case 0xb00 ... 0xbfe: break; @@ -1265,9 +1155,8 @@ static void omap_dma_write(void *opaque, hwaddr addr, =20 case 0x404 ... 0x4fe: break; - case 0x400: - if (omap_dma_sys_write(s, addr, value)) - break; + case 0x400: /* SYS_DMA_GCR */ + s->gcr =3D value; return; =20 case 0xb00 ... 0xbfe: --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806025; cv=none; d=zohomail.com; s=zohoarc; b=axsJXOOeLET2ZDN8jxZlgtTF7EnHjGU4IzeUEo5AEHr5jpVzqPCi+CXapnuOyHjIKc6SQqpmQ/0mQ5mSoeueX/Unafc+RcePFru5XpMAIwiDo9mWg80e5+ae5Pta3no2hV3MIT/vasdOrlD+/O5JUXijx98fPwjRlJlcDksQMMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806025; h=Content-Transfer-Encoding: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:Cc; bh=aVnB0vrWXEEak9W9o+bTVpAMY2S7rxcLtmOrEhnqvjk=; b=cKvHxBwBOseH9HBt8cIz+paIhkgf2f2EKLl68f0nfwQ0jdBwbsKrhmuPI6oM4HlVl3baNcl2+trEVhp8f5q3M+UbqWJP4mdXvLhoHcDV9eF5+e0PuOqtz1+OSBKXWC9FTKr3WUkge1olC+s5ggJn0EZCp+9iHrtFPvnth7NHVo0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806025127244.18656323544644; Tue, 26 May 2026 07:33:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmY-00005p-LX; Tue, 26 May 2026 10:29:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmH-0008Ix-DD for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:07 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmF-0001Dz-JW for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:04 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso91106995e9.0 for ; Tue, 26 May 2026 07:29:03 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805742; x=1780410542; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aVnB0vrWXEEak9W9o+bTVpAMY2S7rxcLtmOrEhnqvjk=; b=UVISmIDt/4FYBovIZ8VxtQYxjo/H6E9SO3AAzBvyIaHewrWRhclvATj+v1uSaDatck sgETlknxR4K7f2yjJaDyhrboSymINcGP1JEsO2xw5dszQEf8gOUGMnrJ/OfABDX6q0Wd TSDRJLkImb0NZeklxW5iVn9Exw8g44bL0tF7wyjAs76Ovcbx10cXcrx/ujDsO2Pc3Cei IJ1d7OuZ0eIJmlCPUlGYhlx6WSMvr6Rxr5KcfRAnEkPkwReLczU63Iz3HLdQvLdlXDsm OqJnpC6PHmKUY0ggLRJykxc2wuzzuzcMzVXI+XuMoroWpwR6T55ZwX/8gt8WcXmpI0hz Ihxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805742; x=1780410542; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=aVnB0vrWXEEak9W9o+bTVpAMY2S7rxcLtmOrEhnqvjk=; b=OJU39BMNnOKiJPWmqOk++q+oWRqPirPFTvQVUpf0DwJ6SVkmj9t2A9ahbZkgtLyMjW 25LPnND8MI8uUpaqFu5JdsBHk+TItZWTPSDiyDdRtGnr2rfPTJ6Woh/TnQp3bBLdpPFw HImYuMj4BmVN11hi+o8b0m/6KcKYv2Yw2oAwB494aZKYfVFeTr4gLr0aDOUnzdp6UlLM v/eb5HeVg4amD/bIMVhfavGt3ObQhBNoI9uI3KiBoZJF9ka3COjXvBnUpRCFyOjTFeeX BZLTnKnN2mZ3oa/e/rsGMAgzSD47cRnP57dtTJovmPPtdHoCGeRtWo7VG052xRPSoFdo fgMA== X-Gm-Message-State: AOJu0YxvtdTuXXeYDL7nKVI4bzlIBkS34Ca2NA4dbptf4omEdOq7DTK2 InJG8YH+XPT0mdB2QpJrXxeVsCW6D3bVJnydFwSuoHCv7SJC7OmLLkdwaEVFPDOmv9Iolw1N264 KFOuf X-Gm-Gg: Acq92OGfrBJmIwsaX98bHA63QDeZ1uZ8jzICfZSBwzBuljSxZGT4/V2BApxycZ1FWk5 hpt+f7HYrgpUmVZJeU+sI7hwu0HNODaMuEvh0WgSd1yqqeiye6di2FC7VZF3yMBU7bRXL39hZt4 JEbrgnGFjA5O3sz4lG63dIXrbOeXq7uf5OGZeuHpwcLajBGBJXZAvGNrbT6XNYDs/hu7E3qmnE7 +QEShedGC3uVHyXJaLoJ7YwogDmfbKtVdA4Nwh6sink9RFAJIxYTcjA0LVMWXca7nFWfC68CnnQ QAKWsyud/aVs1dzJYOFj1Kx2DSHpeofL28Mf7Ha+67JEuowo5YhwGMbatNjVH2OiMOlvPcKndH9 44oDGmCe1HNYliKcgiBnNjYTiXpQWq70sdkFqTru2d2qu3rxWS1A0H+687cr/yYdC2+KbrXCAZh Snt01BnSz7axexl4OFosYovlYybv5hkYg/BWy/WljBn1KnjHYNAmhE8M56i9lZaln3j1jNEGKvb 8DbUYbHCCbP/r0L0jivUiXtHdyE4C8= X-Received: by 2002:a05:600c:444b:b0:48f:e3e7:3d39 with SMTP id 5b1f17b1804b1-490424aa04fmr318571005e9.11.1779805741512; Tue, 26 May 2026 07:29:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/54] hw/dma/omap_dma: Remove omap_3_1_compatible_disable flag Date: Tue, 26 May 2026 15:28:06 +0100 Message-ID: <20260526142850.2326589-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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=ham 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: 1779806026710158500 Content-Type: text/plain; charset="utf-8" The OMAP DMA device has an omap_3_1_compatible_disable flag in its channel struct, which the 3.2 version of the DMA block used to tell whether it should behave compatibly with 3.1 or not. Now we have no 3.2 support, the omap_3_1_compatible_disable flag is set to false and can't be changed, so we can remove it, folding out all the conditions where we were testing it as always-false. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-10-peter.maydell@linaro.org --- hw/dma/omap_dma.c | 59 +++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 49348f40c5..fe43fec58d 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -73,9 +73,6 @@ struct omap_dma_channel_s { int fs; int bs; =20 - /* compatibility */ - int omap_3_1_compatible_disable; - qemu_irq irq; struct omap_dma_channel_s *sibling; =20 @@ -144,7 +141,6 @@ static void omap_dma_channel_load(struct omap_dma_chann= el_s *ch) { struct omap_dma_reg_set_s *a =3D &ch->active_set; int i, normal; - int omap_3_1 =3D !ch->omap_3_1_compatible_disable; =20 /* * TODO: verify address ranges and alignment @@ -177,14 +173,14 @@ static void omap_dma_channel_load(struct omap_dma_cha= nnel_s *ch) break; case single_index: a->elem_delta[i] =3D ch->data_type + - ch->element_index[omap_3_1 ? 0 : i] - 1; + ch->element_index[0] - 1; a->frame_delta[i] =3D 0; break; case double_index: a->elem_delta[i] =3D ch->data_type + - ch->element_index[omap_3_1 ? 0 : i] - 1; - a->frame_delta[i] =3D ch->frame_index[omap_3_1 ? 0 : i] - - ch->element_index[omap_3_1 ? 0 : i]; + ch->element_index[0] - 1; + a->frame_delta[i] =3D ch->frame_index[0] - + ch->element_index[0]; break; default: break; @@ -442,20 +438,13 @@ static void omap_dma_transfer_generic(struct soc_dma_= ch_s *dma) /* End of Block */ /* Disable the channel */ =20 - if (ch->omap_3_1_compatible_disable) { + if (!ch->auto_init) omap_dma_disable_channel(s, ch); - if (ch->link_enabled) - omap_dma_enable_channel(s, - &s->ch[ch->link_next_ch]); - } else { - if (!ch->auto_init) - omap_dma_disable_channel(s, ch); - else if (ch->repeat || ch->end_prog) - omap_dma_channel_load(ch); - else { - ch->waiting_end_prog =3D 1; - omap_dma_deactivate_channel(s, ch); - } + else if (ch->repeat || ch->end_prog) + omap_dma_channel_load(ch); + else { + ch->waiting_end_prog =3D 1; + omap_dma_deactivate_channel(s, ch); } =20 if (ch->interrupts & END_BLOCK_INTR) @@ -610,19 +599,13 @@ static void omap_dma_transfer_setup(struct soc_dma_ch= _s *dma) /* End of Block */ /* Disable the channel */ =20 - if (ch->omap_3_1_compatible_disable) { + if (!ch->auto_init) omap_dma_disable_channel(s, ch); - if (ch->link_enabled) - omap_dma_enable_channel(s, &s->ch[ch->link_next_ch]); - } else { - if (!ch->auto_init) - omap_dma_disable_channel(s, ch); - else if (ch->repeat || ch->end_prog) - omap_dma_channel_load(ch); - else { - ch->waiting_end_prog =3D 1; - omap_dma_deactivate_channel(s, ch); - } + else if (ch->repeat || ch->end_prog) + omap_dma_channel_load(ch); + else { + ch->waiting_end_prog =3D 1; + omap_dma_deactivate_channel(s, ch); } =20 if (ch->interrupts & END_BLOCK_INTR) @@ -711,7 +694,6 @@ void omap_dma_reset(struct soc_dma_s *dma) s->ch[i].cpc =3D 0x0000; s->ch[i].fs =3D 0; s->ch[i].bs =3D 0; - s->ch[i].omap_3_1_compatible_disable =3D 0; memset(&s->ch[i].active_set, 0, sizeof(s->ch[i].active_set)); s->ch[i].priority =3D 0; s->ch[i].interleave_disabled =3D 0; @@ -752,7 +734,7 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, case 0x06: /* SYS_DMA_CSR_CH0 */ *value =3D ch->status; ch->status &=3D SYNC; - if (!ch->omap_3_1_compatible_disable && ch->sibling) { + if (ch->sibling) { *value |=3D (ch->sibling->status & 0x3f) << 6; ch->sibling->status &=3D SYNC; } @@ -791,11 +773,8 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, *value =3D ch->element_index[0]; break; =20 - case 0x18: /* SYS_DMA_CPC_CH0 or DMA_CSAC */ - if (ch->omap_3_1_compatible_disable) - *value =3D ch->active_set.src & 0xffff; /* CSAC */ - else - *value =3D ch->cpc; + case 0x18: /* SYS_DMA_CPC_CH0 */ + *value =3D ch->cpc; break; =20 case 0x1a: /* DMA_CDAC */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806092; cv=none; d=zohomail.com; s=zohoarc; b=TPiRIhCIXZN+xpIR3/QwkYtsKjkoYUvONMpGyCGe9XmzH4a0zIjWxWcwpACJpeeKIZl0wIf+Q7TsdK6cNfkaj8olqztaIp/K2yHXgSQjdFxCpSGPBr0APuPi0vsk0OdESTWbPuJvX4u6WSxcLAYhkPegAwFIY4hNupDb7E8SkwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806092; h=Content-Transfer-Encoding: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:Cc; bh=Mmar4ZpXuPNj7eXVVmTwKPo9AaVohFLA2d4JdRkSYno=; b=Wy10YbpQWFBM4iCCa+yK2rtGUMEowq16mKYOQi+SqGWkQxo301fIICXnswyfJUK4oQ5itXm8+3zyaACUxWbsR3oQcvXDRdD31hfFJj2HnxeIFK4t4y/9ZJMkv882nxFNek5LPr47PsqxrKalFrlrzaby09bYjxU4JvP/RNhY/lA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806092765540.3097379918518; Tue, 26 May 2026 07:34:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsma-0000QP-VH; Tue, 26 May 2026 10:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmJ-0008KR-DT for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:10 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmH-0001E4-4t for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:06 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4891d7164ddso51386815e9.3 for ; Tue, 26 May 2026 07:29:03 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805743; x=1780410543; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Mmar4ZpXuPNj7eXVVmTwKPo9AaVohFLA2d4JdRkSYno=; b=QAKaDsh7SDwBYUz30I/gEyhrjmG6rOYwI6CfnyiTMax9qdzBX9cA5tR32/gMV95Qsr 0Y8JN63WojEEQeCoYZsInaxELL80w4keTeMuAR8XHrZlYVTVQBDb85IFZuYpedxKhO9a 34pATg2vYpovmYU48v26XPqJ/hkjCM1xASMah0o9o3nXX9v3MQrcC5OmnH1LCwsXEGJe TvNN0Max7JikCaAG562hq4LPmnh4zZ7uVEiH7FF9TKVrlcgR3KKtOcFk8OCMb+2nKw/m 0hJe1bxGVkE4sdq5QeCKkGHyqiOOCTAkPJOiR22+BTARvrz+m1k09TNbWK1FqJwVMR3n 7POg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805743; x=1780410543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Mmar4ZpXuPNj7eXVVmTwKPo9AaVohFLA2d4JdRkSYno=; b=MEiTB4iY4UN060ae99J37gR8CuhKRYsoZtji/dV3zQh9eyuqhLeZp47nq37iFh4cwn O1NXV0dyuKyjP6WhAdNVcQuOaVLa6gbzZ3yFSYgD1bMiJENLQ7ooVuS+YxPAaSxkZrwP 49asxSQK1vcLf5SZ4JB7v0sxnovJ5vvay4LcLFhfK0MjjE7pugUn7nnlUR9UpR+zREBO t5MZD1YjiYdekvrjxzptBz3HzbiNnfKObxV+tNa8+YSy+s6JtZtAJ2TyRYOjAnfX/3zE 2pBzMF2mz5JcTii+EXvcx8oRQ/SFwmCpDMjqDPn/231qVgC5oJtgImpSoyOveqkpnTg6 lBQg== X-Gm-Message-State: AOJu0Yz9rFIFt4eVEpheZgtq2oUHWejRMWf9qgTqlW/01+eFHLXvRK6V ledFGq09YQM8Kqi6L0KGsgp32oj0ezY/IivIqCVu5bG+fyrTVBCDngllWHLjR+0OQh7JWGDVUeN cSNpW X-Gm-Gg: Acq92OF9bZwyFXu79gD243Tai+xzKrEAms3FfwORNNA3CgZGn3Pgp+VlXbXpbEP3Up9 2DUNF9ouvo+A8K3Cnno2SuVYN6rxDV6hJsVzvKYdQy5dEkPGI3PTBN+WX0DbtnwPt69+fJuoMVi q9/6NqHLqAK6E8VWmcKUvIS4o3IOgCYaeu/Og4GaRDl2cIGS/dOf3vs5DKdhf5Eh7cdEgChT2fy UOAE+3MDN5/1F//ddyNIstj1KCkN2qC/JhJOcLFG6tF2BQPVc0kx7tTOPNt6kbnniI8oOeZuINH jPRR+ooeFiekhHGouZ34ec1Lk9TiF6Rx6eALq/W5Tg6NsWvxN/DLNyQJDYz6b3+N2NUnovTvTgV eB+4/IcyR2L0pUsxHDgoUWUQRMIBaepSn4BvWvTx6NCXhBFqyYZhamFzwXoi+pTRQbuj7Ct+2pz Wl3kmULu30FLnRTdcqaJL7aVDTVW1sL+KbcfBaaxA80BhO+yQ6FiAv85GP6uE5aS8WE0LS5ksXc sM3N0pGgK1J13mwFH6LvRUhOI1jfhY= X-Received: by 2002:a05:600c:154d:b0:490:44eb:c1d7 with SMTP id 5b1f17b1804b1-49044ebc367mr303759555e9.30.1779805742532; Tue, 26 May 2026 07:29:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/54] hw/dma/omap_dma: Remove 3.1 mapping handling Date: Tue, 26 May 2026 15:28:07 +0100 Message-ID: <20260526142850.2326589-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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=ham 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: 1779806094796154100 Content-Type: text/plain; charset="utf-8" Now we have no 3.2 DMA support, the omap_dma_enable_3_1_mapping() function is called at reset, and there is no longer anywhere that disables it. Remove the function and the unused omap_3_1_mapping_disabled struct field, and drop the indirection from omap_dma_interrupts_update() through the intr_update function pointer to omap_dma_interrupts_3_1_update(), instead inlining that last function into omap_dma_interrupts_update(). The only other thing omap_dma_enable_3_1_mapping() was doing was setting s->chans; since this is now never changed at runtime we can move its setting into the init function rather than reset. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-11-peter.maydell@linaro.org --- hw/dma/omap_dma.c | 52 ++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index fe43fec58d..b05e46724c 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -106,8 +106,6 @@ struct omap_dma_s { struct omap_mpu_state_s *mpu; omap_clk clk; qemu_irq irq[4]; - void (*intr_update)(struct omap_dma_s *s); - int omap_3_1_mapping_disabled; =20 uint32_t gcr; uint32_t ocp; @@ -134,7 +132,27 @@ struct omap_dma_s { =20 static inline void omap_dma_interrupts_update(struct omap_dma_s *s) { - s->intr_update(s); + struct omap_dma_channel_s *ch =3D s->ch; + + /* First three interrupts are shared between two channels each. */ + if (ch[0].status | ch[6].status) { + qemu_irq_raise(ch[0].irq); + } + if (ch[1].status | ch[7].status) { + qemu_irq_raise(ch[1].irq); + } + if (ch[2].status | ch[8].status) { + qemu_irq_raise(ch[2].irq); + } + if (ch[3].status) { + qemu_irq_raise(ch[3].irq); + } + if (ch[4].status) { + qemu_irq_raise(ch[4].irq); + } + if (ch[5].status) { + qemu_irq_raise(ch[5].irq); + } } =20 static void omap_dma_channel_load(struct omap_dma_channel_s *ch) @@ -294,32 +312,6 @@ static void omap_dma_channel_end_prog(struct omap_dma_= s *s, } } =20 -static void omap_dma_interrupts_3_1_update(struct omap_dma_s *s) -{ - struct omap_dma_channel_s *ch =3D s->ch; - - /* First three interrupts are shared between two channels each. */ - if (ch[0].status | ch[6].status) - qemu_irq_raise(ch[0].irq); - if (ch[1].status | ch[7].status) - qemu_irq_raise(ch[1].irq); - if (ch[2].status | ch[8].status) - qemu_irq_raise(ch[2].irq); - if (ch[3].status) - qemu_irq_raise(ch[3].irq); - if (ch[4].status) - qemu_irq_raise(ch[4].irq); - if (ch[5].status) - qemu_irq_raise(ch[5].irq); -} - -static void omap_dma_enable_3_1_mapping(struct omap_dma_s *s) -{ - s->omap_3_1_mapping_disabled =3D 0; - s->chans =3D 9; - s->intr_update =3D omap_dma_interrupts_3_1_update; -} - static void omap_dma_process_request(struct omap_dma_s *s, int request) { int channel; @@ -660,7 +652,6 @@ void omap_dma_reset(struct soc_dma_s *dma) s->lcd_ch.condition =3D 0; s->lcd_ch.interrupts =3D 0; s->lcd_ch.dual =3D 0; - omap_dma_enable_3_1_mapping(s); for (i =3D 0; i < s->chans; i ++) { s->ch[i].suspend =3D 0; s->ch[i].prefetch =3D 0; @@ -1193,6 +1184,7 @@ struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq= *irqs, s->clk =3D clk; s->lcd_ch.irq =3D lcd_irq; s->lcd_ch.mpu =3D mpu; + s->chans =3D 9; =20 s->dma =3D soc_dma_init(9); s->dma->freq =3D omap_clk_getrate(clk); --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806092; cv=none; d=zohomail.com; s=zohoarc; b=APQQW0vXMTzMggeJ2XssMj5GrvxA1esNv+mq8BrVCrkogJ+1R2zwKs9wy2BE7q/06sgoYuGG/z2k3mnBan7TembeYQM7KfOsQpOBrrQi+6gZ/BHysF8eQNc6RBuo+FDUt7OxvuGYTbcawwSAGM4istfSocMhW6limlVvj9fYKV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806092; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=c3n7Oc7aeyIf5LNC1yLJVtTuyTWdjNqILdaKFA1BwMU=; b=Fghr1jOvB25uEfn4f/5eozI04+HQm5tAhMsUqhIgABA1yx3IPfDur45xDkumPfLj3R1G4iLdpzWUvnAJeEuAYkuXNzjgI8XLy6/VFJcRX98Q8gW8/ixILp1S3Gb6u5NvP8OmcPSAVzmOxAplrPrkq08BOASpLMlQcCaxVO67y78= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806092113878.8040635984518; Tue, 26 May 2026 07:34:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsma-0000Mi-A3; Tue, 26 May 2026 10:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmJ-0008KS-GK for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:10 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmH-0001ET-5G for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:07 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-43fe608cb92so6502078f8f.2 for ; Tue, 26 May 2026 07:29:04 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805743; x=1780410543; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=c3n7Oc7aeyIf5LNC1yLJVtTuyTWdjNqILdaKFA1BwMU=; b=f3jkK2FFU+rKOM/hCnldiY3ViHICSMGcS7mQb3sRFR57ibAn4Bgn0vZSvmpEeVAzFy OLeDkmIIxr6VKyCIRLuBgInRXkGNGrvG3v0Fct8qHMGfdRwCwHMEvJ92PNBn2aqv0Ptu RSvQbdCqs7nVglfwQafV6FBoGbQ6vmBWFTY/lnPw0Wo2IroBIbQcRItYnfVyo6TtXS9E KrtqwcG1eBzcYn10t5Lmwa6N7rbkGdBBz4UB7y9Z9kYJkdqyiE0yZFKM/Tu9v2aAKBtv iuLXnW+d+VBr3SvjsjXngBGLk7KjGhpWii4BPZSEM1ZwHsKWHY0UBRE78ot2XtmlttrJ XXeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805743; x=1780410543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=c3n7Oc7aeyIf5LNC1yLJVtTuyTWdjNqILdaKFA1BwMU=; b=cn2Xlp813vrrBAHRQVwbuYN+lp8Owd4vXeGyEgSlTA0uhFyFFmpNdWvx/O0VkfqCAN Ct8Fk0Ykamx0qbKiEHgrdi0aIU/gzHFywaGtzUOUFVhSpUulPAO2VpfUHhDMWrYCt6gr KAsHVmbEXKqeopqOAODrj/eV6G1TCzBkH26IIsW3hQjgmTKsGnT34+MHixgiT5ltO5NI EayU+t/9GHIutlBMuyZiL+iiqdjTXOq0Sqos/iRYc4fMgd8aqRiJV6ovmOAH0vjBR8HP FqmGOWkAVitRrrDRJUCOL4qyUCItz2lQsQQp3U+8XJRE2/Ji5PpLK7g3EzJAexwZb0M1 4/tw== X-Gm-Message-State: AOJu0YzhaIHr8us9xNS+oQRY49nZeklJZA32LDWUEYe5NjZT5/TnGNPV bIOqPWSHcPV8xJaA3DVBrSMKYVT2RTB0fmkVxPa/nwKpJcaOTEHmDyYB403nWMR4vxRNs2q10Wg b0s8m X-Gm-Gg: Acq92OEuQjI0EhakCKRCl5z0bDgTg2jkR2d/HuJjYVyK0wv62XANBSJ9NVa+kbxcmCv 0hjObD61J2hjKFJ8GyfOcNL9H1nUg/UZvfjE1orrsl6rfCC8meDMMHSH0jdPx+LwtdeufotuGXa w8khrctSLtfe9OweTDvIEdfLnwK0FMscdTuhcXv0X0qgOYNqXvYjlhct3ip+x+oANYyTIWS84cF 3jCXqYMJ9V/FE7tYUfxhLv2R9m2bfRMMGAJXEGA7BqMB0VeAxWz3my1OY9FnE+7gHpMewZM87fo Zw/jCpS4UaetSdNmNtcMbPvlhlPy0E1N4azL/OVZ2/ILAY1Dn9t8rvgKLUWxYlLOwsmCC4SNZ24 +ylWk9/5SmoWUSO8L8WaZT2nu+MwMHJJ/g5LXTS2qvYv1vS1y9S/um7Orp67p7ZNzumXakD/fXd 23D2d0MdS4sMP+PshFTGyq7gHQ4z57O1T+CI8lw0Xiczrgf6C9fhGlNsXRixL2Cv2jBgrxuH32g Qt7s9jC/j8HDDeIkbESaEwBB/2mPmapK+j6j3yC/Q== X-Received: by 2002:a05:6000:430b:b0:43d:75a2:44aa with SMTP id ffacd0b85a97d-45eb38e4db6mr31296310f8f.43.1779805743451; Tue, 26 May 2026 07:29:03 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/54] hw/dma/omap_dma: Drop model argument to omap_dma_init() Date: Tue, 26 May 2026 15:28:08 +0100 Message-ID: <20260526142850.2326589-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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=ham 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: 1779806094780154100 The model argument to omap_dma_init() is always omap_dma_3_1, and all we do with it now is assert this; drop the argument and the enum. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260512203414.3633237-13-peter.maydell@linaro.org --- hw/arm/omap1.c | 2 +- hw/dma/omap_dma.c | 8 +++----- include/hw/arm/omap.h | 12 +++--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 80168644ce..44f9dd67c3 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -3789,7 +3789,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, } s->dma =3D omap_dma_init(0xfffed800, dma_irqs, system_memory, qdev_get_gpio_in(s->ih[0], OMAP_INT_DMA_LCD), - s, omap_findclk(s, "dma_ck"), omap_dma_3_1); + s, omap_findclk(s, "dma_ck")); =20 s->port[emiff ].addr_valid =3D omap_validate_emiff_addr; s->port[emifs ].addr_valid =3D omap_validate_emifs_addr; diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index b05e46724c..b042e7c59c 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -1169,15 +1169,13 @@ static void omap_dma_clk_update(void *opaque, int l= ine, int on) } =20 struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs, - MemoryRegion *sysmem, - qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk c= lk, - enum omap_dma_model model) + MemoryRegion *sysmem, + qemu_irq lcd_irq, + struct omap_mpu_state_s *mpu, omap_clk clk) { int num_irqs, memsize, i; struct omap_dma_s *s =3D g_new0(struct omap_dma_s, 1); =20 - assert(model =3D=3D omap_dma_3_1); - num_irqs =3D 6; memsize =3D 0x800; s->mpu =3D mpu; diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 36569815e8..2675d064f2 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -172,17 +172,11 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk= clk); #define OMAP_INT_310_McBSP2RX_OF 31 =20 /* omap_dma.c */ -enum omap_dma_model { - omap_dma_3_0, - omap_dma_3_1, - omap_dma_3_2, -}; - struct soc_dma_s; struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs, - MemoryRegion *sysmem, - qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk c= lk, - enum omap_dma_model model); + MemoryRegion *sysmem, + qemu_irq lcd_irq, + struct omap_mpu_state_s *mpu, omap_clk clk= ); void omap_dma_reset(struct soc_dma_s *s); =20 struct dma_irq_map { --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806093; cv=none; d=zohomail.com; s=zohoarc; b=bgwLB/uxf0rvkyPF7sIlRFuOGFWBYdAKxq/wF9V80C+fzIkOoPWQjC0OJhO82zLBz6syiAgvFuBXMaUtI8OAV+/y9nKdYrPg/ktlO0GBAQCx/Pclz2gzneEY8muzh7lr3J/SuhafEAZpK+qjvtSA67kc06BX9/qLua7YsLMSa2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806093; h=Content-Transfer-Encoding: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:Cc; bh=NlHvCg0punP2/RxJsoNMqmUBc8JZ2RfyNnqU1bG19ag=; b=mLrhFmjFn02ysPqoqOBM+zTbF7UWJssGDGrDbqnPoAM+r1iaxJpH9B2Z+rNXWB12sq812pj+YxzOQaLVk+5xTFnmHsw3MzPhLpUZijvnlZkDyzYU3SM83IpmvUsyuFnsUi15l+GAWSpoTPu1wbQG1dia0t6NNsVbNXFG4KN8/XU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806093627400.5059674615276; Tue, 26 May 2026 07:34:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0000CF-C0; Tue, 26 May 2026 10:29:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmL-0008Kh-7o for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:11 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmH-0001EY-Ve for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:08 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-43d73422431so7551456f8f.2 for ; Tue, 26 May 2026 07:29:05 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805744; x=1780410544; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NlHvCg0punP2/RxJsoNMqmUBc8JZ2RfyNnqU1bG19ag=; b=rN35CAW2MhOH0WKLyO0HyJ0Rkm69PRwSb4KN8QIhcSyrekTtbhr/q/EOE8yA8TipSC ezzcm0iYpxdT65ccrFU7z90z2fMF5171YRofYW1PezEJ5IzKunacVunTZ8zQcGIZv4TF 0ose7annnsr0JkJoEv5wr4qRyiCMlZWG01RMqdW2AqNw2df22MjWR1Wd/Kh16seyPqLw K7sMQb1yo6uEE+mODyDoDpou9U9qnTNM0rfPWeRAyFofgkmv3Ou1MusBFTJ2Eogbxs6M NqcyprUMuRlrFEwphAb6uO/na/eauOc6Cn1xx1o6xGtkKzvEh7MgYSDscpv5b5ub8ECO CC3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805744; x=1780410544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NlHvCg0punP2/RxJsoNMqmUBc8JZ2RfyNnqU1bG19ag=; b=rj5/TN5KrTh4UOZKH8Tb75cdXUbBsM5eztfo44mCR4DAe+Y5sPME6yRIJVnEFYFhsV nOTcD9ZwRBR2lXRSeDHv3AlDzfshefCHykwobq/D2LY7nbHMfANSqFOYG/ePWe9kWSNP xFH0IDylDoRi8cXHgx0Dx0jWFjRN79x7XPGgyPZOzYkEY4lX8fnHql7ecvisYRh7Tesb 5+qTNTPUYH9GC+JYwclEEvOo9513L9XyCx/XWnW69w8kuhbINEY0htoyA6TEDh0bc5oQ uENr0ekomsExcA4ErPigqr6Yk/Q31zh8zpoq1uzcEzFjPjBFy9I7iDKSORBe3RnqLQ9f JYHA== X-Gm-Message-State: AOJu0YyvY9rz2KApBbI3x0lIdhYDOoH1ii+3S6FxyzqdUKOK0NQXqzjZ GUVGhf6zSvFxIQqZXy5h1IET/BICHpgiY3ygU+8yScf+D4Psc8xeSGx65Hzh1OPE9b5ZwJb6UPD yfE0M X-Gm-Gg: Acq92OE+zJDqVN9wQh1Kb4AEVYGG/FqjNfhoIXu2Nl9+MLu7AUYOE5AaAlwQdeR10eH ezvjw604AaczIo27MvA8P8OecUoXaE+JsAFp6QYCumk0iS8UyMKouyIprNM53/xZUiKSKUDLlmu sI1kPQYe5zeuIOL0JDHPvfVJD+kp3EWnSPhL4iQbOt0jdCNXa16MNmqEKXYUWZF9YTHlT4Cbc7K bwuDGKawH370WcrBQ/YPVU/HvEUwjeVhT9Cj8PQ9AcVX6y/DmIzoWxv/b7VZNida2zbr3R5cPtz bcaoNUDqkErcQNkY5b+qus77Edg8uWTysXBEKVUiTeI+I6U7K0Zj0P1LQ+5+6p/dfSQFDisjUvL JkAYe9A4MAClRPIWXJE6yX5q7g4Pg1mlaL73CPyvgqMasJuu7MjoL01/Zcz33ucNANudpPyPsg9 Aj9zJUty75WDbvDmOTWfh4+9esEHo+8QfHjyZrTxqmCIaSe9wv85rcdlJiFaC1ELpXfnvLO0qwz +U9SSLrm5KoXXLmEYaQ3Vb1iHPS3LQ= X-Received: by 2002:a05:6000:4306:b0:45e:ce28:666a with SMTP id ffacd0b85a97d-45ece286684mr9094395f8f.1.1779805744525; Tue, 26 May 2026 07:29:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/54] target/arm: Set debug in attrs in translate_for_debug() Date: Tue, 26 May 2026 15:28:09 +0100 Message-ID: <20260526142850.2326589-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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=ham 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: 1779806094770154100 Content-Type: text/plain; charset="utf-8" The translate_for_debug method is supposed to return attributes that include the debug flag being set. We forgot this when implementing the method for Arm. Fixes: abefca8e7f957 ("target/arm: Implement translate_for_debug") Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20260515131245.366240-1-peter.maydell@linaro.org --- target/arm/ptw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index a4842a4b62..7cc1d5884d 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3961,6 +3961,7 @@ static bool arm_cpu_get_phys_addr(CPUARMState *env, v= addr addr, /* translation succeeded */ result->physaddr =3D res.f.phys_addr; result->attrs =3D res.f.attrs; + result->attrs.debug =3D 1; result->lg_page_size =3D res.f.lg_page_size; } return fault; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806027; cv=none; d=zohomail.com; s=zohoarc; b=SO1i0PImDnOJ/FJucqvTTW50WrEzmzquS+pIyyWCrd1NeqapWKpWIAR4wt/GXzJNDsf+DMwSrkJs3On4JmC4u/f6mLMvQw7uwASwa98EeAdqUg/pyymXY2B1JIvqdZszrHEvlV7KyxR5bWXbiJJRSJui5teyBa0k8twvui+uVWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806027; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=jG7hMMv4t6TRZZSkjv097Jp4nBu3JBHsjisoTvyuADM=; b=kqQXlqD55e2R5yOomNfjynZJ03MFX1I41Qc8WoiIl4srRiN5TG6/mZT3LLLe7uz5aSV9WHYc7XigSYFVKTjdbDOkDk3TZML3Jb/KOpwgJ7O7ick3G44gQyt7ttdJ6gfJi2DTIf/xQ1GuGw3zGgUQCUKroHSDPxuSb6qYfCp05QU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806027228996.6684100375383; Tue, 26 May 2026 07:33:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0000Cp-D3; Tue, 26 May 2026 10:29:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmL-0008Ki-8F for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:10 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmJ-0001Ej-5h for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:08 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-49039a8851fso51247615e9.2 for ; Tue, 26 May 2026 07:29:06 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805746; x=1780410546; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jG7hMMv4t6TRZZSkjv097Jp4nBu3JBHsjisoTvyuADM=; b=oksYFg+wzRCj5Jk2X4JxffvR29qrixLaHeCGmMh7WSM2IA/5miLzGDweuZ5i8CYuow cmE0WY8Rlq9Sjn8vhtzybY7bgCcKR4SWYvtbRZ6weM021MBs0YPzwHXXAw6h9+XjedBG vLnipSyrU2ba2Tofz0HMsIAggClxv8gHxyNBia01sxRgLrELAVRQmiGYjtj5sR0mr15M vWfUzyGS3Mqvn1ka4FaiLKjAWPoLpR7uwvf0LCtSxnXUDcUe231QjrA/X5afjPZbgpPi N85D1op12bg8JYL0uuLmfHe4hw3vJSA8HfWhn8FkEjfFGm61g5nSawANhPKVxcIfAs+6 i0Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805746; x=1780410546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jG7hMMv4t6TRZZSkjv097Jp4nBu3JBHsjisoTvyuADM=; b=oJvA20jgVn5t5UFPLlNiUP8dZCOz9SIDyBHX1owncDKqDROP37SFiPbhv/D72UjSTz fgvdX2NWlM1k5Tjm14BpE1/dV9g8z/aUhFqz2rP2zSHkl5PCCZfSMOQ5N0Abq8znE25S 1V+6QTLPFlCXYSAy6qSxkon8wW3dCpmQWqZ8B6aFRgpmGIyhBJncLRPNxqnQnD3PIPEA 8MFOBbkYXsI/AZmy8wX+UtKRcGPY2hf9cjF0j9P7rDiQ5cGRGK2buwBQSl3weWEvyCFQ DNnThWeeU3OIcUx8dy1CKUwoCo8Am+0CXYCIOwDhyj9q+P+Z033B9dNoIvSrUCGkWZeK kVRg== X-Gm-Message-State: AOJu0Yz3RD8ic5Ody9bcxcVAYFu+iscQid3ASsFeQ57SJbrd/5WUcRl2 OShLOUECFWAoV93YC3mMvIE94NFblWhhbtO4Qhm+51QNtN5hKx+W7nx5WrYz0+p+xqJYfOQC6Qz omEuo X-Gm-Gg: Acq92OFi5BRrfLn/zQ3EK1yOEGce/05PbIlusD6Pt+BYLMpKmRnDTgOX1O3JujERIud z5RfKl/ieHfZQdXYt5jQqyMK1h4rP2630xRjcwUq80aYwbIcoocJ++yYKxzUM5dXMhTDWs62Cam mt2IIknRlqWZpcCjPWmlslA6gqlYrO1in/8AGz02kxxy80/nrd+tn3di3X53gkQcOP6EME2UuIt xtCVUHis1p8Rp4OYN7dpvQGPkt1k06oHwlWULb0qTGoPcTSqKEdgqrcK0zo0BCiY0Du7ywLoJDe Ij7KTo3hnI3xocu64IFxWzKyhhuOb/u74XGTz4iQcAUntNuGO8sCnYNWALdWwuldLLOg5WCe30p zGTz3ap0xNcVxhbjEJsNoOT9mv+XhssWcmNsgGg55tyrJL26kmbH1cmHj4Pgyn2m2wsYQNB23SU dAkvU0ob+9mh+q2AXi/gVRTQLA/ZnjoO9a6b44LfxdNZfz+EsOXqJ6+1wfTl2AdxHdehKidMAdl 4NHBIW5C92QHOIZfBM+SrN34DLQS8Y= X-Received: by 2002:a05:600c:6207:b0:490:538a:9c0b with SMTP id 5b1f17b1804b1-4907dae371fmr7835665e9.2.1779805745654; Tue, 26 May 2026 07:29:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/54] target/arm/ptw: Flip sense of get_phys_addr_disabled return value Date: Tue, 26 May 2026 15:28:10 +0100 Message-ID: <20260526142850.2326589-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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=ham 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: 1779806029632154100 We want to bring all the get_phys_addr* functions in ptw.c into line with the sense that translate_for_debug() has and which seems more logical: true on success, and false on failure. Start with get_phys_addr_disabled(). Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-2-peter.maydell@linaro.org --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 7cc1d5884d..9565a7d446 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3506,7 +3506,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, fi->type =3D ARMFault_AddressSize; fi->level =3D 0; fi->stage2 =3D false; - return 1; + return false; } =20 /* @@ -3548,7 +3548,7 @@ static bool get_phys_addr_disabled(CPUARMState *env, result->f.lg_page_size =3D TARGET_PAGE_BITS; result->cacheattrs.shareability =3D shareability; result->cacheattrs.attrs =3D memattr; - return false; + return true; } =20 static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw, @@ -3682,7 +3682,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, case ARMMMUIdx_Phys_Root: case ARMMMUIdx_Phys_Realm: /* Checking Phys early avoids special casing later vs regime_el. */ - return get_phys_addr_disabled(env, ptw, address, access_type, + return !get_phys_addr_disabled(env, ptw, address, access_type, result, fi); =20 case ARMMMUIdx_Stage1_E0: @@ -3782,7 +3782,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, /* Definitely a real MMU, not an MPU */ =20 if (regime_translation_disabled(env, mmu_idx, ptw->in_space)) { - return get_phys_addr_disabled(env, ptw, address, access_type, + return !get_phys_addr_disabled(env, ptw, address, access_type, result, fi); } =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806086; cv=none; d=zohomail.com; s=zohoarc; b=Ws5NjNDx9lhEuJLmUKmFQxV5cQDtR8QYfMiAIAFxPJOVIbX1G5sIpX9Ys3tGk/1cwGmTg8ZRdef7uzuNEXGi+5SGggjQRolwkDSkmTcdrZ8Q57WsBEz18QEwmdZnj//GxAavf4Vu2IOUUVGSqyTEFhmCDzMNI46zy+KkQFsWr3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806086; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=tmBFhr5bZEi658a1Neb6LtFORntlytJah0gE3InO5v8=; b=O5iyUPZaWgYKMGwSLrPuVw+o+SwhM3RKZLkORTvxTaklPnBa+o7tiWvL5oIWLk13htvhgxs2isdRjseSCbaTKA2rQqjaY30C1DAZ1Omq9rEjKCq40HN4+rMz8CymSr4zQhnc654LEC3jzf3vJsGX0x3wLsp/MpjKpUIxjsbKLFI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980608625069.52182231998086; Tue, 26 May 2026 07:34:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsma-0000IK-0f; Tue, 26 May 2026 10:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmN-0008Ku-JD for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:12 -0400 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 1wRsmL-0001Eo-0U for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:11 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-45d96d21e82so5806316f8f.0 for ; Tue, 26 May 2026 07:29:07 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805746; x=1780410546; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tmBFhr5bZEi658a1Neb6LtFORntlytJah0gE3InO5v8=; b=Rk6CTtc8t+s8+IKKwTM8/kBXMUaTFe81omyluKq/+PMYP9Yab4oEp6hKy8V84wd57s LdVvQsyBJY/neb5VMfA5yHshP8O/feYcN30/HsjPbBTt819ZCoNds5h13yJ5iTbK7kNJ yBpOToGQkqNmkA6gViwrdNZcoJjO790Z220CVJ/gNt52z2NgEYeMu0oE1Oy85A5jDAKP 2ozv2EjsKYSvZTqqbM6FPwlYtq8tm7BNEgUwum7B18iOIH8NLA5UCiei4YXfhK7mH7ef YHvSUj24Iq++IKZYteFVR1LfssFdSzfAKYIv+Y3+X6+0U3eD9wRTP8I6o4j4wz2oTDo5 OIJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805746; x=1780410546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tmBFhr5bZEi658a1Neb6LtFORntlytJah0gE3InO5v8=; b=cGDQgO6hpoGvHY6Ww55GYIV63CRQpQAzrMQTno/mZ1xNsINiCI/dCqDhHlRTYMa/KY 73KH+ltjkZO6nZyYNVDKX6i497FK/l2e9mxvN3GAvfgPN00ayWIcAPt275zOYfyeiapq yar7Q0Z4zpoxd6h39LoTaN+sp4vcqOkTvASU3uZmd815qSWLYt8niNcKKslk/nZh3r2B KTTh855LH745+xyVwleOx3ClqoNaKzmJFDF2NWXr4IlYwuTUFGw6Apg6m5UuXLio6wIO xYouUkGw0exCoEhSozwZVXQPZtzyC0/1qbBatXy30g/FnHOApYfpdAn74TlmFlgCMCZD bcSQ== X-Gm-Message-State: AOJu0YzYuRsA4OPNX3SyGikfHt5kxVFkP9VEh9W1mFpHhBmBDYUqukYL CsAIHQeAkmE+da5EGPdxTC7Cekxdbr0Ej9wI/ychRLKmnTN8llXUuA1QDtsLHQQeS+N1538G6fi 0Yx+e X-Gm-Gg: Acq92OFvYp47L103vE0tKfLRb0cnLJkPpHZzqXpL2F0TvbE4WzldoriVy8lC488Dvxp GIvzpFOeIRi1yC32adsE0z35/bjgYbxecuYm+64KtdoLJD8AuPAVuQd2Eyeya7OeUKdtBUmbVNa xHAc6VBp6Xf8f54zSldki3MK7p/FOE/yjerMHH7AYE5mLZJyMBkKPjtM5w7Ab8GMwnT/JA4HCTU 9cHRni8Z9Dv8Hds7o/JZTNXFQJce2LI0sXP6YSxACsgp6rEBtjTPMI54YyBzZAtlUG3bxdl5JSm kbw+npFeEZfoDEmirYM1CRVVUGF2ynNgactY4ApMS0XczHzUNTsQUkJW2aHcXBG2YgcfDQ4VX5+ ZrI3j07f3QIeU47it6+r9YeIt4WvPPWOmCilIm/QYuM7HjarVooHfMc0Sk8OrTev2UegH9aFzga Umv/pFoOQ7mR6DBaxv537d6PfifcgBkJNH0lOY61lGaw6JW0MoijeXV7504PWvXf1pWk5ziX1hp 5T69yuXDf1vLuxE9jOwQvaNCr6PyEM= X-Received: by 2002:a05:6000:2007:b0:44a:247e:67b4 with SMTP id ffacd0b85a97d-45eb3689031mr31516432f8f.18.1779805746477; Tue, 26 May 2026 07:29:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/54] target/arm/ptw: Flip sense of get_phys_addr_lpae return value Date: Tue, 26 May 2026 15:28:11 +0100 Message-ID: <20260526142850.2326589-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.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=ham 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: 1779806088699154100 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-3-peter.maydell@linaro.org --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 9565a7d446..504ecb622a 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1842,7 +1842,7 @@ static bool lpae_block_desc_valid(ARMCPU *cpu, bool d= s, /** * get_phys_addr_lpae: perform one stage of page table walk, LPAE format * - * Returns false if the translation was successful. Otherwise, phys_ptr, + * Returns true if the translation was successful. Otherwise, phys_ptr, * attrs, prot and page_size may not be filled in, and the populated fsr * value provides information on why the translation aborted, in the format * of a long-format DFSR/IFSR fault register, with the following caveat: @@ -2432,7 +2432,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Tr= anslate *ptw, =20 result->f.phys_addr =3D descaddr; result->f.lg_page_size =3D ctz64(page_size); - return false; + return true; =20 do_translation_fault: fi->type =3D ARMFault_Translation; @@ -2445,7 +2445,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Tr= anslate *ptw, fi->stage2 =3D regime_is_stage2(mmu_idx); } fi->s1ns =3D fault_s1ns(ptw->cur_space, mmu_idx); - return true; + return false; } =20 static bool get_phys_addr_pmsav5(CPUARMState *env, @@ -3787,7 +3787,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, } =20 if (regime_using_lpae_format(env, mmu_idx)) { - return get_phys_addr_lpae(env, ptw, address, access_type, + return !get_phys_addr_lpae(env, ptw, address, access_type, memop, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7) || regime_sctlr(env, mmu_idx) & SCTLR_XP) { --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806090; cv=none; d=zohomail.com; s=zohoarc; b=d3412X/2skuhkUGxGt9t0OHAp/kBmsh5WjyH9yfn5TAF3xQsl+OEoOvUTErHEP+G/xjgWkhFvGGHXbVSPSVi1FMJKuK/DwUdhrjMUMOOBYCJwh1A2wdJdEQ+AbzABckrFffV6DwOiKa2u546gmydm0hdc6ris7xPiz/cwEJjMj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806090; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=sB4l14E+SamPtLUei0j/FzcwY1KiqKOWEgkGE0g36Sk=; b=ZZdEsXDV6WtaZFLqCO+x+zXr8YNZTWW+DwpkI9Juid6VbzincwZLH3XgK/+d92XXpD1mMD6Fqed5xDUjNSk9MToFK0sn1cH6HUttmDlF6gVR+MrT4SP/GFQ9icIt4HJrZxm7x1XzDIT9EhmY0rxX5IRk6+umzpcS3IgDBQA5MME= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17798060909131020.3522665852602; Tue, 26 May 2026 07:34:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsma-0000OB-Mw; Tue, 26 May 2026 10:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmN-0008Kv-No for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:13 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmL-0001F9-0w for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:11 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-43fe62837baso6261485f8f.3 for ; Tue, 26 May 2026 07:29:08 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805747; x=1780410547; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sB4l14E+SamPtLUei0j/FzcwY1KiqKOWEgkGE0g36Sk=; b=OZIA/Blj0FbpdGLF4rBpLAjlLO/5/RVoh9tjlikb4UUScyrABOAjNn1iZT5MLUeJJt 1PH0edcAMqffjlMUGCXPnlf8TIRmZZlFpfScx6nC/GnakrFUJzltStNxEXw46WYY+Tjo 9ef3HK2KCg5WjaWN4HtgTRkdbs3KAbT3ItmN4bzGjPWoyAKfLAw0piDoBkYUEf88YUSO AQUgjwzsAJmOQ3e0kFxF0oaa6umjCZhooK+bGbrc2ruCgW0Ihs5efasv5wc0rUz/FQWu cS77rKoZLhlR2jBozoHk0LndeX5ghGNp468I01clWxhvmkVomvB3aSN98X3sFWHgNszy 0+PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805747; x=1780410547; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=sB4l14E+SamPtLUei0j/FzcwY1KiqKOWEgkGE0g36Sk=; b=GPPDnrcJhXlXf2FNajDxQJEHTg8pRyPam57bBgMxb2i9M3VDwDVQuBu6xMKJ/Ss5yO 3fpNXiXdnkmoETmjqfNVouVKDkoJvuBHCNbUGUK32zK3R1BICI8eJgCPLKCxA49P9kns uLl1wCWQG07ztggOEMM4ZyrxX/OezDgpXHtxTRKx/vQDih7k/m4CZPCPmlk0Q7Pl0IFS 8Ar5D3PolLW9ZisERdYUY52pAebRhAqqie1hPcJ/SM4z1PZRexCcWsMCKhJO9xQqF3vj MPAv08Iz3jAe/hxD3ipvimil/rCBOr4UTlWGVtfEmPkhhzRPiLHSkClpPLRwGSR7101g 5pUw== X-Gm-Message-State: AOJu0Yw47UELZyHAIef9KbvqZe1rp5cPLpyXCbtt9O02FOXJTC1nYRmk 0IorWAUjsVmA/9Bz3CbUnfoY1vJ/uaQ/8TBfxaaDJGCdTpgojdg/3NyPvQ/V8MIhm3WGXYYuX5L 6U5Ls X-Gm-Gg: Acq92OEPpOjVW2d538UMSnF8bgYvWBbDPwFGkjq+ADUVA9BM/TTVq2xs2UyHpniHIhM O0CelQCAuUuWleRDxmXyWrg1ZY1M2Z0vlx7MA1bGETOrlm5owalLenkKkurF4WxdhXHs8IJGiV6 F/dnE4gVI0L7Kh9tXEhotLjjfnUI6I8vNltELW0G6ZiJcsJHIUDAyh712fYp8DPcwq0p2zqzC7H STrWl+uVwv3vwpCPA3iCGCOPxdewqchs1MNfolj7hRwpbSbZurKEAeGFhjdtFXBiBYeUDLU42Uu 0wTFqr54Hrvxw7/jndXTA5UWXpJ37Q+NpmqlIb9lg7Ewz9qIDsxXbCBXVuEi64NLUnMRb9mfgao lmC0Cmt0KBA9x6ukox1yDYcTAvPA/R9CWQz4p7/f8kvLup5FPYXsiKv1VeMdY5es01oxyTZNEz1 2cvOEDdBSHGYEnWdvXX8OQTtGenL+Kj4ZLWtSBxXtWER7eqx07KVX+M2uUsqmTkR10XVUAR6KGa ONYdaX70PDXW3HOj756GEu49kTdFog= X-Received: by 2002:a05:6000:2888:b0:45a:dd7a:e33c with SMTP id ffacd0b85a97d-45eb39ec2c4mr33085717f8f.33.1779805747544; Tue, 26 May 2026 07:29:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/54] target/arm/ptw: Flip sense of get_phys_addr_v6 return value Date: Tue, 26 May 2026 15:28:12 +0100 Message-ID: <20260526142850.2326589-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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=ham 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: 1779806093327158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-4-peter.maydell@linaro.org --- target/arm/ptw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 504ecb622a..33735bc14b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1326,11 +1326,11 @@ static bool get_phys_addr_v6(CPUARMState *env, S1Tr= anslate *ptw, result->f.attrs.space =3D out_space; result->f.attrs.secure =3D arm_space_is_secure(out_space); result->f.phys_addr =3D phys_addr; - return false; + return true; do_fault: fi->domain =3D domain; fi->level =3D level; - return true; + return false; } =20 /* @@ -3791,7 +3791,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, memop, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7) || regime_sctlr(env, mmu_idx) & SCTLR_XP) { - return get_phys_addr_v6(env, ptw, address, access_type, result, fi= ); + return !get_phys_addr_v6(env, ptw, address, access_type, result, f= i); } else { return get_phys_addr_v5(env, ptw, address, access_type, result, fi= ); } --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806018; cv=none; d=zohomail.com; s=zohoarc; b=XhWd3TCIcyHl0P7vTFuKe8Oa0F71Ad4ROJPBBadIe1VxshrjMegk5hDUcXCAnAnIPZEGJ0ENo5fSZbbLdr86y+GrCL9zGYZSEsE9M666/GNxosgyxWsIkhuJKG5jwJFUVOlKkUPkIgjyTK6WfPgjpUJas5LmJZagCETdAeIyQGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806018; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=x6UmId4uQz5l4M/orJXCZGhbYCPNs3zlI45bSFNuQcc=; b=Asb3mdNBio799en3KO/XFibpCl64dxyZqMwyTOTP+G66RqWYle2vLZqnMGfGKuHYPhhdBlMHXMZZMVvLlJwEl1my+eR4wQv6/LU+9quqLyuJE39QLBWXTTKp3dZ3M7/mi/55GrR3ESMRj1K+IpQJ4n2UsJEAAPRrPUw8gqCoGb0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806018375824.1579400091259; Tue, 26 May 2026 07:33:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsma-0000Ii-1P; Tue, 26 May 2026 10:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmN-0008Kw-OV for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:13 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmM-0001FH-4S for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:11 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4903d730b1fso42656645e9.2 for ; Tue, 26 May 2026 07:29:09 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805748; x=1780410548; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=x6UmId4uQz5l4M/orJXCZGhbYCPNs3zlI45bSFNuQcc=; b=rPCu5s4GBCJQyPOYhgOqGwTCieHJPu1b16hysQD4UovGafbFu9hbtyQXSuvD8IaiJK qKdPnJnJh+FotV4nw6Bj9d6aCswoaAE+CznfR4vCNwoxlcJvYx+fvKWfmpyTXfAVxiS1 NJ8DPSATzQR3j198vz8rLdUydm+oHWyCGdSlgczSxB9xFF/7KucWDWiOQd0JDn1oPJDu oVixErnBqZltF1Qe4XPqA96qsiMeR41gUG5qOUWDtTsrbcI2SAQ4MVl8MVOWKNVarBRT jBIYWxldP7mm7OmmM5r5lKJ8PrsqwUfDgxUBUTpbP1olkxUeHNLq3cID/QnUnfBGiKgu Ofkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805748; x=1780410548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=x6UmId4uQz5l4M/orJXCZGhbYCPNs3zlI45bSFNuQcc=; b=tUtMsMhxm0FMEOPA3DaYrRpdfBs9qpYAu0pqFSs5xXfL2iGdRU7osdNyKI6UKot6hQ ueO/l+nq1l6GDMiiDb0QglENRJDDNwfHItr2eEV5EHyezyhH9ADlCGcUHvUkkb0Vc5AJ +IlsJxNtq0zxmhOyvpSZaqrKual4kmqcuMihtnNXQIItJTAfLcWIVfphdixIw0QhqW1r NezudZUX7Pkq7CVJW6Ddgs5KVnO+LFZo6IFKBH2Ch4Eu927SqLcn6+2AFn+1jkjDATnH kCPUxwOfFTE3F8R9y5vq+BazHZW4jEpTpHbF3DYiZwbyEIyWWP128w6SART3fG8urBfD 9x/w== X-Gm-Message-State: AOJu0YwB+RwJkYNGjiyzIK8nHZKThVBdW13Javm8eG/qIo0z/FsUDMGt PRb6CrnQpODtsD1Ne4cmtRhASccx9ydrxNu908hIlaab2dgDpqz10t7wlRddslBdfYXR0WAVkEA ie1Jv X-Gm-Gg: Acq92OFK3tbRQ/n/drdLhLq6yi0+x6Ukzfgir2YDWk3KaZWveqzBoX2p+pq0m+ew7gX raVc1iDU3nzmn0WV0hBlKTq136NTB6flFxKyrE2sGGwabt+RuABb6SLZE9u8twPq6EXpyiTLiOG 7xnRSm5USAnPEqi+IxleR7J0aAh8WCEzXJmH//o2PjfWACv46q4mthfZECZtSzDl5BX9exV713r ScwypWqk1cAm2boxqYffSZGQ2E7/9097Akt9+ok4UH7QBx6+kqUTHqDV0fY7HOnRWUbcEMewD0M eZZKMI/3dCxUJa5YOOXLy+z7bks+EjvfPHVZcdDe5M6hDMhKA0A8xCZoJHaBh8G8tEhDd8LGLCn 0Mppw42HAyG534EgctgqleTxXF81Ut1dVFgn30Ek8xke5Si1/Q+Ybze+2IhXlfjJhfrkEQl/w7z edZ5gevg6sWuswfkWyu07naaMMheml5D2Rp4+F06aeKhGUTyrARZhTTzKOLhZm5HNpWtm4dgUyJ xgg0FPGXurbxiPkzkTppKdSrR29AeY= X-Received: by 2002:a05:600c:3b0a:b0:490:60cb:560b with SMTP id 5b1f17b1804b1-49060cb57b1mr186844695e9.28.1779805748452; Tue, 26 May 2026 07:29:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/54] target/arm/ptw: Flip sense of get_phys_addr_v5 return value Date: Tue, 26 May 2026 15:28:13 +0100 Message-ID: <20260526142850.2326589-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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=ham 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: 1779806019480154100 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-5-peter.maydell@linaro.org --- target/arm/ptw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 33735bc14b..53c2ed439e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1169,11 +1169,11 @@ static bool get_phys_addr_v5(CPUARMState *env, S1Tr= anslate *ptw, goto do_fault; } result->f.phys_addr =3D phys_addr; - return false; + return true; do_fault: fi->domain =3D domain; fi->level =3D level; - return true; + return false; } =20 static bool get_phys_addr_v6(CPUARMState *env, S1Translate *ptw, @@ -3793,7 +3793,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, regime_sctlr(env, mmu_idx) & SCTLR_XP) { return !get_phys_addr_v6(env, ptw, address, access_type, result, f= i); } else { - return get_phys_addr_v5(env, ptw, address, access_type, result, fi= ); + return !get_phys_addr_v5(env, ptw, address, access_type, result, f= i); } } =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805870; cv=none; d=zohomail.com; s=zohoarc; b=m1yjQiiwwPqyvvvuP5veCjXUIGpctU4W/P/39LaXqqZr3AuFVL/ddNJdf60is+dgwNqtsh4aJtXeLY0qOYhROZ0stdU43U/FpYI+Lg6OEK1NU90cO0L3LGcYxPI2vbxLH022bwPssMv+DBhiXUxm3jnyJAGzNHACdLc4LcEW798= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805870; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=gSN92snLUj0NdEQ5Y+ux0EflxKfxyApyrSCSbpPQV2o=; b=iu0gA2Xr/mJKZadlu5SoNkBOiYTGFmp4wsVJITh9XAGk01QJFjWsrlc8QkaZu5taRLg1zvu7DFPetsEkkrjAW2BzWUQBkSUm4ae/U5AVYlqUm6KETaFa+GzrzjUAt1mXVmpUWzX/fdYRXX3W2bSgE3hqrHx0NENFx1f8/SsakOw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805870544595.4261381845845; Tue, 26 May 2026 07:31:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmb-0000TR-9K; Tue, 26 May 2026 10:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmP-0008Mw-Cb for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:14 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmN-0001FX-QS for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:13 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-45ed9336049so489070f8f.0 for ; Tue, 26 May 2026 07:29:11 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805749; x=1780410549; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gSN92snLUj0NdEQ5Y+ux0EflxKfxyApyrSCSbpPQV2o=; b=ZWcGSiZSOcXiP2QjBIa/DKTrfuLkBwVrMquv3dBB9mklXRuSBxc9sWe15W7QY0rYGB fuh/8taisLR6bxdm9LkBCgTFEzWJu47VWQP9MdpevK0eTKcS6KQ8y2pLi02HNhUuUBzf fcGEEsOiwEI87YQZk9Zvo5DperaVCI3qXYiE2XrspyDfezT1YpmIaGy0is7fDZ1znwz0 LsEwPExtOb0StcvOOpSOcUiYQs2NdvB4EngAHkqY3D66hNDvsetV16eOdZEde8wzLFfQ YogGYszffBG+zk0Sq0EJUFiXysJsPTuJcJ+erDnveB0YTDOkD0QZKku/G3Tl7IgWjO/E aBoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805749; x=1780410549; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gSN92snLUj0NdEQ5Y+ux0EflxKfxyApyrSCSbpPQV2o=; b=sqXW4wim/357rx5Wr60GvNk6e3mu2AJwrbuwYgzNu055TQZvqDRLM8s7OdhbNptW2s 2uPxTCR6mFWhhCxKcBv9zQWMsDCfUabR1vatD1/nSZDHfCH0a1B5Q3zQj77+XvpyYI+b ynDoYDmAHZfgKVJ0mlnb6NC41b958x+WSWYemfo8e/Li0Uhe1EnwN+Cg7RbzNHoVxM36 AYxcV1XPcQyzvmWAyU7+7M7lhtJ9ptEnky5firhxvDWMKSg1wPzJwVujiJEJPM5PUpUz ccBAv9lerBmbkUZNHvEyAIK1EyGl5GYFdzU5LHJRIrHwDccNpj2ptIme3zsrVnk6xPZa SxtA== X-Gm-Message-State: AOJu0YwbghVTqRfn8DBtAAYyv5PUH9D4KNcvrp0DvkS3Cc6kPEaj4wYs k9yamlqBwNXf0NCfnxFCWEcEWOujKlCDlxwJzIvh9PjbqRCSubD6lT13kR/NQYpVtogob1NBxdK +xteb X-Gm-Gg: Acq92OHCqePvMZPL1mtXMJrZy1oB0TgAVd2XOL8QSdfRxlXL8BtiWGRIzGVW+FRFomK QbAi3VxzBIhtsFe5pIrdpQDicf3hV2H+nMsjBY6/RWYmcJI0DNztxTLrXSawOme969bOI6dcywM UgbYviSvmNnURQftq5R0SO8HQWQlWrkr6q+GFkrFbmJKm+yy8vpF2ZPg7F8hXzerOPIUUfUyO6m Rg4+sKxfiEN8Bpd6B8OTnFK2/a1xjVQmmcfeIT4nxkOC+m6OwyQZCzpkafAUqZ5Sqvgjh+e2K65 tKhjR7rgBAXmfUtfYEYedQehSqdYnTkoYkJkKUKyCz5DYGEvOJ0GFdX0ynxMOh0lt9vgLZBDwwb 405hLdE5AhIUpPSODtfKf5j6YnHV0qqhVEJqU/NrXp/4vq7kJ2mjEGza3d7GScPwlmA2NgMbsfg Ky6426YxSWIr2HNszcP42REaZddEOPEaUTUkWUXNzYcloShccitlXt4LxfNdStgW0bNFS6w9prs ntB8jgfE9dQTgVhYcYK2jk4unFAviI= X-Received: by 2002:a05:6000:2003:b0:45e:b311:3d74 with SMTP id ffacd0b85a97d-45eb36acd1bmr31370479f8f.22.1779805749550; Tue, 26 May 2026 07:29:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/54] target/arm/ptw: Flip sense of get_phys_addr_psmav5 return value Date: Tue, 26 May 2026 15:28:14 +0100 Message-ID: <20260526142850.2326589-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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=ham 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: 1779805875020154100 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-6-peter.maydell@linaro.org --- target/arm/ptw.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 53c2ed439e..94403e317e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2465,7 +2465,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, /* MPU disabled. */ result->f.phys_addr =3D address; result->f.prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; - return false; + return true; } =20 result->f.phys_addr =3D address; @@ -2484,7 +2484,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, } if (n < 0) { fi->type =3D ARMFault_Background; - return true; + return false; } =20 if (access_type =3D=3D MMU_INST_FETCH) { @@ -2497,12 +2497,12 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, case 0: fi->type =3D ARMFault_Permission; fi->level =3D 1; - return true; + return false; case 1: if (is_user) { fi->type =3D ARMFault_Permission; fi->level =3D 1; - return true; + return false; } result->f.prot =3D PAGE_READ | PAGE_WRITE; break; @@ -2519,7 +2519,7 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, if (is_user) { fi->type =3D ARMFault_Permission; fi->level =3D 1; - return true; + return false; } result->f.prot =3D PAGE_READ; break; @@ -2530,10 +2530,10 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, /* Bad permission. */ fi->type =3D ARMFault_Permission; fi->level =3D 1; - return true; + return false; } result->f.prot |=3D PAGE_EXEC; - return false; + return true; } =20 static void get_phys_addr_pmsav7_default(CPUARMState *env, ARMMMUIdx mmu_i= dx, @@ -3763,7 +3763,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, result, fi); } else { /* Pre-v7 MPU */ - ret =3D get_phys_addr_pmsav5(env, ptw, address, access_type, + ret =3D !get_phys_addr_pmsav5(env, ptw, address, access_type, result, fi); } qemu_log_mask(CPU_LOG_MMU, "PMSA MPU lookup for %s at 0x%08" PRIx32 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806025; cv=none; d=zohomail.com; s=zohoarc; b=ZzmU0wg+Cf+emLkECRVeSeKB+UmqAGdNOoUFRUFm5ulRG3zqDl7/Dl0wUJWbg/W3Xt3FwtS75tt/yNg8xQmMpcD0lUIN43QkAWB9xQLxb90LWCKlr04egHWdlVJtWsG8q+YNIwh2vbaYrM9XMoCe55KBcwxEFDoQiimF5z/xPaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806025; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8CL3ZuYZWbB37FI6q1udXhlxyZV70/cjFqaSmbtR4ik=; b=HjncuDFiPyA6ZYFMt7AnPda3QcMpRkUQS42buqHCfZkYl0NpRntIYIDhr5/e4YQJxX8EUCXWxmO+GHnSijYi6yVUledx81agKId6rYVH6HOcO+W66cXNg7hZC05JY4GFS6txZBfNyAgBuOKVyBdt2cvWmgx0NQK33i+FzK9y9r4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980602569718.93420870582031; Tue, 26 May 2026 07:33:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsme-0000eS-JR; Tue, 26 May 2026 10:29:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmQ-0008N8-0n for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:14 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmN-0001Fj-V3 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:13 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-44a5174670eso5999023f8f.1 for ; Tue, 26 May 2026 07:29:11 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805750; x=1780410550; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8CL3ZuYZWbB37FI6q1udXhlxyZV70/cjFqaSmbtR4ik=; b=uWf2rhkjC/km1OI3Jty72lZg4Jz0msCix+ZY/T+n4Qi+qNeGDG3d8S/GOQRIZEgkDy icJfJTLfp82P4osdxt/bfmsGBoA3p8UYd5R0AgMMhUIwY1EWzi0jyjJkyibyQewWRFur 1/fXu1ILHbkubl6515XQvwNRanILkrX2HeVQqrJMt82oa/gzlCOeLuK5l5CSHmmXuMIh S/GugmL4MU+GoOKw5oyQMr8rehffJZ1ZwGnv7u65AaJ8sCwWGUo0CPMYsHsUgleWW55c gXhT6o9cHI9Ggr5qIqWn7Q2BZcy0hTui+NucA0TL8LcwYJzSd48FLjs9/iH99lpjDyfm IHRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805750; x=1780410550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8CL3ZuYZWbB37FI6q1udXhlxyZV70/cjFqaSmbtR4ik=; b=bxuKn0W67f/RouKxFxR1OO5QoK5f5rf7fT/IlNSGZG1zyh5QlhaftDiwGo6uJ+WiXE oxOyLbfhYnNlSKGpo/7rA8ZYHgQ81zeN3ndtUf1fVrx2kCniKvPilsEu3eDcXOezpFTk AAB9WufEl7GpPNPPLr0Ona3/s1bqODTWqvuJiDxDRPzIFiHF8mg1Clb9T1fI776wHpg7 EcJ+7DNFwDjDfmFGymGfCHel/r13v5nzGKepIXt9GaLHSECqJduwxb0ZQEiUWmX5l2Fc Ivsr2SoSeYnS8iCjTt5u8K/yCzP0SanJlwMVDjTwoKJdZHkkhy4C0WNv77VblRGFenTL 7fKQ== X-Gm-Message-State: AOJu0YwAwgSBcMPkpc0g78XhTpnekWRdJhmAYW6TzoGScYEliJEbAkLo mqRAf/+zCpU61Tdjyig7+nSB2ISidgVXyi6Q2c9NKDz1Olb0gGeSkZX/gFija/1IEtrFRBAVf8z YRhxg X-Gm-Gg: Acq92OHT8PGEI1WLgIZxHKajVz6SGQrtjA8J1EF0hYGHjOw6LsQ3c5kcr7ZqtayIvRj bkgYOvT6qdgEzgglAfOAR0zB8J3QKExq8Xfq4TNQk0kuq7PQt5lkh7vt4XQcKFV22nfraksAVxX JJNmKLt1sAZ5DxqabARV2ANRAQtG02QlG2Hs6yO8pPD57D7q5LsbRbdHxGqE/60dhpl/N4CNtLg J4WjSBqJPrH0aW74NAGTHwedEsu/TYQEtuijeShUOwcFMbhXggfekp6V325lAaPNQ1bbFWCz09/ 8042VSbe/THm4uAv6Mbn4/5x2aOcMWQz3Lrz+vFemV97txBRPkhWytr1vqSt8lCFfS0eeoSLOU6 CzQIMzmLNcDFsJBg/O+udVHMeL0xyABZ7MSCardbx3Q0w4/+LWBmHOySXMPgvRaqw2k5Ut5ppqN axSKY+Rzl75HSmoI3p18hZTi4hDKGbGEWMj5kORDQBus3sLVyA7rbQGhsAmO02fh2RW9K6batT+ zRCj985tUdcwU7eLYdOA9b/jPuPhbs= X-Received: by 2002:a5d:5f41:0:b0:43d:7783:c684 with SMTP id ffacd0b85a97d-45eb38bc877mr33018175f8f.43.1779805750414; Tue, 26 May 2026 07:29:10 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/54] target/arm/ptw: Flip sense of get_phys_addr_pmsav7 return value Date: Tue, 26 May 2026 15:28:15 +0100 Message-ID: <20260526142850.2326589-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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=ham 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: 1779806026642158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-7-peter.maydell@linaro.org --- target/arm/ptw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 94403e317e..5777747a98 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2732,7 +2732,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, if (!pmsav7_use_background_region(cpu, mmu_idx, secure, is_use= r)) { /* background fault */ fi->type =3D ARMFault_Background; - return true; + return false; } get_phys_addr_pmsav7_default(env, mmu_idx, address, &result->f.prot); @@ -2806,7 +2806,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, =20 fi->type =3D ARMFault_Permission; fi->level =3D 1; - return (ptw->in_prot_check & ~result->f.prot) !=3D 0; + return (ptw->in_prot_check & ~result->f.prot) =3D=3D 0; } =20 static uint32_t *regime_rbar(CPUARMState *env, ARMMMUIdx mmu_idx, @@ -3759,7 +3759,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7)) { /* PMSAv7 */ - ret =3D get_phys_addr_pmsav7(env, ptw, address, access_type, + ret =3D !get_phys_addr_pmsav7(env, ptw, address, access_type, result, fi); } else { /* Pre-v7 MPU */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806059; cv=none; d=zohomail.com; s=zohoarc; b=I8VpJVoavL6Nmo5KrKzoHwbUaGeq2OkVS66cx66vKRBOEsgy6OS+qLeZlth+Lw3l083aSkzNeq42gww7D2eZRhr2Fe1LoRM03dEiRWQI2KCGEJQ5MuLN8PnwRt639eKmm+CzBQ02rArlZoCOeFwRh8SqbbPUMGWxR/N8Ln/yYPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806059; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=3zQXLZYl6qwt75DWKw3a5+VHMvKIFQLtBVHOyUPis6M=; b=RKE6lirA/Blr8rEavwMbqqS0UqytHJYLUcR6lo+cRkfLy/gUZQsRCvffjCY4F9fT8NbVi3r4hh9/HuOasfpwJEC+TpCfn3I1yzC/RfDsiVKLfUC/Xb6Y0GWzGEzjcS80K2o6vNWE6HbczfH6daHvbQwSJZQ59F1V1M5vmKtjSok= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806059523181.24582047682054; Tue, 26 May 2026 07:34:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsme-0000eG-H3; Tue, 26 May 2026 10:29:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmQ-0008Np-QO for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmO-0001GC-V3 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:14 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-43fe62837baso6261534f8f.3 for ; Tue, 26 May 2026 07:29:12 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805751; x=1780410551; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3zQXLZYl6qwt75DWKw3a5+VHMvKIFQLtBVHOyUPis6M=; b=P5ek/QEJZ/H+ES6wWhyOVbkUG+Yj1w9Oq++M2PRXZQ2x+ZuO3lKlci3WUpmBKEyND2 mlN7INwlgSSJJYIMSOv1o6fhcezJqd+EXjbpQe9Cvm1xv5A/ecKSkKmv2Ze4YtbxDdCO g+K0oSh0imyj8tiwcsvvcEhiq58AahdJ9cWmb8RabF9szs27vKgAn8f0U0em7iRR39/p E333VPI58Q32yMCVZPYwW1kRzUlccyz23MxX5dodID4VEWRfk+MXFALee8txpjmulF50 q3mdLE20bTgmOmnjPeaXXKEVctytfAIhBdgD5uFO2ZeVnWfLSyawDrvqc+/+TIEgizL6 eZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805751; x=1780410551; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3zQXLZYl6qwt75DWKw3a5+VHMvKIFQLtBVHOyUPis6M=; b=pe/MiBwUPYx/sUrQKqXO0+3ZiFdiihs5DRu00MqdJSCo082jfN78UsXN56gjBEVFtQ 5/bM7nPu43IaEZzNEWggk7ZMwcPxnYQGmLVz4HcdXj1Io+tEzqJvZg2CT58elphEyAUY Bi1VTVn9qEoSsZkd8cPKC2M3cjvZKQbnewyFHLguqNdKHjz7PdA1Hr0Wma1co5LCAgcO CDPMdQxecDmtpCpMMXifLw6ymx83Ed/4UUnh19XO/wLv4R30oVX7SHspAgLsHb0J8zli 2N8/jOZumJjAxYHosySiYJOPzJ/ohXvIZy6jGzZpXpYfpjPlIe65KSGkUIyxGCWITdUz 0dAQ== X-Gm-Message-State: AOJu0Yx4CEna5lBFskmmGz8GhYRRyYeH3+K6yBp/OgvdFuLlk3xZ07hx CwmE/HEV2JbId2HUgD9lf/mc84pfPcQxK+YOHyCrAriyEmGh6juzsB4GhazVyGSRgbWY9Nc+u5c LvlDT X-Gm-Gg: Acq92OEbd//jRc8lLDiLUTepfNedbY3yE79LRQ8zdquWTqT6JWEsfFC8JYzJ+ALgOWh T7+ocvg58OGbc11fSiVzyRmkLASMJOqetVzUyQygOzdpzaG5fcbvvB/ObSC4iLOe2enEMDasG9M gbOwIwXCRYuFlb9jhSgfJ/LIOthh0dZx2clEA9BFZZEEFL3w1x+4+MHJVOpsjhssrXLse5Ep1gw CLU9yGzwlw6Anid7CE39TpVxiJYI7psb06L8wqxRse2kxbQ9vX3LH4k0YydgS0hDzWWtBb1R06z bOSX7IghLIqCj55on5nivX6hzCpXcK3+TZbQMKdjOmbTpqWqoqxwKj8y9YawK2u48hM/DIWcoWe m86ZlZc0UQ0wgLo2ZUY5iVORpQqtXYy6J2YwvRk1pzrvsYR79IQf0Ge2KHHdlXxaf574bjWnUb4 2Vy2JHBybHRcmBxglmDmCXeQB6nwP0vH0xYlBHnFmk1ts5avjhNhSoNgrgc82BjxpejE6CiWf1f cUV/0Pi/GUwcsepDm3Mys1WFKcc04M= X-Received: by 2002:a05:6000:4b04:b0:449:9aee:4581 with SMTP id ffacd0b85a97d-45eb38b04d0mr32629503f8f.12.1779805751346; Tue, 26 May 2026 07:29:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/54] target/arm/ptw: Flip sense of get_phys_addr_pmsav8 return value Date: Tue, 26 May 2026 15:28:16 +0100 Message-ID: <20260526142850.2326589-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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=ham 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: 1779806062217154100 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-8-peter.maydell@linaro.org --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 5777747a98..91aacfb814 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3191,7 +3191,7 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, result->f.lg_page_size =3D sattrs.subpage ? 0 : TARGET_PAG= E_BITS; result->f.phys_addr =3D address; result->f.prot =3D 0; - return true; + return false; } } else { /* @@ -3217,12 +3217,12 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, result->f.lg_page_size =3D sattrs.subpage ? 0 : TARGET_PAG= E_BITS; result->f.phys_addr =3D address; result->f.prot =3D 0; - return true; + return false; } } } =20 - ret =3D pmsav8_mpu_lookup(env, address, access_type, ptw->in_prot_chec= k, + ret =3D !pmsav8_mpu_lookup(env, address, access_type, ptw->in_prot_che= ck, mmu_idx, secure, result, fi, NULL); /* * For two-stage PMSA translations, s2prot holds the stage 2 @@ -3755,7 +3755,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, =20 if (arm_feature(env, ARM_FEATURE_V8)) { /* PMSAv8 */ - ret =3D get_phys_addr_pmsav8(env, ptw, address, access_type, + ret =3D !get_phys_addr_pmsav8(env, ptw, address, access_type, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7)) { /* PMSAv7 */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806000; cv=none; d=zohomail.com; s=zohoarc; b=l2U38k8yV7rSoI9aZ2tCnKDNQjqRNVdx8lTGtj4SNaGOMMoYVL8atfhrgNgpCy7fRQojrigtHqSH1Xi/CJTMLGVvlpEPxqMaHr8XJTr6oTt3JUwfYTa9bJbdaKmIxbvR9pN4t729QBS5mi8NJVKyZ5yxqQRW4RVd9rjDbk+zXHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806000; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=DuX344y2MohXdo2KnmkVfn2tDoDJCPtlSarvv0O7760=; b=dDD7ww68JZ3yrV1QX9cTaG1+CTDgDdtafjGIqI0/UUBRf5+m6pPsXuZDb5sePW63a9OmegvS8T3A7w9awA8JljO2VEU7lnpguLWi9nuRMAMGFF08ZpSmWRrQ3DciDqHQ/zaDlyoXyBbKr0G2kMKytojWCtu0nCZkgJ3LYyuPboA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980600053453.65760920522189; Tue, 26 May 2026 07:33:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmc-0000ZL-FE; Tue, 26 May 2026 10:29:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmS-0008Px-LY for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmQ-0001GI-HM for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:15 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so112131715e9.0 for ; Tue, 26 May 2026 07:29:13 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805752; x=1780410552; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DuX344y2MohXdo2KnmkVfn2tDoDJCPtlSarvv0O7760=; b=C66QYmzzZgY9dWMIS/Uc1GiUT/QEIE9vmVGeCgzqMwpVIxvt6sO4OeHsCEBhr6XEck Ex5gEwLuDsgdOeMRSBLbmAR7DqFiFzXSfKKWyhosJepBVZ3ZcJgQw44Rge1zxd+6DCDH vWFpavszTS0GzyzKk3pOuC0v8fp+1yyv4RS2nB97KndgndB/sx3rvnPC0ZDrxlTXszaL YSbn28sfWcjquHMK3y5KBMt8n6jplUtivcWlbNenA1TykoFnfUOH2yfWsHklXfod0Fc8 77Ls4xJ8UDDbPTvKUD3/Vc9yvQp3Hg3v245GqDJe10H84s8XpvgDayp/T1Dcy87U4DVj 2KLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805752; x=1780410552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DuX344y2MohXdo2KnmkVfn2tDoDJCPtlSarvv0O7760=; b=N36T3FmHr4EleKrwlXn7CCBoq+SSEfF+sWI/wToAtToFkUo/AYVqLK3/KSC+UCnmeM 1qT3sojOA7fOqgM4UYMqx2MZZ+N8kNxl4EH64mqIF+U2+ho3Yue4eJU/7/XPXgfmakto k0sieLOSqeSGZR8IheBpMvx/WmDIRJLCwhpsGlssXxdRrRHrCcXh3wNBWNp7/9zMKbq7 THVLk/ykxtAwhIOu3flk9ACN+lpEViOTRSM0WZiCptgy8drDbPnj62PdeCY6K5PhtJ0v By/DclNwCBqXbmp8E0gOtRWGlTUc7lStl7DUAjTy4Q4v8uPdwYIKFAXMl/UpYnO2RWzK 9Gxg== X-Gm-Message-State: AOJu0Yx4jntwV7plvRYreN3o324cLuEOFg8UEBqm9HJewx/RzSpWREDX Qu7iI8Lt3WwjRLvc+bxX+O7icWM5XcU1C2+2VkUN7dQvg03EjDPuetoVfi/35wLGXnVwvFA7LO1 ZCUJ3 X-Gm-Gg: Acq92OFSDki5bQ0gNo2mzHaJZILGy8PbxxFk3KUVbok12n3GUyJMb0QNKaknlfBxSoO HSH7LdPLK7iWrfZyxmeFru32OYPrx1TLBs4YhvxM2jSkccqLUh51/d2wquYsfJXtz1VUg+54npb D+fyN6wB1jf1YHbTwOSnWS1AlefaVcueGHjpCB6ec97jcPrfUjn18We+SxbwNRoqlCHK9p/CDnX wp1gem8z1SHFzqfGzxrw1CKAGqlNU5/zJo7jdMDB2h38AxVwsbm9r1+mz+o4R4NhQGU32seFVWw 9sa+vQTau5GWZlfmtFITDRqlqjSmeqov8ppDga+U2UWlFEMhb/90ydLBcgfD765ylySxJMFhKl8 /bWQmQdztLOe2axCy4vHLSJ/Hyn1Wvaeo4b6GbP2022Rj09AO/ArGrK1CuTkOzJNwbBjYOQfd3N 21beOdPqFDlju8brbiUWEXhv3h6HacJkc1KS9W2dDjPxF/wdJXoksMB3EK97WUfWBdrCbF8VCpC HMymKMZa4bNGBUoN1aVRKFfc6G9XL1o3KUjJc2JUg== X-Received: by 2002:a05:600c:83c6:b0:490:5872:e641 with SMTP id 5b1f17b1804b1-4905872e758mr219348975e9.18.1779805752406; Tue, 26 May 2026 07:29:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/54] target/arm/ptw: Flip sense of pmsav8_mpu_lookup return value Date: Tue, 26 May 2026 15:28:17 +0100 Message-ID: <20260526142850.2326589-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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=ham 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: 1779806002494158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-9-peter.maydell@linaro.org --- target/arm/ptw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 91aacfb814..ca4b638c43 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2844,6 +2844,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t add= ress, * If the region hit doesn't cover the entire TARGET_PAGE the address * is within, then we set the result page_size to 1 to force the * memory system to use a subpage. + * Return true on success, false on fault. */ ARMCPU *cpu =3D env_archcpu(env); bool is_user =3D regime_is_user(mmu_idx); @@ -2944,7 +2945,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t add= ress, if (arm_feature(env, ARM_FEATURE_M)) { fi->level =3D 1; } - return true; + return false; } =20 matchregion =3D n; @@ -2958,7 +2959,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t add= ress, } else { fi->type =3D ARMFault_Permission; } - return true; + return false; } =20 if (matchregion =3D=3D -1) { @@ -3020,7 +3021,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t add= ress, if (arm_feature(env, ARM_FEATURE_M)) { fi->level =3D 1; } - return (prot_check & ~result->f.prot) !=3D 0; + return (prot_check & ~result->f.prot) =3D=3D 0; } =20 static bool v8m_is_sau_exempt(CPUARMState *env, @@ -3222,7 +3223,7 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, } } =20 - ret =3D !pmsav8_mpu_lookup(env, address, access_type, ptw->in_prot_che= ck, + ret =3D pmsav8_mpu_lookup(env, address, access_type, ptw->in_prot_chec= k, mmu_idx, secure, result, fi, NULL); /* * For two-stage PMSA translations, s2prot holds the stage 2 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806086; cv=none; d=zohomail.com; s=zohoarc; b=SNoAwyaFfJDfA+nuHl4WMX1zdwWCxSN+eAlln+zHEpF/YVIA0RIUCke9bXnH/SfnsgwkZAob7PpTYDsLHC2QWS6GEkcm1kLQH4BZMWOxDNnDi89y7ztGRvAaclrnVIHQvl9lyDE9mrZEymsQrDLyRTI0oxwP24FYCwbV4qPkt5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806086; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wCc5uBVlW40H9499LhJ78HGB3MFCEeh30ulrOkWiyxY=; b=m1O5j/X5KMEOLYjTXrKXVY32B7C+7E3LzLcaTO8mgA4pL5ocMlpA0FKRk/YJc04C/tWahj7QAF9iUXWz5np/PY/8m46HZdz41UFhRTj9NV5emjhsFpWOmCFpGfoM5Nbhvg+Uhg6J5qjX/0VBVTZASUkL6gqoBNfdDhZDnPLPfWc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806086595913.7228689004196; Tue, 26 May 2026 07:34:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsme-0000ce-9U; Tue, 26 May 2026 10:29:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmT-0008Q4-3u for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmQ-0001Gb-Iy for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:16 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-44e1860558fso6825466f8f.0 for ; Tue, 26 May 2026 07:29:14 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805753; x=1780410553; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wCc5uBVlW40H9499LhJ78HGB3MFCEeh30ulrOkWiyxY=; b=YCz3eBiZ3JWp6nAztt/omSwz+keaLKQdCQE7WqUhKs1CPEmoXQNBMa05+L8CFXr0oe MGGbzMdZJNGhT7cph8eE98BHlq/z/EON6nGAi9sPbK60rf97oqgiTwZZ4IB3caM/G08r 0vBBuoK8W5oCR3RejJf+XceiaB9ZS8xu2Kq6BjydEfw7z2AjoaocRRzbKxJqI2Q6MRIQ yRLWQGPMgZ4a5Siet9RPBC2G/JpgqJDhwRr68yMFDvueJkrcj9c/Yr+x5BS4zl0KN6lU 0GOg8wI6XqjlsaQSX+0FPnsXNbnCsxgaGjssVdxhEWA4qXI3LCK6ylh4I9H49LaAzsWP wxlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805753; x=1780410553; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wCc5uBVlW40H9499LhJ78HGB3MFCEeh30ulrOkWiyxY=; b=tXu65dwT8WwPn8btESNPCoXAAc3MHKF/wA7wBHTYuIKiSu4JIqmiA0sqLcwZ/ZRB+p aftQS57KEel2qhkqCECg4POMkAuJX3m1wawyEpPIPzD6c+w4GEh+PlWWMYUHnCPBdk88 ISwZ4PAm4cLLpqyeW4V8zNx6bSHnLuFaL8PqjH7HaM9bvORsaRRJ2m4/EleJuoE5WPcZ RF1dp4hGTE21iMfEvOMdwy/HPSbUqXg1MNeEitukFHi+CL097TnWwL9onky2CxPzlAC6 g1l6LXwKXXXV3F45OtDOjepokzG/C3qMraN+6kqjqfVtrr7TVcPc9aFmSjo6lq3afu3j hJZQ== X-Gm-Message-State: AOJu0Yzmh9p+/H1isgEex8dFwS0uZp8Idibzf8EQCknO3PSb0PMniwZ+ iZJ+RplVX+XW/hJb4Yrb9UeBRzaI8oQk/D90nd/HmSQwxZiVbSXeiY+fnaSAuXins0Lf77HmkRJ PW0v3 X-Gm-Gg: Acq92OHQeu1OfJvFq07OO0Ljcz4sNFTuk00mcfVlgUf9ij5Ckkugjx7FOYSt75u6nO/ QbLa3bTf3bM8G/gVJndkoQ9l5Z5NiozVGebkhiLM56ydIMpqX/YLU0zoxstny2mvmpYsE/utL0Q FHO5URUz4FplyEl6oCjwOv0hknmEu72k+aelXWapCSv0RkIlrghdnLErkydqu3I9LYwyvekqz60 UhMe65pU6fitxJPJQrqTh7nyIyyKVGjUDIAtMzwN3QINrmHLm94y3GjOOaqOBpauzSABJTbdt38 Lnhw6VEf0+RnjyFuwsJCOr/IVx7VN8TEsSavqDS62ektGaynmGDomA2xwmdKvHQD3CgIrv27Tkm 10BNHfPa/pZl3KVoJCz07N3J40J59jd2TkK6/5jRZX944Oc4rQ/vji6y6miB5HSW1/8NERaW6I/ xTlnuEGtNOd8KRR/wOGIVFDFwjaad79+euibDDt/JSkdFygJNc3fAVWOPdDbufMRZrQrQGeAABl Ou0dcpRAqOTCtC5WNTtkc9tiRaARV4= X-Received: by 2002:a05:6000:4701:b0:45e:8978:f176 with SMTP id ffacd0b85a97d-45eb365f1bfmr30375288f8f.0.1779805753229; Tue, 26 May 2026 07:29:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/54] target/arm/ptw: Flip sense of get_phys_addr_twostage return value Date: Tue, 26 May 2026 15:28:18 +0100 Message-ID: <20260526142850.2326589-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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=ham 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: 1779806088687154100 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-10-peter.maydell@linaro.org --- target/arm/ptw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index ca4b638c43..fec24f08fd 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3571,7 +3571,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, = S1Translate *ptw, =20 /* If S1 fails, return early. */ if (ret) { - return ret; + return !ret; } =20 ipa =3D result->f.phys_addr; @@ -3602,7 +3602,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, = S1Translate *ptw, =20 /* If S2 fails, return early. */ if (ret) { - return ret; + return !ret; } =20 /* @@ -3656,7 +3656,7 @@ static bool get_phys_addr_twostage(CPUARMState *env, = S1Translate *ptw, result->f.attrs.space =3D arm_secure_to_space(result->f.attrs.secu= re); } =20 - return false; + return true; } =20 static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, @@ -3724,7 +3724,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, ptw->in_mmu_idx =3D mmu_idx =3D s1_mmu_idx; if (arm_feature(env, ARM_FEATURE_EL2) && !regime_translation_disabled(env, ARMMMUIdx_Stage2, ptw->in_sp= ace)) { - return get_phys_addr_twostage(env, ptw, address, access_type, + return !get_phys_addr_twostage(env, ptw, address, access_type, memop, result, fi); } /* fall through */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805803; cv=none; d=zohomail.com; s=zohoarc; b=PUm1E7lHYAn9UuSQ4GWumw4GHktBtOg4ePie3jsksddDZSkbOJO3S+ruxrDlegyfH8fBKUtu0zQMSfE8olT9+b+zwBqZo2ol0M9hFM01WAJWoco7QSsfhQRB84O1/ngcTN4vpLBHrHgumyOSsOiUjO1qL0kbqgiItsGEox0rwtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805803; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=cUCTR/Tsp12ZlbyQAljlDsV5vOZPXSGWqMvCJY1Cuxo=; b=Fb8NAhJ+UDmheL1/MZBT5KG0KppXamHtys0neiwvmgln/ct0YY/ax+Rjkhxul2nRO6mSAFQ5QFpZq30Pkvb4htgkljsUkTkL7P/Kah0U27A2daM8J90OzLhQWY4feK+Lv2UR1AQ8n+8BPYQ8lsF/TzdRlqQ7PGM6JpwlL4ZcQSc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805803853101.35666616515414; Tue, 26 May 2026 07:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmd-0000cG-Om; Tue, 26 May 2026 10:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmU-0008T6-Gs for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmR-0001JG-Rd for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:17 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-444826c16ffso9069865f8f.1 for ; Tue, 26 May 2026 07:29:15 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805754; x=1780410554; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cUCTR/Tsp12ZlbyQAljlDsV5vOZPXSGWqMvCJY1Cuxo=; b=JyGXLCRcPt9skVzRyllfVjRFxEHKSzC1Pp9TwMC+ygg8gZGxJJVkaa3CP24dp6q2Zn SAWrBJoBFHc+3+IYuSJXcxlotFPLMSgQak4W6YOTCR0Bf9SW1Giz8MeIny21WHWJilah dm6Rfpp5t2UfNA5z3tXqkkJKhMYSjEyA9Z6JgTf2YG6pTP4Vul9J3wc3x5GuenWSWONB pAFw3oWhDWzfId6+gRrr5iwQ2STV4FzYVNlb8sX/Bhmi/vUseZTNhFa4AbGbd4uAjvYD LieyCmsHAKGQhQAsN1dgzcb7KF75jS6Ex9jdp8WIBiS1qAU7pH+OtZXLZJzr5uMl/+F3 peLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805754; x=1780410554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cUCTR/Tsp12ZlbyQAljlDsV5vOZPXSGWqMvCJY1Cuxo=; b=TqJ138/G+KwcJoS8qyNDKOgp/A0u4qYl4M+5qd3pPabQS4YrIRV+CHbbqexgLVj+zB BFy4a0kfYLQiIZHGEoxMLt8X7ZsQcaQ5NTqhwa8asiVccI2gwN0DchmD5jUfyXwcdsuu z6PlClQOUSgz54HBZ0sxegYLxQFhoeOSGwrgrcFgxL15hOyKnfmn5x6jGdLWCc/9eE9l dFxO18WbPdAhGUjMwylRVbxHny3QeHMm3w6mhI6f+jGo+bMCDUecTmCfE3LdYPggPY3C k1H/JYjBIsOhYwRUPAX9f3XfE1/haxzr0TkVmGaths1tJo3ZVKTEHIxfsnoLlWLLOrI/ FXkw== X-Gm-Message-State: AOJu0YyanXv+ZeYEqjIEmeWRhpqN1Hznq0kFRENXnaK3Di8RcHraREHz 9rlV2BiUKIRYJJpUDhXbaS2aEAzWX1nizixhYp5RrZi05PHxWhMp/OGOeCqHIurOFM0TB5rmZS2 JPrYQ X-Gm-Gg: Acq92OHp2t+p62jUG2AcMHwiv0e3wjdAFUxFvbTImp7jhU6qggJ2iqxw6TNinCaiZa+ iSWo0CmVFAULW7Pxrl9cUfS4yLMxFvMqkNvEfIYsLa6+Us0wyfU/PIY7vvah/8olL/9u/VOxjDH vcrG/gG9lPZZSUgr0G5UQKfyVDZRhmWOhtmf5Nl432WgrGs7wzX6kPhr0+OEnTfgpxrFBNbY4lS mNZLGP1Bf1KZdjeTd9K8WZQNSNLEP3lj3I4uhj+0culuDOngSqX5tIU+mw8m7+9khHAgr0OBJ0S PSwlYmCrq8S1NB6zw7dZTdmjK/zFxHymvv2ABpo2usNGbDKgEaTBlYKy9RZeGwIGVt/XpP87zcy voLHGPx/y8MObC/8DeKHP8U1fVY/zEr9Rxlw8fWM9GQHhFaSQ5Kd7/kmvXTZyajP5IQu75Cg0pp qXW+B8shHHah6CQ/utTJ5Sl7rS8Vgtdn6cxJ/mHCQQ6M5yoETX0hzKsr85d6X+RYBQwdQjE+lJk ZErP9XMEDUOKgvdaFgssXCPcqbEfQA= X-Received: by 2002:a05:6000:480e:b0:45e:a314:ce0c with SMTP id ffacd0b85a97d-45eb369cf74mr28083254f8f.1.1779805754171; Tue, 26 May 2026 07:29:14 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/54] target/arm/ptw: Flip sense of get_phys_addr_nogpc return value Date: Tue, 26 May 2026 15:28:19 +0100 Message-ID: <20260526142850.2326589-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=ham 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: 1779805804637158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-11-peter.maydell@linaro.org --- target/arm/ptw.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index fec24f08fd..4538ffeb10 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3570,8 +3570,8 @@ static bool get_phys_addr_twostage(CPUARMState *env, = S1Translate *ptw, memop, result, fi); =20 /* If S1 fails, return early. */ - if (ret) { - return !ret; + if (!ret) { + return ret; } =20 ipa =3D result->f.phys_addr; @@ -3601,8 +3601,8 @@ static bool get_phys_addr_twostage(CPUARMState *env, = S1Translate *ptw, result->f.prot =3D s1_prot & result->s2prot; =20 /* If S2 fails, return early. */ - if (ret) { - return !ret; + if (!ret) { + return ret; } =20 /* @@ -3683,7 +3683,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, case ARMMMUIdx_Phys_Root: case ARMMMUIdx_Phys_Realm: /* Checking Phys early avoids special casing later vs regime_el. */ - return !get_phys_addr_disabled(env, ptw, address, access_type, + return get_phys_addr_disabled(env, ptw, address, access_type, result, fi); =20 case ARMMMUIdx_Stage1_E0: @@ -3724,7 +3724,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, ptw->in_mmu_idx =3D mmu_idx =3D s1_mmu_idx; if (arm_feature(env, ARM_FEATURE_EL2) && !regime_translation_disabled(env, ARMMMUIdx_Stage2, ptw->in_sp= ace)) { - return !get_phys_addr_twostage(env, ptw, address, access_type, + return get_phys_addr_twostage(env, ptw, address, access_type, memop, result, fi); } /* fall through */ @@ -3756,15 +3756,15 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S= 1Translate *ptw, =20 if (arm_feature(env, ARM_FEATURE_V8)) { /* PMSAv8 */ - ret =3D !get_phys_addr_pmsav8(env, ptw, address, access_type, + ret =3D get_phys_addr_pmsav8(env, ptw, address, access_type, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7)) { /* PMSAv7 */ - ret =3D !get_phys_addr_pmsav7(env, ptw, address, access_type, + ret =3D get_phys_addr_pmsav7(env, ptw, address, access_type, result, fi); } else { /* Pre-v7 MPU */ - ret =3D !get_phys_addr_pmsav5(env, ptw, address, access_type, + ret =3D get_phys_addr_pmsav5(env, ptw, address, access_type, result, fi); } qemu_log_mask(CPU_LOG_MMU, "PMSA MPU lookup for %s at 0x%08" PRIx32 @@ -3772,7 +3772,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1T= ranslate *ptw, access_type =3D=3D MMU_DATA_LOAD ? "reading" : (access_type =3D=3D MMU_DATA_STORE ? "writing" : "ex= ecute"), (uint32_t)address, mmu_idx, - ret ? "Miss" : "Hit", + ret ? "Hit" : "Miss", result->f.prot & PAGE_READ ? 'r' : '-', result->f.prot & PAGE_WRITE ? 'w' : '-', result->f.prot & PAGE_EXEC ? 'x' : '-'); @@ -3783,18 +3783,18 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S= 1Translate *ptw, /* Definitely a real MMU, not an MPU */ =20 if (regime_translation_disabled(env, mmu_idx, ptw->in_space)) { - return !get_phys_addr_disabled(env, ptw, address, access_type, + return get_phys_addr_disabled(env, ptw, address, access_type, result, fi); } =20 if (regime_using_lpae_format(env, mmu_idx)) { - return !get_phys_addr_lpae(env, ptw, address, access_type, + return get_phys_addr_lpae(env, ptw, address, access_type, memop, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7) || regime_sctlr(env, mmu_idx) & SCTLR_XP) { - return !get_phys_addr_v6(env, ptw, address, access_type, result, f= i); + return get_phys_addr_v6(env, ptw, address, access_type, result, fi= ); } else { - return !get_phys_addr_v5(env, ptw, address, access_type, result, f= i); + return get_phys_addr_v5(env, ptw, address, access_type, result, fi= ); } } =20 @@ -3804,7 +3804,7 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Tra= nslate *ptw, GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { - if (get_phys_addr_nogpc(env, ptw, address, access_type, + if (!get_phys_addr_nogpc(env, ptw, address, access_type, memop, result, fi)) { return true; } @@ -3851,7 +3851,7 @@ bool get_phys_addr_for_at(CPUARMState *env, vaddr add= ress, * check is handled or bypassed by .in_prot_check) and "memop =3D MO_8" * bypasses any alignment check. */ - return get_phys_addr_nogpc(env, &ptw, address, + return !get_phys_addr_nogpc(env, &ptw, address, MMU_DATA_LOAD, MO_8, result, fi); } =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805800; cv=none; d=zohomail.com; s=zohoarc; b=b509le7s2sLBdIWwzr4UJc5od9EOekeiGkDk6HqZkFCIIyMuG99/XhUQ5ZbPL/yxIhjSyKOetR+guKmVjLhXJfP5h5AUMYMSfnYeUIpgNl3e7OqyvdhEd0Lf30t+kAqJ9MklgkpbwCQiRGyqmzeLKEqnwXPS4eKhUUIXE+fHzh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805800; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=R3ory+fpoxCHFqI4j913Yzu0vAlCVPr6aD908OJVlG4=; b=QjxJbxZwk3Ult8PCKTmYoX79tjLC/uwNQ2Cwz/nvinX2pqiEJsvnZhYaXM0TSdZgbuSjiYU94y01cyFGf3WQ3g9KcpnVZ8lEtqZnH8nkLcJWb88aygA1RUQIQQ/SQ0Mi894s7Z85IFW44PcbHLbCWGc3MK6TJsCreqABc2RM3n0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805800526582.0762302248802; Tue, 26 May 2026 07:30:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmb-0000Wx-Tb; Tue, 26 May 2026 10:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmU-0008T7-HX for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmS-0001KB-Iu for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:17 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-43d76dd4ee8so6253059f8f.2 for ; Tue, 26 May 2026 07:29:16 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805755; x=1780410555; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R3ory+fpoxCHFqI4j913Yzu0vAlCVPr6aD908OJVlG4=; b=X3278JSQLaIVTaof4nOxVJqaV+F8nqX9hNb7cyBlvJl4mFfapSVWK1XyjZczwcaDS5 am48gTMXJVm9SpnF6LE8lJtxD5xiIcuNROzDlevg3Xbvp2g+DcDByaTwB35GJnMS8Ryf rfMVdWsOe/3RaX/l5LGrcAlLcu+KOAKylQ0mBKG0xKGrFg7Ki4LREfQ4pme44uS+HE9n UxdqoXQFIzO2Bv/jrsQFw5uxmDHYK3zx+jDoUjBIbnt7/bzeeNJd0e0TadV5j4Go+HrM VQaj6TsKvSxweeyotSVFI6swLKQioqqxDndlaUQQFJx8Zedwu0w5+XoBBtME5ZRiE+t5 0oYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805755; x=1780410555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=R3ory+fpoxCHFqI4j913Yzu0vAlCVPr6aD908OJVlG4=; b=QMWzLIDISC7nLKeKSNpbqXo0OwxvhdnUEJFpXq4UO1rDPBMdeojnuvxp5lW12KvMUH KxpgqahCgO+fprPXHjDXUKdW29UER6OlWPsr2qygyvDJRBy0uY+R5N/HejdLim3VMxZN TSv+6Kx/dZ6+tmBE6GrncYX1udC/Qjll1pOz3v5QwQd+YELV6nJtKQnrbHjJAzNdXJqW sgJToePesNKUMzkgCvgSFsMn278XmHrkmXnhkfF0gyW8SUo67Gg7R/TcWldKA1DEJwxR JRL7s0n6FX7xqwREyaty51IWGgkRxwC+kPWgcU8tHNEdibV0YM34lToNtrSiP8oHkdXE r60g== X-Gm-Message-State: AOJu0YwR2HG81CnFCbGlLrCgOr0TrFQWkILMbVTyDAvQjA5fbdzqWWuC WriYqzBEjx8BFEydKScJ6cB6KWXnnSWLDn+BhEGIdqxGUHTiTG1X2m1eJp/mDYByXzZjzL0lF4S rTb5K X-Gm-Gg: Acq92OHJUbZSg5SwDRqznLxX0/gKK0WsBBa2Zk7aJmTYCfYRdpP6ale+6oleiUVF0uX tpFiaKdAqYyMx2gDAv6Edpi37qJtexFQ26/wZsiVaqkRdcWSqjDQenIiKYTzOLkB5s3gbPGH4ud N7nkq/cLBd51h5vMjWv9SxjzewxbERBououycGWVbt/30wdImKUUlXsqY4hXhqnWlu4DSSF2+6R +42z6chTDvi/jY7s/WgUEssDQ+zBXzdsC/ei5ID1kkjyab/OxEe8aIdUgqRFzmc+lCZ24cGkjQ9 AWwqd1d5LGcrtQob5/LVlAUcLP8t2W2Lf/Lz4qs9Q/skNmNkIfjSrOpXirtjfEOvrRi6iaDsJ7u iP3QlwPpKEGtUow5HXD0/vcCk3cJOI/Iy6k3YgNFm1zwoLnV+kzxi28SyYEcp72Fh9O9PWu4Q4A rpGqX75S0yPaqSbejaYKmYWWT5FXNOm0u40LtZbCfsgxJ17TB/2Oqil1zf9QweRFONivhh99k2S ybyw6LywIi3967tS4vwEwKj2fmcwbY= X-Received: by 2002:a05:6000:4701:b0:44a:525b:2851 with SMTP id ffacd0b85a97d-45eb369c4e3mr31183397f8f.10.1779805755046; Tue, 26 May 2026 07:29:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/54] target/arm/ptw: Flip sense of get_phys_addr_gpc return value Date: Tue, 26 May 2026 15:28:20 +0100 Message-ID: <20260526142850.2326589-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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=ham 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: 1779805802518158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-12-peter.maydell@linaro.org --- target/arm/ptw.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 4538ffeb10..6146367e23 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -667,7 +667,7 @@ static bool S1_ptw_translate(CPUARMState *env, S1Transl= ate *ptw, }; GetPhysAddrResult s2 =3D { }; =20 - if (get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, fi= )) { + if (!get_phys_addr_gpc(env, &s2ptw, addr, MMU_DATA_LOAD, 0, &s2, f= i)) { goto fail; } =20 @@ -3806,7 +3806,7 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1Tra= nslate *ptw, { if (!get_phys_addr_nogpc(env, ptw, address, access_type, memop, result, fi)) { - return true; + return false; } =20 if (FIELD_EX64(env->cp15.gpccr_el3, GPCCR, GPC)) { @@ -3826,11 +3826,11 @@ static bool get_phys_addr_gpc(CPUARMState *env, S1T= ranslate *ptw, result->f.attrs.space, ptw->in_s= pace, fi)) { fi->type =3D ARMFault_GPCFOnOutput; - return true; + return false; } } =20 - return false; + return true; } =20 bool get_phys_addr_for_at(CPUARMState *env, vaddr address, @@ -3939,7 +3939,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address, .in_prot_check =3D 1 << access_type, }; =20 - return get_phys_addr_gpc(env, &ptw, address, access_type, + return !get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); } =20 @@ -3956,16 +3956,16 @@ static bool arm_cpu_get_phys_addr(CPUARMState *env,= vaddr addr, }; GetPhysAddrResult res =3D {}; ARMMMUFaultInfo fi =3D {}; - bool fault =3D get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &r= es, &fi); + bool ok =3D get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res,= &fi); =20 - if (!fault) { + if (ok) { /* translation succeeded */ result->physaddr =3D res.f.phys_addr; result->attrs =3D res.f.attrs; result->attrs.debug =3D 1; result->lg_page_size =3D res.f.lg_page_size; } - return fault; + return !ok; } =20 bool arm_cpu_translate_for_debug(CPUState *cs, vaddr addr, --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805888; cv=none; d=zohomail.com; s=zohoarc; b=Nt6c7KU27PDUmCkqgv7B8qCfHFqQXXHEmiaY8D97Yjv4tFWRUK1sRvJGAr1ipgGKqwesVqNBRSyQUAG1AJS4m4lbRUJFtTX4yEqYn0G82wJ7ciUoWAlXPbZgYXWKf4gAlzbRNbg2pwzV388TBDlpZuSeedxshdkR+1kH1NV+lOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805888; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=/htVi7EBPeCyHiWwBzi+o97F5mILVA770CYe2rqVw5I=; b=PbLQvq4GMMbB/l4LPsAKqVxGtPq7RATUw97fwLCmo/lm0DcYp1pblpQXHILmqnHo5B3jS6sZEKHTzzhp506f+INiZZqKZnRSa5s7KqZqHXQp/5ARSiTJrPCwtUP6OEiXpSXFseBr6W8WcRD38zajxAZ1HQvXYRXXFUsodXLFUeM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805888114342.94846965392617; Tue, 26 May 2026 07:31:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmf-0000ez-2K; Tue, 26 May 2026 10:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmU-0008T8-TJ for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 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 1wRsmT-0001KR-D4 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:18 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-43d7645adbdso6661974f8f.1 for ; Tue, 26 May 2026 07:29:17 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805756; x=1780410556; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/htVi7EBPeCyHiWwBzi+o97F5mILVA770CYe2rqVw5I=; b=wgFBqvKbk3ghvP4sse+/eNhTz/mhpL6s+5lImM6NlYhh+C2GRSc9Ad82U25PcLqSYF DeL10QLxUTCyVu4ZCap6rN3Mq5AmiVZEcq5VsQ2ul10I0UVBNquRGUEu4QTLqLR43OpE IyOh4DcumlU3MztrOYM+I8vs8QeSw5f2XsrTDPNTD2NQ+Kfxv18iBkJQGLjQKDpaEH53 GwmEVtwYGUworit3Bh4zRVdAHbBRsKIugL0Jvi4S242dWkNJgWiY3BdNeWGxFg6iFytN fjdunCuWt3REJt54hOo6q6tVeXCjAOxTDUc5cJIxfRE311H4PpafilJx9U9AWD3TaAg9 5nzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805756; x=1780410556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=/htVi7EBPeCyHiWwBzi+o97F5mILVA770CYe2rqVw5I=; b=lNzzJD8vlpTtHKfdwJlVnQ202mI82Rnw9uAeZe/IyIw2tYIacqgfa7sxevJdttPbDC TeWkX5zkD0cNLUOSHzXeHVPnb5uwbQgccnaDDsn6p0DuxgtBgF653QpAN//YJphxy/gG ku8dJDHFRjqdQMbMJwxHBapamseB5VaYH8TRzejNnCBMlJsEC53wJUmMK/gLF0EtVn0+ JBDoj0aa170TtX5INW7r050wtgah25yKPAks4RDYqSubVySVZlHF7r+Zz3dEHyMHT1ei qAlrOWWwjHT2xrnoof8B9e2cPPt9Jk8gKGFr7cA59dHECUeqU0b1s627RJ4TV+MRoxG2 2Euw== X-Gm-Message-State: AOJu0YxjUkAZFlGc5W5tLzAT6U7PIQ+8C4LIEZH2J8V/NCSWc0Qj7yFR 7ef+FTKWQsiDBG3ifUMNEDe85X7kgB68n69XbfFBBvyS/zD/kKgs6kqJLo2sSRY61oJAkaQ+NSq 74Rnw X-Gm-Gg: Acq92OH+OUyf6i4KLy5uF35Zzzw9QLgB7lkQarEpPlocTETx3VkL6C3T80o7JOy45ar sAsXPGsMVfuPB8e3mLy0G1M2AYAQ/SKxW8p26Mf2Imzn2dclnSyLyQFSx0khOFCe7OgvCH6YBLx P9i49T8tiAbfvLUMjIm6pSsvPW+hsPN27pwkMGNebwOGovz/yuu+B0e52vIPu0/Ao/dpn4qa5pd lZmt6YfLnWC3dnKRlPRqyiy5pV03cyIyNoc5n7gnu+y5vE2nqUDTF84s8OdhdSgJe/5nCcSDfHH /gxL/F+qX4bgVy4At4XWzaL0Fdd2e5vM2l+hg/kst5yAF98VUzdx0aiOEBGoyQspKmqs07O5MOu An5qtXu+CUzTyXZ9N/3MQrts0qDyIXoriJVC9RithfuFFQJ3yzcfWqp3wUclHU1K4mZVzJEKmOM l9c/QHDAcwFI33hJcEQRLA3XVJd92FikmLL+dcs/uNpb8MuSTFhNX0MG6u3FS8GRNsR8j1FltDQ QBVSqVf6PsQcqg95z4cQEcBP//ao/ptvOpG9YhAHXlD8Dx6ppak X-Received: by 2002:a5d:6f18:0:b0:449:acdb:3009 with SMTP id ffacd0b85a97d-45eb38a83bbmr32973430f8f.6.1779805756040; Tue, 26 May 2026 07:29:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/54] target/arm/ptw: Flip sense of arm_cpu_get_phys_addr return value Date: Tue, 26 May 2026 15:28:21 +0100 Message-ID: <20260526142850.2326589-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.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=ham 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: 1779805889712158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-13-peter.maydell@linaro.org --- target/arm/ptw.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 6146367e23..8cfa22fb69 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3965,7 +3965,7 @@ static bool arm_cpu_get_phys_addr(CPUARMState *env, v= addr addr, result->attrs.debug =3D 1; result->lg_page_size =3D res.f.lg_page_size; } - return !ok; + return ok; } =20 bool arm_cpu_translate_for_debug(CPUState *cs, vaddr addr, @@ -3975,12 +3975,7 @@ bool arm_cpu_translate_for_debug(CPUState *cs, vaddr= addr, CPUARMState *env =3D &cpu->env; ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); =20 - /* - * Note that this function returns true on translation success, - * but arm_cpu_get_phys_addr() and all the other get_phys_addr - * style functions in this file return true on failure. - */ - if (!arm_cpu_get_phys_addr(env, addr, result, mmu_idx)) { + if (arm_cpu_get_phys_addr(env, addr, result, mmu_idx)) { return true; } =20 @@ -3992,10 +3987,10 @@ bool arm_cpu_translate_for_debug(CPUState *cs, vadd= r addr, switch (mmu_idx) { case ARMMMUIdx_E10_1: case ARMMMUIdx_E10_1_PAN: - return !arm_cpu_get_phys_addr(env, addr, result, ARMMMUIdx_E10_0); + return arm_cpu_get_phys_addr(env, addr, result, ARMMMUIdx_E10_0); case ARMMMUIdx_E20_2: case ARMMMUIdx_E20_2_PAN: - return !arm_cpu_get_phys_addr(env, addr, result, ARMMMUIdx_E20_0); + return arm_cpu_get_phys_addr(env, addr, result, ARMMMUIdx_E20_0); default: /* translation failed */ return false; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805906; cv=none; d=zohomail.com; s=zohoarc; b=BIo6Aum040wksx2zsg0EZtI+aOBHBYN1uYtpPJkd21YAgudGxsvhtKQ70+Xg061v6uJNVf0M+FRhRN4yZmVYFYYG7H6vaA3h5rL7gtnGYHGOvxgQV9yhUmrudciPiwetrCLI8aHEryE1C0WtrJ4tX4w1neR/SMzhocqKWtGl844= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805906; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=TIUc3us1uVlG1iMMYGrUqerQ4qxBTEdE41EbBJYVaeo=; b=e3eBm1AWs/9sxdS5aPER73TS0emgM2kQ8Sz1zQ2YF4yq0O8GCXsjY90bRIAv416ZRowLmVuPVADhGdj7N/aCyttVqEN84nuw66nnslgvSMh5+wupStyYd9SAcu9AQGsGfvic45s1tlZJIz1duAEwMIEstmS6fyhrnM6SVq5GADc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805906522544.587704154967; Tue, 26 May 2026 07:31:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmc-0000bH-Up; Tue, 26 May 2026 10:29:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmW-0008VB-ES for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:20 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmU-0001Kd-EL for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:19 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-45d96d21e82so5806444f8f.0 for ; Tue, 26 May 2026 07:29:18 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805757; x=1780410557; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TIUc3us1uVlG1iMMYGrUqerQ4qxBTEdE41EbBJYVaeo=; b=aoXIWh1+aYyaBwDbvso/0PNPNZochWJDn8WSdW9wilGgBZphSXoErbbIWjf/omTNgB +6XJ5A5pfsH+IHw5elZgs7TWhs9eCpM8x+KGCKpthx9FlzHiiEzzOEyDE0RxOyN/yGL7 bDs6QgBDPO1dPalYncXkHAr5KzfUrbahyvLeT43qyC/9HvTWQKOM9hZ6cked0DPD8lZc 6mFBb2RumcHKVz56ojuXrlLCxnFt9Yko+7ggvsFgAzx18INNre2ktvE3pQyvIRBffsLZ m38Z0yC2WU6BsyR0KGK6Pc2g3uVne16rzxNV95i73vtbee6j1iHGv51xx9ZLZ8qTpIqL wk2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805757; x=1780410557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TIUc3us1uVlG1iMMYGrUqerQ4qxBTEdE41EbBJYVaeo=; b=RbdEuDuDKenEG932FB1lDyfGeXvWv4oaF/MrQHJz237TvCz/lOCoCXl+04aXAPBGWM rl01vCCAgd/WpprLKqmVYiZV9kG1AvuEfqvAagy2pFAT449dk/Z8oCc9CE8lv2jxJEW2 tokwOKnF6WsxB6tEQRoOHho/QXN31zKb51dIsuc7m/WHcVGA11goZzRiQ9WosG4qJrtZ 0Z+wa5QfjzYvRPTNbjMD9n1+hYfeFsKmHI/52XLb+5W3gSdCGk4TX65cUsKyK5NWjclb 3n9QW7hud3/OEo6aKVkRBRLaPU9Bf0HCAvHTt6JakDHHC8t7GdKkWDN/7hd/kswOD4Ub 9RQw== X-Gm-Message-State: AOJu0YztpMDgKINp0EoeWPa/dvfPWj40LwBdEtbHwBWF+uvp7xn5VFHO 7WKZMH9aet43p/LIWCnZAk4Nh95aDF3SvCtuBe9kCqzAs7oBfFP4GkBuJWlLXavJZ08TdfJIZsf G3qfC X-Gm-Gg: Acq92OHq4mCh6qit5Uq3+tP7az/9H8knkYuijw+hJFqXGwE8OZXYofoLaJF/O2tZcSL DbhONZdr87X/UXp8Fn64IHOhG1RMECqYh0/5j02h4YO+Bd5BPNEakW4lA6avcWgrBAMRYYtNJWM 1+ivX8tzZuB2WU5PssdtV+7B0A3o1JHBjM4Oj8vDCFqsYahsEw9nZPCs1cjqDPzb+tq6ob6hUAt 3QU10z3O0uUfystTm40To5GmNfKXQ+yse7zg37MWVD+S+hG0EgLAniHsdHYhHanTqKeBN1/3ig9 Ncz3CC7ElmANuHtyUNFSt59n9bAGD42zZk7CqU/9TexKbC6dyt9D30GMds/Jw3BEXZ1XHjX2GaZ VgT3jpoM0QIJZwo41x8Ka8TW63qwNswxSt83XNc96aqpDkGIm8Gtr6kbsaMtok+t/Z+q3z0CH1y niU/LxaZ8pcNUCjXgozzVXu92saEu+jH6H3JYogH1D00bFJ46HhSxCQG/k+Rm3xu9cMwwaWHwKb rvl7ii93ngrWIAj7XLS7WiMYGKXTJc= X-Received: by 2002:a05:6000:4803:b0:45e:7c19:a328 with SMTP id ffacd0b85a97d-45eb38a10ccmr30465550f8f.28.1779805756837; Tue, 26 May 2026 07:29:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/54] target/arm/ptw: Flip sense of get_phys_addr_for_at return value Date: Tue, 26 May 2026 15:28:22 +0100 Message-ID: <20260526142850.2326589-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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=ham 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: 1779805907703158500 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-14-peter.maydell@linaro.org --- target/arm/internals.h | 2 ++ target/arm/ptw.c | 2 +- target/arm/tcg/cpregs-at.c | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 00830b1724..139c8d1769 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1526,6 +1526,8 @@ bool get_phys_addr(CPUARMState *env, vaddr address, * * Similar to get_phys_addr, but for use by AccessType_AT, i.e. * system instructions for address translation. + * + * Returns: false on translation failure, true on success. */ bool get_phys_addr_for_at(CPUARMState *env, vaddr address, unsigned prot_c= heck, ARMMMUIdx mmu_idx, ARMSecuritySpace space, diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8cfa22fb69..d1f23340aa 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3851,7 +3851,7 @@ bool get_phys_addr_for_at(CPUARMState *env, vaddr add= ress, * check is handled or bypassed by .in_prot_check) and "memop =3D MO_8" * bypasses any alignment check. */ - return !get_phys_addr_nogpc(env, &ptw, address, + return get_phys_addr_nogpc(env, &ptw, address, MMU_DATA_LOAD, MO_8, result, fi); } =20 diff --git a/target/arm/tcg/cpregs-at.c b/target/arm/tcg/cpregs-at.c index 53dd67375d..1c819c1cdb 100644 --- a/target/arm/tcg/cpregs-at.c +++ b/target/arm/tcg/cpregs-at.c @@ -31,17 +31,17 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t= value, bool format64 =3D false; ARMMMUFaultInfo fi =3D {}; GetPhysAddrResult res =3D {}; - bool ret =3D get_phys_addr_for_at(env, value, prot_check, - mmu_idx, ss, &res, &fi); + bool ok =3D get_phys_addr_for_at(env, value, prot_check, + mmu_idx, ss, &res, &fi); =20 /* * ATS operations only do S1 or S1+S2 translations, so we never * have to deal with the ARMCacheAttrs format for S2 only. * (Note that res fields are only valid on ptw success.) */ - assert(ret || !res.cacheattrs.is_s2_format); + assert(!ok || !res.cacheattrs.is_s2_format); =20 - if (ret) { + if (!ok) { /* * Some kinds of translation fault must cause exceptions rather * than being reported in the PAR. @@ -144,7 +144,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t= value, if (format64) { /* Create a 64-bit PAR */ par64 =3D (1 << 11); /* LPAE bit always set */ - if (!ret) { + if (ok) { par64 |=3D res.f.phys_addr & ~0xfffULL; if (!res.f.attrs.secure) { par64 |=3D (1 << 9); /* NS */ @@ -169,7 +169,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t= value, * translation table format (with WnR always clear). * Convert it to a 32-bit PAR. */ - if (!ret) { + if (ok) { /* We do not set any attribute bits in the PAR */ if (res.f.lg_page_size =3D=3D 24 && arm_feature(env, ARM_FEATURE_V7)) { --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805861; cv=none; d=zohomail.com; s=zohoarc; b=G/kw3vMjYM2Plcv/9ttUWS0G4XZUo5negPbs+2PqVdu8flfHEk0p/Rw6nuzgJr/X2mie70Avj26Lgc0LHL3WqDDTZUvT0sV4S6rcDjXjqtQJZ4hI2GS3UNCU1gpYPuX1GMH20naOXBXIv7juGEESAyqFIOyASjSGU4Fa7Y2aNRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805861; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nw9+ZkGYvqLC/PP3ScE0XL1JrYtjlJc9Fw+E/KuN0R8=; b=f9wTnmBbYYiRmJ+zX3v85rt8T8eh9guWAJu4MSjfwLtTpH7uejadNX1Aq4eGMK6NTb/cS/HSXNOFAEITqoirY3EI79OXVeDYsH2Do82ObuEXM0iFiaruNzNiKG0Ip22ylR+QeS95e538BX03Vc7z8domofqp354DLWS3iAaCA0Y= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805861832575.6691262815258; Tue, 26 May 2026 07:31:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmi-0000qa-A4; Tue, 26 May 2026 10:29:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmX-000068-VB for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:22 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmW-0001Kh-6Z for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:21 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48d146705b4so112878315e9.3 for ; Tue, 26 May 2026 07:29:18 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805758; x=1780410558; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nw9+ZkGYvqLC/PP3ScE0XL1JrYtjlJc9Fw+E/KuN0R8=; b=kmNtd7W0yXHkmsrn8fSLp+2fi3XDC1W1QBhaFj95qvUymhINC10Vz4D4Nvh/14jw9C Uz0GAixGHUL0dAV/p41htZjQn81BgoqOEJbeKlOqX0M7lGkLZpnJC687NTVoTtejMaSs I90eep6fQIuU/HqdZsXrWMuCKrd3fXm3DPI5ZPMEN1KGy5uPAlvWkxeQrhL0FuGkhgm0 dYwtpD2VQ7KMlMnpUmDZqPyHWuuyxqlA9863UcVe6g51geA1g0mP9EtGoyDBiylI571O AOlf013kJ+kc/FDFWGH0Eac9PJU1jNzwHlE36s6CBOsV4a5k1Cp4b96T6BlyRSWZU3uD hTPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805758; x=1780410558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nw9+ZkGYvqLC/PP3ScE0XL1JrYtjlJc9Fw+E/KuN0R8=; b=aAL2pzcYkLauByG3LRc8gNYHdQwDLyJpb5Khg3yHrMxP430XiUqIu/0CYJc9pDwMRK Mcp6EAKo3jK0o3hLSnPdpdOyq2fshNy0mvvnL3mmtOtLI1lHt1fyNMxOj7a5vB1dxE4/ PqXftXfKc5LWac2V0fvW2+BtZfuQSdcUGm0va2U+gcWjhVEu0XM0b3bwsmfHKNbWrEJA wzvdLjFW2nQW0WNe+Y1MHdNGcg1Em07oOdzEAJTGpcZVRE8b8mBUBiSY4Htr17/qz9x3 6GFDKiTbi2nipGVegMJQXWjp8O0DELkpKkxx04BVF84o/R8noqA6Cl4heJeRd5VDtR+x qoUA== X-Gm-Message-State: AOJu0Yz0P8BoTsL+tu+VrK3xyiv2AoTHOlf9XW32uufzTFcW9z+5uVeK PCYA7zJsis0p4Zh4+eyGarJsSygstM/pDd+orM1AgQQj/9ziuXeqeKbsvV3cQrwHweX9x+DJOlI AMzDN X-Gm-Gg: Acq92OHTBa9xKRcwmwdrdwL5byAxI4enB6mEJCl0ur1y6VuS9avJ+EMG+bpoVFUIYN8 aY77UlE4N+XqoKcb6aaNC4QakBZ1ml41uvjGa20TXKxPBr0U43uWoldf43ERy9vAxbf2yHILreF MgLWXn3w9VXlbSKZhhmZBheEyyxiYsVC+pxouxdL83Xdp7MUcWWwTGRQkuk36qNPjgTO0LK5Bdx g/VaamAGiuL+ih5JsreyzwCME0chVDur5e6v2yQKF9M3+M7IVPY1DsygmRkIUu3KbW+VWsqILgk opbw8wZqPeR+gSOLUWcuXG/MFZLohwkDHwTU0uYYZTcW+A/lLe5bNY3bgzbkii6OFtPeCcjx9wT OtSA5XQvf8ia7puyy2PgH8WNOyYit2/z+V0uERkFShtou/9YKSKcuL7G3ZfWGVNQrfQJJ/XT2wM 3M5lzi4JibdlDaKG8t8AKq0FkZPuaJtAbKFGFqPme8Y7VeriwbiBOpmOJXEaVzMVj+lmbsKBdXl gAzRlyaQjg1GriYoy7ccHtRaVq9/8bxNk2c0XQNQg== X-Received: by 2002:a05:600c:46c6:b0:490:46df:a87a with SMTP id 5b1f17b1804b1-49046dfa9c1mr330826665e9.1.1779805757705; Tue, 26 May 2026 07:29:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 27/54] target/arm/ptw: Flip sense of get_phys_addr return value Date: Tue, 26 May 2026 15:28:23 +0100 Message-ID: <20260526142850.2326589-28-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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=ham 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: 1779805864724154100 This completes the conversion of this family of functions to returning true on success and false on failure. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260515142541.571911-15-peter.maydell@linaro.org --- target/arm/internals.h | 2 +- target/arm/ptw.c | 2 +- target/arm/tcg/m_helper.c | 8 ++++---- target/arm/tcg/tlb_helper.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 139c8d1769..fcc08ece90 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1500,7 +1500,7 @@ typedef struct GetPhysAddrResult { * by doing a translation table walk on MMU based systems or using the * MPU state on MPU based systems. * - * Returns false if the translation was successful. Otherwise, phys_ptr, a= ttrs, + * Returns true if the translation was successful. Otherwise, phys_ptr, at= trs, * prot and page_size may not be filled in, and the populated fsr value pr= ovides * information on why the translation aborted, in the format of a * DFSR/IFSR fault register, with the following caveats: diff --git a/target/arm/ptw.c b/target/arm/ptw.c index d1f23340aa..0a5201763a 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3939,7 +3939,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address, .in_prot_check =3D 1 << access_type, }; =20 - return !get_phys_addr_gpc(env, &ptw, address, access_type, + return get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); } =20 diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index f2059ed8b0..c5a553a5d4 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -222,7 +222,7 @@ static bool v7m_stack_write(ARMCPU *cpu, uint32_t addr,= uint32_t value, int exc; bool exc_secure; =20 - if (get_phys_addr(env, addr, MMU_DATA_STORE, 0, mmu_idx, &res, &fi)) { + if (!get_phys_addr(env, addr, MMU_DATA_STORE, 0, mmu_idx, &res, &fi)) { /* MPU/SAU lookup failed */ if (fi.type =3D=3D ARMFault_QEMU_SFault) { if (mode =3D=3D STACK_LAZYFP) { @@ -311,7 +311,7 @@ static bool v7m_stack_read(ARMCPU *cpu, uint32_t *dest,= uint32_t addr, bool exc_secure; uint32_t value; =20 - if (get_phys_addr(env, addr, MMU_DATA_LOAD, 0, mmu_idx, &res, &fi)) { + if (!get_phys_addr(env, addr, MMU_DATA_LOAD, 0, mmu_idx, &res, &fi)) { /* MPU/SAU lookup failed */ if (fi.type =3D=3D ARMFault_QEMU_SFault) { qemu_log_mask(CPU_LOG_INT, @@ -2023,7 +2023,7 @@ static bool v7m_read_half_insn(ARMCPU *cpu, ARMMMUIdx= mmu_idx, bool secure, "...really SecureFault with SFSR.INVEP\n"); return false; } - if (get_phys_addr(env, addr, MMU_INST_FETCH, 0, mmu_idx, &res, &fi)) { + if (!get_phys_addr(env, addr, MMU_INST_FETCH, 0, mmu_idx, &res, &fi)) { /* the MPU lookup failed */ env->v7m.cfsr[env->v7m.secure] |=3D R_V7M_CFSR_IACCVIOL_MASK; armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_MEM, env->v7m.secur= e); @@ -2059,7 +2059,7 @@ static bool v7m_read_sg_stack_word(ARMCPU *cpu, ARMMM= UIdx mmu_idx, ARMMMUFaultInfo fi =3D {}; uint32_t value; =20 - if (get_phys_addr(env, addr, MMU_DATA_LOAD, 0, mmu_idx, &res, &fi)) { + if (!get_phys_addr(env, addr, MMU_DATA_LOAD, 0, mmu_idx, &res, &fi)) { /* MPU/SAU lookup failed */ if (fi.type =3D=3D ARMFault_QEMU_SFault) { qemu_log_mask(CPU_LOG_INT, diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index bbe1e70bc4..f90765cb59 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -361,9 +361,9 @@ bool arm_cpu_tlb_fill_align(CPUState *cs, CPUTLBEntryFu= ll *out, vaddr address, fi->type =3D ARMFault_Alignment; } else if (address & ((1 << memop_alignment_bits(memop)) - 1)) { fi->type =3D ARMFault_Alignment; - } else if (!get_phys_addr(&cpu->env, address, access_type, memop, - core_to_arm_mmu_idx(&cpu->env, mmu_idx), - &res, fi)) { + } else if (get_phys_addr(&cpu->env, address, access_type, memop, + core_to_arm_mmu_idx(&cpu->env, mmu_idx), + &res, fi)) { res.f.extra.arm.pte_attrs =3D res.cacheattrs.attrs; res.f.extra.arm.shareability =3D res.cacheattrs.shareability; *out =3D res.f; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805891; cv=none; d=zohomail.com; s=zohoarc; b=Oh4NXgWfp9vQs924sBPSdAtMWaCzFoPrNm4yG+rX5/r0QSFXzGBeu3QxFXzxUY+VfysZ3B29+1x/vi9NOwsU7oQ9MQhoMBhykFzsD/EDtkPSFYFMQMYOGh7wSd4ckYh215Kusw8p1savizKT/uHkmrH5UQKYGQz8kZfy/A1LDlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805891; h=Content-Transfer-Encoding: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:Cc; bh=DQqsaZ8KXCDVjBXlqmHlbDtKPnb7URsI2I5IPm/qc/s=; b=QC/bIGlDSxcBWI9UsLQkRuMg/W2PdwE9griIOQDYFxo4CjkGnhaUgjXmtfAbuKgPt102XDF4SfNaBh8kL/KzLU8HOd6a201sxIfhf7QWAv18jEAVIIjzKqatLfuVXI0S3ZWZzO3uS/LI/Hj3tVwFMoyxR7uCKxpdcbOAGgbg6jo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980589123616.740931722886444; Tue, 26 May 2026 07:31:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmf-0000f3-3o; Tue, 26 May 2026 10:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmX-000067-Qx for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:22 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmW-0001Kz-BV for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:21 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4891c0620bcso66972675e9.1 for ; Tue, 26 May 2026 07:29:19 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805759; x=1780410559; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DQqsaZ8KXCDVjBXlqmHlbDtKPnb7URsI2I5IPm/qc/s=; b=LYw6RwKi7uO3wFJ2CFTkusmk0c4WSE+6cHV7m6KbBEPEZ46ok2PHw/pB0Y+sKRPFf8 hbudTkQoIhxYuUNVj+uhB2uTTROIJQZQ/2Kvpkk+/hGArHWhvFzAKaOtHV97jmQNLRWk bosXw3IxJfFyGm5IWuPt0Zb6Kv4OwdePfhPYy51vZao/1uVlEOHGqg9DAMv5UJcUfjNC p2dJDwcsc612wpxJwWA5EQZvQJ/BP95fU5VQH8EZGnPy8JbRAlu0tJjy73twbPTPLd+I p6dpU1xjmzuh1O8StqePSsHhtgLu3JIJmQ5eiWS9ka8pUfDoCtxeZd9TyUv/oz1RKE3x B0hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805759; x=1780410559; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DQqsaZ8KXCDVjBXlqmHlbDtKPnb7URsI2I5IPm/qc/s=; b=W5RTIi1LvRbBv+YxJ9HFg2no4ui3Ed6wahaDfMZJpJiIpwb0bhLz4dlhJHayTeiJVv LUmAkjFRaW3VyHIq/ZQEmmE1AMvIDJYScIQEXbU9QaZBwvrneEYq0pckYRPYV55+wEW8 G3d+4xE/tdrUxHcricEQUw5OZRuAgd6iTtsIV/feL4HV/bySv9btNO1wWNtEveCYw7E3 kDb1qhljIozeIrRfAzh/4tVyrOf2zNFgq3bps3aC2Zth4zhMIPXr41ze0XExfWI++Cnz QSfCf5wx/1/zq+x9AM9KnIFiXFxoasFCVnbAclo2XY+uBAF38sRP6YEwqiCHdBNNvj1h kdcA== X-Gm-Message-State: AOJu0YyiP6fBm41ceofKLcu3lywL1EyN6pIO6nIKWyCY5V6O2ucCXOmg uEhgEZIVGCNfvVh/fzFH0awTlj/6gj0ryRFKbdPRfF/89qv3Mn3ljESqLegdd9kkVU0P6It3TqX g2fjS X-Gm-Gg: Acq92OFHWpvERMge0GQol6LoKIRQFiXffMB1q01Y6u8v5ceHqqlHMwzMTPuq39Seb3U 93XcvVjsGSuCUACnowGdCJMVWDjagzhBYTpHjZhGfkEvWiN5uzk+N88uz2j6mYfsolpXwJx7Gt5 Z8yoCl2X4lqvyVdrfMPvOkY86kJZJt30fWUZ1BgUc+e81ai4tbd2/HHJL19ClYyRrUS1iBvoV70 9fzT3kJtvnc/60GoKZ6P6BtqHpqeav/udine91qyr7rSbEGpckv/J7ciZxDz1q1IIaTq+mpKKHO x2x906i/wRsUjzMR9uy9Qb9OgEuB/dyqGLVGKIMyVG11/oJ5daYvRO65k8RI2t4zwRgGGTQ6a97 dXE4ixZ8g0F7HacVSyzNbjV8uLVeXY73zVvzpr8yxxHsoGeyQ+/O88fhXBHMeg5PDdmCdAD03n1 VniGLKvevbRP/yZy5RbZj5IXcUJO5fmMESBHm0VkqUq37f8BDKc1ShcZkC7XbIonVoJvDEYvXJV SzO16w5smiNYAbttuM9G6MrQGXxwXs= X-Received: by 2002:a05:600c:35d6:b0:490:4973:91a0 with SMTP id 5b1f17b1804b1-4904973932amr285542975e9.10.1779805758651; Tue, 26 May 2026 07:29:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/54] tests/functional/aarch64: Bump up timeout on vbsa Date: Tue, 26 May 2026 15:28:24 +0100 Message-ID: <20260526142850.2326589-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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=ham 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: 1779805893337154100 Content-Type: text/plain; charset="utf-8" On a debug build, the virt_vbsa functional test takes about 2 minutes to run on my machine, so it tends to time out. Bump the timeout to 4 mins. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-id: 20260518160440.1037245-1-peter.maydell@linaro.org --- tests/functional/aarch64/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/aarch64/meson.build b/tests/functional/aarch6= 4/meson.build index 9803f66299..e81afd6c39 100644 --- a/tests/functional/aarch64/meson.build +++ b/tests/functional/aarch64/meson.build @@ -17,6 +17,7 @@ test_aarch64_timeouts =3D { 'tuxrun' : 240, 'virt' : 360, 'virt_gpu' : 480, + 'virt_vbsa' : 240, } =20 tests_aarch64_system_quick =3D [ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805840; cv=none; d=zohomail.com; s=zohoarc; b=FdUjA6WXtmadTMYTAc+k0KXqWGezfGIlN6wT0QMRFEJ2DaSZfZQmfmIvmSrCy51A/hHM/KZ8lkYiFw+8Qto9PY9zLw+ZkYkU3ZC8oqtb7WgS206Pk8FVxpHns29iIkXTgzPByFTUR96xxroA5pwMc03+KUo4TK50k1e71UMc8PQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805840; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=fbUR0y3m+ZaGpE8A2CtpDj4N7hEhJk70SJ9aVfodHf8=; b=ArYYdRNrrPlzyGD1Y+a4IBA0gj3ztnpEYsPnxwlgEwiHC+T7ICMDKWMZT72nQae9rpCHNECw/EMg16P6eurFBYxgmEhw+EuE3mIaqJ9Sn4201tEx+J4Wkzoz7fKHEgthwumzV7GPJCyDQNL5/sSJ8k6xae8U5uzOlzzQrNmOP3w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805840420650.6031933326776; Tue, 26 May 2026 07:30:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmi-0000s8-Qb; Tue, 26 May 2026 10:29:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0000FA-Gl for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:23 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmX-0001L5-92 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:23 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4904c1ce4c1so43281435e9.3 for ; Tue, 26 May 2026 07:29:20 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805760; x=1780410560; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fbUR0y3m+ZaGpE8A2CtpDj4N7hEhJk70SJ9aVfodHf8=; b=FI9pnZMBRj0Rqq5P8GI+UU7fWmdanAY5t2Uaz6GuKjV2rjd4WJq1sLFrjgXkyyN4xI tc9Rc3fbvraUV3UiqxdlfoQIUbKZ/04DOQwOWYvGFhdtpqAq6UNGShlJRoUyFB6V42dN HEoBKDNTlNKfz/d9J9gVV/SSIIOFPk+U7fkT66sTgS1S73Ipb1ajhIDIdcVpnBgwUg3P g/mL75lxQ6oha6kmlwzDJNjQeoJQmDKFyc/+l3y299+Q0gC4siZr0iqQ+yGjjeDIpUhQ KJUnrHfnQ7HBcJY6L4a6QphjsZA5NwP+cXJR+fFga2Uj1IlJCN2kCxe4sVsCBCNrKJWd kA4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805760; x=1780410560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=fbUR0y3m+ZaGpE8A2CtpDj4N7hEhJk70SJ9aVfodHf8=; b=cUf46d/FjmOgy3xjOzIfojoszCYcwU3xIxNDWhXjGJbfwDlaTrsQ2wvj4lQGlmHTk1 P0jNyIwE0hgy2SlymbZgnTI3iAalQO18Qoa55cPacwzMi+OqpZSrn3DAeYMNiuqgsNXv jpx7cbxIHMGrAPgrzRNfZXm4XXfIQLz1SMSilfLQ4mcMdFDIr1w08VgNkSqKBPars0Wg f95doL2wG9upFJCfgRfI0/hrmySIP365uf8Tgk5O+IoegWIXsRpBZ9R+wbKZB6UIMqTO hZByyJ7M7C4QDCllX3XdNbpBHAf0eJQF6aANiBFG6v8m7sCX/Gc+UyEvPuJ2aobsTSvt w69A== X-Gm-Message-State: AOJu0YyMLufUwnDU4cSQdecN5dXAyGug41BVV+NBPDGA/Lu1r8gtGhQP v1S4DPRF0Qn37aHrlCUWLv3k9SENK0xV9JT4CeuCJR3P52i1Erp8t4r1uE1Jvzwxn5faLI1waGR u+9VY X-Gm-Gg: Acq92OF9Itqpg0UQRgRBRMShB6yJEm+ShakdOmxtwcgZuogmzdgQ7yX0c6mP4uuSDlJ gX7x3zcUFvVPaq8t91o4rtwmEmzUiThDmbmkgFz9XR6H4DnqfPZj68CtK15c+8tGdpM27hpQdVz CuAscbXCY9msXjxLwMhLQxB0FG0sHz07vcKFc2biXJ6UJFjCdKTM6KgPoq+Z/f4mB6kC7J8GN4M ZcoIFrQC918gDU/e8N1SXtcrW6WWsDLDcBDPLGINCAdRLICoeQIcrRA940CN34QlAS15khrhhaO +XyBKaJo+s/4MeXumjJjjPet2PWvSYznPNwJ7+jcK6vONm1ImWb1ZbQBC3CfqqIbAGvtPP+n32r FZHY+B/m/xiWeINVHAHu6AfoXI5AZjtqres1vgNkr4d02oCQPDOc1vu9vwHTuS8aI14sOsYd3fE rh5uvmXOWtHqlrKy+OWYbf6D0h1v16H3/IOcFLBl+DYtQUAN75/MjyYdPmo9QLpzmYFDIGzy0Sk 5fIR8TIupQ4uSw/7hPA40vvLQfeZro= X-Received: by 2002:a05:600c:3581:b0:490:482c:4391 with SMTP id 5b1f17b1804b1-490482c4586mr331794845e9.23.1779805759598; Tue, 26 May 2026 07:29:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 29/54] target/arm: SVE2 FMAXP, FMINP must honour AH=1 Date: Tue, 26 May 2026 15:28:25 +0100 Message-ID: <20260526142850.2326589-30-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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=ham 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: 1779805842168154100 The behaviour of floating-point maximum and minimum insns has some odd special cases when FPCR.AH=3D1. We get this right in most places (for instance, the ASIMD FMAXP, FMINP) but forgot about it for the SVE2 versions of FMAXP and FMINP. Cc: qemu-stable@nongnu.org Fixes: 384433e70983 ("target/arm: Implement FPCR.AH semantics for FMINP and= FMAXP") Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Message-id: 20260521122913.1565011-2-peter.maydell@linaro.org --- target/arm/tcg/helper-sve-defs.h | 14 ++++++++++++++ target/arm/tcg/sve_helper.c | 8 ++++++++ target/arm/tcg/translate-sve.c | 4 ++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/helper-sve-defs.h b/target/arm/tcg/helper-sve-d= efs.h index c3541a8ca8..cd05dd0fb4 100644 --- a/target/arm/tcg/helper-sve-defs.h +++ b/target/arm/tcg/helper-sve-defs.h @@ -2914,6 +2914,20 @@ DEF_HELPER_FLAGS_6(sve2_fminp_zpzz_s, TCG_CALL_NO_RW= G, DEF_HELPER_FLAGS_6(sve2_fminp_zpzz_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, fpst, i32) =20 +DEF_HELPER_FLAGS_6(sve2_ah_fmaxp_zpzz_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_ah_fmaxp_zpzz_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_ah_fmaxp_zpzz_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) + +DEF_HELPER_FLAGS_6(sve2_ah_fminp_zpzz_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_ah_fminp_zpzz_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_ah_fminp_zpzz_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) + DEF_HELPER_FLAGS_5(sve2_eor3, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i= 32) DEF_HELPER_FLAGS_5(sve2_bcax, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i= 32) DEF_HELPER_FLAGS_5(sve2_bsl1n, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, = i32) diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 062d8881bd..179cbd74fb 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -778,6 +778,14 @@ DO_ZPZZ_PAIR_FP(sve2_fminp_zpzz_h, float16, H1_2, floa= t16_min) DO_ZPZZ_PAIR_FP(sve2_fminp_zpzz_s, float32, H1_4, float32_min) DO_ZPZZ_PAIR_FP(sve2_fminp_zpzz_d, float64, H1_8, float64_min) =20 +DO_ZPZZ_PAIR_FP(sve2_ah_fmaxp_zpzz_h, float16, H1_2, helper_vfp_ah_maxh) +DO_ZPZZ_PAIR_FP(sve2_ah_fmaxp_zpzz_s, float32, H1_4, helper_vfp_ah_maxs) +DO_ZPZZ_PAIR_FP(sve2_ah_fmaxp_zpzz_d, float64, H1_8, helper_vfp_ah_maxd) + +DO_ZPZZ_PAIR_FP(sve2_ah_fminp_zpzz_h, float16, H1_2, helper_vfp_ah_minh) +DO_ZPZZ_PAIR_FP(sve2_ah_fminp_zpzz_s, float32, H1_4, helper_vfp_ah_mins) +DO_ZPZZ_PAIR_FP(sve2_ah_fminp_zpzz_d, float64, H1_8, helper_vfp_ah_mind) + #undef DO_ZPZZ_PAIR_FP =20 /* Three-operand expander, controlled by a predicate, in which the diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index aa7d72a35e..bf9f0ae179 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -7667,8 +7667,8 @@ TRANS_FEAT_NONSTREAMING(HISTSEG, aa64_sve2, gen_gvec_= ool_arg_zzz, DO_ZPZZ_FP(FADDP, aa64_sme_or_sve2, sve2_faddp_zpzz) DO_ZPZZ_FP(FMAXNMP, aa64_sme_or_sve2, sve2_fmaxnmp_zpzz) DO_ZPZZ_FP(FMINNMP, aa64_sme_or_sve2, sve2_fminnmp_zpzz) -DO_ZPZZ_FP(FMAXP, aa64_sme_or_sve2, sve2_fmaxp_zpzz) -DO_ZPZZ_FP(FMINP, aa64_sme_or_sve2, sve2_fminp_zpzz) +DO_ZPZZ_AH_FP(FMAXP, aa64_sme_or_sve2, sve2_fmaxp_zpzz, sve2_ah_fmaxp_zpzz) +DO_ZPZZ_AH_FP(FMINP, aa64_sme_or_sve2, sve2_fminp_zpzz, sve2_ah_fminp_zpzz) =20 static bool do_fmmla(DisasContext *s, arg_rrrr_esz *a, gen_helper_gvec_4_ptr *fn) --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806051; cv=none; d=zohomail.com; s=zohoarc; b=JT1NEfMtOLJv0ckr/uoRuOfE8WBQ7lu4unjE9JAmmBXQDra52Ld6hJCN6Sx0rs2HbmSpMRoD8FmplfE75N124x9RJJYge6JChD/21xsUnV3QVDsZddqQk8jY/3vxR16nKxUO/7nSua9UVob6oUFSuOhhUXjSVKUKTeXiAQNtpyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806051; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Oyc9WLt5chjRtOnme0+hheyrtoueTXcE0HqrcPgz3fs=; b=FunO2qJ8Zv7f1uTB2yzbyMPi1nqCNRRvv3iIUcdJCDt+1LIJmpQSet6w7O+BCHx6gYmsBH+o+OiNC82tjIMfpJRIwwspQ2dNlWDnnxrBUh1KioJ0Qm+LLvCXUem/8j2LETE3izhXb/j5iik1o+1LHEOJKJtQCdUYR4UFWMBdR0c= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806051395439.89414598661597; Tue, 26 May 2026 07:34:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsme-0000ea-PU; Tue, 26 May 2026 10:29:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0000G0-KQ for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:23 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmX-0001LI-Sw for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:23 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-44a5174670eso5999129f8f.1 for ; Tue, 26 May 2026 07:29:21 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805760; x=1780410560; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Oyc9WLt5chjRtOnme0+hheyrtoueTXcE0HqrcPgz3fs=; b=qeKs3E6Q6qaX2D802o2BZAGX1rIeaSOuARKh1sDhMt0B4f3o/+mPPbRiGodJpg9Gtd RfkcxsKsx5v8CyVIrE6yIznMyhB06IA1bXsF9+QPPIf1f5zDbaGRnPcZGQtvv76oephT GhThe7a3k160zlNacMEOK8sN913PRdbOWhzpHtYpEIqHaAm9vQwR1E2mD0smEhWWbu6r Nscup56vY2Y6+rEY/Ux0ppBzUDsP0kz2AUTRWnoCBPrcAPo8eEFj5YShMw7WOM3fijj3 ZjT2ndTZzHPHjXnH8XlPMK8Jub27ewQnx6TxegiuMQXInQsomg3ZY8C830gs6ynDdQeL B9Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805760; x=1780410560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Oyc9WLt5chjRtOnme0+hheyrtoueTXcE0HqrcPgz3fs=; b=e+vh0XDbs/jSrbal82FgsDOuSNp6R5IvZxiKAvrdPxA/9Ju6unwgkzcwmtcR4DQ1+m J7m7HKoDFI24BqNpTQEHVSP/huxTdiWc6ohD4rA6J0T3RHB9mPL3vlhI+FF7sTQUnTRJ 3giZn15oUiidQVG0X+hOtzw1cMJPx2G9Xn4ueyqCh1W+B7vf3WniA3v1/CRR/VtD/mal /b90odGWooFxkM/e0qXuJE0Jiw1Qgjaw+VqCcl9rGM4SDSGV8e8faGuQQSLf0WZx+anM g9SIH4U3EtgoLbkBWbRphNOS5zuCGBeCgb1k0w5XYB0FVNpP7XEuX/UztSfvCu9u/f7K 0W4A== X-Gm-Message-State: AOJu0YxxQeEDTLrD2wrZ/pOngYl54rFzY1j9fuuCiP+oCsxR3zUOlEKG 4NFb+Tpm4Y2NINYj+dDDfC5/nltYfj7mQfOWRYrD8CcseRgxXVWML6wdf0w1WRfqbLewyoaoQRH gycn9 X-Gm-Gg: Acq92OEgApNzQtAm77boP9RsaA4/9p6uKpJVMVMyyogZvEeyJys5gRBhYlih6VLuOgX feaQEOsIO2VPx7A3p3+cQRtf2yafkfEfI4RwpZPGq+/f4rcuoDDwFWXIW3EcGFQrQ219TCOdddN yOtoYCWe/Jg6wlWuSNjgO2UHcD/Nw3A7F9yn9wzQpafJrU8ec3H1vOszBY/j8g86WuQMvMIRA6+ bRShqJPzaW0We05gPwSfwBTc6QFrXjS2//fKBOL4ejx70UqDXpZE7j6ZjWW0+uVmFcAPCmi321E YkwjRAsdEARS17Tsb9iD/90DcRxLHw3xWDun3Iyuc79e3fJRjMOP4rp5hPZMTkcTkYH8tC26/5i kigGvXyCpFIe5nqGC2dPK/Lr/ETFCKYc+w9NUQOT0TryxNkDB/GSLo9Rpe5pDhP33z8Fvuh19ln ecAZsWeuPwVmi7GrCyiTqlfT6J79FhcQ/LrjEuSe2lrE3JvOtWZHWKxqh/mq8HLrHLhmCCJ8UC4 8jmPbdQ41Yt6QO8speCwRQraLU/g5k= X-Received: by 2002:a05:600c:c16a:b0:490:6237:5200 with SMTP id 5b1f17b1804b1-49062375334mr173601015e9.10.1779805760534; Tue, 26 May 2026 07:29:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/54] target/arm: Use FPST_A64_F16 for SVE FCVTLT_hs Date: Tue, 26 May 2026 15:28:26 +0100 Message-ID: <20260526142850.2326589-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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=ham 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: 1779806054071154100 We should be using the F16-specific float_status for conversions from half-precision, because halfprec inputs never set Input Denormal. If we use the FPST_A64 fpstatus then we will incorrectly set FPCR.IDC for input-denormals when FPCR.AH=3D1. In commit e07b48995aaa we updated most of the halfprec-to-other conversion insns to use FPST_A64_F16 as part of implementing FEAT_AHP. However we missed the SVE FCVTLT instruction, which has a halfprec-to-single encoding. Correct the FPST we use for the hs variant of FCVTLT. Cc: qemu-stable@nongnu.org Fixes: e07b48995aaa ("target/arm: Use FPST_A64_F16 for halfprec-to-other co= nversions")a Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-id: 20260521122913.1565011-3-peter.maydell@linaro.org --- target/arm/tcg/translate-sve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index bf9f0ae179..59b8c494a8 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -7827,7 +7827,7 @@ TRANS_FEAT(BFCVTNT, aa64_sme_sve_bf16, gen_gvec_fpst_= arg_zpz, s->fpcr_ah ? FPST_AH : FPST_A64) =20 TRANS_FEAT(FCVTLT_hs, aa64_sme_or_sve2, gen_gvec_fpst_arg_zpz, - gen_helper_sve2_fcvtlt_hs, a, 0, FPST_A64) + gen_helper_sve2_fcvtlt_hs, a, 0, FPST_A64_F16) TRANS_FEAT(FCVTLT_sd, aa64_sme_or_sve2, gen_gvec_fpst_arg_zpz, gen_helper_sve2_fcvtlt_sd, a, 0, FPST_A64) =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805909; cv=none; d=zohomail.com; s=zohoarc; b=GpKRXtA7XuxjBkECqdHMnrst3UhNpGcxsQiYXd9bnesAeq1i02TZoF69gqlTPp2Y/enC9vybD9WWARYfjpUVPg2wPvNidgfxzpk/Q8A0qlD7Zf+NlGz/+9iHwYrhnQpzLq2o+06h/vVO8W3lP53AjhCttsHEqodzcF9cADFo/0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805909; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=/Qq+AFeXrq38eYO+wKoYXxQJ7Nf8N6PWvBk9ykPre4Q=; b=O8p9xHTQ2hyMiLsWzrx9q2CmD4bkQ81sgI5HfXCRPj58rsbsKuztehKAL6ONhWDl/b8a5E0Jsh1wS9Nyi4Q7sz3v34W6zANkVSl84ZXzS83AIf9RfRmdN1PtFNrXtaMqXSqOBNz3KWL3iKwVVjUz6uzKj8C7CaPz9IG8iGkpjrw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980590906074.41696296565567; Tue, 26 May 2026 07:31:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmf-0000gC-Ko; Tue, 26 May 2026 10:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsma-0000PJ-PO for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:24 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmZ-0001LY-3F for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:24 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-44e5624c053so6390606f8f.2 for ; Tue, 26 May 2026 07:29:22 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805761; x=1780410561; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/Qq+AFeXrq38eYO+wKoYXxQJ7Nf8N6PWvBk9ykPre4Q=; b=RjLbq3ANI/aGqkWaeXgOdoVy0NS0wEyH3n2jp56yi3x/7r63ZnTXSXg0iR9KosS5Az 3NK6nOTjm8UPMEPEy9lwP3abXhgkT4pWJMkgZxYacuS6OGZ4UIqdq/aZMReB7P0yaiw/ 3UuT4vVmas5gcuv85MH3Bpsg9OE2e2qDNkv+H2gJP53cKVNT1Btz0MtMKn1Vnp73JdlX jh9NhnU2SQma6GOkmPU3dcLGdc9EbfPxV8+oXhhFMgzq5QGJTiGh6cE4AowpFbm1wayc TOgMiwUkQQCGLnrRd2Jsvkaa9zjmXqMbfrFmSoGcpPyyC5/Zfqpl40OcnpO0kOhX7ey4 P+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805761; x=1780410561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=/Qq+AFeXrq38eYO+wKoYXxQJ7Nf8N6PWvBk9ykPre4Q=; b=TsOOaF6S7Wg8ddOUtghkcy1ObEnXDp+SQo0GuMDIMF8Oh10Mv0jmEQ6qzHPETHbCAp mXokgZd/Af3sxdbiHellftA+uu88vDcz+lDl0ImfGUC4Yh32xK2fTNLKzpwseG+dzCit tlq78T0exjJw9Rj7NBF+1dhWErOMBZWlV3VFAUzaViq6ptNtgqmYXBdJzSRb/8ryfgK0 Pkt0o7itVLSZ5CUoRxXV3hUpWcnYeh0fuFzpJNC0Cl8Y8htL+vC4tMDZM0DEhjt2MRx4 syFP0M6FZ7xMZxo7YF+Mtva/QOdk/cah/IqTr4putCHK7L9rodZszdt5mZiFALnRItto U4RA== X-Gm-Message-State: AOJu0YxSZ7Yk5zmNdX43nzi2ZW36kIu9eZBc9f6MU97a1m2XljN0B7P4 10s6nbz0JYFh0rB15veMeOohT7VSJym0xiHAFn59Qi2fo4lxukCR2KgCeLo4OYUFo2sap3D1by2 dKJjJ X-Gm-Gg: Acq92OGQHbyAQNykMKsqxtOOO0Xkk0MwdVHEaKqyYw+yCQLfm1WgwRyy4jrDLK5ydOe gv6FIBWnWv9qGadlSHMLCiKjNWA0WRkgjCYqrw9z70dM8tHWRiPFJ7ZhdYpsAi3LspGjSd+iONX keFX3FFL4bQ62QpDWrw45H5kcUyZqIFWvzPjoOOuTSCGOZAR12OQKgOXbGbnwYdg+PZsUkOA/26 QoYCFtXHVDiNDts0tyIf89SGs4D7QHi4FnM6QRJkVRvenM+huuioHHmVrQwvHP0HsRHihMMD0dv VDVJpVXagAUDZVPWb42NoQoIBLXKwiMv5s2GGiUEBo0Pi19eEtKn8cTJFW0ijjW1AD4wCGgyrx+ ii8u7HK9QmeeLOATAn0meDf2dl8px0IL9ZK7oVXjwTNnTzWS1ONjArAHcuzC7eyoRpjKk/DLeId ZopuMpreGYvMq99fMBJmpvIkyYz3A+sKZRN1KgS5dscfT/piILFpQxs8RPHjYOfhniGOqVF+tpY T8CMvrH6pWU9XO5aneOlkFXak6kOtRx+Ympnet0Og== X-Received: by 2002:a05:6000:2688:b0:45e:88f5:ccfb with SMTP id ffacd0b85a97d-45eb367320cmr35519308f8f.2.1779805761487; Tue, 26 May 2026 07:29:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/54] target/arm: Set correct fp flags for FLOGB when FPCR.AH = 1 Date: Tue, 26 May 2026 15:28:27 +0100 Message-ID: <20260526142850.2326589-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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=ham 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: 1779805909658158500 Our implementation of the FLOGB insn does the operations entirely in the helper function, without needing to use fpu functions. This means it needs to handle all the fp status flags itself. We aren't setting float_flag_input_denormal_used when we use (i.e. do not flush to zero) an input denormal, which means that FPCR.IDC isn't set when it should be for FPCR.AH=3D1. We missed this when we added float_flag_input_denormal_used and made the fpu/ code set it. Add the missing float_raise(). Cc: qemu-stable@nongnu.org Fixes: d38a57a3f ("target/arm: Enable FEAT_AFP for '-cpu max'") Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-id: 20260521122913.1565011-4-peter.maydell@linaro.org --- target/arm/tcg/sve_helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 179cbd74fb..d884ba474f 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -5036,6 +5036,7 @@ static int16_t do_float16_logb_as_int(float16 a, floa= t_status *s) if (frac !=3D 0) { if (!get_flush_inputs_to_zero(s)) { /* denormal: bias - fractional_zeros */ + float_raise(float_flag_input_denormal_used, s); return -15 - clz32(frac); } /* flush to zero */ @@ -5064,6 +5065,7 @@ static int32_t do_float32_logb_as_int(float32 a, floa= t_status *s) if (frac !=3D 0) { if (!get_flush_inputs_to_zero(s)) { /* denormal: bias - fractional_zeros */ + float_raise(float_flag_input_denormal_used, s); return -127 - clz32(frac); } /* flush to zero */ @@ -5092,6 +5094,7 @@ static int64_t do_float64_logb_as_int(float64 a, floa= t_status *s) if (frac !=3D 0) { if (!get_flush_inputs_to_zero(s)) { /* denormal: bias - fractional_zeros */ + float_raise(float_flag_input_denormal_used, s); return -1023 - clz64(frac); } /* flush to zero */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805821; cv=none; d=zohomail.com; s=zohoarc; b=DHKCuvZQzW92IStIorWhcJgl2JGDYqdF2mY+qy4P9jArZ0vod1F35DovtIOeExbhScbe5sx7aveS63joKsEoHBL6NjvJ++iRZDvOpY53xlWG1ES1uNOKXtrNYgEY4X6HJr5xEb8X4fSFC/jN3tgJVkZ7l8ul7Jg6uE3kdp9fyNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805821; h=Content-Transfer-Encoding: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:Cc; bh=yL5NRAXpRBtuHCSzVNE194CNIE6tSdV2xGaEmF0h4I0=; b=VEn/xw10RosSvNu1JNNPcqpneNnJDWeECuAYeFWdg/ylVUarqijQUF51EMHVWuC1zNVcGTvTnNmgCwmtPUg4eKmJN8EzyjXf0SiQTluMwFulESJquq/XWzSrN3w+5eFTGD96gWuyQwjmRz70bjmDWiugPYzu/ZUoDJABcv2PpUM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805821281369.9359874283631; Tue, 26 May 2026 07:30:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmf-0000fL-BC; Tue, 26 May 2026 10:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmd-0000bq-Cw for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:27 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450: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 1wRsmb-0001MT-Ld for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:27 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-bdb3fd39045so802731766b.3 for ; Tue, 26 May 2026 07:29:25 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805764; x=1780410564; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yL5NRAXpRBtuHCSzVNE194CNIE6tSdV2xGaEmF0h4I0=; b=QMnQDeKwrY05mEDYhdUQi99HKrt3jIgQcTQxcq5IfNKv/V/6pC5DZtV44n1rX8iDlj wKYneS8/g0UjlPb69LYQKcWyFHYluQmE2NMs5MYgh92hCLxAO4lEmVd4MyUo9grMPAq4 OMHeRqcNY+QFUZdfWks/BlhMpmRuIgrUhybYZfmQQSY+Y1frW2buY3o11mtjTx6sYeRw kOFLk8XHbKOAgPB2qwNEw7isTtlmMWTxrJXJtl4M1n9zi7oVCI4vjCTZfhtwtkhOF496 /NMTrMDdVpCz+CF/BfUoR77u+CP8I+86Ny/Dxp9dzyBlfm6ybxtwLhu/I/ORNepAi36A xP7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805764; x=1780410564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yL5NRAXpRBtuHCSzVNE194CNIE6tSdV2xGaEmF0h4I0=; b=hUxGqVQJFl/fwQ+g5g63o70iskyxELBkuQlU6tUZ/XcHgw1NPGYuEWw9erUhjj1hez 74kT+HAvl4KeiLCMw3AW53vs9RVQTkl5QuuaAxsSWeAe8TGsrFcTVTR/CBCoDYOe/1yF VGidyNwCb595ayoGI/JNETZoxR1QqSwhv6snVfnH/vikHdoh4VdmlCoF8P6sRSEIN+Ny 5Fk/t36HREcguaEoCSx8YnUA1ea5lWXtOsncU02lsfwyzvYoeqDpbK3r3TKeQUn4ZaZz Wjv7eOrFEyP4HXdAUOFU9iAeWCalMseXkgo9cWNcHClmCBk1e2jnRadlhFzjrMAg3Twj p2fA== X-Gm-Message-State: AOJu0YwcjwCf9xJXkXLMBJ8u/1scJG435O98kRkaSWbfDDex8tuqZeQV 1Wp/K2Zj+DnfiV2XX+qOuZjtFmpZYhhuwFa8VyrJMQKdjaa7IzgNnmsVWUYHpYxCWek8zxVN3WI 6yAj3 X-Gm-Gg: Acq92OFBoYqLbalybU2g8xIjWTV/yByA5fGm3/SAE8Kx/sVMm1EZ919r1dcQiw5lJnw W2n8L7EdjmoiB4Or/1p3OgnyrNx9hea8kh8jfALbhSDGUscZKJ21MfQQeGys8Qior/3fDUoFkxg UlY2epVLUQaAsONbHrT23Alg3nepAg8p2LFeQZTlCxf5RMhn2zx33ZZ6sLVQNvxx7qg80Ip9004 +2VDy5liGjHlxZr08BemK+ssmJ3j6xZo/yNtEWPkEFNS5ZqjOUwkAbKFrSdbpY2jyaEpfXcKRw0 7FLaAan+KMGMdaetDZ4VCF5LYxbZfbI3ff1nOkETwtt0Fu+5ShMtez76q0aOYJfxnjwXtzTxoCE zyJKaAo12LBHVQ5uWtNv++NZj9IuPD6v6jxOjxXqLMAKWQGvSQOr0L4nG2iNni2p60Y4CZnrY69 dETpauJwzIklQdS/BZa75E5sVPt8aH3L6Gs6guFYYPHXh3DTZ1xiZmsWZvaE91gukEikKtnxB2G CaVtIp1y0JWGVe1qAfUOHex2hAjU5Q= X-Received: by 2002:a17:907:c317:b0:bda:d08:35ea with SMTP id a640c23a62f3a-bdd283a64bdmr1135444766b.48.1779805764080; Tue, 26 May 2026 07:29:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/54] target/arm: Implement ID_AA64ISAR3 Date: Tue, 26 May 2026 15:28:28 +0100 Message-ID: <20260526142850.2326589-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=peter.maydell@linaro.org; helo=mail-ej1-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=ham 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: 1779805822716154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 9 +++++++++ target/arm/cpu-sysregs.h.inc | 1 + target/arm/cpu.c | 1 + target/arm/helper.c | 8 ++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 4e44245a8b..50776347a5 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -244,6 +244,15 @@ FIELD(ID_AA64ISAR2, CSSC, 52, 4) FIELD(ID_AA64ISAR2, LUT, 56, 4) FIELD(ID_AA64ISAR2, ATS1A, 60, 4) =20 +FIELD(ID_AA64ISAR3, CPA, 0, 4) +FIELD(ID_AA64ISAR3, FAMINMAX, 4, 4) +FIELD(ID_AA64ISAR3, TLBIW, 8, 4) +FIELD(ID_AA64ISAR3, PACM, 12, 4) +FIELD(ID_AA64ISAR3, LSFE, 16, 4) +FIELD(ID_AA64ISAR3, OCCMO, 20, 4) +FIELD(ID_AA64ISAR3, LSUI, 24, 4) +FIELD(ID_AA64ISAR3, FPRCVT, 28, 4) + FIELD(ID_AA64PFR0, EL0, 0, 4) FIELD(ID_AA64PFR0, EL1, 4, 4) FIELD(ID_AA64PFR0, EL2, 8, 4) diff --git a/target/arm/cpu-sysregs.h.inc b/target/arm/cpu-sysregs.h.inc index 3d1ed40f04..b99579f773 100644 --- a/target/arm/cpu-sysregs.h.inc +++ b/target/arm/cpu-sysregs.h.inc @@ -10,6 +10,7 @@ DEF(ID_AA64AFR1_EL1, 3, 0, 0, 5, 5) DEF(ID_AA64ISAR0_EL1, 3, 0, 0, 6, 0) DEF(ID_AA64ISAR1_EL1, 3, 0, 0, 6, 1) DEF(ID_AA64ISAR2_EL1, 3, 0, 0, 6, 2) +DEF(ID_AA64ISAR3_EL1, 3, 0, 0, 6, 3) DEF(ID_AA64MMFR0_EL1, 3, 0, 0, 7, 0) DEF(ID_AA64MMFR1_EL1, 3, 0, 0, 7, 1) DEF(ID_AA64MMFR2_EL1, 3, 0, 0, 7, 2) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index c47b70ac69..e1ea41fdc5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1747,6 +1747,7 @@ static void arm_clear_aarch64_idregs(ARMCPU *cpu) SET_IDREG(&cpu->isar, ID_AA64ISAR0, 0); SET_IDREG(&cpu->isar, ID_AA64ISAR1, 0); SET_IDREG(&cpu->isar, ID_AA64ISAR2, 0); + SET_IDREG(&cpu->isar, ID_AA64ISAR3, 0); SET_IDREG(&cpu->isar, ID_AA64PFR0, 0); SET_IDREG(&cpu->isar, ID_AA64PFR1, 0); SET_IDREG(&cpu->isar, ID_AA64PFR2, 0); diff --git a/target/arm/helper.c b/target/arm/helper.c index 8240f1b384..6ad01b345f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6519,11 +6519,11 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_tid3, .resetvalue =3D GET_IDREG(isar, ID_AA64ISAR2)}, - { .name =3D "ID_AA64ISAR3_EL1_RESERVED", .state =3D ARM_CP_STA= TE_AA64, + { .name =3D "ID_AA64ISAR3_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 6, .opc2 =3D = 3, .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_tid3, - .resetvalue =3D 0 }, + .resetvalue =3D GET_IDREG(isar, ID_AA64ISAR3) }, { .name =3D "ID_AA64ISAR4_EL1_RESERVED", .state =3D ARM_CP_STA= TE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 6, .opc2 =3D = 4, .access =3D PL1_R, .type =3D ARM_CP_CONST, @@ -6752,6 +6752,10 @@ void register_cp_regs_for_features(ARMCPU *cpu) R_ID_AA64ISAR2_BC_MASK | R_ID_AA64ISAR2_RPRFM_MASK | R_ID_AA64ISAR2_CSSC_MASK }, + { .name =3D "ID_AA64ISAR3_EL1", + .exported_bits =3D R_ID_AA64ISAR3_FAMINMAX_MASK | + R_ID_AA64ISAR3_LSFE_MASK | + R_ID_AA64ISAR3_FPRCVT_MASK }, { .name =3D "ID_AA64ISAR*_EL1_RESERVED", .is_glob =3D true }, }; --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806034; cv=none; d=zohomail.com; s=zohoarc; b=RztyAF6AwRBCUJvkdHwrGhYaoXfJUfaageLKw9ePFSqXpCYKkDwFS87ljjZWw0bjwSXjUd+1M28koZNX2+N99DU51b4UCYNE3QPZVE+Ekeml7xWWzRcIS06F5e1ABq55BroOCJ0q49kquc22A7QxsxGaNxMPjLoQ+hefsw+sUkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806034; h=Content-Transfer-Encoding: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:Cc; bh=LBubfPlRL2OEyIUISq0TynA64sXx3nlSkrR2/26xoFQ=; b=gZoajxUuAdTr2lCp/tRgHqiGHDbvLvRXZK1bnW/7Dca2h/ZeHGNSEpNfwtWUDKTxKX7y19qnR6BEEAMzmHKs3c4wTDhWvW1SVGlogzkuGi2GEbPOc7CvYZLNFVXmCMAOM/UWhYdVOeOY5BPcqgtZzCHDVcbUfTb9N19Od8XAKnw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806034718736.3993750555657; Tue, 26 May 2026 07:33:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmg-0000iJ-MX; Tue, 26 May 2026 10:29:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsme-0000eH-Ey for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:28 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmc-0001Ma-EQ for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:28 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-43eb05b1875so5697724f8f.3 for ; Tue, 26 May 2026 07:29:26 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805765; x=1780410565; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LBubfPlRL2OEyIUISq0TynA64sXx3nlSkrR2/26xoFQ=; b=YaTgnZNK8j/gt1k/C5cfciqijpJtEiGUw7HLKu1GK2yTG/sRjApKi7C8M5xB8BYR8U M9nBcojgWw4wQAw62AAvbL7VDdwvO0zczgKvl+zHdMYONFbzeh3GIxLHnk3GYxOzTlGB LjJkR2ELozi/DQ1DIQQ3L4fvg9sLFYLHTu8P/jPpdA/WIqcpBzgv3ZnqORLsyjwHTJbf tpjdnYbm8qgy8/hkAudBTr1B7HUU6u1252pYizO7yY4aTK7rYsMstfLMZT+gv9sldAml WSshsJL710U2VC5XaI2hs68VIJCDGCodMJrGL3kXh5hu55ZEAEKw8vRX76rU3Ni7t7el IrJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805765; x=1780410565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LBubfPlRL2OEyIUISq0TynA64sXx3nlSkrR2/26xoFQ=; b=blmSacHmUTT1mM9TdjHHnARHv0jHlzBuAqI0JtnbBvCcYShmD3xpjPfJTIVbWsN2Fs 92RmLAyY+Aqu8IcGprk8OrAkM+gaKUNunDGABxaoaNQcCsLBV8AHvvxc6xC9kggJTHe9 y6We8dx3kiK7jUnC4sRRE495B3YrYqHSFOUBRGT/HyoFE0q+Q2YWGxYBto5bSBfCwIml GlL/DSJ0Ni4mBWgm9xxLgCjlXHtVWI25V6OrUFA5IFyTzDIK96dVAXX3/FMbSzPpURd5 uv1I7zbJuBtzP7Z8MJmwCdrmhAOwXTYMAYfgzh7ckiW/mokDl0N6det/sr5qUu9a3o44 4MAg== X-Gm-Message-State: AOJu0YxNGkwFn5gqpg2sbUydkisKUfhti7rRizNbh2weVQ0v8CyVJtq2 mzqkU2t60OdE7OoFo+fMvdZwjITiRCYnkiEk9b2Xg3wUf1xZIhOj+EpBCDH4qHkDWDxHmtEhxLR dVEyt X-Gm-Gg: Acq92OEKTXDvqgkAh85qzwPRRWojy9DExrShlV+J6Z0ZATPRtEwDZmXgbHgnP0XBLOW ZgLDcXM0JSM3iiIjlP4Xi4sH+5SXnBHMMZJNdpoZXRQGScnFe4rTiOceRSaTEFpeLY8a8kj51aF Li8owUdUwxaW49NIf1+y68wUr9YaxQ6M2C9qd89xcAAarH+qDcfgvPhYG6dc5hZ6tshIsFrxO6j EhrcUdxRSJ/T0FDOhaKM/+DHhX6a/n9CpvBihfiFYH1+EO2XnL821q9XvOuWaNO/LaeWO9U/oA9 NYzuqV+2+tBuWiMssSQCOtI/3RiKVrxQrl0oEyoWz/qKzuqJf6pm76OnBDJ9WGwJkdH7YlrEPd1 k9RuyYXmP8PdQWUK6I12e+jiwkG2djGTDUiFMslN/0keNEaSkxGS6o9041vPBWNVcH4efSfGKKp kacDFZiTdXiDAkfp29hwLoq6N0yIFoD4NUMwm4VwiwL98fC/dUm7+2cObZ7+9ZxyEaWaA6YpDFx fD1tcrPI8/uZAuhzBazSGoVATrzqh9b18fEESxL7Q== X-Received: by 2002:a05:6000:1888:b0:45e:73a5:e5e4 with SMTP id ffacd0b85a97d-45eb38b9243mr31922255f8f.33.1779805764975; Tue, 26 May 2026 07:29:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/54] target/arm: Implement FEAT_FAMINMAX for AdvSIMD Date: Tue, 26 May 2026 15:28:29 +0100 Message-ID: <20260526142850.2326589-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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=ham 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: 1779806037849154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20260522220306.235200-3-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 5 +++++ target/arm/tcg/a64.decode | 5 +++++ target/arm/tcg/helper-a64-defs.h | 7 ++++++ target/arm/tcg/translate-a64.c | 14 ++++++++++++ target/arm/tcg/vec_helper64.c | 38 ++++++++++++++++++++++++++++++++ target/arm/tcg/vec_internal.h | 7 ++++++ 6 files changed, 76 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 50776347a5..21a1f941dd 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1062,6 +1062,11 @@ static inline bool isar_feature_aa64_ats1a(const ARM= ISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64ISAR2, ATS1A); } =20 +static inline bool isar_feature_aa64_faminmax(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64ISAR3, FAMINMAX) !=3D 0; +} + static inline bool isar_feature_aa64_fp_simd(const ARMISARegisters *id) { /* We always set the AdvSIMD and FP fields identically. */ diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 01b1b3e38b..666a293540 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -1193,6 +1193,11 @@ RSUBHN 0.10 1110 ..1 ..... 01100 0 ..... ..= ... @qrrr_e PMULL_p8 0.00 1110 001 ..... 11100 0 ..... ..... @qrrr_b PMULL_p64 0.00 1110 111 ..... 11100 0 ..... ..... @qrrr_b =20 +FAMAX 0.00 1110 110 ..... 00011 1 ..... ..... @qrrr_h +FAMAX 0.00 1110 1.1 ..... 11011 1 ..... ..... @qrrr_sd +FAMIN 0.10 1110 110 ..... 00011 1 ..... ..... @qrrr_h +FAMIN 0.10 1110 1.1 ..... 11011 1 ..... ..... @qrrr_sd + ### Advanced SIMD scalar x indexed element =20 FMUL_si 0101 1111 00 .. .... 1001 . 0 ..... ..... @rrx_h diff --git a/target/arm/tcg/helper-a64-defs.h b/target/arm/tcg/helper-a64-d= efs.h index 3c3c5dddb7..215df1201b 100644 --- a/target/arm/tcg/helper-a64-defs.h +++ b/target/arm/tcg/helper-a64-defs.h @@ -145,6 +145,13 @@ DEF_HELPER_FLAGS_5(gvec_fmulx_idx_h, TCG_CALL_NO_RWG, = void, ptr, ptr, ptr, fpst, DEF_HELPER_FLAGS_5(gvec_fmulx_idx_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr,= fpst, i32) DEF_HELPER_FLAGS_5(gvec_fmulx_idx_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr,= fpst, i32) =20 +DEF_HELPER_FLAGS_5(gvec_famax_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) +DEF_HELPER_FLAGS_5(gvec_famin_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) +DEF_HELPER_FLAGS_5(gvec_famax_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) +DEF_HELPER_FLAGS_5(gvec_famin_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) +DEF_HELPER_FLAGS_5(gvec_famax_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) +DEF_HELPER_FLAGS_5(gvec_famin_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) + #ifndef CONFIG_USER_ONLY DEF_HELPER_2(exception_return, void, env, i64) #endif diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 3e3971db3f..b5f953ab0a 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -6475,6 +6475,20 @@ static gen_helper_gvec_3_ptr * const f_vector_fminnm= p[3] =3D { }; TRANS(FMINNMP_v, do_fp3_vector, a, 0, f_vector_fminnmp) =20 +static gen_helper_gvec_3_ptr * const f_vector_famax[3] =3D { + gen_helper_gvec_famax_h, + gen_helper_gvec_famax_s, + gen_helper_gvec_famax_d, +}; +TRANS_FEAT(FAMAX, aa64_faminmax, do_fp3_vector, a, 0, f_vector_famax) + +static gen_helper_gvec_3_ptr * const f_vector_famin[3] =3D { + gen_helper_gvec_famin_h, + gen_helper_gvec_famin_s, + gen_helper_gvec_famin_d, +}; +TRANS_FEAT(FAMIN, aa64_faminmax, do_fp3_vector, a, 0, f_vector_famin) + static bool do_fmlal(DisasContext *s, arg_qrrr_e *a, bool is_s, bool is_2) { if (fp_access_check(s)) { diff --git a/target/arm/tcg/vec_helper64.c b/target/arm/tcg/vec_helper64.c index 249a257177..cb55a2b441 100644 --- a/target/arm/tcg/vec_helper64.c +++ b/target/arm/tcg/vec_helper64.c @@ -8,6 +8,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" +#include "internals.h" #include "helper.h" #include "helper-a64.h" #include "helper-sme.h" @@ -140,3 +141,40 @@ void HELPER(simd_tblx)(void *vd, void *vm, CPUARMState= *env, uint32_t desc) memcpy(vd, &result, 16); clear_tail(vd, oprsz, simd_maxsz(desc)); } + +/* + * Use float_minmax_ismag to get the absolute value min/max. + * Avoid float_minmax_is{num,number} so that we get normal NaN processing. + * If the result is not a nan, take the absolute value. + * + * Note this operation squashes FZ, FIZ, and AH to 0. + */ +#define DO_FAMINMAX(NAME, TYPE, MIN) \ +TYPE TYPE##_##NAME(TYPE a, TYPE b, float_status *s) \ +{ \ + float_status local =3D *s; \ + set_flush_to_zero(false, &local); \ + set_flush_inputs_to_zero(false, &local); \ + arm_set_default_fp_behaviours(&local); \ + TYPE r =3D TYPE##_minmax(a, b, &local, MIN | float_minmax_ismag); \ + if (!TYPE##_is_any_nan(r)) { \ + r =3D TYPE##_abs(r); \ + } \ + float_raise(get_float_exception_flags(&local) \ + & ~float_flag_input_denormal_used, s); \ + return r; \ +} + +DO_FAMINMAX(famax, float16, 0) +DO_FAMINMAX(famin, float16, float_minmax_ismin) +DO_FAMINMAX(famax, float32, 0) +DO_FAMINMAX(famin, float32, float_minmax_ismin) +DO_FAMINMAX(famax, float64, 0) +DO_FAMINMAX(famin, float64, float_minmax_ismin) + +DO_3OP(gvec_famax_h, float16_famax, float16) +DO_3OP(gvec_famin_h, float16_famin, float16) +DO_3OP(gvec_famax_s, float32_famax, float32) +DO_3OP(gvec_famin_s, float32_famin, float32) +DO_3OP(gvec_famax_d, float64_famax, float64) +DO_3OP(gvec_famin_d, float64_famin, float64) diff --git a/target/arm/tcg/vec_internal.h b/target/arm/tcg/vec_internal.h index 4edd2b4fc1..5c3f51eed3 100644 --- a/target/arm/tcg/vec_internal.h +++ b/target/arm/tcg/vec_internal.h @@ -342,6 +342,13 @@ bfloat16 helper_sme2_ah_fmin_b16(bfloat16 a, bfloat16 = b, float_status *fpst); float32 sve_f16_to_f32(float16 f, float_status *fpst); float16 sve_f32_to_f16(float32 f, float_status *fpst); =20 +float16 float16_famax(float16, float16, float_status *); +float16 float16_famin(float16, float16, float_status *); +float32 float32_famax(float32, float32, float_status *); +float32 float32_famin(float32, float32, float_status *); +float64 float64_famax(float64, float64, float_status *); +float64 float64_famin(float64, float64, float_status *); + /* * Decode helper functions for predicate as counter. */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806051; cv=none; d=zohomail.com; s=zohoarc; b=HVuLUwdBNlAFWHYt9F7CX7+7A7A6+jkz/t4PclVxLTB4B8+hXo38733HxozQQ5K15qf0UMFQg2vyisOD5xP44wPUo2ooqQayZJ41t4e+GKq3LtOO1CdTkm9jnV4aFLtfXekZdM72M9MkrNo7EUSaoiW8sPiPzafZRuodEHuH/bU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806051; h=Content-Transfer-Encoding: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:Cc; bh=3IOAQk6KbulfhANL9WnNqNGOvA2dsDEB/htNxscxGVU=; b=I8Fcvm8Rn6UDlNbuVHiPqfC+j4TTT3Tyx7u27TJkDe1IVfty0vXaIUiW8smm30ryGNyhbIyr8CpwIYxTZ3o4IJqtU5hZSSny+M97TCnzAkvc0hoycoN/MALLzLuZZ4zkCyRFVh/u20TOLHyCKx2ylWH0flr6AmA+Bqu8m86rEzg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806051452796.3106254966883; Tue, 26 May 2026 07:34:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmg-0000iR-S0; Tue, 26 May 2026 10:29:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmf-0000gS-ML for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:29 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmd-0001Mj-GW for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:29 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so78344815e9.0 for ; Tue, 26 May 2026 07:29:27 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805766; x=1780410566; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3IOAQk6KbulfhANL9WnNqNGOvA2dsDEB/htNxscxGVU=; b=z0l3i3aJ42X9tADZ1iX2KLV78Ra8TbJqkUHJdtEtM/F4jbJAyC6cbvUpUr82aqbkz8 ND/7+ViUpfTTTwzuLeZA+4QmbrgQnqleNwKUwUqLfjOwRtBHQK9hzZi6LXwPzJY1Zx28 ruDhb/1Lnlrf3scKQ/I6V1JelAM9AZB2yimrcxPTbbhgH2+KeykyGWa+sE2j/d7rJXwA eYi/z9sooVfPRPc21BIEdDAoR/e/FTXgnh3jnU4hFOsYf2X74tcSfChoDbUMYh5XLt2f 5cPAb14UK+ngLJJh25xvZ/H4FlWpjn2LfmH8gdXTiC/fE+t+PSsY1nQnB66lQIv37sPq lK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805766; x=1780410566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=3IOAQk6KbulfhANL9WnNqNGOvA2dsDEB/htNxscxGVU=; b=USj2EWibQ1rbjWe94TgMiv81/sBEKSyGw5TlcIH/iF6OLQg/MXrnImqXmEU1VnACfb v85WPhH8YS83HWAzHhoZfsjL/Fh3NGe21aUjCo2EoGn/wU2jmY7V8lRlxlwo4+kROzSv 2Cv58UObP+jUmHr51n83RJv/o+n1meoJx1+zILMUXzZH3pXNDiRA8cY3vO7mhFgK8nhf Qu8oNwwCgUzkvZb6DCHCh6YdOxfpF+7/t8UYB78II0gmj/CMsg8iK9SEa8lWziSoEFsA lxvpcHAM2JFJ6U108ydAB+AVhCzNtTtn2RbSfTVrsVhPfxhHfwl01j9CodETT5xNl2Z8 MCwQ== X-Gm-Message-State: AOJu0YwK2xAfMA5iGzIzCeo4YNW6nP1+rL8ZjPU+R2KNwXnq8FBnewpG zLTApg5t8aqoR88R8DyneZPeO+tJljDInv/ysxdnCL6bhfHCltbKGPKpywjgA8mtgLgy8QmFTuD JGNTo X-Gm-Gg: Acq92OFHxDbLaReaP6YL1gM2UzRlZVv8LsbBgAB4TZgz7X/tK7XdQF4G7E8gzbeqAYL DKSJSZEjCpvummcvl0mQ9eh4z2UmgLwsfg7FmiiitTx74hg4xKNsPSzAJ5r6iT0XeY3fB+Royae THclTOUzmVyCjUChaMQiak8n182x8zKMZps6A//3//E8MwkPI5l5YXkD6zxK8PRXwqPDX69Yh18 1khng4aXPq3IKiPHsyJxBVjI9fkFVwLhVPsWIBpBxDxXMAtucsZJACU4aqUhR8bQAOTxzqDm16Q NJBm1CVbD+omQvl+nBOl4CrD9G+UB5chpow0ErIyAn8vi6MbziCaaC5Aobxekqb+iMwdEsmtRiQ 7Tojgqcg5xJ34K9S8xjVNwfCwu1me2eUPxPBskwv/LiZtYPFLXTTFWlEDFNynPg2qDVPlgIK7DE J7EhaTyxv4KhjKzor+3N/bT0s8t7xAzwWGkS0my6lxSz2FlthXbZnfBlrBQ05mC4fmuyhEF/XeU jgC76jpYLatf0EcmudlP4LhA5nCbjQ= X-Received: by 2002:a05:600c:8b84:b0:490:5466:8576 with SMTP id 5b1f17b1804b1-490546689a7mr274166605e9.1.1779805766028; Tue, 26 May 2026 07:29:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 34/54] target/arm: Implement FEAT_FAMINMAX for SME Date: Tue, 26 May 2026 15:28:30 +0100 Message-ID: <20260526142850.2326589-35-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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=ham 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: 1779806052944158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Since there is no bfloat16 variant of FAMINMAX, check for missing function pointer in do_z2z_nn_fpst. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-4-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 5 +++++ target/arm/tcg/sme.decode | 5 +++++ target/arm/tcg/translate-sme.c | 23 +++++++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 21a1f941dd..21b91b1503 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1593,6 +1593,11 @@ static inline bool isar_feature_aa64_sme2_f64f64(con= st ARMISARegisters *id) return isar_feature_aa64_sme2(id) && isar_feature_aa64_sme_f64f64(id); } =20 +static inline bool isar_feature_aa64_sme2_faminmax(const ARMISARegisters *= id) +{ + return isar_feature_aa64_sme2(id) && isar_feature_aa64_faminmax(id); +} + static inline bool isar_feature_aa64_sve_i8mm(const ARMISARegisters *id) { return isar_feature_aa64_sve(id) && isar_feature_aa64_sme_sve_i8mm(id); diff --git a/target/arm/tcg/sme.decode b/target/arm/tcg/sme.decode index 6bb9aa2a90..9dec7318a4 100644 --- a/target/arm/tcg/sme.decode +++ b/target/arm/tcg/sme.decode @@ -286,6 +286,11 @@ URSHL_nn 1100000 1 .. 1 ..... 1011.0 10001 .... = 1 @z2z_4x4 SQDMULH_nn 1100000 1 .. 1 ..... 1011.1 00000 .... 0 @z2z_2x2 SQDMULH_nn 1100000 1 .. 1 ..... 1011.1 00000 .... 0 @z2z_4x4 =20 +FAMAX_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 0 @z2z_2x2 +FAMAX_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 0 @z2z_4x4 +FAMIN_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 1 @z2z_2x2 +FAMIN_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 1 @z2z_4x4 + ### SME2 Multi-vector Multiple and Single Array Vectors =20 &azz_n n off rv zn zm diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index 08254b088e..a67501226f 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" +#include "helper-a64.h" #include "helper-sme.h" #include "helper-sve.h" #include "translate.h" @@ -742,9 +743,12 @@ static bool do_z2z_nn_fpst(DisasContext *s, arg_z2z_en= *a, gen_helper_gvec_3_ptr * const fns[4]) { int esz =3D a->esz, n, dn, dm, vsz; - gen_helper_gvec_3_ptr *fn; + gen_helper_gvec_3_ptr *fn =3D fns[esz]; TCGv_ptr fpst; =20 + if (fn =3D=3D NULL) { + return false; + } if (esz =3D=3D MO_8 && !dc_isar_feature(aa64_sme_b16b16, s)) { return false; } @@ -753,7 +757,6 @@ static bool do_z2z_nn_fpst(DisasContext *s, arg_z2z_en = *a, } =20 fpst =3D fpstatus_ptr(esz =3D=3D MO_16 ? FPST_A64_F16 : FPST_A64); - fn =3D fns[esz]; n =3D a->n; dn =3D a->zdn; dm =3D a->zm; @@ -812,6 +815,22 @@ static gen_helper_gvec_3_ptr * const f_vector_fminnm[4= ] =3D { TRANS_FEAT(FMINNM_n1, aa64_sme2, do_z2z_n1_fpst, a, f_vector_fminnm) TRANS_FEAT(FMINNM_nn, aa64_sme2, do_z2z_nn_fpst, a, f_vector_fminnm) =20 +static gen_helper_gvec_3_ptr * const f_vector_famax[4] =3D { + NULL, + gen_helper_gvec_famax_h, + gen_helper_gvec_famax_s, + gen_helper_gvec_famax_d, +}; +TRANS_FEAT(FAMAX_nn, aa64_sme2_faminmax, do_z2z_nn_fpst, a, f_vector_famax) + +static gen_helper_gvec_3_ptr * const f_vector_famin[4] =3D { + NULL, + gen_helper_gvec_famin_h, + gen_helper_gvec_famin_s, + gen_helper_gvec_famin_d, +}; +TRANS_FEAT(FAMIN_nn, aa64_sme2_faminmax, do_z2z_nn_fpst, a, f_vector_famin) + /* Add/Sub vector Z[m] to each Z[n*N] with result in ZA[d*N]. */ static bool do_azz_n1(DisasContext *s, arg_azz_n *a, int esz, GVecGen3FnVar *fn) --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805996; cv=none; d=zohomail.com; s=zohoarc; b=Ax5c7ol//pL5p4YBZw3ext/9EHLThvriCdjyxL2bLzefvH6W2ClChTPWHAt1e/BZugeqg9kq8XgfHQcPw5DMS5aIpSmdkm+peu+8Iz8Uiwl00w/aSh+4CR1NJ95/1ju8IN6XlK1utC0sMTfHScF/t1nNEfBZaMXxwiFeypTy8Oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805996; h=Content-Transfer-Encoding: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:Cc; bh=uiSxSSvXNgeTkOHtQ1PRnF2n1HTHwql5VVMq3OlWrWk=; b=T+CUCAmLpjjGC7A8g72nQnVEgKFL2vp+lLUxUhmo3NldhNK/pO4qm0T6JVKjIezDa8CoiQK236J2Xbf4xVbgW1ui7osSwBahx88Go+b/Jh/yyDj5WdvxMRCcOTWi1dvPGE2w2XPnfacR9bLl8i5H34yWU/gzHduR7dTZlEPM7xA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805996203920.0671709559754; Tue, 26 May 2026 07:33:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmj-0000tR-Bd; Tue, 26 May 2026 10:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmg-0000hz-Fj for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:30 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsme-0001Mz-G2 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:30 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-452169ae568so6891036f8f.3 for ; Tue, 26 May 2026 07:29:28 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805767; x=1780410567; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uiSxSSvXNgeTkOHtQ1PRnF2n1HTHwql5VVMq3OlWrWk=; b=QK3IS4Wk9knY+2Zey8qaW46M8C7Bhysg1wsYmaLucPg62bxmknQt9Xpy1Rl+BlvRON dhM8oo42+5nJCjuHt8+kKt7YEw8JuUshX64ce5DFs5GdLT6KDitJdTvKoYssLEhX7KSA Cb9+YHNVTiOvUkq9CyPvcWfeUbgwm7ecWUip77Z0xjsWamc0SvkVWoq7WEgFOMI5l2JV zQZpsesUEPVs9lJoqbfSqPasOauE4G/cj40+dcVFMwHYaMi8R/9opJXK5b4sAcrDUwQj 0dibbJtKAW6fXBCZW5l7x9VsWmWEh7IwR835vY55QYrRQ7oul9Rpd05GZ+YfXtmgD6eM UdjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805767; x=1780410567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uiSxSSvXNgeTkOHtQ1PRnF2n1HTHwql5VVMq3OlWrWk=; b=oJOtcZoYcdPPlU93JuOyUr/lKtnqRHn5K42Ky56ZJg5gJEOUrBq50peYW6mvHn774S CHgytZ4uHp7Rb/E76s+qi+5FyPxLDxqCmlry42nrO6A5kpT8wWj3NecmWZXRJ45wg1Er tFBZdMhKJDJIUPEK0iCF4RVmbByoxZjBO3Ri44/gxKhX3avRbrY7USfbNir8O4vDK6sf hvjacK4xD7WjbnzTNh8u+9+zvE5FxmZpzoLGpM6WSWRrGlOgVjKtHynQplL6sAYEMbrk 8Sb1itmvg5M0fkLapqoQbUCOpcQDWAs+SW/ID1O/r6aiHBaYAO9IcWC69+z9BWiJIxPj zUdw== X-Gm-Message-State: AOJu0YzU3SDCz7phl2+mmQKhG1EWbKK/Z10zWBoseNmli3WcNdR4W025 qQ8gTSsmLxFxYmtog7PsUXpItdSlAezxmfaJ4iccdO1MFKhqU3ZRqhYGfx7FDNkwVUIlxnFiJYw 0rmS3 X-Gm-Gg: Acq92OGnSy01Rkt24VVvrbOL6Q9lyupuZnK2JQCcjTLilBEsdjGzqEGzJcpCXLNuCcl BYRZKAF/pcSU/4KQpq/m+UPuITFpzPNHXwtp4xwL+HWgJt4BsSdSfR9Czi04hJ4rZtI3gs9jaME U0Axh5SFyik/mdnfw9x7pz5AAbrERMUqbvf41ZuMo44pI7az9sZkFYYMR7sSTM4l0UcFMS25p97 H19nUaprtF3tJfs78Jmn5IKJ1hhu4R4DlnPaestyOvyFQDPv9PaSRg2Yx6KgJR5yuOOT99vtJfv Jbcnhl0+o4xgzeoMjcTfrBbkolSkcX0BgkKxAS9A69FO4yzXTo8H2fAJbpS0zxpngOO8XEipumj rpvC24VvzM/aEanqVvPoaX5ZK+nKq0+GpZ/2leJ2LLu8s/p6FzhvscDomF0bDM+vmaqDKCsyd43 nS905Kj3emZpxnCKwa5SAgSS+7l4ZgWsjeihsqTZFcaWtoxePp2XLcUT96Zrk1Et8O+02Xiljuc vcLJVH3+QCGyG/JwN5/1nQUPF3Cjjw= X-Received: by 2002:a5d:59c4:0:b0:45e:5c98:c8ed with SMTP id ffacd0b85a97d-45eb38af486mr28299629f8f.21.1779805766969; Tue, 26 May 2026 07:29:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 35/54] target/arm: Implement FEAT_FAMINMAX for SVE Date: Tue, 26 May 2026 15:28:31 +0100 Message-ID: <20260526142850.2326589-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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=ham 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: 1779805996472158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20260522220306.235200-5-richard.henderson@linaro.org [PMM: add comments for TRANS_ macros] Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 11 +++++++++++ target/arm/tcg/helper-sve-defs.h | 14 ++++++++++++++ target/arm/tcg/sve.decode | 2 ++ target/arm/tcg/sve_helper.c | 8 ++++++++ target/arm/tcg/translate-sve.c | 20 ++++++++++++++++++++ target/arm/tcg/translate.h | 12 ++++++++++++ 6 files changed, 67 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 21b91b1503..a7ab7e2a31 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1568,6 +1568,11 @@ static inline bool isar_feature_aa64_sme_or_sve2(con= st ARMISARegisters *id) return isar_feature_aa64_sme(id) || isar_feature_aa64_sve2(id); } =20 +static inline bool isar_feature_aa64_sme2_or_sve2(const ARMISARegisters *i= d) +{ + return isar_feature_aa64_sme2(id) || isar_feature_aa64_sve2(id); +} + static inline bool isar_feature_aa64_sme_or_sve2p1(const ARMISARegisters *= id) { return isar_feature_aa64_sme(id) || isar_feature_aa64_sve2p1(id); @@ -1608,6 +1613,12 @@ static inline bool isar_feature_aa64_sve_bf16(const = ARMISARegisters *id) return isar_feature_aa64_sve(id) && isar_feature_aa64_sme_sve_bf16(id); } =20 +static inline bool +isar_feature_aa64_sme2_or_sve2_faminmax(const ARMISARegisters *id) +{ + return isar_feature_aa64_sme2_or_sve2(id) && isar_feature_aa64_faminma= x(id); +} + /* * Feature tests for "does this exist in either 32-bit or 64-bit?" */ diff --git a/target/arm/tcg/helper-sve-defs.h b/target/arm/tcg/helper-sve-d= efs.h index cd05dd0fb4..f97c31763f 100644 --- a/target/arm/tcg/helper-sve-defs.h +++ b/target/arm/tcg/helper-sve-defs.h @@ -3180,3 +3180,17 @@ DEF_HELPER_FLAGS_5(sve2p1_st1ss_le_c, TCG_CALL_NO_WG= , void, env, ptr, tl, i32, i DEF_HELPER_FLAGS_5(sve2p1_st1ss_be_c, TCG_CALL_NO_WG, void, env, ptr, tl, = i32, i64) DEF_HELPER_FLAGS_5(sve2p1_st1dd_le_c, TCG_CALL_NO_WG, void, env, ptr, tl, = i32, i64) DEF_HELPER_FLAGS_5(sve2p1_st1dd_be_c, TCG_CALL_NO_WG, void, env, ptr, tl, = i32, i64) + +DEF_HELPER_FLAGS_6(sve2_famax_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_famax_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_famax_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) + +DEF_HELPER_FLAGS_6(sve2_famin_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_famin_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve2_famin_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) diff --git a/target/arm/tcg/sve.decode b/target/arm/tcg/sve.decode index ab63cfaa0f..078a085a79 100644 --- a/target/arm/tcg/sve.decode +++ b/target/arm/tcg/sve.decode @@ -1130,6 +1130,8 @@ FSCALE 01100101 .. 00 1001 100 ... ..... ...= .. @rdn_pg_rm FMULX 01100101 .. 00 1010 100 ... ..... ..... @rdn_pg_rm FDIV 01100101 .. 00 1100 100 ... ..... ..... @rdm_pg_rn # FD= IVR FDIV 01100101 .. 00 1101 100 ... ..... ..... @rdn_pg_rm +FAMAX 01100101 .. 00 1110 100 ... ..... ..... @rdn_pg_rm +FAMIN 01100101 .. 00 1111 100 ... ..... ..... @rdn_pg_rm =20 # SVE floating-point arithmetic with immediate (predicated) FADD_zpzi 01100101 .. 011 000 100 ... 0000 . ..... @rdn_i1 diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index d884ba474f..9490f0327f 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -4750,6 +4750,14 @@ DO_ZPZZ_FP(sve_fmulx_h, uint16_t, H1_2, helper_advsi= md_mulxh) DO_ZPZZ_FP(sve_fmulx_s, uint32_t, H1_4, helper_vfp_mulxs) DO_ZPZZ_FP(sve_fmulx_d, uint64_t, H1_8, helper_vfp_mulxd) =20 +DO_ZPZZ_FP(sve2_famax_h, uint16_t, H1_2, float16_famax) +DO_ZPZZ_FP(sve2_famax_s, uint32_t, H1_4, float32_famax) +DO_ZPZZ_FP(sve2_famax_d, uint64_t, H1_8, float64_famax) + +DO_ZPZZ_FP(sve2_famin_h, uint16_t, H1_2, float16_famin) +DO_ZPZZ_FP(sve2_famin_s, uint32_t, H1_4, float32_famin) +DO_ZPZZ_FP(sve2_famin_d, uint64_t, H1_8, float64_famin) + #undef DO_ZPZZ_FP =20 /* Three-operand expander, with one scalar operand, controlled by diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 59b8c494a8..d04ef2dcfc 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4254,6 +4254,26 @@ DO_ZPZZ_FP(FSCALE, aa64_sme_or_sve, sve_fscalbn) DO_ZPZZ_FP(FDIV, aa64_sme_or_sve, sve_fdiv) DO_ZPZZ_FP(FMULX, aa64_sme_or_sve, sve_fmulx) =20 +static gen_helper_gvec_4_ptr * const sve2_famax_zpzz_fns[4] =3D { + NULL, + gen_helper_sve2_famax_h, + gen_helper_sve2_famax_s, + gen_helper_sve2_famax_d +}; +TRANS_FEAT_STREAMING_SME2(FAMAX, aa64_sme2_or_sve2_faminmax, + gen_gvec_fpst_arg_zpzz, + sve2_famax_zpzz_fns[a->esz], a) + +static gen_helper_gvec_4_ptr * const sve2_famin_zpzz_fns[4] =3D { + NULL, + gen_helper_sve2_famin_h, + gen_helper_sve2_famin_s, + gen_helper_sve2_famin_d +}; +TRANS_FEAT_STREAMING_SME2(FAMIN, aa64_sme2_or_sve2_faminmax, + gen_gvec_fpst_arg_zpzz, + sve2_famin_zpzz_fns[a->esz], a) + typedef void gen_helper_sve_fp2scalar(TCGv_ptr, TCGv_ptr, TCGv_ptr, TCGv_i64, TCGv_ptr, TCGv_i32); =20 diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 77fdc5f3a1..2a586321c8 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -865,6 +865,7 @@ static inline void gen_restore_rmode(TCGv_i32 old, TCGv= _ptr fpst) static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \ { return dc_isar_feature(FEAT, s) && FUNC(s, __VA_ARGS__); } =20 +/* For SVE insns which are not valid in Streaming SVE mode */ #define TRANS_FEAT_NONSTREAMING(NAME, FEAT, FUNC, ...) \ static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \ { \ @@ -872,4 +873,15 @@ static inline void gen_restore_rmode(TCGv_i32 old, TCG= v_ptr fpst) return dc_isar_feature(FEAT, s) && FUNC(s, __VA_ARGS__); \ } =20 +/* + * For SVE insns which are only valid in Streaming SVE mode when + * SME2 is implemented + */ +#define TRANS_FEAT_STREAMING_SME2(NAME, FEAT, FUNC, ...) \ + static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \ + { \ + s->is_nonstreaming =3D !dc_isar_feature(aa64_sme2, s); \ + return dc_isar_feature(FEAT, s) && FUNC(s, __VA_ARGS__); \ + } + #endif /* TARGET_ARM_TRANSLATE_H */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806020; cv=none; d=zohomail.com; s=zohoarc; b=HOt9KQLe+yF101//iByLYPOBIBrXdJhxPdX5q2OR5NaNB0OhSIMX/A427u+onn7hEM8Vbkpe9cIH4bH5QPcpbgh1RkDZY4DxwS1ZfsPaJ2YqiShkHlJCbnG/njCdQ2hH/yhCCx/87ORE+/S/G8SNscQOWsWWlcB+COI8UAz1hKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806020; h=Content-Transfer-Encoding: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:Cc; bh=RWd86sD9FLzj9rOo7wnk6NltKwMUrhT51V/lU6MpZik=; b=Td+e7KPtnparFc5X8vd/A6E0lzduXUzKp723coA3FrGPJ0Ufygu2t+rL+S9tJ0nlu4GNX9Uz3SXovu80EzWKVPH8j6CX6y6RvplBi/GtlMzIUJ2qbueBCaXTa10e7hwvnS2V4GLamn8x3vqiRT9XMq6pgQbT4u0mLO5EhOjVI7k= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806020593239.49083111761843; Tue, 26 May 2026 07:33:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmj-0000uu-VF; Tue, 26 May 2026 10:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmh-0000ir-1Q for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:31 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmf-0001NH-Gn for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:30 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4904c1ce4c1so43283655e9.3 for ; Tue, 26 May 2026 07:29:29 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805768; x=1780410568; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=RWd86sD9FLzj9rOo7wnk6NltKwMUrhT51V/lU6MpZik=; b=R9Lcl8xf1LcU8DctDSy9o+mcLuk4nppjRxDEzQ4fAneKjC3MBNOVPc/tokLAyVac0f kSxJn0+h2gGdkEZU6ldRz/lEK4gkfUwceAyEMljoZqAAbkwEZ/xjQzz6nYLEPuQg3Tza apXdcP60hvcaGc5Zft6j8IF7Altu1aBWo4NFxxCWaBqQy4V97C1BB3KoQ/Vi90TuHP8b GEJaWy002BfExw7G5Yg3d8fXLgqdg+rao82E4AwXmRFHLaMOIRLlktkRu8coqTQmlpIQ jPjQQmNkxa8sXbGhkkNnI43WzuvG7knhqwFafII9pZb9/1SIo3PsZ85n7a21E2ODSBj9 SXog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805768; x=1780410568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RWd86sD9FLzj9rOo7wnk6NltKwMUrhT51V/lU6MpZik=; b=T+Fk7DKnKIgazUhmI23sxM01ZmGWBkHFF5JSInZ0pV8EDEO/7coUTyb9EBDlWFfJLP F4ctmtAothL2mTaD9GtkmphtdNLWDDjQAeLBjw7Qqn1G0PtYaTXWZ69oL8p1qexsogUS eQZ/HhUKclwBx8VoNh9tYMH4QshHyvPYhoLJGBMphM8Tu0bCYxMmCF3MjGCeMi3l40ei zeXDIHQiNwZYebVW93NW6vOmSX0rnHqlmy1pbkvZKOkSDan/481GE6jlEddeljVSnFq6 v+qURbsVpN9LuHgDT+AxA/LV1S1xRFPeAlwYb4yzXgvIGnokNS6K9zOOT1VHGv+zAoSW XG9g== X-Gm-Message-State: AOJu0Yz0AxKHK4MdAz1+dxZ83jV3E0PmaeKGkI4QYWwgbnYSBIzApJtD RiRXj3eBLFByYAQfZ1y+Z2c/G4XS99perRoMMQzZj3e77n69wxP3kBYJLM0OMO8FOIIkva/+pua Q41cl X-Gm-Gg: Acq92OHW95q4ef7wcaqmQ/SPiKyhTjGjwNw1NIqrNDU/dp9XIxf9Fs15ttZVNgD9ZZw ntCzD9iW/v4Z5zzm6zKISmOrTYp9wxRuUn8i/18029Z9SloeurClUEI+yJOvwayZZ1PoCoMtMiL Xf7gd/bys5JQPYy5QtIMFkqemXbKQS9u+jzsogSjsJN/DZpqpaK6Fm4S4P0etJg8Ct5QWiZ9lpK XNquH/wN/z6qfJ8rJzMYafhgFOu47+K3hRuiqky+0zsfMZCS/F1VOnAI1/XiyP+BmL2ZzHdjRoh w+EKMXTtoRsEuAiIlNyoo5jEbxuTHn6JFDuLHP6roc48AgnmdhCBp+wLoMXXQo9QP7p9QANkmj/ rUQkP1cesjtulLbYI6jD3M8+LfXTLSdKww9GKSxrR7IjYh69bVDlu81H0aLBtlGJXowTjOF6M2u K9mW0cvuRay+k5vzLZ3EjiYGkkpSaGj18xBQeg4bG/tzTp1PUehQkM1sfyP3zE6CetW0tR1UB1R UXSw/L9rnTdz0L+OjjWCJuUWkbvp10= X-Received: by 2002:a05:600c:4ecc:b0:48a:5501:7995 with SMTP id 5b1f17b1804b1-490426d06c0mr320318875e9.18.1779805767871; Tue, 26 May 2026 07:29:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 36/54] target/arm: Enable FEAT_FAMINMAX for -cpu max Date: Tue, 26 May 2026 15:28:32 +0100 Message-ID: <20260526142850.2326589-37-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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=ham 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: 1779806022654158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-6-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- docs/system/arm/emulation.rst | 1 + linux-user/aarch64/elfload.c | 1 + target/arm/tcg/cpu64.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 8cd7fe7b00..da5f7efce2 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -68,6 +68,7 @@ the following architecture extensions: - FEAT_EVT (Enhanced Virtualization Traps) - FEAT_F32MM (Single-precision Matrix Multiplication) - FEAT_F64MM (Double-precision Matrix Multiplication) +- FEAT_FAMINMAX (Floating-point maximum and minimum absolute value instruc= tions) - FEAT_FCMA (Floating-point complex number instructions) - FEAT_FGT (Fine-Grained Traps) - FEAT_FHM (Floating-point half-precision multiplication instructions) diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index 3af5a37776..c5ffe21368 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -218,6 +218,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) GET_FEATURE_ID(aa64_sve_b16b16, ARM_HWCAP2_A64_SVE_B16B16); GET_FEATURE_ID(aa64_cssc, ARM_HWCAP2_A64_CSSC); GET_FEATURE_ID(aa64_lse128, ARM_HWCAP2_A64_LSE128); + GET_FEATURE_ID(aa64_faminmax, ARM_HWCAP2_A64_FAMINMAX); =20 return hwcaps; } diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 649d854a65..ff0c2b1c47 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1266,6 +1266,10 @@ void aarch64_max_tcg_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64ISAR2, ATS1A, 1); /* FEAT_ATS1A */ SET_IDREG(isar, ID_AA64ISAR2, t); =20 + t =3D GET_IDREG(isar, ID_AA64ISAR3); + t =3D FIELD_DP64(t, ID_AA64ISAR3, FAMINMAX, 1); /* FEAT_FAMINMAX */ + SET_IDREG(isar, ID_AA64ISAR3, t); + t =3D GET_IDREG(isar, ID_AA64PFR0); t =3D FIELD_DP64(t, ID_AA64PFR0, FP, 1); /* FEAT_FP16 */ t =3D FIELD_DP64(t, ID_AA64PFR0, ADVSIMD, 1); /* FEAT_FP16 */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805929; cv=none; d=zohomail.com; s=zohoarc; b=An41CEvFFKGJ/l5GpIghDQknzPrPcGX3NyxKRMEpwEPQUkCJpbvV538tF+pRbtNk8e6gHg8l0LmHC+/0MkDxsaBMjtnH2cVJfdIqxEvIphJIyns2+mmbsaEMmvY3P5xf8hEowJLMLAk3J0LjdHaCHqnfbnESGZYrej05Q19ZwfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805929; h=Content-Transfer-Encoding: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:Cc; bh=Hp2FDximaok2RE+XvcBpnez4vXq0AYf7mVkyPILuhHw=; b=nD6DvyGjFS9uV8BmXzDIpGsj4RwgSf8acAyKXiV+97E2cffoqwVrOrMBQqa/86zvtVS15LZqiusRlv+E8XOfbiHthZ8Ef/T9o99nJJNTMC2yqp5cljvKoyrrrJAobixK9aLSzPS3SZj/+FWAC2fYhHcevXN91xC3oAwf5GKx9hU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980592910032.77231033380997; Tue, 26 May 2026 07:32:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmk-0000xC-Oz; Tue, 26 May 2026 10:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmh-0000l8-KW for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:31 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmg-0001NS-7z for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:31 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-441209fb77eso6615674f8f.1 for ; Tue, 26 May 2026 07:29:29 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805769; x=1780410569; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Hp2FDximaok2RE+XvcBpnez4vXq0AYf7mVkyPILuhHw=; b=ksB68GeM9HGbvPUEh27vK/VC8TrTLWO7blcnPq57WnSHC6Z7p72/q9KEyOyTSF4roz LKcVa/i9klNQBA/DkTb5R6qYqjm9j25Vh9weogHtRzIGJRwty3oDu+Q6IyKG0nx73AkU BH7J6/tdwPvUc4XNmffFx7v88dZdQ6BAzxLyDi9riM3zEQNVB5DTPKgmd/OM9LdP3Vxi tT+wLy3WTDlZhVLKsqVq0qB4uI4Z2kqxluHdFbhrij9sNlHTP5HEKVb3dyGlweeev6Tq AocCQBa72dPzt3dsyNhQvkXXDQSo8tWuowfCpIxSnpD9S/K25WWEU9P8ZysFY2RNYklc QZeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805769; x=1780410569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Hp2FDximaok2RE+XvcBpnez4vXq0AYf7mVkyPILuhHw=; b=oeZjXx7qC4wEBzOzR378hDQBx22h3ZfNr0gj7RPSu3C8UrpS6MyelIPtgUxu0GQxR+ ihxifSrMYqgun+KdzFz4Ppy8A4tOe/ZOWkKwrmIENs9f0h8B/aKNlWW1M8cPup5sr2sT TkBokxzcLebJ7ACcbxQCjkWevKaJ30GnD3KjytgwgB6Jlfyl+lLUNNg3A7lFuHvhDVWk omjbUQ7orYARHm8KtRWkU4cTvaskk257GHdX+otZ71GGfbsTzG1xvzetfaaVAuOlP6+6 0hvSzu75Yr9j7iotrXVuWCRUMaHFN1GxqqM48m07gSO70MEuu9hclxuVw19cMomOfde4 ERUg== X-Gm-Message-State: AOJu0Yyhk+KfP9YSOXI8RcgDMKJExh7CKQ7d658g+V4f8/XXkcj13B6h vrQNU6F/towZu0dtNY68ugX0RO7JF73j6z1JzjU5GisY459J/HsTMxRK+nOKRg8NtubAGrZso6S Oy5OY X-Gm-Gg: Acq92OGrxcVbM1D2UjonHnpqEEVkwPEHBpXVvDC0sdZWJH96gizHYIOKSnhoyoAi/tS 65oz+jhxbFs1grxbVSdkQeG6zoMS9lNTtga9CMsI5g9xjicgekobogiMPXJKkUqh/Yb1JAfH2Dx xloD2avfam8N28hRctfEMckHETReq02sWQnsrh+GYMkOu4BqDWyBl5l0OVB7yNz/+Q0uFrO+hAe qfxM7lLLGNvz22FfnI8F2Qohdn2MT/vviTRuYseVXeZjvvvqta3tuwLH19v9Tr3P8r4MRNw2XWx p1FbXSzV4OXfsHEQMs58gdy6NMJAEpUSzZXQoe9CoEFvO553ZHuUfjAUtMLKfyAs/xzKaVgdD7B bZJaktXdsV/9NNXdBXMdHrQfUrUyqDHFYqm13UGp0rw8yXNFicC0XmylvgYgA+gF/fFqPgOxKS+ +BCRpa+cr46AzYY6En7uX7AnTY11+r5PbuhXVj/RkNBVF6fngLcagMYIv0U2aqzjZUugXrzwFMv rH/J9JDBQJtEFZlZQoKcZrWb64yDK8= X-Received: by 2002:a05:6000:480f:b0:45e:8a9c:608c with SMTP id ffacd0b85a97d-45ea3128da8mr35282270f8f.2.1779805768829; Tue, 26 May 2026 07:29:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 37/54] target/arm: Update SCR bits for Arm ARM M.a.a Date: Tue, 26 May 2026 15:28:33 +0100 Message-ID: <20260526142850.2326589-38-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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=ham 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: 1779805929837158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-7-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 15a13b9292..3c2bf476b2 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1820,6 +1820,17 @@ static inline void xpsr_write(CPUARMState *env, uint= 32_t val, uint32_t mask) #define SCR_AIEN (1ULL << 46) #define SCR_GPF (1ULL << 48) #define SCR_MECEN (1ULL << 49) +#define SCR_ENFPM (1ULL << 50) +#define SCR_TMEA (1ULL << 51) +#define SCR_TWERR (1ULL << 52) +#define SCR_PFAREN (1ULL << 53) +#define SCR_SRMASKEN (1ULL << 54) +#define SCR_ENIDCP128 (1ULL << 55) +#define SCR_DSE (1ULL << 57) +#define SCR_ENDSE (1ULL << 58) +#define SCR_FGTEN2 (1ULL << 59) +#define SCR_HDBSSEN (1ULL << 60) +#define SCR_HACDBSEN (1ULL << 61) #define SCR_NSE (1ULL << 62) =20 /* GCSCR_ELx fields */ --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779806054; cv=none; d=zohomail.com; s=zohoarc; b=iCymcYJC67sMMxXWXkm9LWZpVoiGFTR3gRQZFqrjrQGKAAJyVSNfIEsLf37KA9CuKtBZ61d3Oca6fPxnH5lwrVnOkGrXnXnhzG4nMEFSsKybNBU2nUCPce0euhi0fTzuxeagj2vmrrARtfxxB5gfK/et18JMfy1sw/sTo5Z9/uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806054; h=Content-Transfer-Encoding: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:Cc; bh=HEvO5IG8VjlkPXIoc9dWoV0pnU2+6fyZD2rdebxmp2I=; b=ies9ejeQqcYAqMh5kYnlpVW1S/lt8LO2hfXFD33SjH9mgnuOfTEitxh74JSDO6p0xnLDys21KqKJ16EPDngpAXMGpt/XJ/baxOOkzP76LcarasvqxAnO1WXwj26p2QiURML/BDL0bBy9+Zu75mCI1GNLAsiy8xT4wIrK1FN2uso= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806054849197.29813395343058; Tue, 26 May 2026 07:34:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmm-00010m-O9; Tue, 26 May 2026 10:29:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsml-0000yP-5H for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:35 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmj-0001OM-7b for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:34 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-bdce61897ebso501840766b.2 for ; Tue, 26 May 2026 07:29:32 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805772; x=1780410572; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HEvO5IG8VjlkPXIoc9dWoV0pnU2+6fyZD2rdebxmp2I=; b=SGEYpHdhYSvqucixqMb3p36wIduU4ZqOaFvStvIDF6DflZb9b+xPJyMQkP5WVjJycY LBMyxhTfAuVSkK+kKCWMHOEvIig+3pRhbgNoh5xaEgcCfiBjUIjSGVu0rf/hZfU8GiUS eEg1299QGyapwns4/Y8MLBn8DobFV+rDyEPBbrkyHIOUp42exgXC1FsknpMp5wzjJ0CN jcVldh0T4yKjhaQavOvmijj//x+ZCThHEJQrBCbRy3hFGzjPyOMA3bZ5sGCJeN1UzD/O GkUtYcvLo8VpRR/+3Ipimm18XvBZPqDhG6aE+oT2eRCrqsxbFPs7su5DsxW2tmOFOfJd v/Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805772; x=1780410572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=HEvO5IG8VjlkPXIoc9dWoV0pnU2+6fyZD2rdebxmp2I=; b=gls+H2PY4DvMxuOv7simyILVJ/AJXtMszoxpFcpIh5F6+DGBXh4vBC4HLQZO0106az 9D7FZm65RpmRus8l33Dioin5SDxanq9/GfW8ijYj0qF3MbQpF2QkYcviqZxDWHoF2tgU y3wcNjX4j9AbX27rAjZ73mYR6AVzNHDIO3dHoZ5NZcVOWreVWM+UBOjeNDNPQthV5MdU ELyYgX0HUVtsuA9TtJI/EXXvKm96Xl0UcenZHaFnNqIUsyKnHj7YyMr2sohDOQVHnPRq KDV1ehpgA6aIlyEKNo4XizuHvE1yiSpUJkYfFFJW56uH8P4nTM6iwvr9GGP3yOL5USDG 42wg== X-Gm-Message-State: AOJu0YywbZCJhoXm29LIwW5oNVF3919CSFUCjn8H6NtYTp+JGR+jXNzh 9hb3QNOIitRwjwc4/kgXFhiYtppp/r5Cs6uT0Es+tTg/G/X6Em+Nb7TTMWteT55gHmFtLpEPx/F FQc4T X-Gm-Gg: Acq92OFyBqE+bSOIX7urECNWTMoXfjzVv58G0DvfvnHcsLq4yaAzraoyIGb+0+gRusG dn1o9Ko3lyEI7AHrkSIBwDS7ElCX/9qS3oKkDdqB1tU5ko5Z71RZOSwgE8MvbTYQ2Zl+fu/DYZ5 3YXuSF1iQwM+Vc2p0PzrleFY6y7XJfmlPe6UCyPjQ8ZuHip+n4c7aNjy418EDo8hZrQeMTZ9WYr Wv2XLBES8eGvMgAK7WDZbRODq9qbtsz9rWdpeqcyrJxpA4cwT4THuZ/eaEqUrAo8MmNBSrPSIbR LBw9oPHhx2htrP8V1V2XnO3SOaVFQTTh0WOECFRn8KMY/B/MBw9mjQHkxwvCzAFRNN759nonPYo PapPFN09aOsQxO1MOKkO6dmrqa3AeJldzgehAnwW6p5a6u63PKpxLZmsMs46OLqDHFDh5pj5Oao hSt/yqNKfZSElM5LOfDwW1kBqAksNOhnMSHZmkv51uZhtChpFR6sLL8hD3as4rlUbkCnAP1kS1q tkrJ1aV5eBTahMi+XW1zvlidpETu7c= X-Received: by 2002:a17:907:290f:b0:bde:72a9:ba83 with SMTP id a640c23a62f3a-bde72a9beaemr601555866b.29.1779805769641; Tue, 26 May 2026 07:29:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 38/54] target/arm: Update HCRX bits for Arm ARM M.a.a Date: Tue, 26 May 2026 15:28:34 +0100 Message-ID: <20260526142850.2326589-39-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=peter.maydell@linaro.org; helo=mail-ej1-x62c.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=ham 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: 1779806056897158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-8-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/arm/internals.h b/target/arm/internals.h index fcc08ece90..0a9b4d41af 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -258,6 +258,9 @@ FIELD(VSTCR, SA, 30, 1) #define HCRX_TCR2EN (1ULL << 14) #define HCRX_SCTLR2EN (1ULL << 15) #define HCRX_GCSEN (1ULL << 22) +#define HCRX_ENFPM (1ULL << 23) +#define HCRX_PACMEN (1ULL << 24) +#define HCRX_SRMASKEN (1ULL << 26) =20 #define HPFAR_NS (1ULL << 63) =20 --=20 2.43.0 From nobody Sat May 30 17:44:40 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=1779805908; cv=none; d=zohomail.com; s=zohoarc; b=YoE+W5l11uKcvAojivOuT9nAAWva9h6IHnni8LV55/kyIzO5OihwjwpESKJFukZX0gUHhDiTzKtg2fcLVxlEi7a7iucI7G7Ezy5ZkZIWXozYwy6u4NNdVyTbpqPm15qNP/t/kBMvUDFo+D3dQBL+KgRp/tNcvEZPpkx/K2O4reU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805908; h=Content-Transfer-Encoding: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:Cc; bh=2/oXsXz6f50ENeJfUqlZ2SkVo/jqaVvPr1Wk5eRyyaM=; b=feLTNzSlFP+fG4F1Kl7THrQ7a6FQe1GxlfA89PO3IyDYfZlACfeXJEniWIrGhwvy5CQCt8xn6V8shO+C+6XO1VIjPn6ZrLaKB4DYsI6Hf9/tSzWHuJ+H4VA7maU2L5NIITARFOm0Ty82nGp9pjrSEV7smfQ0EFD9j3KhZDiLl/c= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805908014260.5309948199057; Tue, 26 May 2026 07:31:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmn-00011k-51; Tue, 26 May 2026 10:29:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmk-0000w1-2G for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:34 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmi-0001O1-7s for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:33 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so112135505e9.0 for ; Tue, 26 May 2026 07:29:31 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805771; x=1780410571; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2/oXsXz6f50ENeJfUqlZ2SkVo/jqaVvPr1Wk5eRyyaM=; b=vQXRKSK/nhAf9wk+pOs+PYjJquIXO6xr9cKW3DplETcGl1daAarT1YeN8rcB2HF57M VH8X4rV1/5f7ZSECJHhqHUXCyN5aFK0Z7kDUh/B4m+xYCxHU8gHYp+QTO0OtPOuzFylo vW0P3bAoABkew6/f5hS6KNjhAHWBz4p3FNCfz8xlIS8NQ4iWawqTdWJGDoCeKOdjhXF/ mibEn1mgfqrCJQ21kquBu6Yu+fD7zV65d0aO+KNiTm42plS0781cMFXY0CqJFbIGz9AA DZPVjrTsIlFdB3xBCBdUGGmfJc8NTfrpHDcJJFglyDgwLVSlgWFwxFovjhtV+ZXWqgVl NV/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805771; x=1780410571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2/oXsXz6f50ENeJfUqlZ2SkVo/jqaVvPr1Wk5eRyyaM=; b=N5seuIJpy4EyOFwbCjD3WppPgLtiAJOa8cZnvoMETFYiM40l23kWOLujt1s+yNeCWA WeMyKlkNmIAbpgMQNLdqviqrHgvKPjvebVwKN7wWrrUIjrqA1GcQpf63nlZHdWh24K0z V6UPesftKiUnuMpayjgTF/jEJVbbal0htszcL5Ts/ubc/XlJWNPR/HAJhBUKzKT9gX7u /zLDZChFkxTiNXW9utIU/kqNVj6N2esBD4+5SCRh1b6rjyU4goboQfcfU4Gzoy7eQUNQ wIZCxAiS+9CcK/xqvC3UFwmGOLo7lj6DCjpFi8nnMgLQR7ub6jSRj1xmwQAONsr+aFkz 4B5g== X-Gm-Message-State: AOJu0YzRSUt+hcHTkuEwdfYJ5wWAGJdKBkMzBnlxOX6whYipwEZt9waO 6vD6UfFYMnzCj5fh1cg9Qn3ZWqWxLOgtIXPbN9ZP4QjAm5I+ZYO7+/mdCof76MVEn0hbJaVqDfV RVvyt X-Gm-Gg: Acq92OHWhxdxtMu9pL5RCmjzRwZN/akYQ6fyZKQ1E2FsUEHQbG2lwhUYMlhXlLwDRH8 uZjjfBOB8lJ2pf11ixFvDTpirraqylDpd/o7fow7TwPtwcVRXDRtA4cSGUFN6OK8WlQyiyYEbbr 7R81mJKX/VXaJOn0IolqCplo4RUG9mnUsIt7oVcOirAowjtDy2U/8Z8/jiqxANx2JcGPBiFte0a mTbutK0mKyj/je2pe3vGQOpH1M4QdRoslL/8fcpe+Z+PocgU1pgK+3OxTTtdvcLaa39wdB9m3p8 Vf6Kkeu635+gW9UWo/Gu5MQTr9XCwvpyGih+rrTQNbCxiT2RPLYmdVjbzDoiglyERwzstW15+ES ZawDkNOaZqj5SgHGcjGT4G6oPTfWT87MqUtP7Er+lBhpMr1g9bnN66zPeHqhiet75IhbFcPZV5T +23zmhD5bODXudm6ph+BXcsmGoY8sF4pVqxEEwlq/JQ08XswR+N+nj9CR7jk8pYPW7A9HUgi+iz uhjSalwWWd+ElEONbk08JCzlcl290c= X-Received: by 2002:a05:600c:674a:b0:490:5057:f5f7 with SMTP id 5b1f17b1804b1-49050580a91mr247315335e9.11.1779805770618; Tue, 26 May 2026 07:29:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 39/54] target/arm: Introduce FPMR Date: Tue, 26 May 2026 15:28:35 +0100 Message-ID: <20260526142850.2326589-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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=ham 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: 1779805909514154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Introduce the special register FPMR and its fields. Migrate it when present. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpregs.h | 5 +++++ target/arm/cpu-features.h | 5 +++++ target/arm/cpu.h | 1 + target/arm/helper.c | 12 +++++++++++- target/arm/internals.h | 10 ++++++++++ target/arm/machine.c | 20 ++++++++++++++++++++ 6 files changed, 52 insertions(+), 1 deletion(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index f5ec7484c1..391c0e322b 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -149,6 +149,11 @@ enum { * should not trap to EL2 when HCR_EL2.NV is set. */ ARM_CP_NV_NO_TRAP =3D 1 << 22, + /* + * Flag: Access check for this sysreg is constrained by the + * ARM pseudocode function CheckFPMREnabled(). + */ + ARM_CP_FPMR =3D 1 << 23, }; =20 /* diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index a7ab7e2a31..e13c1c1331 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1192,6 +1192,11 @@ static inline bool isar_feature_aa64_gcie(const ARMI= SARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64PFR2, GCIE) !=3D 0; } =20 +static inline bool isar_feature_aa64_fpmr(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64PFR2, FPMR) !=3D 0; +} + static inline bool isar_feature_aa64_tgran4_lpa2(const ARMISARegisters *id) { return FIELD_SEX64_IDREG(id, ID_AA64MMFR0, TGRAN4) >=3D 1; diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 3c2bf476b2..a549a50b7d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -713,6 +713,7 @@ typedef struct CPUArchState { */ uint64_t fpsr; uint64_t fpcr; + uint64_t fpmr; =20 uint32_t xregs[16]; =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 6ad01b345f..ae1dd42dc4 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6229,6 +6229,14 @@ static const ARMCPRegInfo aie_reginfo[] =3D { .type =3D ARM_CP_CONST, .resetvalue =3D 0 }, }; =20 +static const ARMCPRegInfo fpmr_reginfo[] =3D { + { .name =3D "FPMR", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 3, .opc1 =3D 3, .crn =3D 4, .crm =3D 4, .opc2 =3D 2, + .access =3D PL0_RW, .type =3D ARM_CP_FPU | ARM_CP_FPMR, + .fieldoffset =3D offsetof(CPUARMState, vfp.fpmr), + } +}; + void register_cp_regs_for_features(ARMCPU *cpu) { /* Register all the coprocessor registers based on feature bits */ @@ -7502,10 +7510,12 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, mec_mte_reginfo); } } - if (cpu_isar_feature(aa64_aie, cpu)) { define_arm_cp_regs(cpu, aie_reginfo); } + if (cpu_isar_feature(aa64_fpmr, cpu)) { + define_arm_cp_regs(cpu, fpmr_reginfo); + } =20 if (cpu_isar_feature(any_predinv, cpu)) { define_arm_cp_regs(cpu, predinv_reginfo); diff --git a/target/arm/internals.h b/target/arm/internals.h index 0a9b4d41af..5a2263799c 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -293,6 +293,16 @@ FIELD(CNTHCTL, EVNTIS, 17, 1) FIELD(CNTHCTL, CNTVMASK, 18, 1) FIELD(CNTHCTL, CNTPMASK, 19, 1) =20 +FIELD(FPMR, F8S1, 0, 3) +FIELD(FPMR, F8S2, 3, 3) +FIELD(FPMR, F8D, 6, 3) +FIELD(FPMR, OSM, 14, 1) +FIELD(FPMR, OSC, 15, 1) +FIELD(FPMR, LSCALE, 16, 7) +FIELD(FPMR, NSCALE, 24, 8) +FIELD(FPMR, NSCALE_F16, 24, 5) +FIELD(FPMR, LSCALE2, 32, 6) + /* We use a few fake FSR values for internal purposes in M profile. * M profile cores don't have A/R format FSRs, but currently our * get_phys_addr() code assumes A/R profile and reports failures via diff --git a/target/arm/machine.c b/target/arm/machine.c index 8dc766d322..58f8dfd53c 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -960,6 +960,25 @@ static const VMStateDescription vmstate_syndrome64 =3D= { }, }; =20 +static bool fpmr_needed(void *opaque) +{ + ARMCPU *cpu =3D opaque; + + return arm_feature(&cpu->env, ARM_FEATURE_AARCH64) + && cpu_isar_feature(aa64_fpmr, cpu); +} + +static const VMStateDescription vmstate_fpmr =3D { + .name =3D "cpu/fpmr", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D fpmr_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT64(env.vfp.fpmr, ARMCPU), + VMSTATE_END_OF_LIST() + }, +}; + static int cpu_pre_save(void *opaque) { ARMCPU *cpu =3D opaque; @@ -1323,6 +1342,7 @@ const VMStateDescription vmstate_arm_cpu =3D { &vmstate_syndrome64, &vmstate_pstate64, &vmstate_event, + &vmstate_fpmr, NULL } }; --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806010; cv=none; d=zohomail.com; s=zohoarc; b=SvmUzKpR5xGwbh9fJDyJFTCNfPf5GgmYSqq2fsFXYN1H90vy3hGThOK2yV7A9P+SJ/6Sb+265H0ApCoZrSd3HvlUcv+LSyiUW204nPfHZMJq+SI6kJPXRIfY/HI6knXnNgxwU0mb5cgc5BElx5UPaVMdmyu6s936Ep1xicoQqlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806010; h=Content-Transfer-Encoding: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:Cc; bh=N55g6uOUkcXbuwCj3DQHO8MRkbx5OGQICT/gKIBW97Q=; b=kzOi/usiQLnFjQ6m+I5t/WYUf8kjfuCuGJG/hvzq30nB9vquJneDfr0u5KaCVWy3ic9YzBr4ul1haM5+J6KIOiFch73n0X6QllznLKDDBedyXvYhTuNSE0wU33ymkD9zdLdpT4YjF6PQBcXOALZcmsOsX6Vpw4Fy/jskYUXnLmE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806010383982.1719108540617; Tue, 26 May 2026 07:33:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmo-00014w-KO; Tue, 26 May 2026 10:29:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmk-0000wW-FY for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:34 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmi-0001OK-Vd for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:34 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-44ce78ab5feso8553011f8f.0 for ; Tue, 26 May 2026 07:29:32 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805771; x=1780410571; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=N55g6uOUkcXbuwCj3DQHO8MRkbx5OGQICT/gKIBW97Q=; b=HZ3J5/wN39debsgXgKlv8pH08iiusAxSOrHVKUOChBIhVeGza/SiR/48FLIdF0PILn hK95ySoXRq/co+UG9gkXHsIHZxq/tjsJd2jVMZ5KmU56+qO6biKQSknRi6GfiDierUlD oMz2feIqUwCI60UHK7Y4pUXpOpduo7RLWhFjjctrqWlLgeATcgJkPWopm0+HA2O5zqg+ NruwX4lQ66z864h1cSWt5OFuObT/wVmUJS96i1ddPJ9LRvG5aaooBI/TCQMj+ZAipg16 3scuMqFHTXfJ3RtAOT7X/zLwFcv5QRFmhnaf3b7w3lxlvWGYUez6tYGI8+haBnHblzjo BABQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805771; x=1780410571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=N55g6uOUkcXbuwCj3DQHO8MRkbx5OGQICT/gKIBW97Q=; b=FINKLdHW/ikGOLFg4N16tsCR9+r4+dlnYrCIfr/Jp2bN3C72ttGFwvPh6gcEo+kONs RSt12HyH/bR0nMn9LZiuigOUsaaOzSHarKHVRBmlcbTCAV9U6SiMLR2VLaPwaidVcews 9i/Kadv5ehkhH3OV1bjk3m0IR+t9oGPH0iJPxSMB6VebHPpJFvot36isOxOLhwMhVwro u22v45tPEGjvCCaHu2Lq1w0Lg8jAtfyEpzETtlxXiskqw8z9uGl4NTL13aXL5W9Tr2Hh XN4dD2nb57H0ZspZIVlnrBwFn96FX1ktKGUWFgu3rMwgyDFrjC2pqjieTXe0xiiLCqFF LgXA== X-Gm-Message-State: AOJu0YxLaQ56r8KfBV4U/K2AuYea43UXwtp1ByiVB0sEt5ncMipEy4o6 oeAEoC9GH5OopswXsUtnLt5CyDUEUY+Lvtbm7aUHKymdp7dKdk+sMVw7HDI0W02yQyCjmqQW4oM X7h2p X-Gm-Gg: Acq92OEOmrv0BzsS//cHZzvejZ8FUFckO2TM3whcUP3dEJ2BTd0O3zb3IBb2pSmJE1u dDu7nH4yiWWJQQ9jQhLD2diiJ10UGcYs3uOAGUPLRwiL9CL3hFCwnHp8ewkG6qSNHmQfvarXyOg fTWo018P5Wh8UJjraNrNLgcbGnegKu/PXyxIjI8b3LieonO+WFXkQsKB0g6rU1zRDvdYyvVSO7U pPlYMG3PJFzF3ymMn9LIjlKsQ275oAVdhd+sh9Cu1oTOYKw/PMu2GEaBSRW2in8MkyXYQlsIDR5 sN1q0Q4Mn6jZPPqTvOfOEHucAp0UpPQnxKDoJRH7065fHRWzOnJn0RCZzcLxT1nhcVLzE+ZIsAL /+ZKrgzfvLXI5S/lDdC1i/itQHkwhT6qipO6M2NECXBEdG3hG2uCgfUrh74zywBhZLCjgNaQGgr WpBx3xSsMLcXGb3T1VBXAsa+A/mMAwjIiQwn0jGt44VddxUfr9tJRiSmCbzB3vtDLa9JUslnY05 sEe7RC7Si/1g5ieU9Y4bJXnmKygmm0= X-Received: by 2002:a05:6000:2508:b0:43d:7b7b:ab76 with SMTP id ffacd0b85a97d-45eb36aa739mr32013498f8f.10.1779805771437; Tue, 26 May 2026 07:29:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 40/54] target/arm: Update SCTLR bits for FEAT_FPMR Date: Tue, 26 May 2026 15:28:36 +0100 Message-ID: <20260526142850.2326589-41-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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=ham 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: 1779806013454154101 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-10-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a549a50b7d..e9e261eb2a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1485,6 +1485,7 @@ void pmu_init(ARMCPU *cpu); #define SCTLR_DSSBS_32 (1U << 31) /* v8.5, AArch32 only */ #define SCTLR_CMOW (1ULL << 32) /* FEAT_CMOW */ #define SCTLR_MSCEN (1ULL << 33) /* FEAT_MOPS */ +#define SCTLR_EnFPM (1ULL << 34) /* FEAT_FPMR */ #define SCTLR_BT0 (1ULL << 35) /* v8.5-BTI */ #define SCTLR_BT1 (1ULL << 36) /* v8.5-BTI */ #define SCTLR_ITFSB (1ULL << 37) /* v8.5-MemTag */ --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806055; cv=none; d=zohomail.com; s=zohoarc; b=Rx52oHmCeam/FsiRL2VnXuIUxsfkE0/1I3ViwRo/qonD3vBWuWlrHJqGYyeqtSMcfkGF/5w/J08NGJHg6jkami+F8xcXKyFqSbO85x1HsNw4AgUJMenCogrB6h00pmr9lVue6Go12LKOIhgtfsBlgkx5CCw1KX2RoYN2OfDvYLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806055; h=Content-Transfer-Encoding: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:Cc; bh=9AqD1oHDlEi7hjoiK1h0GkH5UvTjIhBiTLaTuxECtGI=; b=Nxz9GbRaVBws82fqG20cFaCWobrCBzbuqFHTz5AWk0X7dU10QWPOQORlCWX8eQbyzVc/2S5vdSebcirwswe/MP4WP+2k5UimeJfVB7dQV9mleeK8xyDw0ZmTftuRBaHHtSWsCYh2z/yyOz7rFIGTescNBXI0UNr20ReSh73X2Z4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806055651675.2038735388549; Tue, 26 May 2026 07:34:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmm-00010H-9f; Tue, 26 May 2026 10:29:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsml-0000zJ-Jq for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:35 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmj-0001P2-Sq for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:35 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-490388fd0dbso51202785e9.0 for ; Tue, 26 May 2026 07:29:33 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805772; x=1780410572; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9AqD1oHDlEi7hjoiK1h0GkH5UvTjIhBiTLaTuxECtGI=; b=BSIDisU908VhKqEdR2HpH1Xj/HS8+guONNmPuR/bVJFNnActWq6kNdAvnJ3L6cV+F+ KXzq1SVz02Lcugq8yJIsTrzOfulei3TbqQvCjN5y6lELgICFUtvX9pffU1zzn5weIW62 MqiWKOk1Xj2LpgiGCgBA5Dni5TdHWGDz+jRljGLEjw/T5wVxtEUvrRgquRCXCtVZ47rW Zzks9QU3LmFw44z9bTbwWwBUpDblZiW8Nap0z4b9abz7EAlvmnnU90/sL3jz8f/4EMg+ 7Ukt3d+VGXRKuojhRxPfIapI5QqwyEhvKBhlj6+xU1zuyhHc0wCKZL+MYssv+O5OUKiA QPXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805772; x=1780410572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9AqD1oHDlEi7hjoiK1h0GkH5UvTjIhBiTLaTuxECtGI=; b=F0WErgPftEhoqHSoqf7uHwtAGjSy5PqvQ+JkH1NzQ5atlv6lYxlichE80mzWnRQ43a Pgv5SmMfhisnXHBRGOGpITN4thSd3mp6KX2QoQi7RdjRwawTetaqLVKebK4+m7F+DSqd MJYq1JNB0bM9SEYJOZf+8PN628N/22fufhRDibx7G19joIhoKX2ebFIGqsAEJsf/+nH5 9rcmOsMwjxJ4bnwUrLyTRDrcnlz6y0gO52fZh7NFxjl5EJbAJxOhuaKbqNjOxdqUYUcX r7FFgBItyZBbkT1n9opgTnm3L0I2GwPBzN/vne27m4FoOD7sUr/jJZY/NEhrKdSxTuFr iNzw== X-Gm-Message-State: AOJu0YxBlBt1HPpNI3rRLfm0hpVcoZkhkf03IV4NQ56N5AB9LZUrDfEq a7F2QXewRDTUJdwN2s2cCLGUQu+KoLv9dCRlBvKTCWALZXHem+H3aYp9yXY199/2hm21jy1Z+ts F+u4e X-Gm-Gg: Acq92OGZi1Sg6EelBBocfbxSOaYup2w/LW/pi+2n6rpGR1T5j6AmHMvSOPiuPOn9VMl Ln8zy3tyuKkX+pwXllwgaeyQ8fhxFwPpxonTd9QIzA8XEFC+mN4ld1PCi8L0rivDGrMTcFVGu6B Kztx5Ear7uA/2pNpALzdx5jFc99EpCMXuI6FnzJjzUHmXO84x558cjjWre6cqZH1ZEZpvakTvfv /h/enkTouqFLE8Utoa8NwPoG8lRAl/sviE5zov/xaf9qU395MfJQagaMwuvXVGRQWmAJAqtOzDx QYvG0jZzeQQZ6vt+pPe7QHC37chuAWKG5F8NNMDjvO4Xysa+Ojqig/PzG7bCP908XumOrKZBWU/ mf1ZyvwifD6DGuhWb/gnftcauaq64hNlsg1eV1McAjF3fMYHma3o+wSMwIzxgpihZgWezoVtlUk mw69iWPWA7cAjImBgNh1Qrh8mqLE/Etk6OC7jBsYTvGS/rFDPpd7zZ07VeP3gI32ITQvPQjAjQQ Ahw1Hc3Fdq+2IRC0u1PL+xtk72Y11MriSRaluLO2A== X-Received: by 2002:a05:600c:3b20:b0:48e:8741:fd53 with SMTP id 5b1f17b1804b1-490426adc1amr289814525e9.15.1779805772325; Tue, 26 May 2026 07:29:32 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 41/54] target/arm: Enable EnFPM bits for FEAT_FPMR Date: Tue, 26 May 2026 15:28:37 +0100 Message-ID: <20260526142850.2326589-42-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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=ham 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: 1779806058107154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-11-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 3 +++ target/arm/helper.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e1ea41fdc5..84b2cc70e2 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -742,6 +742,9 @@ void arm_emulate_firmware_reset(CPUState *cpustate, int= target_el) if (cpu_isar_feature(aa64_mec, cpu)) { env->cp15.scr_el3 |=3D SCR_MECEN; } + if (cpu_isar_feature(aa64_fpmr, cpu)) { + env->cp15.scr_el3 |=3D SCR_ENFPM; + } } =20 if (target_el =3D=3D 2) { diff --git a/target/arm/helper.c b/target/arm/helper.c index ae1dd42dc4..7eb7031294 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -787,6 +787,9 @@ static void scr_write(CPUARMState *env, const ARMCPRegI= nfo *ri, uint64_t value) if (cpu_isar_feature(aa64_mec, cpu)) { valid_mask |=3D SCR_MECEN; } + if (cpu_isar_feature(aa64_fpmr, cpu)) { + valid_mask |=3D SCR_ENFPM; + } } else { valid_mask &=3D ~(SCR_RW | SCR_ST); if (cpu_isar_feature(aa32_ras, cpu)) { @@ -3973,6 +3976,9 @@ static void hcrx_write(CPUARMState *env, const ARMCPR= egInfo *ri, if (cpu_isar_feature(aa64_gcs, cpu)) { valid_mask |=3D HCRX_GCSEN; } + if (cpu_isar_feature(aa64_fpmr, cpu)) { + valid_mask |=3D HCRX_ENFPM; + } =20 /* Clear RES0 bits. */ env->cp15.hcrx_el2 =3D value & valid_mask; @@ -4046,6 +4052,9 @@ uint64_t arm_hcrx_el2_eff(CPUARMState *env) if (cpu_isar_feature(aa64_gcs, cpu)) { hcrx |=3D HCRX_GCSEN; } + if (cpu_isar_feature(aa64_fpmr, cpu)) { + hcrx |=3D HCRX_ENFPM; + } return hcrx; } if (arm_feature(env, ARM_FEATURE_EL3) && !(env->cp15.scr_el3 & SCR_HXE= N)) { --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806025; cv=none; d=zohomail.com; s=zohoarc; b=bxpqg9ka7x0DpxJF1eLnjV55tvEzQOKgeTMryEpAmB7YZ08lhXNd9IR9SqpzsuBvBn2MJ/AtpSxypBnDeObXaCGimzLQFoMy8iRFraMFiWkvuTNr9R2JmwOC+7wYeIA87X1j6pzub9mHRF7TnWYSOOM4y/ZpLl/Q44TQzxpB1f0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806025; h=Content-Transfer-Encoding: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:Cc; bh=dekYF9pPrnIVrcP0IqaeXaJtDkemEhBeBmy30K13ZaQ=; b=LmbMT7egCDCALpGdLm1EG01HQR2j9e1s9qHzeb1ew4jmlxanPyhPQ1bOLh9MAkQhsm6z//ZdwFO/rcE3tAfc+QZYdmc7cpHaLRSnrKVf4FkA1N1gLYLkv3UaD6OOhNAdbRUGspkcSkNUEto+9g895J0hW9zpsqvIShnQZUfWz5I= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806025793194.47932885921705; Tue, 26 May 2026 07:33:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmo-00013v-5O; Tue, 26 May 2026 10:29:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmm-00010B-3C for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:36 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmk-0001QL-L3 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:35 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-459bf19e87bso6314277f8f.1 for ; Tue, 26 May 2026 07:29:34 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805773; x=1780410573; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dekYF9pPrnIVrcP0IqaeXaJtDkemEhBeBmy30K13ZaQ=; b=KStNzm6+qQSw/J866c8f0rLm7bhxY8dfEJGchVxJLU/OxLR+8WLbZ+1u6aFnz50/9e 72r6Sy2ZFiIIJckq03tfTefd6jYiNbYyTwWyEdlyJ4BTKgrOWtwcfqlQiRyZq1pvN51o RzW5Aref8LV0/P6YSVpxecOEq2BBpqLcbhm4YQMzKFr/Hq1sbvmjsd6hDYqc6TTxCrn3 fp8pbNeQUn6pCoRM+SIOE6QdEfKS8S/BDwgjydXKiClou7U+tEbyJ0gBFKMZtwh3bsr/ 1J12zzEZwxFJYXpZJnTK0YqD1S7+Kst+KK5uAHHukp4Hoj4/DUmQ2c1R7R6GXp48AeDN yfVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805773; x=1780410573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dekYF9pPrnIVrcP0IqaeXaJtDkemEhBeBmy30K13ZaQ=; b=gX6P91i9L2XJSlYFYp8tcBnb760z30g7C3TcXTzb2ktltVJTUvyidO3ZNCGaqjvRiy /Ws0a4CXFQ4OLCF5by/+Xvnpzwp9QBVdVr89QhPFZLV4/YaApzFYODjqcoKgYPdsByGo ZOOupg3Bu6G7qs2G60CmELIvdSVMvmjsC5RKiFsXeMoJHxtonDAFVZrKpU5WJ7KlBtnb uulhjObkzMFieqhYWZUucxq6AQ6cyQLR1RSXGtAF9dq4Zw9/zIBqGQ4DykkpIniW4zIN XkW0p9AGvbYN10Dg6vms2dVwgI/LDWLH2tEHL0gPTkiShP26rQJqxa4poT0mgLXcgSKi 1vbg== X-Gm-Message-State: AOJu0YwpJca6rtFzXfSe+Sley1I+9cWIR8lr9D9UfLPhX7D1ngUOOCBp bFo7dDe5r42vl9LezB/3ChRBo9CDD7ghXSeIG17qmD3BW5KnprokT5dFn0uP5QOWVcz8vFY5lva 7Q6gJ X-Gm-Gg: Acq92OHFP3qdsywI8MU6Xa+dXuMz82DQRfTp8iTJHfUnuHWOTBGUhDcQPJafT9ydm1x EmRjvvAwmv1jNRgjjb25H1Q0EkiLAlg63ehATQ9skZwC+/w2vumUBW5NwRo69OZ8SSJQR85r1bk hnSyJ6xQgVwLhzbqTnmOQt/qaFbSMAOFPJUtls1j18glDw9NrKlemAkbRcrd/MwlWzIoJeeEaVS xkKJmBBHIynxKTAs6Kta7Y2PQiLHHDGwrcr4yEgIA/B2e36ABTam3v/j4y1lK4L/0M0cOqwnq4Y dzBqmGENWg4Uehz3bIW9r7TtbxsABnIYqdTNZAaYDIUIOv/2KpOvkCOcoy/4IJUkaSta0BrUd4p xSx6i4qJuKM9whzEvuzks4gnDD0SdAuEdymrNvNckO+ojZgQBpDWkVGclhBDUn9cNjwv3G7BowD ccIr/qWRGgom1wk3WwKsHI2I39UA4kapFiSKtjcQ9Fu/u+PtAuDD4caoZxlpPfFyTI88bJOiB/c a7UjoYCmT5OHOxvNCLl8SHpNu4JyZM= X-Received: by 2002:a05:6000:381:b0:455:4695:92d9 with SMTP id ffacd0b85a97d-45eb38a1c99mr33312482f8f.12.1779805773283; Tue, 26 May 2026 07:29:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 42/54] target/arm: Clear FPMR on ResetSVEState Date: Tue, 26 May 2026 15:28:38 +0100 Message-ID: <20260526142850.2326589-43-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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=ham 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: 1779806027549154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson FPMR is cleared when entering or exiting Streaming Mode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-12-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 7eb7031294..3d6e7f1ccc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4856,6 +4856,7 @@ static void arm_reset_sve_state(CPUARMState *env) /* Recall that FFR is stored as pregs[16]. */ memset(env->vfp.pregs, 0, sizeof(env->vfp.pregs)); vfp_set_fpsr(env, 0x0800009f); + env->vfp.fpmr =3D 0; } =20 void aarch64_set_svcr(CPUARMState *env, uint64_t new, uint64_t mask) --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806037; cv=none; d=zohomail.com; s=zohoarc; b=GW8x1msxk9oQHa1mLQ17M33jlH1Lzv6iWQ2HI51AxX84W8bR31IZH9J83ZthYxmWsMdUVlmETb5lXal+w5o9bIn7aekBAt8yAwNM0RW4nmKgl9sLSZZfJ5/xuStBL3YwwYk00CKcPPQIRJ4JIeA1ZP2aeCXsztrFsoRycascPY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806037; h=Content-Transfer-Encoding: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:Cc; bh=an/pRd0B8ExZfKcqRxxMey7eyeY7kyVhiyHPw5sPgYQ=; b=GsNewtfBCS5xgkV3eZpAn4CAzGdszAsViUJCxuyQNcP7GpBaH7NgEQNzGqHE5uha3KCD+0bh4Vfv/Dtie6op2D98Entd7be1jTsYwOYWVSujaQEHu/IWx/49fTL/kjwSmzJQdNTHFmL6AbB2mrA9jg/lb+ORO7mGEUkRdoOi9Ao= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177980603727194.6039341880313; Tue, 26 May 2026 07:33:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmo-00014t-Ij; Tue, 26 May 2026 10:29:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmn-000130-9y for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:37 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsml-0001Rm-LN for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:37 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-45ea19f412aso3138007f8f.3 for ; Tue, 26 May 2026 07:29:35 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805774; x=1780410574; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=an/pRd0B8ExZfKcqRxxMey7eyeY7kyVhiyHPw5sPgYQ=; b=Ebqe/7sMglHnSiRbc2NVRVHZI2IEPDV/ciXXDCD9Ab+P0V07lStowOppTLwcMTyGpr BDVL9j6R867hXR+URIB/nz68rlQ/l7Q2ZzMf5bGKjB8Xuw0SjiZIIMAwhIp6zFQwCo7l 4LJ+o2lae1j8bP6R6ewJFZSlQZejf7O877FLHQEGbp+DLg6TIh+4FBjZczCwojAbjs1q f0BQRBlPmO7Sbw3nOUkdY6vsyx8T2ZyN+hTrf+vOrujDPNOOTAlZOI0Ratlnx4wKve6t ttzx5Tj4ajTxYjx3MTvI/hQ7mxum4OO0g9df81rPAd0GCA3kx0qHpEOOBv5c5RFktvQo yn5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805774; x=1780410574; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=an/pRd0B8ExZfKcqRxxMey7eyeY7kyVhiyHPw5sPgYQ=; b=IP4arqlHg3XFL6gmIdrqvgiR0ZZLapaHbsYkI8SHqwBWx9+5bszN4euDNfjIqOh9y8 4Z3k5eG3y3wVAecHzRgzX7HfqJNz0WpVyyEfrixdSOBhJiygPLS7M9K6o49Xgm3ErSTt fRUd7HjZhYUloVNb5aecYWlpqOI5z4nMR+ROGCMYsfxZp0fq4FtXVc3lCkBcBe7yhisf w13R6cywUSmiR5W9qwpghVUWJw9EipWwOlRSlrwhWfEy/W6PiS5Uh1J7dsSw1JW2qCp5 FB7a1b96tsm+6kAvCq2b1Qb7j2NyJvXciai8Zds3qth7YswGvhqc235zIcsZd6EsC0vE 7Tfw== X-Gm-Message-State: AOJu0YzS0WVT3ef567t9KXIIcVrRLXa1zL1Wodg23YIBkq7N0j19mmNM B1DBF/SBN8kG0L5EGZOpB/Q0+R63Ks4fi35Dzz9IcgWkXY+ldJYD5JEX147WWdIGIpR4xSXaW87 +luva X-Gm-Gg: Acq92OGs/0JtJzAv7EmsHqULwucxX/FOqt0GNRoI+kkSPl2BnN31ayMfNTwblLFTKwW O8+LFchKcuPr6VkY7+EC4Dw7gjjGt0fnLPIcTL4UBw5fZ2JYaP8ddsTwJ11Ao/ORJ2SqT61iMDG eCQtS67KrxpjcvEm/qChXDtcUAn/CK3CH+3ZXab8wYFR28U+CR8SIDICe9+kbPvi4yO+vxMHX85 e2bUSiVM2CEfz5jo9PPwMYNUInl644QJai0OrX+mbXHE2krcqsCTiCjPUts2jEw3muw2qKokHL0 tk3V7meqBpxYFLDUAXlutnpWzlupS+ClfUiOH8oyZ/XvxENfYobYh7gmQYMt90K+Y76jrfqqn6+ 1ayIjfk5kVMEECpSTvd08WWHP3i06yQTDiGOkzZLv7fSrDXbAypcY8bi8ICmbz3ZbTNCxXscWIq 2S4KhPWOsMd2fN3W1WJWB9yuyq/P20H1gY/0cxjDxKBTaicApovI+Jpq7NmG0iB7/iMEcpGK+Y6 GsNxNUBDrnts2rBksq/jJt1pUtktoc= X-Received: by 2002:a05:6000:41e3:b0:43d:50c:6f18 with SMTP id ffacd0b85a97d-45eb38a1687mr26532795f8f.11.1779805774173; Tue, 26 May 2026 07:29:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 43/54] target/arm: Add FPMR_EL to TBFLAGS Date: Tue, 26 May 2026 15:28:39 +0100 Message-ID: <20260526142850.2326589-44-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=ham 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: 1779806038792158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Prepare to perform access checks for direct and indirect uses of FPMR. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 1 + target/arm/tcg/hflags.c | 42 ++++++++++++++++++++++++++++++++++ target/arm/tcg/translate-a64.c | 1 + target/arm/tcg/translate.h | 2 ++ 4 files changed, 46 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e9e261eb2a..2a93de4132 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2567,6 +2567,7 @@ FIELD(TBFLAG_A64, ZT0EXC_EL, 39, 2) FIELD(TBFLAG_A64, GCS_EN, 41, 1) FIELD(TBFLAG_A64, GCS_RVCEN, 42, 1) FIELD(TBFLAG_A64, GCSSTR_EL, 43, 2) +FIELD(TBFLAG_A64, FPMR_EL, 45, 2) =20 /* * Helpers for using the above. Note that only the A64 accessors use diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 7e6f8d3647..794cdf00b2 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -237,6 +237,44 @@ static int zt0_exception_el(CPUARMState *env, int el) return 0; } =20 +/* + * Return the exception level to which exceptions should be taken for FPMR. + * Compare the EnFPM bits in the "Accessing FPMR" pseudocode. Note that + * the floating-point enabled check will be handled separately. + */ +static int fpmr_exception_el(CPUARMState *env, int el) +{ + switch (el) { + case 0: + if (el_is_in_host(env, 0)) { + if (!(env->cp15.sctlr_el[2] & SCTLR_EnFPM)) { + return 2; + } + break; + } + if (!(env->cp15.sctlr_el[1] & SCTLR_EnFPM)) { + return 1; + } + /* fall through */ + case 1: + if (!(arm_hcrx_el2_eff(env) & HCRX_ENFPM)) { + return 2; + } + break; + case 2: + break; + case 3: + return 0; + default: + g_assert_not_reached(); + } + if (arm_feature(env, ARM_FEATURE_EL3) + && !(env->cp15.scr_el3 & SCR_ENFPM)) { + return 3; + } + return 0; +} + static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_e= l, ARMMMUIdx mmu_idx) { @@ -500,6 +538,10 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *e= nv, int el, int fp_el, } } =20 + if (cpu_isar_feature(aa64_fpmr, env_archcpu(env))) { + DP_TBFLAG_A64(flags, FPMR_EL, fpmr_exception_el(env, el)); + } + return rebuild_hflags_common(env, fp_el, mmu_idx, flags); } =20 diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index b5f953ab0a..d1a581acfd 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10723,6 +10723,7 @@ static void aarch64_tr_init_disas_context(DisasCont= extBase *dcbase, dc->gcs_en =3D EX_TBFLAG_A64(tb_flags, GCS_EN); dc->gcs_rvcen =3D EX_TBFLAG_A64(tb_flags, GCS_RVCEN); dc->gcsstr_el =3D EX_TBFLAG_A64(tb_flags, GCSSTR_EL); + dc->fpmr_el =3D EX_TBFLAG_A64(tb_flags, FPMR_EL); dc->vec_len =3D 0; dc->vec_stride =3D 0; dc->cp_regs =3D arm_cpu->cp_regs; diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 2a586321c8..d4bcc5bad4 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -199,6 +199,8 @@ typedef struct DisasContext { uint8_t gm_blocksize; /* True if the current insn_start has been updated. */ bool insn_start_updated; + /* FPMR access exception EL or 0 if enabled. */ + uint8_t fpmr_el; /* Offset from VNCR_EL2 when FEAT_NV2 redirects this reg to memory */ uint32_t nv2_redirect_offset; } DisasContext; --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779805899; cv=none; d=zohomail.com; s=zohoarc; b=SQaixQto2mAJQuqvHDCuAqlzy+wdsJ4lc6Y7QsJMm++pn6gHmApI41J5aav204Qvl7bAqqXAsK+bOxoIZZ3XVvo1MADkbiDAFXhZy2KnBlRVk4ozMPH/r0/IQt+roUuQbV31rr9yagEpRj2zTgPAGSBOnIJUWXeRbX+xr0PMwZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805899; h=Content-Transfer-Encoding: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:Cc; bh=mt2hX80wseQewY57S1j4Yf/t3dERnLFFl4xcPkBbimI=; b=lUfNT94UObFyFAG/gb+aX8GgZG2gtR/ML3j33sg0vaw4zzAmiz2dvCrOgLxgWLzXH5dQXp5+3L5ePGxn8jaKFpDnOU6yoAINOwf5VE/hJXZ2LkSmcg8yThl2BkTJrT+REEyJC0LsnExJ2zOGqKL4w3/vpS9H/ARO8dwYzIMfLIw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805898699896.7169991005488; Tue, 26 May 2026 07:31:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmq-0001GD-QM; Tue, 26 May 2026 10:29:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmo-00013r-2y for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:38 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmm-0001T6-IK for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:37 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-45ea19f412aso3138014f8f.3 for ; Tue, 26 May 2026 07:29:36 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805775; x=1780410575; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mt2hX80wseQewY57S1j4Yf/t3dERnLFFl4xcPkBbimI=; b=Vx/LEy1bFAuX4Z9zBbb0gzSgHQzZN32LQeO2O2XEUHREjXm1863AjfwTZXvDttlOzy /1PPo2AfWAGVMgbAGbUtc1eddDHk/ss/eRBiwsjWunDq6cQVFqAWJe+lxAKOufkp/2cp tZIuTbOsRycKU55HVFoYk5g+kf5F2pYrjT7aElyHcwdFZf0QG7863UoGORds5Ga4aB5O y1WbrwkuU+L0RnCYV2scPqNOhR+gFcWrj7WvqQeDL586K32gvq/seWv8iC+qlzMpzGd/ 41dwCxYralWiKKfVu5fOjL8DG0TyG0ZTZsA2qsRqjvHJ25xtjWYn1ZUX9pHJ5QAfP0iQ 7eUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805775; x=1780410575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=mt2hX80wseQewY57S1j4Yf/t3dERnLFFl4xcPkBbimI=; b=VHfJbUCrNqPSJABmObx/Rar5PUP/Fgc/qFmfVuH7O5E+Qe+tjf+ADejatFns6FYiS1 38mcx4ZfX8tNdfMk7HTWg9FnaGRybRsmZYWEj2DyBgPYrOR3dGg5t/deZhubgDe3L7HE wG7lFy4tb5s9gvIA5cl1vfF8W2u4mmtdP6CcIErlDapOH5CjtnqNEk62jOWlrboNrNZ3 B9mAIMDz71sSHJhsG5wQQJm0/vGf9jTwj/wVldNbXEKzDZ88tC9q2Nd5cqr0qR43iC/I RbKrcDw/y9lc0/2wKmpn6sZUu2nqIdpFt5l81w/8yeHGkfv8e1DSeU2goUl/SDzCC7hd Pxfw== X-Gm-Message-State: AOJu0Ywyl9+RmqnIN37P1Kavkw1QH0GDA0s/qQF5nZL9AKcVrtuLBB/D Ss4DPwJjnQpsyXryZZSum4C4XiG7MM4xwyqASfDOTYEtA9aU7viMgOXh93n7BLsmZ3NKKUqZ1/v fcPyE X-Gm-Gg: Acq92OHuPBYyHn7n2Dw+AUBz+AAEFvYLVFwuN7UHoyCJc+CzAYEl2si0XSu1LKjRMe5 NZzgz9f+dLVqEuhV32rH6d1xCc/8/aGaZmq2qR43qbKRuqF617OaKDF5CLvX6Dju3VbTMOacKl8 ceitsbhLIw9LXONfrMlj1lWJY1hTDxxbC4WoH0fKAXzL/2tGERdQo4i+mXlYvdbO6CMrIyGg4Ot lugSC23pC4iIJuFrKHelNNI7mVq+L3wYYKcMNQe+CnTluI0T4jg9fNLG3+UPdXWyR3oBXihgSwh Jp1E0rBQJ7KXWMPHySaVCjYF0j/kW1oFJJjEWVnXWR4klVmd2NQmyvIIEZCahbFONRlery+jRvE qn3j+R+ChbhphA8zQlBlEM3yW9EqSxM1+NBBs7ngwLnBj8VWMAnHH6i9C2O3u6/ZW/YrsKzNERy g5j13IBZhp18QSymGapzn8kJrG/Mz+D90Xz3Yz4Yvb+Yl4mZ6LvWYb12g731mCfDBTjRaEJiMlp x1YTRDaJFhFwMSSADeCBo8BETwE0DREvpSNHNaNPg== X-Received: by 2002:a05:6000:4a05:b0:451:bee9:17c8 with SMTP id ffacd0b85a97d-45eb36b0275mr29355745f8f.6.1779805775192; Tue, 26 May 2026 07:29:35 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 44/54] target/arm: Trap direct acceses to FPMR Date: Tue, 26 May 2026 15:28:40 +0100 Message-ID: <20260526142850.2326589-45-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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=ham 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: 1779805903333154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-14-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/translate-a64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index d1a581acfd..41dd013784 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2899,6 +2899,10 @@ static void handle_sys(DisasContext *s, bool isread, } =20 if (!skip_fp_access_checks) { + if ((ri->type & ARM_CP_FPMR) && s->fpmr_el !=3D 0) { + gen_exception_insn_el(s, 0, EXCP_UDEF, syndrome, s->fpmr_el); + return; + } if ((ri->type & ARM_CP_FPU) && !fp_access_check_only(s)) { return; } else if ((ri->type & ARM_CP_SVE) && !sve_access_check(s)) { --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806020; cv=none; d=zohomail.com; s=zohoarc; b=fMl2jXdLvjU0BQAEWm/F2iAAz/xnkJ5YGOYnRgZBRhfi+LPB6WsPlrhvSd95EnGIkGQxJ6nbmjEQOLH3a+iYg1Q0yZZ4NGtrTCuO6QMfeJu1szwsYXeMhG+BtJgW+7k8lpKOI5vzSE4GJX5zhaQMfnoVzsMIAaoVcLXm+DGnrK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806020; h=Content-Transfer-Encoding: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:Cc; bh=elv6ee8yIKN9DCAa5de0OYQvRTlKie2FGVuOoUFOxt0=; b=OVpMgMHEenU9IemzQqdd9hc4k1l6nFGxMggkBFbb0f5W+bzHG0mhMNojkbcspTWCfm5Z0IlYGJQ1TJsU8XRL0iJp8dAww43+fd0lkyotBqDGCSkfWuZDLVrY7yzERGK0Py353F7HyUlCDWalteuEmG+tfXnn7cWwSHWRHn8Dt/g= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806019996726.092088592294; Tue, 26 May 2026 07:33:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmr-0001KY-JJ; Tue, 26 May 2026 10:29:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmp-0001D2-Ei for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:39 -0400 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 1wRsmn-0001Tx-H7 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:39 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-449d6c68ed8so6657641f8f.0 for ; Tue, 26 May 2026 07:29:37 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805776; x=1780410576; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=elv6ee8yIKN9DCAa5de0OYQvRTlKie2FGVuOoUFOxt0=; b=CWTvtlFitXWdud/TLEeEtIFQBiNeNKjuVBTJhRH6GfmziRkZmEx1frDXhIrLnSjzaC xAixjGPmzfmWinAhCUhQuz6RksPpwPrb6e8qVK0kLYFPWGZuRIl8OVeaGEWYx/TcS8hS Z0tIRfsLyBwtcp4ucgHtSEFRks8VsNMPTjxEW75M2nAQIxBg7R9xb+MTb3Bp3jnOr3tt clru8AYisHQFLXOKuBPd1P+w6WH4df4he7JUGaVniwrK0Pg2zoY96B6L7I4jAaJEDxyo 1NWmkxlDKsfoz5CRSzufZUd7NKXb4/NaFh6kPI9MxB0PiCPIBjc/HopTmysta4eHS7R4 O+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805776; x=1780410576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=elv6ee8yIKN9DCAa5de0OYQvRTlKie2FGVuOoUFOxt0=; b=I3t4kA7C7m7EGKtjs1vsOazx77icQ5/rOhBmT5nMiFjm9dJ3eI2G+dmxSMyu1naz9y RLmfYEU32pA2Ulw3y0ICuaFxA7ubQjHtu8zpC7ubVdWliciRfa6uhL6ZOtqNdXOyf7gZ qNawgfaJJBBBR/QokR2uIfqTPyd1GQcApXzVy3jM9m0e+y1xGFNPgbCbPSo+zRu1BXjs EtcdbwG7TCy2pgZrm6QsmxDsL6mQe0W8to8mAizaNpKx6uqk4Qv4SPj2PFkZnHO2PJQ4 GNU5WlDXMvFsHJf6IdMM/DU+x08ehKTpDJIebccQF2vC7Fxm74PJYXUuYbJPPt7kJ8ua II3A== X-Gm-Message-State: AOJu0YwZMrzs+6XofXAdQYncTwfmnzgl2DUQV1zHAqWw/0NVWry6H/kR G5Waz1MHyQTf/MivMophFMSr+VWTwz/sJAhVabftYIP5dsC3Crj1lEWZbCUor1KN+asdPZIw3ST bYiTC X-Gm-Gg: Acq92OEt6/9Q0gl6BOhQ0CMtQQHss4bZ7zc/iZpsG0fc1SPjTWNC1z1az6iRlYSQtkz e6j68bvQEkQs0Mpb60Vf3uVNLYrwmhTBsPvqNdapLmnyf5RGtwfuYutyo1SCKJvFULum55DH9mw 3AM4Uoc9NGOI6QxoB4Z8O1TOBXYVlfNAsMMteoW/Lv71FpvAFeUpDGuxA+V+p3mS6fiNOUFZeQw O/YK+m7fvXjmqWODDH0UmLWJq0Fq81msTn0gB7F2QFIjOkoEC5LILrC6Dd028ZKGbnMGCLXyZue AXoEPPimxV3H6VFS8l+F6Dxy3g6pwUieEv5bMRxTXTXTSfZ3igYilF8fy08AJ9kgAN7Qftg7vth IJjPEDFNlCffESM6iOWlr9W9HqvHBP+ums3pOwPgZqxWLy/qHTeKrHmW/gKmdW9PMJrPZqnJOAI 2MTbYPphlcuGAu024IMAlTb6ehk0tKsyXQ0yq4TqoDbChF5wy5yjoT8Sd2FDdm9cSMQpMTEQ9wS 3wuod61/pQ5hkGjZ8QNLzBz9Fcrs0k= X-Received: by 2002:a05:6000:480e:b0:45e:739b:3e3c with SMTP id ffacd0b85a97d-45eb36418d3mr28903257f8f.0.1779805776172; Tue, 26 May 2026 07:29:36 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 45/54] tests/functional/aarch64/rme: update images to support FEAT_FP8 Date: Tue, 26 May 2026 15:28:41 +0100 Message-ID: <20260526142850.2326589-46-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.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=ham 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: 1779806020670158500 Content-Type: text/plain; charset="utf-8" From: Pierrick Bouvier As well, use -smp 1 since there is no visible speedup running with -smp 2. Reviewed-by: Peter Maydell Signed-off-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-15-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- tests/functional/aarch64/test_rme_sbsaref.py | 7 ++++--- tests/functional/aarch64/test_rme_virt.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/functional/aarch64/test_rme_sbsaref.py b/tests/functiona= l/aarch64/test_rme_sbsaref.py index efea80c578..d252101ac6 100755 --- a/tests/functional/aarch64/test_rme_sbsaref.py +++ b/tests/functional/aarch64/test_rme_sbsaref.py @@ -20,12 +20,13 @@ class Aarch64RMESbsaRefMachine(QemuSystemTest): =20 # Stack is inspired from: # https://linaro.atlassian.net/wiki/spaces/QEMU/pages/29051027459/ + # Built from: # https://github.com/p-b-o/qemu-linux-stack/tree/rme_sbsa_release # ./build.sh && ./archive_artifacts.sh out.tar.xz ASSET_RME_STACK_SBSA =3D Asset( ('https://github.com/p-b-o/qemu-linux-stack/' - 'releases/download/build/rme_sbsa_release-6a2dfc5.tar.xz'), - '5adba482aa069912292a8da746c6b21268224d9d81c97fe7c0bed690579ebdcb= ') + 'releases/download/build/rme_sbsa_release-74b7fab.tar.xz'), + '82a754bacea04e709cb1cf2759d1d12d09fabd612e014961eb32368723c7920a= ') =20 # This tests the FEAT_RME cpu implementation, by booting a VM supporti= ng it, # and launching a nested VM using it. @@ -57,7 +58,7 @@ def test_aarch64_rme_sbsaref(self): ' --params "root=3D/dev/vda rw init=3D/init"') =20 self.vm.add_args('-cpu', 'max,x-rme=3Don') - self.vm.add_args('-smp', '2') + self.vm.add_args('-smp', '1') self.vm.add_args('-m', '2G') self.vm.add_args('-M', 'sbsa-ref') self.vm.add_args('-drive', f'file=3D{pflash0},format=3Draw,if=3Dpf= lash') diff --git a/tests/functional/aarch64/test_rme_virt.py b/tests/functional/a= arch64/test_rme_virt.py index dcb18678bf..2afcdc6b07 100755 --- a/tests/functional/aarch64/test_rme_virt.py +++ b/tests/functional/aarch64/test_rme_virt.py @@ -19,12 +19,13 @@ class Aarch64RMEVirtMachine(QemuSystemTest): =20 # Stack is inspired from: # https://linaro.atlassian.net/wiki/spaces/QEMU/pages/29051027459/ + # Built from: # https://github.com/p-b-o/qemu-linux-stack/tree/rme_release # ./build.sh && ./archive_artifacts.sh out.tar.xz ASSET_RME_STACK_VIRT =3D Asset( ('https://github.com/p-b-o/qemu-linux-stack/' - 'releases/download/build/rme_release-56bc99e.tar.xz'), - '0e3dc6b8a4b828dbae09c951a40dcb710eded084b32432b50c69cf4173ffa4be= ') + 'releases/download/build/rme_release-2701e89.tar.xz'), + '8c40af440f5bd1518f7add7d0a43b39289865ee48430979db8024cb897a74790= ') =20 # This tests the FEAT_RME cpu implementation, by booting a VM supporti= ng it, # and launching a nested VM using it. @@ -44,7 +45,7 @@ def test_aarch64_rme_virt(self): rootfs =3D join(rme_stack, 'out', 'host.ext4') =20 self.vm.add_args('-cpu', 'max,x-rme=3Don') - self.vm.add_args('-smp', '2') + self.vm.add_args('-smp', '1') self.vm.add_args('-m', '2G') self.vm.add_args('-M', 'virt,acpi=3Doff,' 'virtualization=3Don,' --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779805894; cv=none; d=zohomail.com; s=zohoarc; b=NLIpXcFcDAqp4XaWsirEkvl1sEyi0LMoGJYicOUX/7JoY1/2QPp7pKdhgZBEzzWYEvuf6ZdQTU0Whh3fbipLDcatp+uptT93Dq4aBnDXOo0Z7jhR66Zyjf+i/QC7OoBUbY8xsd/WccaMcZBAzRxV9N1vSIVNCd5YzlOcJM+WoZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805894; h=Content-Transfer-Encoding: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:Cc; bh=pGYNIEOr1rNrvCWNsFYjRoJ1f5Nr8vGA4w0m+3esayE=; b=FIopGIpotQNGxVcXNFZ0mX/lHeUlcCvIg6yWCvFlFXYRTwUXnRU/SM/MPSK1u5y+f6hUqZSabH/S0YA5hKDNBPPROQOJDABd+X13/8DNKGklQwU0muuZiF2Pp+BS89+oW1webPjPjKW/3sTsHKus53GDCkpEO5XCAJBd2GdSt0k= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805894855412.381503802343; Tue, 26 May 2026 07:31:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmu-0001QJ-3d; Tue, 26 May 2026 10:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmp-0001EY-PO for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:39 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmo-0001U8-8K for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:39 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-459bf19e87bso6314338f8f.1 for ; Tue, 26 May 2026 07:29:37 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805777; x=1780410577; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pGYNIEOr1rNrvCWNsFYjRoJ1f5Nr8vGA4w0m+3esayE=; b=GhXSAaWLUFbIkDFSZKO9BSBfBd8O6fUTl4IXmaVea1vTVRKEha+6JQk8lcdApTkiRW CFrKiNS9DEeFKQaxTw4tNDNPCDoinnV+dhibOptfqqoOms5raLqTsYVa8HltY5Je8/Ht mRx3rvoZIBomDfZ7b7b1eU7o5dOGPuRkTdbsJhzQo3eifOb4MrfTfpX9q9ZxI4tW+V9M SHWFAQxejBbenru6BfiNRrRyKob6qxbX72uiSekmcdyVXAGarze1Ic7jULwbAE/84cbo Kmditgxs9mtCYAytUTKNOB/XL6tBT4uQ36XcLjN8bh1apjuv8wKRQ9qSnUQYvJdAkwm/ HdqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805777; x=1780410577; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pGYNIEOr1rNrvCWNsFYjRoJ1f5Nr8vGA4w0m+3esayE=; b=MUVDDj9sICFEmIib7V7jj1CtUIIuepElhAF7v0XD6PetZKjVhx/tPJqfgOcUDtCmkx 7Yg3hMFE3rYXhi+jeTsJgIJajC/VhtrRcn4SCQnVHdxW2aIlApSAOUiLrUCenQMs6cEB amX6VMlKx29Aul6LGRsxoTzjuQpywMjJoRpfEofYuEXXHAjZSofex2me28dhkc0S+mDP thw7281AdnCjxDcmzb0jpMYA+YzeGlyMbqZY8DJ9Cq0L1AvCZmpKFM9CPjQMD8QiF6aw HAvVMDx7MGODDaosVcoarq8vQhidaHlaUs3H7qJnsCE69bVCifybvW7Du5rNY4PbT0P6 Yhbw== X-Gm-Message-State: AOJu0YzPvoKjiQR87MnthU/+j0SFQz4Vy7gxwgaHQgXpgirhQrd02VJR RhYHEbW+2fo36wSiuIXl5sJO5DCHfFDPI4dhOsDkLyXtF9MzDxLlNj1tvKytJO1RToL2Mr0pYPW l/26l X-Gm-Gg: Acq92OHQtH0cvKJG6CqHOB480sBDxLdPj+NyK06zH1bdjmVGq127chLjfnALJN0PX7y dXJdUPFlxgENzXtjSzbrgA62xpveo8KyOSSWMb8Mnk/3XQmPf91Vjl1V62+HfeL6kLMyWwkmG5W XxFIba7nMnWCji1oxaimroixcqvlGSPjCqHv1f11wGYE6wVw2SesA/MXFa7Ub+K0MOSm3ofg4FL mBMTeoDtbSic2iQfO+4QuRuuzKtkItND29FvywJo+x2v56dGA9GmthY/k/V6tQaMx3+XdY2OhHE V9Rv48xYkwFRQsppABznTFhjI9v41QIyTR8y09V32qTm/NWYKsKzNeeXohob3b7cTkLPtsnh/0o MmXXYTxj+V1cgmPsb2diPv1BNRSQlma3fy6h4Oef45uKTmXcrf+ViisXwaD0aCwjPyZ9u7KADbR HZOUUv0EO15aB3IKe+I/dqQwHdx0dtt89gkB9D2yXYjNvnHxgHzuBWe0dL+Uw5oDzzhmBHIxowP hvIHCg4ew3ooL7ersx8DOiOb3mkMaPsJocOUSwfgw== X-Received: by 2002:a05:6000:2384:b0:441:3144:efc5 with SMTP id ffacd0b85a97d-45eb38e4fd0mr32451419f8f.42.1779805776931; Tue, 26 May 2026 07:29:36 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 46/54] target/arm: Dump FPMR when present Date: Tue, 26 May 2026 15:28:42 +0100 Message-ID: <20260526142850.2326589-47-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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=ham 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: 1779805897264154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-16-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 84b2cc70e2..facd4def38 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -972,8 +972,12 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE = *f, int flags) qemu_fprintf(f, " FPU disabled\n"); return; } - qemu_fprintf(f, " FPCR=3D%08x FPSR=3D%08x\n", + qemu_fprintf(f, " FPCR=3D%08x FPSR=3D%08x", vfp_get_fpcr(env), vfp_get_fpsr(env)); + if (cpu_isar_feature(aa64_fpmr, cpu)) { + qemu_fprintf(f, " FPMR=3D0x%" PRIx64, env->vfp.fpmr); + } + qemu_fprintf(f, "\n"); =20 if (cpu_isar_feature(aa64_sme, cpu) && FIELD_EX64(env->svcr, SVCR, SM)= ) { sve =3D sme_exception_el(env, el) =3D=3D 0; --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779805861; cv=none; d=zohomail.com; s=zohoarc; b=LoQbbAwFIczECagNV6GgqaPB2joA1OU+oQgknvHCdIZp9KfN7plUhojC5ldOag5sXEvbxv2yDY9QZTKLr12Qj1crFn2Vls9SsZiGS+8X1XkWF56kHE17X7A25xhqjT/B1ZtDkcaqqqQJnrkY4rQbg59NB6k4st7Bq3FcoOWLM/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805861; h=Content-Transfer-Encoding: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:Cc; bh=4pfkmfO6w1kOno/o5NKaV1qIY+DkeTQ+Jd3ugyh66bk=; b=cuLMYsssTs8M59kwKw1ZCM8ePcsBO+1y+4OjuNx601JcQP53xiSBN4N3b/IGYrierPcSRTH6heoTWqlFU63yF7pLlp0siHyiTmM8fMQ8DWt2ZWC7vXmIqkKD2jzjjbNtGReUL9HctO84K0Wr/W4nMOFfJLiFAMRfNUuo/G7ZdLY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805861342509.398722601848; Tue, 26 May 2026 07:31:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmw-0001W8-MW; Tue, 26 May 2026 10:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmr-0001IL-46 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:41 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmp-0001UI-83 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:40 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-45e6a4d0be0so4722277f8f.1 for ; Tue, 26 May 2026 07:29:38 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805778; x=1780410578; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4pfkmfO6w1kOno/o5NKaV1qIY+DkeTQ+Jd3ugyh66bk=; b=FJDKcPn18DOZEEWqSztAAw/UxwfN+jwnFD2ZqISenldK3uCBPOGs4BXlLxXLzSYZuF Qo15WIF57WHEzadAhY+t+Epsnvqvg01SZ5EFgm4QHhVlfYFdBeVBz4Kgeuk08xV5Xh78 1ZXQ3rkrQ4xr1vsm6XaELwUKZ0KLqAsu7/fxGAk6JYy42jyFcDgQohv/grIg6SNbAoTN WXUAm0Z6fyvgSa7BrLFGjkXnHC6S0Fi2UBzLzXaFirbGMAhgR5/aPCCb4Qmy4ExPbQlr 52NBSrqR30OAq9Euwruv+lnaQhoCF7TliOiLe9N66pxf2GVlV1oNkMQnRPoDRckBdZqO f9kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805778; x=1780410578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=4pfkmfO6w1kOno/o5NKaV1qIY+DkeTQ+Jd3ugyh66bk=; b=U4ZqZVSdYfGzL6X6XU2DUlrNYm+bP1kDEOAx8cF3paj1s79GRbpaJ/uwx0Nrl7jFTG xrVmIVYJQtn3s5hufJYTfyhcTVshCnVVUaiDXLEBEbIueugdwZKYXwTcsBkz507WAB/M y0IEAjuQb62VEf+Ry5mj0IB/wkbDJqAkwXeo70hFvxaPeJwVzTujX621T1iN4p6u60kT FV9me1E6HYdLoihKLIe4TIOR234IT3iRsusS+2KNzTzF+wsYj8AWS4DR1zH2EaETZvD9 vNKdJZdINt8HfG0JjrGZxt5rM2HAdV7oqWUNp9u63AwqC3H0mUTDZo2IKLMxlH1QK0GQ 4U3g== X-Gm-Message-State: AOJu0Yy87j35p37fOPfIU43mp0GvCrhdGbY72NeLuWeFmn6jpkdGhEbS pMVpclM60qUPJ4srAohK7bZzC4QVDPN2rl3+31yg8pnAJ8Z/l4sSKyOu8IRISF+rbPtKo/3FvJU IRbTv X-Gm-Gg: Acq92OFOaHWEni4LjnmqNvd81q9IQ76Q05v2tzzUHnGwAZXmtE96gbORDbcuCcogGw+ fMNHLvaR71qhAIsBoto9j8sv0oPXayASKsBgoBJtvhxDnRqearCjBdFXe6IJH82SRJup3wRTAZ9 7UCay/a+c7NwvITMilntmxN7BlLyIGsdBTMBBUUGvBvttEdFoPTYZqm9I7Dkv+rGXaLvEJ2VLWW mFfvy8IRYxxQRfhv603k513Vsbb8y1d+Zptuho8pu3EiW5tRmOiAX7LJJ4SN2/yAlx3bpig4jUY 7yA8rTgE3gtD9fEgxapnPFmbHhVfSxZhbrocUesqmu6bvEQPE/QlOMG/0RK58A6x42OkFQ7G2zp EF1arz1JRYaBYhZiFVzRELEEQRr3/Ppb+xs5q9qIEFlTQj3hXitEfQcAre1+3u46sVKgArc8zMY xLnZPUB/okNJ7SWvPq/QwjlB5mazxizOGKSmb1wXWKA0Pr8jZ80jwvjg9y4CkFEvva5WgaMzRA+ 8LQhZui8CcqLwEVudpKP4bEcrEi1GY= X-Received: by 2002:a05:6000:4704:b0:43d:300b:2285 with SMTP id ffacd0b85a97d-45eb3690494mr32812115f8f.11.1779805777811; Tue, 26 May 2026 07:29:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 47/54] linux-user/aarch64: Implement FPMR signal frames Date: Tue, 26 May 2026 15:28:43 +0100 Message-ID: <20260526142850.2326589-48-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=ham 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: 1779805862822154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-17-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- linux-user/aarch64/signal.c | 44 ++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index f7edfa249e..899fce7643 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -73,6 +73,13 @@ struct target_esr_context { uint64_t esr; }; =20 +#define TARGET_FPMR_MAGIC 0x46504d52 + +struct target_fpmr_context { + struct target_aarch64_ctx head; + uint64_t fpmr; +}; + #define TARGET_EXTRA_MAGIC 0x45585401 =20 struct target_extra_context { @@ -362,6 +369,14 @@ static bool target_setup_gcs_record(struct target_gcs_= context *ctx, return true; } =20 +static void target_setup_fpmr_record(struct target_fpmr_context *ctx, + CPUARMState *env) +{ + __put_user(TARGET_FPMR_MAGIC, &ctx->head.magic); + __put_user(sizeof(*ctx), &ctx->head.size); + __put_user(env->vfp.fpmr, &ctx->fpmr); +} + static void target_restore_general_frame(CPUARMState *env, struct target_rt_sigframe *sf) { @@ -518,6 +533,12 @@ static void target_restore_tpidr2_record(CPUARMState *= env, __get_user(env->cp15.tpidr2_el0, &tpidr2->tpidr2); } =20 +static void target_restore_fpmr_record(CPUARMState *env, + struct target_fpmr_context *fpmr) +{ + __get_user(env->vfp.fpmr, &fpmr->fpmr); +} + static bool target_restore_zt_record(CPUARMState *env, struct target_zt_context *zt, int siz= e, int svcr) @@ -610,6 +631,7 @@ static int target_restore_sigframe(CPUARMState *env, struct target_tpidr2_context *tpidr2 =3D NULL; struct target_zt_context *zt =3D NULL; struct target_gcs_context *gcs =3D NULL; + struct target_fpmr_context *fpmr =3D NULL; uint64_t extra_datap =3D 0; bool used_extra =3D false; bool rebuild_hflags =3D false; @@ -691,6 +713,15 @@ static int target_restore_sigframe(CPUARMState *env, gcs =3D (struct target_gcs_context *)ctx; break; =20 + case TARGET_FPMR_MAGIC: + if (fpmr + || size !=3D sizeof(struct target_fpmr_context) + || !cpu_isar_feature(aa64_fpmr, env_archcpu(env))) { + goto err; + } + fpmr =3D (struct target_fpmr_context *)ctx; + break; + case TARGET_EXTRA_MAGIC: if (extra || size !=3D sizeof(struct target_extra_context)) { goto err; @@ -735,6 +766,9 @@ static int target_restore_sigframe(CPUARMState *env, if (tpidr2) { target_restore_tpidr2_record(env, tpidr2); } + if (fpmr) { + target_restore_fpmr_record(env, fpmr); + } /* * NB that we must restore ZT after ZA so the check that there's * no ZT record if SVCR.ZA is 0 gets the right value of SVCR. @@ -817,7 +851,7 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, uc.tuc_mcontext.__reserved), }; int fpsimd_ofs, fr_ofs, sve_ofs =3D 0, za_ofs =3D 0, tpidr2_ofs =3D 0; - int zt_ofs =3D 0, esr_ofs =3D 0, gcs_ofs =3D 0; + int zt_ofs =3D 0, esr_ofs =3D 0, gcs_ofs =3D 0, fpmr_ofs =3D 0; int sve_size =3D 0, za_size =3D 0, tpidr2_size =3D 0, zt_size =3D 0; struct target_rt_sigframe *frame; struct target_rt_frame_record *fr; @@ -841,6 +875,11 @@ static void target_setup_frame(int usig, struct target= _sigaction *ka, &layout); } =20 + if (cpu_isar_feature(aa64_fpmr, env_archcpu(env))) { + fpmr_ofs =3D alloc_sigframe_space(sizeof(struct target_fpmr_contex= t), + &layout); + } + /* SVE state needs saving only if it exists. */ if (cpu_isar_feature(aa64_sve, env_archcpu(env)) || cpu_isar_feature(aa64_sme, env_archcpu(env))) { @@ -917,6 +956,9 @@ static void target_setup_frame(int usig, struct target_= sigaction *ka, !target_setup_gcs_record((void *)frame + gcs_ofs, env, return_addr= )) { goto give_sigsegv; } + if (fpmr_ofs) { + target_setup_fpmr_record((void *)frame + fpmr_ofs, env); + } target_setup_end_record((void *)frame + layout.std_end_ofs); if (layout.extra_ofs) { target_setup_extra_record((void *)frame + layout.extra_ofs, --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779805827; cv=none; d=zohomail.com; s=zohoarc; b=P0cjA/bcp5n6VjFegtR5zDTQGzXefHhC2wj7oIoE5QxKWs81y0VinTJehTUsoLXoiHtm2yWFAyQhnD0egxHwzVCvPgOiD2c8S/rQwXVq3qQ9HCGItfoNvBS8XvPViSVtKH9qGqZ04FQpY4do25Wng7/otxOCtrkcOo1cvNivCBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805827; h=Content-Transfer-Encoding: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:Cc; bh=aUwhoNUYBmu7k7QFzTRgfW3y4sYDCp0LrlYK7tGJv6g=; b=fEEO2OnxILnwm4Sb7dfxzpb87nyhogqQumhDqUM3TaVFMUrbpv/wce6Gy5FtdI0TzixbLYjr9TzVh4YlLZfLTOV8TjGDA3OvXR5F97TCYkiTSxxCwpBcY/SOtE+1+yHTAyWu/znlrB88e2NqX2+WXXbhR5we5L6s7kXDhIu16Pw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805827454539.5826705141839; Tue, 26 May 2026 07:30:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsmu-0001U3-K9; Tue, 26 May 2026 10:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmr-0001MM-PI for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:41 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmq-0001UR-6H for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:41 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-45ed9336049so489578f8f.0 for ; Tue, 26 May 2026 07:29:39 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805779; x=1780410579; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aUwhoNUYBmu7k7QFzTRgfW3y4sYDCp0LrlYK7tGJv6g=; b=jWt6GZCyMq/w9rh7MRr1UX8xVk4AYOTaXQ1jGqeWf7iV1bNNs66iSb6/Da2MB8FLBl lVGgv+I5lqnWWcGaEO6R8CFxTWt1n4Knl0Vei+juh0hj9IM1smH8kXXZxppSYKjKG7fw U9swl1KriZtVAgfXMIYgA+ulDoptHRS2n0JZJAKzj/6TXBWTC4ZQaqRx0bWdzIlqtFh5 EiY9R9xiFK6nVJCjWDpavXHp+Dfw0ltD9M6bOcIo0EouLpxqNWS4fvAqQ6KeDQMjzUDP dbs19AdSYUrzCFukUya0IJm6LaBKpIPx7Ha2L3teVKmqL2dt0OCQEUQXcRB3gnDG4/Fa KGYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805779; x=1780410579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=aUwhoNUYBmu7k7QFzTRgfW3y4sYDCp0LrlYK7tGJv6g=; b=iPixztH1USA6H53rGq6Gqa3I/oCiXYlvXEIKmz8RjcbXTW95I57N+H4vrsQlsaldIZ eXraqnxYOsyXX5/KfM+vjRqPSEHoIE5hMRE2wwjWjU3en1NFd8WBvo0gAGqdzPXKhm3e UvvVwFS9iLRBSxRJLTYUWF0XcimVyc4X29VgyzM7TCZbKxQKdmdz1rF6j5tdtAZsEbTj TvT5vOgFdhMV7eR/CXIJctXt7DJVoUMfi8UdlwmvI60O5FMGX1OW3xqevNX9NnAYPA0U GxQy7Fg6WZ66m2zERatRvsA+GeuPfQDfvcwx3qjlHplHdVIgsU0l0tbrivcvrJCF6yEy PwXg== X-Gm-Message-State: AOJu0YwOW31LnGxbwcQNiq64gv7w2ENKVjAf1bfi5IJnwmx2sYMlIAyy Msso8hlnOc+zCIrTdEHgcl/fl8vaJJqhTlw122RXwyDZb15VBGY2qeqEkGDaZ4lq/qtVY4Uaw0K RtycO X-Gm-Gg: Acq92OEZgYdBWvMHmi1B/Zu/EYLZnHXGEs93OsIoZEn/79IyiSfbrgGoDTk54Sa+F7s Mcei2UzzACsfVSozc6u7AQLbhohhTYHaA9QAT0TzfBCUUwD1jIfYtAqhrgAwENF1/hLK5LY8dEY PJkecQoyhPBw4vnrAJAEAHVujcAGRB2g0zLMe8sNVE2HykEhTlbBYhKvPNrVwhQi5r3b+2TUng1 O3yEAWCBvtvAldUQrgh/zOUCSz3P6F1ra3QWZSFBu3ovK3TCPQhAkSj4D+s7/RNI7WjyZf5WMLO rnZAGxi2UDmFBPNLjzWNnNQLwvWZzbP+7ZsCOnE7uc5XTY6DfY0HMo9AyGv66nhoRH0uAFVB2lr XxQTurzyftSe75+t8yvmRXYjiJp+rbIqSAOsPHEag2tQ4isbpvoXL0oYjSVzKXvKGOXVztbQpsu petwvRuQLE0vtZsiWqwlp5AFTpkrW/l5tpoz7bYSBUpTyHOwrUHTQJZR8m1pR0q95oumC5dDfhM Ln03AHPfnCl+Jhf5yaWxOTv8fwH0l0= X-Received: by 2002:a05:6000:25e1:b0:449:9aee:4575 with SMTP id ffacd0b85a97d-45eb389fd2emr30055302f8f.30.1779805778754; Tue, 26 May 2026 07:29:38 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 48/54] target/arm: Enable FEAT_FPMR for -cpu max Date: Tue, 26 May 2026 15:28:44 +0100 Message-ID: <20260526142850.2326589-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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=ham 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: 1779805828122154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-18-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- docs/system/arm/emulation.rst | 1 + linux-user/aarch64/elfload.c | 1 + target/arm/tcg/cpu64.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index da5f7efce2..e44b3016be 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -77,6 +77,7 @@ the following architecture extensions: - FEAT_FPAC (Faulting on AUT* instructions) - FEAT_FPACCOMBINE (Faulting on combined pointer authentication instructio= ns) - FEAT_FPACC_SPEC (Speculative behavior of combined pointer authentication= instructions) +- FEAT_FPMR (Floating-point Mode Register) - FEAT_FRINTTS (Floating-point to integer instructions) - FEAT_FlagM (Flag manipulation instructions v2) - FEAT_FlagM2 (Enhancements to flag manipulation instructions) diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c index c5ffe21368..ceeeee5315 100644 --- a/linux-user/aarch64/elfload.c +++ b/linux-user/aarch64/elfload.c @@ -219,6 +219,7 @@ abi_ulong get_elf_hwcap2(CPUState *cs) GET_FEATURE_ID(aa64_cssc, ARM_HWCAP2_A64_CSSC); GET_FEATURE_ID(aa64_lse128, ARM_HWCAP2_A64_LSE128); GET_FEATURE_ID(aa64_faminmax, ARM_HWCAP2_A64_FAMINMAX); + GET_FEATURE_ID(aa64_fpmr, ARM_HWCAP2_A64_FPMR); =20 return hwcaps; } diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index ff0c2b1c47..a377f67b9c 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1297,6 +1297,10 @@ void aarch64_max_tcg_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64PFR1, GCS, 1); /* FEAT_GCS */ SET_IDREG(isar, ID_AA64PFR1, t); =20 + t =3D GET_IDREG(isar, ID_AA64PFR2); + t =3D FIELD_DP64(t, ID_AA64PFR2, FPMR, 1); /* FEAT_FPMR */ + SET_IDREG(isar, ID_AA64PFR2, t); + t =3D GET_IDREG(isar, ID_AA64MMFR0); t =3D FIELD_DP64(t, ID_AA64MMFR0, PARANGE, 6); /* FEAT_LPA: 52 bits */ t =3D FIELD_DP64(t, ID_AA64MMFR0, TGRAN16, 1); /* 16k pages supporte= d */ --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806064; cv=none; d=zohomail.com; s=zohoarc; b=UV3wiAznzjwSByFgGX7aUVV0Q/2uGlUgFmQiYjRCAoeOUmYPezZSyoMAAjz5AMQQRdJUen6/x///4jIgDvhkFbLVlWt4wfTLRtKAPU3x4PV8QNWxYaLj4P2cE/zPsQSZBPU3Has4OjCK1NBWIKlxjuVp/bHH9c/DIzLgRsHhAvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806064; h=Content-Transfer-Encoding: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:Cc; bh=fyYDysEGjb/xns15lLPIe7SYd8K7mitMipemiUdM/H0=; b=HyClPD2GuBK4WFWSOo/7qfscnEkXKVhwZRcxnITNiwI0/XM7CoKs4LA0lurxVN/Eflwv5RouShad4EFjJFip6VhvugPVI0stLoBqfKqzQD/zopIxNSb6BxuCPQ94G6+qKSdUxEb592g3uhRdXwHy9bCSvx90Pz4j5gBvYW9sMF4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17798060643402.533776529838292; Tue, 26 May 2026 07:34:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsoE-0002q5-CA; Tue, 26 May 2026 10:31:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsms-0001QK-NL for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:44 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmq-0001Uf-WD for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:42 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-45e9f4a3510so2994107f8f.1 for ; Tue, 26 May 2026 07:29:40 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805779; x=1780410579; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fyYDysEGjb/xns15lLPIe7SYd8K7mitMipemiUdM/H0=; b=K0lwldPQ4SDl0puztiY1lRhwu9oetE36tvfHXc8PtND9hERHuCV46ftQYF/iB5oHeG 5wg2ovofRD3lPCmLt2eucj/OZw9YA05i8Lzr/LtYXQpd9zJ2wIVKNu19DbyY1wNj4KYA gZXT2fOaepBaRlMIqis+z7NVtQXt6mZ1sM/DfMZTSHUotG+7oQtVDWJOW3kD/HbZFUXp jZGa38Fkbe1Zoqdur8zwAoV1bwx7d0z5u4HwmVUC9olG8RBB8+zIeyLfy0xKuKeUG+a8 hQ67tWEafZ08C6NspLuyKYjtfansHde9kSdWhxrSWzgnjMpUNiDoarARNV1FCYEgVfpi 7WLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805779; x=1780410579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=fyYDysEGjb/xns15lLPIe7SYd8K7mitMipemiUdM/H0=; b=ktQ2hAfBqvYsQXHqePR4Ne3xL61q+LzehItlQM4SRvYi/+b3ik6pAfP7tlPpMSH4t3 IWAlpNEkMbDN7q9jjNKIIKFOHp0lRxXGBok/0Wy2Ygfu+dyZ4nAtji8Zfbh660VdSSYk Ocr1iVpW4rg5mNz0G47EdtnR8gDqNlP0maCGnKRMD4NQZpv0xyth72v+3cP38ggy12Ds RGsfBrWOka2Ki7/VhGa6jLaY39aGA8WBvRSRJgYd7qbUAyAd9z+scyYci2f+zMdbmHE5 UxpFbW6Tez9b9eE+sq+syYjW+fzbjI6ha1+8GvZ6r/oMj9Bt9o3h/INNxSQ/WscZpt8W rL5w== X-Gm-Message-State: AOJu0YxcYQauTmL+XInwuZRl5wM84Dxj+Qr3hsM8jgTnEFRAFlm25hmO 56Ga24C8l2TV0vI6Ev3FfrwiuwnNFN/yNoc+6gtYgT6dbSgLQq3p7e5cDy/I/eqH7z2VmDDGm83 EBSJA X-Gm-Gg: Acq92OHI1g4ptnD0HR2ofZA4q2+bOW1IYoUeEce9qOHvL2z4H3Mle1BuLt4Z2O0zp49 TyaswAQGlQbmpmiW3UaMOyvmsS0RO+C3UkMf7zuqqFOPIoDYV1Dj6y5YsUUasS8MpaFl22sYkw6 cekowh6ga3odLXpYDwLTK/su+27Kgf3UKhJ3UVQyJywELGklACpB+uVF0wEtuZkpHrjyI3W2KSZ 9PVmYIkTENvrWEKSdtImX73MaCWvH2dIPgF2/KSiWsjab4s3XNCyX5rayqk9b0AEKPgfkTIzs3j tfKF/CamVYIouI+VcGhpej4hhtmfqjgOKT4iKqt9ghRULs4nuJXS8LqL+3D+CZwl1MmHsxFFHxa g7VM7eVk3npQAzKgp4EpWTZOOuulcM2mSAjO3W5Nc/QeO0SCzXADMk6f+K8RNDze+NI9+z7wYtF spVUS7FP9ajpeKIjD0Ezbyr2muPSYWm2kJBlOodnHX2tNZzPvivSGzNsEq9Em05nBis6mhkFSgv awUtKO7Eh1UAgVAjuUBX4lCpDaR9RNXqU5XwZ1eZA== X-Received: by 2002:a05:6000:25c2:b0:45d:b14b:23f8 with SMTP id ffacd0b85a97d-45eb369044bmr33300787f8f.18.1779805779602; Tue, 26 May 2026 07:29:39 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 49/54] target/arm: Implement ID_AA64FPFR0 Date: Tue, 26 May 2026 15:28:45 +0100 Message-ID: <20260526142850.2326589-50-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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=ham 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: 1779806064938158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 9 +++++++++ target/arm/cpu-sysregs.h.inc | 1 + target/arm/cpu.c | 1 + target/arm/helper.c | 13 +++++++++++-- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index e13c1c1331..1bb77d78da 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -410,6 +410,15 @@ FIELD(ID_AA64SMFR0, I16I64, 52, 4) FIELD(ID_AA64SMFR0, SMEVER, 56, 4) FIELD(ID_AA64SMFR0, FA64, 63, 1) =20 +FIELD(ID_AA64FPFR0, F8E5M2, 0, 1) +FIELD(ID_AA64FPFR0, F8E4M3, 1, 1) +FIELD(ID_AA64FPFR0, F8MM4, 26, 1) +FIELD(ID_AA64FPFR0, F8MM8, 27, 1) +FIELD(ID_AA64FPFR0, F8DP2, 28, 1) +FIELD(ID_AA64FPFR0, F8DP4, 29, 1) +FIELD(ID_AA64FPFR0, F8FMA, 30, 1) +FIELD(ID_AA64FPFR0, F8CVT, 31, 1) + FIELD(ID_DFR0, COPDBG, 0, 4) FIELD(ID_DFR0, COPSDBG, 4, 4) FIELD(ID_DFR0, MMAPDBG, 8, 4) diff --git a/target/arm/cpu-sysregs.h.inc b/target/arm/cpu-sysregs.h.inc index b99579f773..6e8b335b8f 100644 --- a/target/arm/cpu-sysregs.h.inc +++ b/target/arm/cpu-sysregs.h.inc @@ -3,6 +3,7 @@ DEF(ID_AA64PFR0_EL1, 3, 0, 0, 4, 0) DEF(ID_AA64PFR1_EL1, 3, 0, 0, 4, 1) DEF(ID_AA64PFR2_EL1, 3, 0, 0, 4, 2) DEF(ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) +DEF(ID_AA64FPFR0_EL1, 3, 0, 0, 4, 7) DEF(ID_AA64DFR0_EL1, 3, 0, 0, 5, 0) DEF(ID_AA64DFR1_EL1, 3, 0, 0, 5, 1) DEF(ID_AA64AFR0_EL1, 3, 0, 0, 5, 4) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index facd4def38..a13e6dae2a 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1768,6 +1768,7 @@ static void arm_clear_aarch64_idregs(ARMCPU *cpu) SET_IDREG(&cpu->isar, ID_AA64AFR1, 0); SET_IDREG(&cpu->isar, ID_AA64ZFR0, 0); SET_IDREG(&cpu->isar, ID_AA64SMFR0, 0); + SET_IDREG(&cpu->isar, ID_AA64FPFR0, 0); } =20 static void arm_cpu_realizefn(DeviceState *dev, Error **errp) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3d6e7f1ccc..34487eeaa3 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6477,11 +6477,11 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_tid3, .resetvalue =3D 0 }, - { .name =3D "ID_AA64PFR7_EL1_RESERVED", .state =3D ARM_CP_STAT= E_AA64, + { .name =3D "ID_AA64FPFR0_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 4, .opc2 =3D = 7, .access =3D PL1_R, .type =3D ARM_CP_CONST, .accessfn =3D access_tid3, - .resetvalue =3D 0 }, + .resetvalue =3D GET_IDREG(isar, ID_AA64FPFR0) }, { .name =3D "ID_AA64DFR0_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 0, .crm =3D 5, .opc2 =3D = 0, .access =3D PL1_R, .type =3D ARM_CP_CONST, @@ -6712,6 +6712,15 @@ void register_cp_regs_for_features(ARMCPU *cpu) R_ID_AA64SMFR0_I16I64_MASK | R_ID_AA64SMFR0_SMEVER_MASK | R_ID_AA64SMFR0_FA64_MASK }, + { .name =3D "ID_AA64FPFR0_EL1", + .exported_bits =3D R_ID_AA64FPFR0_F8E5M2_MASK | + R_ID_AA64FPFR0_F8E4M3_MASK | + R_ID_AA64FPFR0_F8MM4_MASK | + R_ID_AA64FPFR0_F8MM8_MASK | + R_ID_AA64FPFR0_F8DP2_MASK | + R_ID_AA64FPFR0_F8DP4_MASK | + R_ID_AA64FPFR0_F8FMA_MASK | + R_ID_AA64FPFR0_F8CVT_MASK }, { .name =3D "ID_AA64MMFR0_EL1", .exported_bits =3D R_ID_AA64MMFR0_ECV_MASK, .fixed_bits =3D (0xfu << R_ID_AA64MMFR0_TGRAN64_SHIFT) | --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806033; cv=none; d=zohomail.com; s=zohoarc; b=b9xFc/5vuZXPG3m6mXZVh3phDYWDRNQQdz7YdsiikpU2EieYFwh7bb6GUGnab2awL13DSCccSMc/g4s/YheQC1CaHntfxLdmmiUcJUa+9RxWV2bV+z6heHuqjlIbxKDX8+Fv4MOnVp8qWUv7J+v79fHnYr/DtWCE/f6cr/pDJ98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806033; h=Content-Transfer-Encoding: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:Cc; bh=+7f90FAkva5cg6nPQHCs82ewt/oQ5gQh3x0FYc7aFZI=; b=QiJje3hrDV5ZzxuIuMNbOigQlBpk/m3y8STB2vMPN9eNZAZaXz6O/q/Xpl8/MvpbJ4UL55loLLIU8pBg7fRc857fqaqCEjpNKrk5VfMwy1+tQdhJy0GJabT91DrMvP3s5u5N2OEo/sYZOyq3YtNxDlCo1juAVo0KAJz2pwLcta8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806033695163.8252092143215; Tue, 26 May 2026 07:33:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsoX-0003jY-0j; Tue, 26 May 2026 10:31:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmt-0001QN-C4 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:44 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmr-0001Uo-VK for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:43 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43eb05b1875so5697898f8f.3 for ; Tue, 26 May 2026 07:29:41 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805780; x=1780410580; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+7f90FAkva5cg6nPQHCs82ewt/oQ5gQh3x0FYc7aFZI=; b=q3jyP3qz2VFr8Ju349pIWluYB92vwi9QeOV+zYK8JFCbjFOB+1rQ262mDr444o80V/ YAJwt3KBUn6A+9VTauYWoxcW3wHM6ujbvf/gsJ/GCpeQrU8YP+Z/bZi93H+PPLKssfAm sJBs8XHz/Fg4D9k9I1Y1+Zo8wvorJ8E07NVlPcDCVvle1vHTnPZ9DYfnS8YY3G3PS9Wz wE3On3Lo3RZgnSxnWMNoM1zzxk732W01Dm2BOgwcsNlhjBBK8fLXWVMSApap7gn0Axye 2HdvfR+7LiCoLjNxPuDoH4AISF+pHaDGJXEDl21gindZBTuqeopq1bIzFJo4Xp8VilTZ SaGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805780; x=1780410580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+7f90FAkva5cg6nPQHCs82ewt/oQ5gQh3x0FYc7aFZI=; b=aB5YuJzWl29cYkrio4DTS8A5r6ftgVs5EhvGhWD1HeSvoGboLvf3zc+4KYwUt307l9 fTorFwtnSrNwLO7e/7ww73fojEH4g6TCkVME/1AwTiDfvlsj7c3E9Ov4+fYgAiTn0vH2 W/bUFPIbhs4WiJMpfdXlb4LODJAwPz98RMe2wOTpF9fb7sFdVzjfkadscEDSWFa2o05t pdT80RLwXjp02tj6iNwnJKJ6ewmhiLSX23oTb0f6OSfIrELR1gn/emno/6SI/ZdnexfD aZSk9T6GR2cO4iQF3VLqR+cFwkkbV41yNqA3iLw1ebQM/KQxr1+ZLLzVsYcrnRyEx+Yd J01w== X-Gm-Message-State: AOJu0Yx2UMs142zwLYOhQ/qFzGEddDjVLIr/IESJeaGUs214M2xIpwIY UdlmzZ6AeAVoAviMI9vo219JOPEj9Z5M50PQ1dpakFs9YIznshXbr/g17exVG56zRqTL7sEpHnC 4BDEN X-Gm-Gg: Acq92OFsP3b107rLyoFl/iU6kSKVxIPnJjZm2eCJGLa9utOzbNJlL1cIQ5ooal8fo1F PM3v6Q7UoujICb1UntnaOsZ9N8whDKIVo4yXuFWHf+k7QAmLI8bMG/3WFSTIcKiBuiuux4sug3W a1Blq86oWxbMJeHRAnm2HVDZ9qcpAAR+Yfi4zTbJXYqoeIp2sWJlSfS0ZQtgP7qfbwFTB3bRsP6 nnrHsJ0Mh/hkJcz0fe2YPPJrgpcaJXTpaFh+kNM6tmNUyEr802Y2+w/0o1w/aymZpX1LnLsgAw9 jQxQ4ouuFOMYTJnRkp8Jbe1HYhtKa+KsfEINL3fRD1xiiAtckjIS3fyMgcI3h3HmojCZE8RsRGe Q9S/IMTjhaTbn9N7t3skoihWJxvYlmuEJTkjEl0j9qmvpZm9boWzwZ3NrbBspRQaOOM9R7mzgT+ ItoXTRo+EinZejjujqhZCPjwodiywymUiRxx/KpKftsA420qzzCKEfMxKhTLwBtwefCv8WIeLOu gu9c8J/3Xhnn986qmdUXwBETT+JgALaxBiONVe6Sg== X-Received: by 2002:a05:6000:4010:b0:43d:7b90:fa23 with SMTP id ffacd0b85a97d-45eb38b7b7cmr32864486f8f.29.1779805780446; Tue, 26 May 2026 07:29:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 50/54] target/arm: Add isar_feature_aa64_f8cvt Date: Tue, 26 May 2026 15:28:46 +0100 Message-ID: <20260526142850.2326589-51-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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=ham 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: 1779806034724158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-20-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 1bb77d78da..1fde3e9231 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1569,6 +1569,11 @@ static inline bool isar_feature_aa64_sme2p1(const AR= MISARegisters *id) return FIELD_EX64_IDREG(id, ID_AA64SMFR0, SMEVER) >=3D 2; } =20 +static inline bool isar_feature_aa64_f8cvt(const ARMISARegisters *id) +{ + return FIELD_EX64_IDREG(id, ID_AA64FPFR0, F8CVT); +} + /* * Combinations of feature tests, for ease of use with TRANS_FEAT. */ --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806036; cv=none; d=zohomail.com; s=zohoarc; b=VMx24hGNTnT7p0ZrSG3Ij9qfRTupz/VH1tv/TPA1Rsr0FjChTs9iaK5ZL5henUXrg2RPrpXiQkfqhr2vmRUKMUKqe4fhGclq5fsm8sNwDOusW9mmdjhbo9FjZ+0TUXz2GKhf2IjFjL48Oore29FIjDXa5FN9LfsD62aYcf+8ABw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806036; h=Content-Transfer-Encoding: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:Cc; bh=7zEXoxHe4tEeDjtW6/nWdJr7RedH88EGZCuOfLggJ20=; b=OOqVi3h0Nb9N/KveM1wUKVnIbK4LNtPhT6er86Z5bNZcZ+XFUU0skTKJ8vGDORkq8Lae8qjggZqpkxVjvUjUuAmtCqfjT92e4X8xQ2fSL5zXJN5EFU5bQ29u93HG44LPXcajN18oC3t431dHWi1XG+Onft1R+MF+LNWueFu3Ooo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806036946529.7632430730652; Tue, 26 May 2026 07:33:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsnV-00024W-Jt; Tue, 26 May 2026 10:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmu-0001UX-LD for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:44 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsms-0001VA-V9 for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:44 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so112138125e9.0 for ; Tue, 26 May 2026 07:29:42 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805781; x=1780410581; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7zEXoxHe4tEeDjtW6/nWdJr7RedH88EGZCuOfLggJ20=; b=TATD4JsS93PTRQBE/RF27pCVaLwgvB76Wz9qW0Jzde/eRq7rbnAHkXy3kFqCQk8kok RJGuBqfSSrucgDgZm76wuUFdeqqwCl08OBg2oJGXhn6owYN8JRqG5W8wMSnl3JYlZQLu Jhl6QDy/afaXPAQLecOJ2f1XezxhCJ0WL37z4SuE2cLyKscSdjfkgv1y22vVxmhp/l+U MwGsRH7WkCe0eLo9v96Azy8+XZ3efx3RhPEY8DQMNyRABAbJsvxGnddxsjWhBXw8gaQn B/FdtLMOAu5QoVsUXpxcsyc4AsV9LaB3LrQKVgwlmRCr7ns7oS/ILaUdXj94MwirKjBa juWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805781; x=1780410581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7zEXoxHe4tEeDjtW6/nWdJr7RedH88EGZCuOfLggJ20=; b=qAdECWpWRQnPRvO6sSuNRtPZ5V+k22l+TosE1SyWW1P5E5Z7pEkkgetmv6+RhuopVf iEYxY80xcpG8THjTfEZz6rYN9RC31x/jZgkL7evimO2etLRhXa9pBg44XtfzPs1NCAk/ DAFlmems5upsv4xwCyfer41AsYZW5LvBtQe+HX7g9mcPhCMdi1Msja4Yja4trUOWMSyn u4FUgRWVMwT0mOQ1tDNlP8MmEq0quo+Fp0moyhGIHnl8IvsCpxHigfpTh4EudahrvFh3 yXnY4NJVs+DJWk5t1G8ZxaHXFnG6Bv3nitI+rmlnZYEDQgR0nCuui7mHugishaddEeJM wDgw== X-Gm-Message-State: AOJu0YwiTQv5QxKxXKhHXX9rar1aNuXgr5MTtr7B5kD0tpPaPCDo/eEi 8Q5K+c02PagR0rFO1vGsUt+ZTtn29wJQcYXIAHHdIjLVCos9WXHMl0q2Xzjht2zFpQeivk/mJ97 Voshz X-Gm-Gg: Acq92OGPbwQZtTaoDyzxwiRYz/734mGVgwOTna6YiEWJFuy+x0XBIcVeTVTDTEB79mK p7T1n8dDCEAmKTIwKfDdZ7I09gcQLPgshCxC0hFNoF3umclUu+9QYPhbU7aG0xWQysEG1hkLWyW WqHVdKQWv8EaoTqhE5qyE1PtmTo9JRPOXexA6xy1uz4Ztu0DwbFhtSr+U1YdJ1EB4CzxAFJaBDZ sf8k8x6GMu4RF5vzqK6gw7ISTuXyhdyP1820vwkwfAaxpIlHXeSQQ3eeQnqFKqkPj/pfLOvMAc+ ezTtvMBdlQqj/lrPCL2rsmMOcopdl9bsIcvQ/M3zyTDpRXMj9wUgkWzDmwZuURk7L7++3jaHJyd fwExpOYdCGSY1E4RPd9V3AI6THLhlcVqmldCwK7Q72vbCWIVQvgcI0Ry5Ro6WNrtx4znjACpxNG ijWQvX7JOsDxYG4Orf9bwV56LvbvrU+jl22UEsPhhCYteL52u16IZ2WNSvXPuZRcaulIcMTwk6p qh3RpDdWq65HocNdKmmfWeA1DYCyxI= X-Received: by 2002:a05:600c:1393:b0:490:3890:605b with SMTP id 5b1f17b1804b1-490428e0bf3mr315471015e9.31.1779805781515; Tue, 26 May 2026 07:29:41 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 51/54] target/arm: Implement FSCALE for AdvSIMD Date: Tue, 26 May 2026 15:28:47 +0100 Message-ID: <20260526142850.2326589-52-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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=ham 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: 1779806039862154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-21-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/a64.decode | 3 +++ target/arm/tcg/helper-a64-defs.h | 4 ++++ target/arm/tcg/sve_helper.c | 6 ------ target/arm/tcg/translate-a64.c | 7 +++++++ target/arm/tcg/vec_helper64.c | 4 ++++ target/arm/tcg/vec_internal.h | 6 ++++++ 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 666a293540..02c7264cb9 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -1198,6 +1198,9 @@ FAMAX 0.00 1110 1.1 ..... 11011 1 ..... ...= .. @qrrr_sd FAMIN 0.10 1110 110 ..... 00011 1 ..... ..... @qrrr_h FAMIN 0.10 1110 1.1 ..... 11011 1 ..... ..... @qrrr_sd =20 +FSCALE 0.10 1110 110 ..... 00111 1 ..... ..... @qrrr_h +FSCALE 0.10 1110 1.1 ..... 11111 1 ..... ..... @qrrr_sd + ### Advanced SIMD scalar x indexed element =20 FMUL_si 0101 1111 00 .. .... 1001 . 0 ..... ..... @rrx_h diff --git a/target/arm/tcg/helper-a64-defs.h b/target/arm/tcg/helper-a64-d= efs.h index 215df1201b..b7880f773e 100644 --- a/target/arm/tcg/helper-a64-defs.h +++ b/target/arm/tcg/helper-a64-defs.h @@ -152,6 +152,10 @@ DEF_HELPER_FLAGS_5(gvec_famin_s, TCG_CALL_NO_RWG, void= , ptr, ptr, ptr, fpst, i32 DEF_HELPER_FLAGS_5(gvec_famax_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) DEF_HELPER_FLAGS_5(gvec_famin_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) =20 +DEF_HELPER_FLAGS_5(gvec_fscale_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) +DEF_HELPER_FLAGS_5(gvec_fscale_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) +DEF_HELPER_FLAGS_5(gvec_fscale_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) + #ifndef CONFIG_USER_ONLY DEF_HELPER_2(exception_return, void, env, i64) #endif diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 9490f0327f..a002006ea5 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -4736,12 +4736,6 @@ DO_ZPZZ_FP(sve_ah_fabd_h, uint16_t, H1_2, ah_abd_h) DO_ZPZZ_FP(sve_ah_fabd_s, uint32_t, H1_4, ah_abd_s) DO_ZPZZ_FP(sve_ah_fabd_d, uint64_t, H1_8, ah_abd_d) =20 -static inline float64 scalbn_d(float64 a, int64_t b, float_status *s) -{ - int b_int =3D MIN(MAX(b, INT_MIN), INT_MAX); - return float64_scalbn(a, b_int, s); -} - DO_ZPZZ_FP(sve_fscalbn_h, int16_t, H1_2, float16_scalbn) DO_ZPZZ_FP(sve_fscalbn_s, int32_t, H1_4, float32_scalbn) DO_ZPZZ_FP(sve_fscalbn_d, int64_t, H1_8, scalbn_d) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 41dd013784..15b40090c0 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -6493,6 +6493,13 @@ static gen_helper_gvec_3_ptr * const f_vector_famin[= 3] =3D { }; TRANS_FEAT(FAMIN, aa64_faminmax, do_fp3_vector, a, 0, f_vector_famin) =20 +static gen_helper_gvec_3_ptr * const f_vector_fscale[3] =3D { + gen_helper_gvec_fscale_h, + gen_helper_gvec_fscale_s, + gen_helper_gvec_fscale_d, +}; +TRANS_FEAT(FSCALE, aa64_f8cvt, do_fp3_vector, a, 0, f_vector_fscale) + static bool do_fmlal(DisasContext *s, arg_qrrr_e *a, bool is_s, bool is_2) { if (fp_access_check(s)) { diff --git a/target/arm/tcg/vec_helper64.c b/target/arm/tcg/vec_helper64.c index cb55a2b441..d8b25b868e 100644 --- a/target/arm/tcg/vec_helper64.c +++ b/target/arm/tcg/vec_helper64.c @@ -178,3 +178,7 @@ DO_3OP(gvec_famax_s, float32_famax, float32) DO_3OP(gvec_famin_s, float32_famin, float32) DO_3OP(gvec_famax_d, float64_famax, float64) DO_3OP(gvec_famin_d, float64_famin, float64) + +DO_3OP(gvec_fscale_h, float16_scalbn, int16_t) +DO_3OP(gvec_fscale_s, float32_scalbn, int32_t) +DO_3OP(gvec_fscale_d, scalbn_d, int64_t) diff --git a/target/arm/tcg/vec_internal.h b/target/arm/tcg/vec_internal.h index 5c3f51eed3..758e3db1c3 100644 --- a/target/arm/tcg/vec_internal.h +++ b/target/arm/tcg/vec_internal.h @@ -349,6 +349,12 @@ float32 float32_famin(float32, float32, float_status *= ); float64 float64_famax(float64, float64, float_status *); float64 float64_famin(float64, float64, float_status *); =20 +static inline float64 scalbn_d(float64 a, int64_t b, float_status *s) +{ + int b_int =3D MIN(MAX(b, INT_MIN), INT_MAX); + return float64_scalbn(a, b_int, s); +} + /* * Decode helper functions for predicate as counter. */ --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806035; cv=none; d=zohomail.com; s=zohoarc; b=Id4scDLz7+QgRNPQX8CpBZ1rLR4akzW/TBALESc2ptc8gj5n0pmrF+ZvciHUpyT80ChjA0h+SUv/bDkguBeaudyS6ptf8JY5c4xORV0SaTLx+uFMkvvSTzj6M3EFNXzqquKrYct6jd69fSvfgzg1qJft0bR99uxxhz6AYNKPomE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806035; h=Content-Transfer-Encoding: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:Cc; bh=4baddaOThhvVypa+zR9C68Esb7J0JFElIMpjqOxSFIQ=; b=fRTj2CsDRLO2olV5XrPcnLr25eY/G+2U1uRu1a555geTqXh5ZbJ5PPhK6hCVRa2V1/awk0nIpV3iO9Oyg538SXTx6sElgOpzEXybmn0c8cdNFalizZ77oQxN3qjmOJPdHIJDqyJOl6Er0qqpqqEZDBN76YdV/ommh/qajlFE7cI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806035743433.1656969400773; Tue, 26 May 2026 07:33:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsoa-00040T-E0; Tue, 26 May 2026 10:31:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmv-0001Yh-IJ for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:46 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmu-0001VL-1J for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:45 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-44c350a5b87so6328818f8f.3 for ; Tue, 26 May 2026 07:29:43 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805783; x=1780410583; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4baddaOThhvVypa+zR9C68Esb7J0JFElIMpjqOxSFIQ=; b=b2B/Pv8s4+/lG2AqzKxS/wr9jWdVF0+8pkMUJv/w69kd9TiWdzOJq7cbHO1OcR4TbC Wc3JpRDy1Sm7FAHcBTdovgufroaBCGVMJ6KhehVuUc72aJ3rsvV7FmRC8q2afOCjN/Fi DkYQghBYEEUTGcP6dciyNbK0CWBdfrejKDdhmo7Gpfne7Iq2j+bv5ymXeK6zZJPUndI7 U3L17V8YZs7L4Ow1uIUlybPh09MVNThVHIaY0NkjNJ4rcB4umEMJTUOz5Rc2QycgBIy8 riP22OsjyL1ISqFOpiFOcYSFwdPfEYtsofqA85ZUvOVPWC9bYa0q6uAUuCf9lnpa5kMB Vfzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805783; x=1780410583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=4baddaOThhvVypa+zR9C68Esb7J0JFElIMpjqOxSFIQ=; b=I37QiW3Z8iyehLz1xiOnEZTkATDHFNtCSycQ7JHwz3dC1TGopMJp5IHVCbl1t/+uf6 Y6BEgcsmvC7gnygFe71yMX9pv9DHtVjS4zua79bX2zcftQXY6At/Xw8QQrl3PffOjF7M 1ot+/f54ybdMw5zzpoRl4YyLj3G7vCafNVypXsSHrPT5Tst2uUsRTKbu94NhzqAAZRZM VOxrFR9Rfb/SRJvdMRfuKvn9+6dVESFwYmCIZG5Pw4CUKBRGARDqzZ3kGlFlWiJdxtob /+3fE05ZKRALt5q9FnoN6NKdT5jptZbgD6JtbvybOTYpRdgD8mVAn5fH5SNUxuz+W6Jz 4JgA== X-Gm-Message-State: AOJu0Yyu7m8QwRs7wocKoMOVxPg0MBndOhSjJq4aGp/axzas3+aNW59r x/AAs6F02Fv2yzPfXstu5PhgyI6jGzH6GaMSgHMoTcyXSBH4fsVobZpg32cf5fBPfrG+3mdIdMf vkDZq X-Gm-Gg: Acq92OFSXliTobMDx8rR4jHZmYuMUwfo7MMBB3mKzb2VSyIv4Z9DWFEtfkUThFZ2qI4 KC3pMVhQ2YdeVZhuzfiMo/mEAYZoNoleFNDoB/j5MmHk6WHMng6vOTZZI+ysPVa8us2hDQPYEtK JySBWqcNhUWSz89n4kGYR4CAf4PCOCVC6jX5tz+1i8rVKlI+KiPzkgmZ0YXL8R7j4dFYjBr5Bav hnFdeYrEi6cQaYA1wb901tWPNCiHnXPjrGoiPpkjodIGb0ZwbLcXpKvSIYPz8A8Tkl/8g86ms3T 1QLHBUvkkuv8+/c+eKAJvcWZcB3JbsWSPqgvwFWA9pOg9AiPkal7W2rTsxHV0QiokHzfBEVoafP cNWNMTM4Kin5Ek7gpYVW+Oz+5ddYP1vy0sl2SzMkxaiyugIVaEn9tOvQwvtAtKqYz7e4OjGuInq tawUMsyxp8j+P3eQ6T7plSz4RSVZe0CxU5qrpfuyffkx2KzYmt/EfwSvbq0spFDPUCVxibUohyl pg+K3pW7gHuZ5g7zedoPviYMOLiRN8= X-Received: by 2002:a5d:5f54:0:b0:43f:dc54:9493 with SMTP id ffacd0b85a97d-45eb38a6779mr33499011f8f.21.1779805782537; Tue, 26 May 2026 07:29:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 52/54] target/arm: Implement FSCALE for SME Date: Tue, 26 May 2026 15:28:48 +0100 Message-ID: <20260526142850.2326589-53-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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=ham 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: 1779806036699158500 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-22-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu-features.h | 5 +++++ target/arm/tcg/sme.decode | 6 ++++++ target/arm/tcg/translate-sme.c | 15 +++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 1fde3e9231..f9c979d20b 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -1622,6 +1622,11 @@ static inline bool isar_feature_aa64_sme2_faminmax(c= onst ARMISARegisters *id) return isar_feature_aa64_sme2(id) && isar_feature_aa64_faminmax(id); } =20 +static inline bool isar_feature_aa64_sme2_f8cvt(const ARMISARegisters *id) +{ + return isar_feature_aa64_sme2(id) && isar_feature_aa64_f8cvt(id); +} + static inline bool isar_feature_aa64_sve_i8mm(const ARMISARegisters *id) { return isar_feature_aa64_sve(id) && isar_feature_aa64_sme_sve_i8mm(id); diff --git a/target/arm/tcg/sme.decode b/target/arm/tcg/sme.decode index 9dec7318a4..ee874be1a6 100644 --- a/target/arm/tcg/sme.decode +++ b/target/arm/tcg/sme.decode @@ -250,6 +250,9 @@ ADD_n1 1100000 1 .. 10 .... 1010.0 11000 .... 0= @z2z_4x1 SQDMULH_n1 1100000 1 .. 10 .... 1010.1 00000 .... 0 @z2z_2x1 SQDMULH_n1 1100000 1 .. 10 .... 1010.1 00000 .... 0 @z2z_4x1 =20 +FSCALE_n1 1100000 1 .. 10 .... 1010.0 01100 .... 0 @z2z_2x1 +FSCALE_n1 1100000 1 .. 10 .... 1010.0 01100 .... 0 @z2z_4x1 + ### SME2 Multi-vector Multiple Vectors SVE Destructive =20 %zm_ax2 17:4 !function=3Dtimes_2 @@ -291,6 +294,9 @@ FAMAX_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 0= @z2z_4x4 FAMIN_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 1 @z2z_2x2 FAMIN_nn 1100000 1 .. 1 ..... 1011.0 01010 .... 1 @z2z_4x4 =20 +FSCALE_nn 1100000 1 .. 1 ..... 1011.0 01100 .... 0 @z2z_2x2 +FSCALE_nn 1100000 1 .. 1 ..... 1011.0 01100 .... 0 @z2z_4x4 + ### SME2 Multi-vector Multiple and Single Array Vectors =20 &azz_n n off rv zn zm diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index a67501226f..e2d17de165 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -707,9 +707,12 @@ static bool do_z2z_n1_fpst(DisasContext *s, arg_z2z_en= *a, { int esz =3D a->esz, n, dn, vsz, mofs; bool overlap =3D false; - gen_helper_gvec_3_ptr *fn; + gen_helper_gvec_3_ptr *fn =3D fns[esz]; TCGv_ptr fpst; =20 + if (fn =3D=3D NULL) { + return false; + } /* These insns use MO_8 to encode BFloat16. */ if (esz =3D=3D MO_8 && !dc_isar_feature(aa64_sme_b16b16, s)) { return false; @@ -719,7 +722,6 @@ static bool do_z2z_n1_fpst(DisasContext *s, arg_z2z_en = *a, } =20 fpst =3D fpstatus_ptr(esz =3D=3D MO_16 ? FPST_A64_F16 : FPST_A64); - fn =3D fns[esz]; n =3D a->n; dn =3D a->zdn; mofs =3D vec_full_reg_offset(s, a->zm); @@ -831,6 +833,15 @@ static gen_helper_gvec_3_ptr * const f_vector_famin[4]= =3D { }; TRANS_FEAT(FAMIN_nn, aa64_sme2_faminmax, do_z2z_nn_fpst, a, f_vector_famin) =20 +static gen_helper_gvec_3_ptr * const f_vector_fscale[4] =3D { + NULL, + gen_helper_gvec_fscale_h, + gen_helper_gvec_fscale_s, + gen_helper_gvec_fscale_d, +}; +TRANS_FEAT(FSCALE_n1, aa64_sme2_f8cvt, do_z2z_n1_fpst, a, f_vector_fscale) +TRANS_FEAT(FSCALE_nn, aa64_sme2_f8cvt, do_z2z_nn_fpst, a, f_vector_fscale) + /* Add/Sub vector Z[m] to each Z[n*N] with result in ZA[d*N]. */ static bool do_azz_n1(DisasContext *s, arg_azz_n *a, int esz, GVecGen3FnVar *fn) --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779806054; cv=none; d=zohomail.com; s=zohoarc; b=YrjLMrrgq7FD6ykbeR+xFEGcaRWBceBcz9eBC9M6zRxfD0q6wEIlu2h2vEwMnkT5B37LW5ysCNq1nUfdN4IHPj5EY4DXPdX5JwUFal8YqkCmjc7KTn97Ds6dbjVdAD8cMGN9NXuSJEdJ6WRmhPt+p/zTGteq9fgf/7tTUS3FluA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779806054; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=i/q2wfhAByWiYzfnLkFT+2vC1TzNOMSgQe7MpYCYhW0=; b=igb4g1vIt6dHnyWM+uWooGEVx2GGGGodceJK6tn5jgS3BCFDhlAzm1//O9/K7RdFgpN+oJSEZogIBr584qvfdxGjNsxw4e14QisTgm3PmBjrES0gHt7Fd9M8DVKErTz+M9SaLD710nKiTP2LGIux7GtIak750atBt1kHZwEtplo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779806054711607.421442367755; Tue, 26 May 2026 07:34:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsoW-0003ca-9I; Tue, 26 May 2026 10:31:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmw-0001c3-Kq for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:46 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmu-0001VT-Rb for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:46 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-45e6a4d0be0so4722330f8f.1 for ; Tue, 26 May 2026 07:29:44 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805783; x=1780410583; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=i/q2wfhAByWiYzfnLkFT+2vC1TzNOMSgQe7MpYCYhW0=; b=c4+LS7vnKAxvYQDLGa0GdFUfHXXc1JDx++3GxgTvATpcjaPSEwPiDLiEdIsosMgupR culQpn8QQvFd4OEOUumbfraUX5DatpRu9fONwKz1GEWGtKeeQYZBwaTO8ZTqgaQPhup/ immcPN5JY3DBoKsgj9Gcz1+zqyZj1WoJHYJtDvGw0tg9134kjo1kInFLH7Ylv0q0/gEG BSz4MnHPYrqtUtt/T0fLb5rQ4Mhl3hHiYqjHma+dY3zrsHQNzsqpqRn3aErb1I2GCfjA Fo4ZqKYpHEi5yfZ3T2DKfyn2r43vWHKPlWBZZYsbCYc226/Uuj/hxBfZCrDGCXcMK/RC Fe5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805783; x=1780410583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=i/q2wfhAByWiYzfnLkFT+2vC1TzNOMSgQe7MpYCYhW0=; b=Nrhhc6AnTGQz5nIjjRD5e/cCGh8NsSAoecm8aJq72bPsrx/g7v5A3/d0qd302GtyRm dIylLlFJTOrLjRcK0NCx2+w9LJQbefVOQURi/zJwBaYVy1KPsTxstknMRHycIqVYYTFR +3/N3sKCTeBajmF/MhBWctiXpX7oChvyV8EosR/tEO5wjrTOPsBMweNC5ayGYMMdirkg CttKWsZ/ILTNg/2tOjW/UvkOgb8XYasw4tzVOF5JC6j7dslj57iRSmymEq1Z6h9IR6oM 5BLC2G/EA2eymb7BorqE0eAuAGYAZm+Qz9tiOh/qtM6arAPn16mfDsvthwUSEj1X/NmJ +LUQ== X-Gm-Message-State: AOJu0YwpSxSh4NM3BguuIx2f6kf1PlvJRXhc9/IRAmcp9Oa3bxMEThke UkgnBC8YykKClkIbF9PP/QmvVsaKpvC/rASCQUrXSKH+41E+I9MhQpOJc1lRwa67lM3wtiRA21T l0f+V X-Gm-Gg: Acq92OFbt8SNdL2sxOQrmecIKSdr2QnB8fzOEcrs/K79oZwOytCAHY+iVDm4am0VkCj n3yndyWe/BsYZ8RGPuOFVAxrESCwK/CiXDIgr/5PVlL6rhIugpgIxE67PaYYtG+gdGLPbQrHfzu qE0Yq+169AY1SelRDcwFQeZSUUQEupQ79bKHYqbwl1ME1HMqAEOAj8JbDd4Cd+FhjcabYBTM1xf hVueUKdThgGkvh309I67pUCnRrst3PyXECs8s9ShDT3dCHNQWs02Qj/W4OvvsM6UVDkKXxeVbGh E8aFv2tyPxSXFaVGQyQ2DxxSpyRgEh3PriFMH/E25GzRQJJzG/2F7Kb2V5xlcESOWl5jqql6qwM 2r61wYTbCiBMjywfMv/Cik1bkRGx686JuSYir7fDCqlIWaktR8qPPJpG7EsuSMCvydlJW8Sm+y7 AyKTGmKFKY7ChmKVYSVe3LOGKgOEN8Q586NpRy0FWj3ghyM2uo2nq1Cx29IK/nM1TMC00hMBEd2 tpFEqTyJjHAMG2UYevB8bBpYWM92gd7tniMq7lxqg== X-Received: by 2002:a5d:64c2:0:b0:44b:5398:4e85 with SMTP id ffacd0b85a97d-45eb38afb20mr30851967f8f.22.1779805783385; Tue, 26 May 2026 07:29:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 53/54] target/arm: Split vector-type.h from cpu.h Date: Tue, 26 May 2026 15:28:49 +0100 Message-ID: <20260526142850.2326589-54-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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=ham 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: 1779806054944158500 From: Richard Henderson We want to be able to reference ARMVectorType etc from common code, so move it out of cpu.h. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-23-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 38 +--------------------------------- target/arm/vector-type.h | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 target/arm/vector-type.h diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 2a93de4132..85552b573c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -35,6 +35,7 @@ #include "target/arm/cpu-sysregs.h" #include "target/arm/mmuidx.h" #include "hw/intc/arm_gicv5_types.h" +#include "target/arm/vector-type.h" =20 #define EXCP_UDEF 1 /* undefined instruction */ #define EXCP_SWI 2 /* software interrupt */ @@ -140,43 +141,6 @@ typedef struct ARMGenericTimer { uint64_t ctl; /* Timer Control register */ } ARMGenericTimer; =20 -/* Define a maximum sized vector register. - * For 32-bit, this is a 128-bit NEON/AdvSIMD register. - * For 64-bit, this is a 2048-bit SVE register. - * - * Note that the mapping between S, D, and Q views of the register bank - * differs between AArch64 and AArch32. - * In AArch32: - * Qn =3D regs[n].d[1]:regs[n].d[0] - * Dn =3D regs[n / 2].d[n & 1] - * Sn =3D regs[n / 4].d[n % 4 / 2], - * bits 31..0 for even n, and bits 63..32 for odd n - * (and regs[16] to regs[31] are inaccessible) - * In AArch64: - * Zn =3D regs[n].d[*] - * Qn =3D regs[n].d[1]:regs[n].d[0] - * Dn =3D regs[n].d[0] - * Sn =3D regs[n].d[0] bits 31..0 - * Hn =3D regs[n].d[0] bits 15..0 - * - * This corresponds to the architecturally defined mapping between - * the two execution states, and means we do not need to explicitly - * map these registers when changing states. - * - * Align the data for use with TCG host vector operations. - */ - -#define ARM_MAX_VQ 16 - -typedef struct ARMVectorReg { - uint64_t d[2 * ARM_MAX_VQ] QEMU_ALIGNED(16); -} ARMVectorReg; - -/* In AArch32 mode, predicate registers do not exist at all. */ -typedef struct ARMPredicateReg { - uint64_t p[DIV_ROUND_UP(2 * ARM_MAX_VQ, 8)] QEMU_ALIGNED(16); -} ARMPredicateReg; - /* In AArch32 mode, PAC keys do not exist at all. */ typedef struct ARMPACKey { uint64_t lo, hi; diff --git a/target/arm/vector-type.h b/target/arm/vector-type.h new file mode 100644 index 0000000000..d94c0d986e --- /dev/null +++ b/target/arm/vector-type.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef TARGET_ARM_VECTOR_TYPE_H +#define TARGET_ARM_VECTOR_TYPE_H + +/* + * Define a maximum sized vector register. + * For 32-bit, this is a 128-bit NEON/AdvSIMD register. + * For 64-bit, this is a 2048-bit SVE register. + * + * Note that the mapping between S, D, and Q views of the register bank + * differs between AArch64 and AArch32. + * In AArch32: + * Qn =3D regs[n].d[1]:regs[n].d[0] + * Dn =3D regs[n / 2].d[n & 1] + * Sn =3D regs[n / 4].d[n % 4 / 2], + * bits 31..0 for even n, and bits 63..32 for odd n + * (and regs[16] to regs[31] are inaccessible) + * In AArch64: + * Zn =3D regs[n].d[*] + * Qn =3D regs[n].d[1]:regs[n].d[0] + * Dn =3D regs[n].d[0] + * Sn =3D regs[n].d[0] bits 31..0 + * Hn =3D regs[n].d[0] bits 15..0 + * + * This corresponds to the architecturally defined mapping between + * the two execution states, and means we do not need to explicitly + * map these registers when changing states. + * + * Align the data for use with TCG host vector operations. + */ + +#define ARM_MAX_VQ 16 + +typedef struct ARMVectorReg { + uint64_t d[2 * ARM_MAX_VQ] QEMU_ALIGNED(16); +} ARMVectorReg; + +/* In AArch32 mode, predicate registers do not exist at all. */ +typedef struct ARMPredicateReg { + uint64_t p[DIV_ROUND_UP(2 * ARM_MAX_VQ, 8)] QEMU_ALIGNED(16); +} ARMPredicateReg; + +#endif --=20 2.43.0 From nobody Sat May 30 17:44:41 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=1779805888; cv=none; d=zohomail.com; s=zohoarc; b=RulQFVuRi1fY2zFo1t3AozuH+l+ZvVGWz/sNK1kSDqdQy19XsQ7Y6+vIQdq6L97ezkGr1gfAObn/rYx6ODwGYpejNw4vgY/f9oxnmNxslACJURt7bdksAqu19KmZV+Y/gUYX72csXGoFpDtYCV3MIWDyHSSfZ9PiL84xuvJWMk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779805888; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=C8LTepMhdhYYWsj5ukZo6Hqe529dZMs/c5IW2NmqJJ4=; b=OhsV8jNq5/k30Z6BhAWmonhPsd2WbDAZB1NSR85nq2wq4LD8EOpG75pyE+RyScXCZsxdlROA66Vymmpm6ALHG5+Q+k1XAAFxmMqb8ZGoRDFGYgGVrZRFywEDaH4Aqc5LvbpH+aEX4sLV5WOSkFMGMdJHi6V4bIaU2krwWsV7PNs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779805888235871.5233909562281; Tue, 26 May 2026 07:31:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRsoS-0003Eb-RN; Tue, 26 May 2026 10:31:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRsmy-0001ex-DN for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:50 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wRsmw-0001Ve-0C for qemu-devel@nongnu.org; Tue, 26 May 2026 10:29:47 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-49056b9f04aso40329775e9.0 for ; Tue, 26 May 2026 07:29:45 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6d70c51sm38325225f8f.36.2026.05.26.07.29.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1779805784; x=1780410584; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C8LTepMhdhYYWsj5ukZo6Hqe529dZMs/c5IW2NmqJJ4=; b=zDVclAYiRTMPIuuehi0pqD1CXJ8OMWuIq+to3kZLXVPaEau7QCcAvXk2XPDWjFjFHB O+WS0x5Dw/miSHGHaHf5FLlDI72dZU5DibVR2kajXNXoAMXWMpwd2/7CbaDJ+xzjB11m 8PecvHkVMiUtZB7J+Si2tu0IWSko96H2ECy57X0Ayf4oIStZnJqbXs9DtCzHAAWH6h4r IAYsQTlff7d9rHuUe0UJSXZJ1FmdVLU42K3vFJ9HYEUFfd/2YTJHP1MK/I8OfxCeoaq8 h7nK0vAelvGd4pATzWOtMDGP4C8nK547sEnXszdwD1RDeCqzWhX8DRc31ljmSwxjxtYO c9Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779805784; x=1780410584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C8LTepMhdhYYWsj5ukZo6Hqe529dZMs/c5IW2NmqJJ4=; b=SwStxSFZBe+sppXpa0PZabwUC1pg5lTgiVl9V1oI+JgFUExh9PUEW0N25WN6B96AQN QAgjdtw5J0sFG2UnwQh7x04qbvEdFo2QDzupE9DQrKVOHY7riqZ7ix9NfcLHvjnXyA3X vGgxTHdabpRne0szhtlEU4dap+0pHOzPKpRjaGPHAb3GkXmlY9QgfcxMB2FBuqI/sIun kd82RUDlPHqGTDsg8qygJ1R6XYNoA/J8HinyP9QahsqhME6r2kvxB0SrHrTCdJxHQijr hwvt+7m4PcZzJlGPRytchae/MLiCUqdNk6SssrJitnSSDvaHkP2H7dT3lttKgju1lpC9 QOtA== X-Gm-Message-State: AOJu0Yw3eakUJV1u/21Ms+1TYRpo4p20Jpzpl1fsZ4hFS7alWLB6bojH 3e5xVSP8AAASG6TBD+g1+SIIUtMYQ4/VyIQ/T3nBncBC86vT8FBJDZMDG/gsbsnGKvAmcX/FGav 4KW7b X-Gm-Gg: Acq92OHijUP07P6PE/MkGRtqXrDP++vzLxhXOjjbL8I5VQYA69GUnvYjO8dzWgVjxsZ N3ad1qX7HnnT52nBKyUg0oBJT124gmkXc9Ug6ebiKpuoZ5NHSM/R4hN5/oXDxxpO3xZ/jVzXfC1 qrIeUf7pVVCUrxkPcrHSzDo+rHt8gAYjPOL/GlLFPwJFHFN3lvKezBPzawu0gtqaWFCgya+Yu88 Yh2WKLyaRlyb/GBgEwiZRiGcFAXUvhvfF8+HPDhEb0ANsSJUtCnsAtRfFFZRh2t8B2PoxrXzSZ0 zlBM5bdregTw2bmG29nyEX40xpycaxpEr8+RswuLY7cLam4LlrbKgmEpqNITn0IkxcpkRPWZvQh JiIYmvtQEmO8oMgUFw0xSPhjsytxcbeMqnSfeRAHt/UdFCqcICkdEbPlTE7tsCpLaz+ALEoKnur gWoscs0TpUZ4EbGTP9AjJGDuvtTzz6+KUGSHXHnCD7lWT63FHSyw1F6eGXCLTWJNPiT5GkFi25S HhHNj9ERUiFGxNijjXENac5CtblzT+4kHBbxzMrCg== X-Received: by 2002:a05:6000:26c4:b0:44a:2555:f8a9 with SMTP id ffacd0b85a97d-45eb369072emr31076759f8f.10.1779805784330; Tue, 26 May 2026 07:29:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 54/54] target/arm: Move vectors_overlap to vec_internal.h Date: Tue, 26 May 2026 15:28:50 +0100 Message-ID: <20260526142850.2326589-55-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526142850.2326589-1-peter.maydell@linaro.org> References: <20260526142850.2326589-1-peter.maydell@linaro.org> 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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=ham 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: 1779805889756158500 From: Richard Henderson We will shortly need this outside of sme_helper.c. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-id: 20260522220306.235200-24-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/sme_helper.c | 6 ------ target/arm/tcg/vec_internal.h | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index ab5999c592..0055e97a2b 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -33,12 +33,6 @@ #define HELPER_H "tcg/helper-sme-defs.h" #include "exec/helper-info.c.inc" =20 -static bool vectors_overlap(ARMVectorReg *x, unsigned nx, - ARMVectorReg *y, unsigned ny) -{ - return !(x + nx <=3D y || y + ny <=3D x); -} - void helper_set_svcr(CPUARMState *env, uint32_t val, uint32_t mask) { aarch64_set_svcr(env, val, mask); diff --git a/target/arm/tcg/vec_internal.h b/target/arm/tcg/vec_internal.h index 758e3db1c3..84f7f15228 100644 --- a/target/arm/tcg/vec_internal.h +++ b/target/arm/tcg/vec_internal.h @@ -21,6 +21,7 @@ #define TARGET_ARM_VEC_INTERNAL_H =20 #include "fpu/softfloat.h" +#include "vector-type.h" =20 typedef struct CPUArchState CPUARMState; =20 @@ -463,6 +464,13 @@ static inline void depositn(uint64_t *p, unsigned pos, } } =20 +/* Determine if [x, x+nx) overlaps [y, y+ny). */ +static inline bool vectors_overlap(ARMVectorReg *x, unsigned nx, + ARMVectorReg *y, unsigned ny) +{ + return !(x + nx <=3D y || y + ny <=3D x); +} + #define DO_3OP(NAME, FUNC, TYPE) \ void HELPER(NAME)(void *vd, void *vn, void *vm, = \ float_status * stat, uint32_t desc) = \ --=20 2.43.0