From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932114; cv=none; d=zohomail.com; s=zohoarc; b=AhCYquW/7IMB1lw8rw6gCfRcpn/HXn8wfeJZqvkqwIexRPSOmiHfYz8jHH9XAUVUWZI64Kfo0FdLT+c8Tm+4CsimZKlUxS4av+KoDvckL4d3DjPqXRsUpKd6LwzoVXWtf1P00m+928mnXtX454+giiC+5D7FsFq9vjmjX3AlEPc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932114; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hbl7ajSiNJK7b98o2AX/9HHrEnoB7DYhJ//FpfdP6jM=; b=kw8hXNctycUnOxGruFH/eya1iaQjr8HHBqO/+uqH8sd1qXfAOZh1l0SBqNsub92Y1BvmLSLb8q8PkSoURqoykKK4v3SJQmv5cZv3yDZe7eh1l6GrCl00tPDUwjB+ABY5dYsjkm0q0zTAoymIK8JuMR2/PltINEd2wkQZ4Wx5wcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175493211473866.34786674220368; Mon, 11 Aug 2025 10:08:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVym-0004n2-Bp; Mon, 11 Aug 2025 13:06:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVyi-0004k1-7h for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:32 -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 1ulVya-0001kY-6x for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:31 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3b7910123a0so4250702f8f.1 for ; Mon, 11 Aug 2025 10:06:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459e6214640sm272712305e9.1.2025.08.11.10.06.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754931980; x=1755536780; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hbl7ajSiNJK7b98o2AX/9HHrEnoB7DYhJ//FpfdP6jM=; b=VnKcCFZqiEqzU0SuYZ6nBdbpTC8zOXY8Cnhyx2vPzl2EqvfSazD7c5ZfwaDWZLQ1iN AkREtOtje+2hCWoN2YyANc3JSuPfqKlPwKiFQd0+ETmqFNiu6yRS5+41xAW03GNdvmPJ BGRXBtau71iKm3jbWzqhcK/aHp7xiOMw/NNTJjBJKhjz8dtnSmibfbOT2oSUOk41qy7V pCQOinza6ph+Ah97h+dQg2rpRL2T9wY2pHx2Azy7jh2Ms09FQQyR5AYJ2eDkLVPHo4+/ upzT/mzrUasAW8Mto/rY+cb18WiX06amQ0cNi4eMzuXjTu2oEBcrWXDmBdtjT7R9BJTm cC9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754931980; x=1755536780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hbl7ajSiNJK7b98o2AX/9HHrEnoB7DYhJ//FpfdP6jM=; b=EJUhzIz0SXJpH5cAgJzofNPImmWD73pL9h3I0xH5SV3K3jE4oLESJ1lFZ6rQMgSArL mE0jz3u1dFxMOB9T10fdolgyy+q2ZDFUj7oOIgmWUyrBhYoSV5IK0zqfyzjU1sRlVAYc s/cq/vRMNiO6fbajz7aMPPMhSKorXvrnHRrorxw5nKPatGHnkj+kpF9KmtLur7xwmpmp ofBuucQnfn4cyLkomJumwM0lFwhO65ZHK+WlNsZ2Ta+KUmKCXF4d9M3aZOmorNgBv338 +7Q0jOHvXawDpscDl6XvKs03DBHqaKSXF6+57CxxaBb811NNPa+S8wmtvjV2HKWP42zM CIiQ== X-Gm-Message-State: AOJu0YxC8Dh+DTGqMkWtzJMSHfVrk2CKphlvNIvvYk6MjzOR3t/P8BQt /4sYrV6YFPMEx0X7SAqbe0dP/3Sc6kEjBGIOZUr/M8oOV12n4MdX4bwvYp8r1d9DttUtM6sg/HR 5xQaP X-Gm-Gg: ASbGncsw/u3c2/2igImO0Xvrcv0uj8uZ4DHPU+NU2Ido3pZOv7qqSlXt90H+pVZcTDo T/Nh+dbPBJVhV4OpuAoxsFn+9cwZdchmmnsEjxSlujHixv6UeAXom26ty6e3WFZQXpykVBqXxOq hgvMOXPq/gP7V9DAbc4xhA/vjOPt1sbTfVakOF9+SaPSuO/J+G8m3Ywxpk07STRJ2knCbxzWBbP G7PnzAMd4PB2L0/Kq0u0OXAdR4hxEaH1zJY2sHwsclb29/NyUiDalnMqTAN3XexBaWO3X/z51gN lOaZwvYxmkkiu2CATPJ1ulwL+y5vXaIpcYv55urleDn+Tr07yLv7U8Xyo59YSeyOK7tJtwRYjL2 HlYrb5kzKryOMx3A4asC31RKB95PS5it5BalfHAY2H7RHUR2bdLsr8giFKw81otRoGocETGzK X-Google-Smtp-Source: AGHT+IHs9VhBLuyq5DxMA3Sqc0EWtw1Yz98FWwe/a6XU5QQ2lahjqbMswlIp69fYsNKRzJHrl1XcwA== X-Received: by 2002:a05:6000:2886:b0:3b7:9589:1fd1 with SMTP id ffacd0b85a97d-3b91100eca2mr436223f8f.44.1754931979737; Mon, 11 Aug 2025 10:06:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 01/11] accel/system: Introduce hwaccel_enabled() helper Date: Mon, 11 Aug 2025 19:06:01 +0200 Message-ID: <20250811170611.37482-2-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932117681124100 hwaccel_enabled() return whether any hardware accelerator is enabled. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/system/hw_accel.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/system/hw_accel.h b/include/system/hw_accel.h index fa9228d5d2d..49556b026e0 100644 --- a/include/system/hw_accel.h +++ b/include/system/hw_accel.h @@ -39,4 +39,17 @@ void cpu_synchronize_pre_loadvm(CPUState *cpu); void cpu_synchronize_post_reset(CPUState *cpu); void cpu_synchronize_post_init(CPUState *cpu); =20 +/** + * hwaccel_enabled: + * + * Returns: %true if a hardware accelerator is enabled, %false otherwise. + */ +static inline bool hwaccel_enabled(void) +{ + return hvf_enabled() + || kvm_enabled() + || nvmm_enabled() + || whpx_enabled(); +} + #endif /* QEMU_HW_ACCEL_H */ --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932114; cv=none; d=zohomail.com; s=zohoarc; b=Qy0K3GQr1ccBHG2kKzLdpCvQLYuW3LjI0R8uetpzISCSiyBSXLkpNoTcplqJhMprygVvYAbcc35tR0y2P1FMceJZdSRv2OpR10Ht+8OxuTyvkYfg9x/05/bca9Du4Zi7Xhhdc08LDtWJ6qRfx+O6wS0JM0A4iAGSYk3e2FW0F0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932114; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sTgiDxRSLxB+/Dn7RyfAMOT6DRpkQW6SJaCX0ndx+MI=; b=QIHk76kii+gdzVMdg2b0gH2+z+8eEMJUQjRKpxoL6j07HjH3DVddVO1NmoJtimZd99PK4y2ZKzK2MFoQ0OeytRNpU3/YFcVWpOEOrjU0B/fwzfDLNsrQ876kmleGdO2DZX77EXsl+SKevlu+K9hgM/cZz1dyRZMBHONtE4WD9WY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932114473953.5252328070325; Mon, 11 Aug 2025 10:08:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVyt-0004pF-Sq; Mon, 11 Aug 2025 13:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVyr-0004oJ-Gs for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:41 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ulVye-0001lD-KC for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:40 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-459ddf9019cso15114945e9.0 for ; Mon, 11 Aug 2025 10:06:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b8e0683045sm32464335f8f.41.2025.08.11.10.06.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754931985; x=1755536785; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sTgiDxRSLxB+/Dn7RyfAMOT6DRpkQW6SJaCX0ndx+MI=; b=IsG+H3GntxmqMDHatqDlOp4fADROO4cmTatuD85H1Ia5zoobIbN2UcqFuMP9/hQz2d 1I1tKglOMF7CQ/VA0pbmUPNZEtw9AhFmi1GszImwP0rCTIiwZ95GUdsY3SXg4IkAq5TE fPJcBhC5fDtvEdllGMdSeRgyfa6wb8ZhnzBRHBT9TouLnqGPvXeIafuQX5VjHGS5WF3l 1W3nbmtuSUjXoCjRhUekdH5OHmB2QL91b/c2RPBrLly3MYTU/4iQsbKEp5aRkbEIk+Yy ipuThvPF7TVLfgsaLMnbdfZYlHIJiBadZQ7Izk4fhm/hxZyYtkUSH5F61fuDnKo4wSzM zuAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754931985; x=1755536785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sTgiDxRSLxB+/Dn7RyfAMOT6DRpkQW6SJaCX0ndx+MI=; b=srTDxfIMuqAk1z9q2lp2TOim6e83p6pevr8m8xTd8TE5ceo1+KPO4ILrC1ku7cXy7/ HyIA3OpU7fmXHseAv3ICrr68WRtArIHRFrS4i1N/zpJeuhA8c2jMB+0tldAUDONT3MfL q6Fso/93UrP+T+zF0IN9UxsPiJA5Bz7VTWRKbIfVLDZE9shujqvWUi7UMcLcHgSK/qMT INKeVxNuLMg3HdRkjC/JACMKuIemOm5XK+m1IQVMS5+YlTzIHdqUBmo19ULfIkWLRYa0 /7gjMtwPme30shNtHKPLzeXt6/v92ant7jfmxjD0oUxYcNizLKKFRRMUXVUq9Xztt2zi pI5w== X-Gm-Message-State: AOJu0Yw/enqSFfrHgvRDPKKVGTyfphlOuoUSvf2U332AhRsw7h73Yx6F jciLB9jVsnvul3FcjxBjAGiaENLW1OL7g+ehMCIgmncM8nJIXucLQaKQRm4Ap0VG+CuVO6FLwe8 fNpYf X-Gm-Gg: ASbGncvSuoBIfmDrFaVhSoAab8/Z7W9du9Kg0RjUkYJRaewQBIbkoDjUPUOiRxlyg5o bURrS4N8gXaQ+vIXmBDKNvF7R8VDTb6HS+ZwmGznkEspbqgy1//W6TEaJuQBun5hDBjSLgpt2nW 6+QLDN+K5ehreuraKYb6BYs7rh0+q/G/WnVqBF2U6TlFssbR8HzQY+HuXjisvzdkxa2GAMDPic+ U5dP24aN3fI+FPWAvchX2LRMewsZ3xNhH9sBtUuMnbto6cHrByHg3lhMaHsR8xrovhw9dfKJQuu AgLU7n07+c0+QI7y7Slqe+Ennwz94Gt7MwqcGTfQetQbB06FkDA6BA5iIn4+9bX3Kkuo53p+0sF +jwA7qxmFwhy4Y64/2shB0DL0nhTWmj1vFR5c/074xetH9/UT6qI+RYY9yZljmkH9mUTJdME1 X-Google-Smtp-Source: AGHT+IHmKFWh0EX5W4UrlAuaShc8z5HGaqyl6BzhAlbha6mdD4im91lzcojjBo1X/5DvQMYjrTsAeg== X-Received: by 2002:a05:600c:3b89:b0:459:ea5d:418b with SMTP id 5b1f17b1804b1-45a10f58f2amr1775565e9.9.1754931985104; Mon, 11 Aug 2025 10:06:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [RFC PATCH 02/11] target/arm: Use generic hwaccel_enabled() to check 'host' cpu type Date: Mon, 11 Aug 2025 19:06:02 +0200 Message-ID: <20250811170611.37482-3-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932115815116600 We should be able to use the 'host' CPU with any hardware accelerator. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier --- target/arm/arm-qmp-cmds.c | 5 +++-- target/arm/cpu.c | 5 +++-- target/arm/cpu64.c | 11 ++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index d292c974c44..1142e28cb76 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -31,6 +31,7 @@ #include "qapi/qapi-commands-misc-arm.h" #include "qobject/qdict.h" #include "qom/qom-qobject.h" +#include "system/hw_accel.h" #include "cpu.h" =20 static GICCapability *gic_cap_new(int version) @@ -117,8 +118,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, return NULL; } =20 - if (!kvm_enabled() && !strcmp(model->name, "host")) { - error_setg(errp, "The CPU type '%s' requires KVM", model->name); + if (!hwaccel_enabled() && !strcmp(model->name, "host")) { + error_setg(errp, "The CPU type 'host' requires hardware accelerato= r"); return NULL; } =20 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index e2b2337399c..d9a8f62934d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1984,8 +1984,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) * this is the first point where we can report it. */ if (cpu->host_cpu_probe_failed) { - if (!kvm_enabled() && !hvf_enabled()) { - error_setg(errp, "The 'host' CPU type can only be used with KV= M or HVF"); + if (!hwaccel_enabled()) { + error_setg(errp, "The 'host' CPU type can only be used with " + "hardware accelator such KVM/HVF"); } else { error_setg(errp, "Failed to retrieve host CPU features"); } diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 26cf7e6dfa2..034bbc504cd 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -26,6 +26,7 @@ #include "qemu/units.h" #include "system/kvm.h" #include "system/hvf.h" +#include "system/hw_accel.h" #include "system/qtest.h" #include "system/tcg.h" #include "kvm_arm.h" @@ -522,7 +523,7 @@ void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) isar2 =3D FIELD_DP64(isar2, ID_AA64ISAR2, APA3, 0); isar2 =3D FIELD_DP64(isar2, ID_AA64ISAR2, GPA3, 0); =20 - if (kvm_enabled() || hvf_enabled()) { + if (hwaccel_enabled()) { /* * Exit early if PAuth is enabled and fall through to disable it. * The algorithm selection properties are not present. @@ -599,10 +600,10 @@ void aarch64_add_pauth_properties(Object *obj) =20 /* Default to PAUTH on, with the architected algorithm on TCG. */ qdev_property_add_static(DEVICE(obj), &arm_cpu_pauth_property); - if (kvm_enabled() || hvf_enabled()) { + if (hwaccel_enabled()) { /* * Mirror PAuth support from the probed sysregs back into the - * property for KVM or hvf. Is it just a bit backward? Yes it is! + * property for HW accel. Is it just a bit backward? Yes it is! * Note that prop_pauth is true whether the host CPU supports the * architected QARMA5 algorithm or the IMPDEF one. We don't * provide the separate pauth-impdef property for KVM or hvf, @@ -780,8 +781,8 @@ static void aarch64_host_initfn(Object *obj) =20 static void aarch64_max_initfn(Object *obj) { - if (kvm_enabled() || hvf_enabled()) { - /* With KVM or HVF, '-cpu max' is identical to '-cpu host' */ + if (hwaccel_enabled()) { + /* When hardware acceleration enabled, '-cpu max' is identical to = '-cpu host' */ aarch64_host_initfn(obj); return; } --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932113; cv=none; d=zohomail.com; s=zohoarc; b=P32zG4MbGA6393g5YIpNHmPd0zaExWALI+8dUmR56D1vC6zRJzgu1wEMiHRe27UtKAiD/h3y07dn2v2HHFTQwJlzCJoiUgbHUxhKicnSdH3Xc/A6EDtcd+ehDYKiGWXBb3S6lt/xXE8gSKumhAFPTKydg6jWt3K/Ga2g+ws7bTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932113; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EBVvp2mm8aGqZTUxsuL2RXTGufy667cu7GsFN8qW288=; b=ehBCjxZ8yICDmL3rAX4arpsPPNSz3f6WhtYNT9yBtLEaUhxzVFwHkU6IpZLStHc4odZpO4qNiuXFjQEEZ0JzsBJOyN/nGK3JGB9/Xi8dJBH9ZgSzXKTv71prhA2G/G6ceGpxP/NgEBaWpb7NRLqjmlJ+bFwNgrm62UDgomKAUic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932113792999.0839313661618; Mon, 11 Aug 2025 10:08:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVyw-0004pm-GG; Mon, 11 Aug 2025 13:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVyv-0004pK-2r for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:45 -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 1ulVyn-0001m8-0u for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:44 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3b783ea5014so2507767f8f.0 for ; Mon, 11 Aug 2025 10:06:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b8e04c7407sm31841796f8f.13.2025.08.11.10.06.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754931990; x=1755536790; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EBVvp2mm8aGqZTUxsuL2RXTGufy667cu7GsFN8qW288=; b=gDUg2SdeuV/tcph5j2jA0hLodGspxiHh35xP3y/Lqx3XVLMGzcpTg3dnvVu2+BarsX gnsC0ZFwo1mBra4gZprPiaFRSFBkOv7BnCyrtSXMDNiwHE7z9nzS2UldBHKckrJYCC2u 2WMeswT5m5tLchnzIODMTC/xfz5QPLyoUHVC7wkrPozuaUDkOYKy2dxM4HYYJkJnOO3r DZ7Oac78VwxWOdZ7ExbRrRZsrBM8UwYluQeCuR91W3tFlRMdU/axerB3LRZiIdt1kK7n c351SWQfVdoN5lKbo7P4s/Mnhzk99Vv17MJ1riYWA4/tOPL/RzixKY88unur+vjNMrov UR/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754931990; x=1755536790; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EBVvp2mm8aGqZTUxsuL2RXTGufy667cu7GsFN8qW288=; b=U1lcBoZ33p7plAVn3n/wNHoUtFwJMmzRNn2e8w0nxgGJ/V6uYYwG5dbSs97sQiCnb5 o0kpVnU8aEpVzs5MYj2o+l/0oQxEvWSW9VP8yE+70du1DT30TsnqgI3/gwhb7sMvL1uH LfgDqPNl/MYlCV/dze2wP6Sq5I35NyKP9QqKvsR/3IyjBwUyQaRSQltrxC4nIFe6WxIv 3ao8/tqb9JlqhHiJG9U2eW3g1ePj+o7gi7Q7dO3pbqBo6Ude4+IktNKVDKYB+36sZxnO OAG/o/uSllyLzdbC+8yzQ6KC34OBNdvOGYDlz3asFlJ+MI9/8FhU1HCgS3jOpl3c4/BO NByQ== X-Gm-Message-State: AOJu0YzGniTydFOyTFuUw5Jq43djtTTX1/w2qE0qqaVqE6Ylp9G1ppJs V19QZ36sJHcT/GBxzDieX/awaIrCqK6L+H0Pp9nEdTmEoAQdPhpgXhV6/F0dfdO//JQhKrvElf4 5+mg9 X-Gm-Gg: ASbGnct5NEnL12HxaEZKu6atr2CW8LHK4v+exoco1ew9MfiqhRljYQT7UxmfE5GhpZO QTGrslfEeXDL6QhpDYwSz+TbANAlZie/ZgJpFvDiHgYl2vIEQMMYCdcZAbMrXe0Daf3FQR78WLf /23zxsKwd+Fsqeq/yj+R6lOKLiHdFJjDWb8ujgPa4mV3fxU0cYm2TjWb5Q4Af4UZchCo3eSQnAg EtZErM53T84TQF+v/HFOdw04aOsduBoBYs/6ezdoSRSn8YSTqAWGoKpM+SnW/OE2mZ4vQmQmXON l3iP/sGZseTvE2oSkCyMyPJDAwAyU1g69K6nVV+YZ54LQ32paaDWdou6ebtmZ9ImcI8Fb6qwGVp r0kfeNiXD2yQ/dZhv7hFQoT1Qoe9e9gjpwEV4uKMpKFi++ckHZnmU0BgcdQO8kCjSw5s2oKXq X-Google-Smtp-Source: AGHT+IGYtGd8rolKCFqRynOmaKKG7z81rdsXHVV5N9o+CH0wBtLo6sJkFR2p9cNAlJ+BSookmaVkUg== X-Received: by 2002:a05:6000:1ac6:b0:3b7:7749:aa92 with SMTP id ffacd0b85a97d-3b900b6ab1emr10379986f8f.58.1754931990393; Mon, 11 Aug 2025 10:06:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 03/11] target/arm: Restrict PMU to system mode Date: Mon, 11 Aug 2025 19:06:03 +0200 Message-ID: <20250811170611.37482-4-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932115655124100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index d9a8f62934d..1dc2a8330d8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1551,7 +1551,6 @@ static const Property arm_cpu_pmsav7_dregion_property= =3D DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU, pmsav7_dregion, qdev_prop_uint32, uint32_t); -#endif =20 static bool arm_get_pmu(Object *obj, Error **errp) { @@ -1576,6 +1575,8 @@ static void arm_set_pmu(Object *obj, bool value, Erro= r **errp) cpu->has_pmu =3D value; } =20 +#endif + static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp) { ARMCPU *cpu =3D ARM_CPU(obj); @@ -1771,12 +1772,12 @@ static void arm_cpu_post_init(Object *obj) if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property); } -#endif =20 if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) { cpu->has_pmu =3D true; object_property_add_bool(obj, "pmu", arm_get_pmu, arm_set_pmu); } +#endif =20 /* * Allow user to turn off VFP and Neon support, but only for TCG -- --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932187; cv=none; d=zohomail.com; s=zohoarc; b=jDTnyhz35AK43AjahqDfRmiKjuT3zosIMIJaEVrI5oYNJk8UBKDT1Ylm6FIkmbZAPVC2ZdQ5kv6RnFoq41/vEXQXZ4z8x+qqnxhzw6UyIDzHnJEwOuTaq0UDmveQuUk2P0x///Qri0kbI+tiH4w8gTiHNBQ6RLX2grY+wZuf95w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932187; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4kCcMKgJsUFQdM/mVU8Sb2r9KycdWMl/tLnBwMf6U/Q=; b=nTsOyWH/LBKuSbe6hPnPgFFQh3Z/933Rjex+/V+7tO+CGFQY/SQIWLCapzwcnbpfziKwY74cVmsa5+X5WqoCtXk4RixF7VVDFKPiJDL4ZQScg42be5GWgdWEEf/PXAyFmXhycx1dRU2WLweM7kzge2pwyqFEMj4GYcrdlc+IBE8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175493218714447.551711926463554; Mon, 11 Aug 2025 10:09:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVz0-0004rz-4F; Mon, 11 Aug 2025 13:06:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVyy-0004rA-L9 for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:48 -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 1ulVyp-0001mz-Cf for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:48 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3b7862bd22bso2798966f8f.1 for ; Mon, 11 Aug 2025 10:06:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b8e0846777sm31486669f8f.48.2025.08.11.10.06.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754931996; x=1755536796; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4kCcMKgJsUFQdM/mVU8Sb2r9KycdWMl/tLnBwMf6U/Q=; b=oy/l4rcInepRoex/IKDezCvpAgxqsY/leWH8zOO35rCDZvfMUaUZkus1icH2RBLMa9 nmxfxPeMOAo4C3TfUhRrTGCi+S08HYV569JdpfnkdcxEoAwNKARIc9gf5wX9/LzxJMEg MwBPM65hUbakaRTbYWV2x776bfbD9ElEy7ljjDmMSkytCOlpUp4uH+5nj0R/ryBRZF6n ioogttgRz90TCFvgUfgBG6yQHDchtvYPWi6wvjF7uuCD1EbzTfz1u/nIz1Moc1cjq1qJ FZFtGV5F4aGlFh376rdDE88nvrXP9bCiJmESrxkpoQiIDNPVBebOjOl0P/Cpl4UT59oS qLQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754931996; x=1755536796; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4kCcMKgJsUFQdM/mVU8Sb2r9KycdWMl/tLnBwMf6U/Q=; b=wVqSyTOka3klj/j7ij3zncKUxUzmxNEwTFQo0oM7/IEJgwdEQdjNZIDLo/A/N+odXe Zl5IUKiyIHlcnQWUcBsppd/Ji0z3bwkmSKImt5IXs44Oernc9n2DQGiQ0mcDdcQolWNX w3J04r9BWL9xUyUcbmibK7i5nHaRvp3JyZw5OP+mdiG+cqHb8OZHRofevB4fCUbrOr5f IYc8MJjdn7hiyU4kdssvtbvapZA7RZ2hLNXgsminx+0bGa7NDBpL8Jgf4FdOXPd3mOtR D7RGiMRQXaN0mL1ruPKvbjneYAqz11TUR+9Vrh67c8QI+X9txyVtK4uhqJtZVbYRwc4P GRbA== X-Gm-Message-State: AOJu0YzzN26tFh7ih96tXv4KQHUdLzO5GCJtiX8174fSk2QRpcQFCuHU 9VOTTlvSgoM+iUpyCUD5E0aOQdWzkMBnZI8+ICrLy8CORopKwueFOfkDGbfEuNxvH56jnZMHtpf 0O0uP X-Gm-Gg: ASbGncuRZsvW4MuJBikEYHkdKksSbAPrP4KFDg6X1SSgEX8Ikt1IN4go5meMxWmWVbH chSzp6zxV7EN1s3VwH14T/LBwibMrzS3ziloaDUla2QVso5903C62K/32iFEhed3nMjI/67QIZl OH6+8u6ii3Wxm6kqvwXtgcqM6wUHfpuRNIBLq9g7S3iT7yZwqhyNKQwSwazB0+4OBUmZvkVs/06 EStgr3aTvZEIl2rdcpC77R1FwpTsyvG3HQoJ04hlYScuSAXCTCUgg7wjD/htbBq9gHSsMycK2U5 XQzrCsmdxdVhtvEQ0Bt8BDqF/bFpYHyYPcVmviwpX6jfdPd7xU2U/jfzVZi0ajd0tmi/C9jjao8 /ZeYRr/F1sMXamfQdxVzTfiZw43HZiFsQ29HaqZWV/lztjXN0BMbLRlkgmUI2OFDgUmNcl7yT X-Google-Smtp-Source: AGHT+IH0cwxj5ttg7X/SuYwtZcuM0ETCatH/wcruBaxy12H3LRe2v4MWcJy+yEUAgit00aPOKJauoQ== X-Received: by 2002:a5d:5f53:0:b0:3b8:de54:6e64 with SMTP id ffacd0b85a97d-3b9111b5fb8mr312079f8f.26.1754931995845; Mon, 11 Aug 2025 10:06:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 04/11] target/arm: Factor hvf_psci_get_target_el() out Date: Mon, 11 Aug 2025 19:06:04 +0200 Message-ID: <20250811170611.37482-5-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@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, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932189683124100 From: Mohamed Mediouni Factor hvf_psci_get_target_el() out so it will be easier to allow switching to other EL later. Signed-off-by: Mohamed Mediouni Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/hvf/hvf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 47b0cd3a351..81dc4df686d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1107,6 +1107,10 @@ static void hvf_psci_cpu_off(ARMCPU *arm_cpu) assert(ret =3D=3D QEMU_ARM_POWERCTL_RET_SUCCESS); } =20 +static int hvf_psci_get_target_el(void) +{ + return 1; +} /* * Handle a PSCI call. * @@ -1128,7 +1132,6 @@ static bool hvf_handle_psci_call(CPUState *cpu) CPUState *target_cpu_state; ARMCPU *target_cpu; target_ulong entry; - int target_el =3D 1; int32_t ret =3D 0; =20 trace_hvf_psci_call(param[0], param[1], param[2], param[3], @@ -1182,7 +1185,7 @@ static bool hvf_handle_psci_call(CPUState *cpu) entry =3D param[2]; context_id =3D param[3]; ret =3D arm_set_cpu_on(mpidr, entry, context_id, - target_el, target_aarch64); + hvf_psci_get_target_el(), target_aarch64); break; case QEMU_PSCI_0_1_FN_CPU_OFF: case QEMU_PSCI_0_2_FN_CPU_OFF: --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932116; cv=none; d=zohomail.com; s=zohoarc; b=XJ+rXs5yIXoKeO1Zz1kNpqDHM67CbtkCTeAHW2Bma6Vl8ciL4pA13Cz00FqzF6DBKDxijI4D1U4DUOyfId0ScG2/t43UjfDmAc3ac+pu77ivqd7Zyn/gV4qAREw6ZPeKKRAGBA0eimofMpb2+03U+nKPWxynM8TQpC9zxa2s9MI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932116; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=87BQk4WDEzqTJD4OBgNMj09kaieo6h7xgFKV69c1SWc=; b=X0e2xQ2HWnYfOpRkBF2uq0skD7fZl7Z6iS5/QkKxYXlzqdN3Js+oWiTitIkbKtSMIjfgM6Da0EYe3Z6JBg8QOGeEHFEla5yWp5anOiQN2Me2zPbPvX5RaGz/eO+HXfAcIsZuTm7Co4ZyV3KtUnN34hLQGduxlu8HMKgqqtUr200= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932116777436.9294395788356; Mon, 11 Aug 2025 10:08:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVz5-0004tV-C9; Mon, 11 Aug 2025 13:06:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVz2-0004sj-OL for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:52 -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 1ulVyx-0001o2-1l for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:06:52 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-459ddf83023so28089005e9.0 for ; Mon, 11 Aug 2025 10:06:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459dcb86d6asm311879855e9.5.2025.08.11.10.06.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932001; x=1755536801; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=87BQk4WDEzqTJD4OBgNMj09kaieo6h7xgFKV69c1SWc=; b=QJxxL7eir4zdIy1w280OZ+mobj1czlYrRolLcSdbDYRFPdBTfJnIaEIESbZUPvQudl 2hoRL/cuvvGJobGmF+rlSht4zubO3ZJ3k/si+VnZYvJZPv3ei70HFgoAmP8hbfUNAEWm 2HJpeQmrQGV6P33g7eI8eTZBsOJKqUZql2Pq121/O2aWEyIOga5Lv9mDr1/Jm3OqRenh GKMrCMfsWyAZgHyu4rvgBYFakRxlA8FezMfGnaIVKVeUHti2ZKp1aQVClhZ0PQLrjDBf ijhpTnq2xi3+BvvDvsv97Q832Zge3OKnn7gDVhPMfMrCwMRCNrW4GkgeLaQiz09jrhuA wg7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932001; x=1755536801; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=87BQk4WDEzqTJD4OBgNMj09kaieo6h7xgFKV69c1SWc=; b=EQlHzWE7ZissrIgzgQI7Aqk7bcuUCk4B0k0/KMu1e8sIQg+IZ0jH1cZih/7IQmlQAk 3RZ7in+yV6lXCR9faM4H1N7wSDNq+WMiHkONQfT/M4nQLE9MabDbR/L+lIxyqq5UyNiw W9XBx1biEAY3AdYsYS8KdcbMSk8O0ZGe6Id910toDjZXNsgxAptNmHM4wtsRIT7LOVT0 jIJRcK9e5DkVMuSNMxFdafUAciLapP0hpvviqMofpto98QZyDjlXcdoefZux0hxXIP8w cNo6qPix1wuFqu0tBP7R6ibIbxzyrtj2s1Xqwn8SmaNL33B7jCciR1AwAWwDRj/s8DQc eS7A== X-Gm-Message-State: AOJu0Yyc2kIf9bOfWX6q6JxD2pmhsMeqDc8/rWYEdhjQsqdZeDgDultr 7IdkERmliDDSyI+VkgzApfgddrJ8MIuIYx+g2GuIVzKH0Ft9/TOv/67aBjWMBNC/FVNnECM3ufV oxLCl X-Gm-Gg: ASbGncvkaet7ldUtMFRWtRhh7KEijn2LWmMI3FZ04d5jEeaMKLor+ehPwPEur0DXrIc Qd/kYcTScn6tUgzzbMFJMXZasPOyehOVMv3lB5yq+6P6gp1Pvm6oIURE8FD9vSekKEMkW0cHncj LeDZlbXvIuaZgzlS5Rh6X/jRMZreoGNFK7TlWde/9eksSFOTO7Df6pp6u0r3Y/2AZxtlEqyva+K pMWrEb9vM6Dm/job7vfK14Lav/LbMQ9ey4QCfYgbjdE0hOvU4GJjV3ItfMwettbEKqGgeK4l3Fq uNuAeyM28citO3bPxhKL0btDbD0o8+1vf6sNRP9WG3DAI0RNQO/6mT7ltA0vts7sZnHVCwLKLtZ 6pdubQCIHnklZcsSjWiFoZRThjCDygPNLGct8EE5+hBiG80W3tQtwaNuEsnLWsjYCS/abdXcd+M vHhVA6FVw= X-Google-Smtp-Source: AGHT+IHaTwICaPRcKARdQT0mw9k+cJoRSQtgKTQLc8LGODj1lp8+nI2sBInpFOyWKeNcBONwY9kYnw== X-Received: by 2002:a05:600c:45c7:b0:459:e398:ed80 with SMTP id 5b1f17b1804b1-459f4f3b70dmr100697845e9.32.1754932001105; Mon, 11 Aug 2025 10:06:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 05/11] target/arm: Introduce arm_hw_accel_cpu_feature_supported() Date: Mon, 11 Aug 2025 19:06:05 +0200 Message-ID: <20250811170611.37482-6-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932117495116600 Introduce arm_hw_accel_cpu_feature_supported() helper, an accelerator implementation to return whether a ARM feature is supported by host hardware. Allow optional fallback on emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.h | 12 ++++++++++++ target/arm/hvf/hvf.c | 20 ++++++++++++++++++++ target/arm/kvm.c | 22 ++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index dc9b6dce4c9..5136c4caabf 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2507,6 +2507,18 @@ static inline ARMSecuritySpace arm_secure_to_space(b= ool secure) } =20 #if !defined(CONFIG_USER_ONLY) + +/** + * arm_hw_accel_cpu_feature_supported: + * @feat: Feature to test for support + * @can_emulate: Whether Allow to fall back to emulation if @feat is not + * supported by hardware accelerator + * + * Hardware accelerator implementation of cpu_feature_supported(). + */ +bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, + bool can_emulate); + /** * arm_security_space_below_el3: * @env: cpu context diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 81dc4df686d..5174973991f 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -964,6 +964,26 @@ uint32_t hvf_arm_get_max_ipa_bit_size(void) return round_down_to_parange_bit_size(max_ipa_size); } =20 +bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, bool can_e= mulate) +{ + if (!hvf_enabled()) { + return false; + } + switch (feat) { + case ARM_FEATURE_V8: + case ARM_FEATURE_NEON: + case ARM_FEATURE_AARCH64: + case ARM_FEATURE_PMU: + case ARM_FEATURE_GENERIC_TIMER: + return true; + case ARM_FEATURE_EL2: + case ARM_FEATURE_EL3: + return false; + default: + g_assert_not_reached(); + } +} + void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu) { if (!arm_host_cpu_features.dtb_compatible) { diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 66723448554..82853e68d8d 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1771,6 +1771,28 @@ void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error = **errp) } } =20 +bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, bool can_e= mulate) +{ + if (!kvm_enabled()) { + return false; + } + switch (feat) { + case ARM_FEATURE_V8: + case ARM_FEATURE_NEON: + case ARM_FEATURE_AARCH64: + case ARM_FEATURE_GENERIC_TIMER: + return true; + case ARM_FEATURE_PMU: + return kvm_arm_pmu_supported(); + case ARM_FEATURE_EL2: + return kvm_arm_el2_supported(); + case ARM_FEATURE_EL3: + return false; + default: + g_assert_not_reached(); + } +} + bool kvm_arm_aarch32_supported(void) { return kvm_check_extension(kvm_state, KVM_CAP_ARM_EL1_32BIT); --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932116; cv=none; d=zohomail.com; s=zohoarc; b=OMN5Q6yGUIfYI4RBCWxG44IPyMW6Rlcdcv//5lhTbkDIFA8hPWlR/7Zyn3JJCYbQrCumdHhBoI1+fnVzICzOCznVR2qKCW8mLeQ9KYvxZJEyv+XU3jMYKTgmtkcjOs/nhDAG26wANApvE/DE8B/ZAhrGy2t4NDkYRa4wkkIDg8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932116; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+MJUQ+OQJ9HkeNlMQlODjCm+Oh2wh/gShIDZyY6yH20=; b=fgPtj473Tii48SBh+jBycK2TAPhI1bWwOSbP34l1rxdHWDT+PsUyBMxzej36kFRgjUZqHcxu0/4E6L2aWMh2iIi/lj8J00psmcjo95LPA7uxU05J/v5GoPku3JdcYMN7wXrMU2cHKFdAzMwq+nM7Yb6XlycP+H1MLCWtW0E4Jos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17549321162251000.1959175867162; Mon, 11 Aug 2025 10:08:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzf-00053e-Jt; Mon, 11 Aug 2025 13:07:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzE-0004w6-1X for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:06 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ulVz3-0001pE-Vz for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:03 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3b783ea5014so2507943f8f.0 for ; Mon, 11 Aug 2025 10:06:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459eff7918csm196801235e9.25.2025.08.11.10.06.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932006; x=1755536806; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+MJUQ+OQJ9HkeNlMQlODjCm+Oh2wh/gShIDZyY6yH20=; b=UyvPmZq8Ae4Ionh90UMja3Y8NHm8JoV70c8UzRGhPaVb4u5ARtH7PyT1662120Ghxf pyrICAW71NGj7EVvN59VmeYiILoNzrHIxdRofZKLTKzAI40Mv4zxNgpxPFKBVU9mwIod /0j5HVLSm4rz0RgrCJsJIBtUkgYjTC1fCMf5QyesoVf5a2aY2xalgkkkkpfP7boIOr5q /h6Rt+CjDi9MfgbdzPty6eqZ6HT+tdPnuxXTricZ41vpyTyMV2ideGpQqpvU00KtQr2g aLolnqx3FHpeI+spFckI63SFlprYO+vxkzdjduvOfRvc9U1oT6OSIiHVTFiPVJMLRHGV gfqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932006; x=1755536806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+MJUQ+OQJ9HkeNlMQlODjCm+Oh2wh/gShIDZyY6yH20=; b=UdQgmQWESqVxnvG1bQNAs3jEv4plCl2vB0qwJdjuJQAhvvtRQli4jJH5FZVZ3jSACi Hv4ANBcakxIOVnbsKONhNKnlUp9D8CZEkMlWkJoCyOx1z0lQrFNkoilnhZS18GnLLfu6 e3+HpHbJ82blChE2cf0f5Yux112ayZoOd2AOcvTApZL6g/KaYP+g0sgGxTgGgJQhRL5/ IUFg44cakcpSbmPlgHSM57TMjMxUVRBY47MMiVcJZ/VYpZo737ezJdsNQhlwbaQOoW3D z9IhWl7mEMMBZfVIqcgNqtID87bbGDlSU7XDOfMgUlRsbpWCAKbaTdM7Iotym2GLcrKX SeYw== X-Gm-Message-State: AOJu0Yyl+eKmnfLJ1IbXGzBj/yVnAI/AiUOWNXXg0FM8Gr1ZBN8jJgWJ TTmZgEkXmnU9APKOxFsIxeapoaGI6CsFVK36K2hzKB9kUKa+qZ+iixu2anlXq1InqnD4n3oKtNe g62Ck X-Gm-Gg: ASbGncuk96izhZxS71tNk/RyQcM+EwXKJlxzgFN9znUg53Rn4Zv9AqUvh89NNhUJ1N9 t/c7yMqiCwwPps58SqAHpi89n+iUSajCbymG3yKHKYSG+QlAjydegt1iQqBpm/Q9oPlu7L2v3Ah Kx2zRoBjDsCu3Wo5abmDC360hqPwFu2TwDG4jksHk6RZjQVKhJvMXDB9n7aaPO/p6jCUojQaswm R7ZtrFpyTJXGNM2niFJOhIinvlK7zRQjZT/3YmbkmEMuWlufjOVQrLzcz4IRRj0MMXdyu2V1lpx Q+2TewLC568J6+4tCGS9WYpCUoQ4cfMEAOGIyQmtC4IF4S0MNHCRw8e4Q3pf4x/P26lZnfwjDYL PJU+3lJRW3sK6gM0gRcPLP1rJ7Lss4gQQ4MpqS7PC3vTpiuYSwQ1g3LNnogCtg5q0LNq+2RFb X-Google-Smtp-Source: AGHT+IHQU/+29t09xJxuB50pqa5k+Bpb42xmnALPPoJ7HYs9t6XhwQxWVIBqxqWkJr4ZvR5q0iDpcA== X-Received: by 2002:a5d:64ef:0:b0:3b6:12d9:9f1b with SMTP id ffacd0b85a97d-3b900b2de3amr11005330f8f.22.1754932006474; Mon, 11 Aug 2025 10:06:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 06/11] target/arm: Introduce host_cpu_feature_supported() Date: Mon, 11 Aug 2025 19:06:06 +0200 Message-ID: <20250811170611.37482-7-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932117731124100 host_cpu_feature_supported() is the generic method which dispatch to the host accelerator implementation, taking care to cache supported features. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.h | 11 +++++++++++ target/arm/arm_hw_accel.c | 27 +++++++++++++++++++++++++++ target/arm/meson.build | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 target/arm/arm_hw_accel.c diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5136c4caabf..aff60cef6da 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2508,6 +2508,16 @@ static inline ARMSecuritySpace arm_secure_to_space(b= ool secure) =20 #if !defined(CONFIG_USER_ONLY) =20 +/** + * host_cpu_feature_supported: + * @feat: Feature to test for support + * @can_emulate: Whether Allow to fall back to emulation if @feat is not + * supported by hardware accelerator + * + * Hardware accelerator implementation of cpu_feature_supported(). + */ +bool host_cpu_feature_supported(enum arm_features feature, bool can_emulat= e); + /** * arm_hw_accel_cpu_feature_supported: * @feat: Feature to test for support @@ -2515,6 +2525,7 @@ static inline ARMSecuritySpace arm_secure_to_space(bo= ol secure) * supported by hardware accelerator * * Hardware accelerator implementation of cpu_feature_supported(). + * Common code should use the generic host_cpu_feature_supported() equival= ent. */ bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, bool can_emulate); diff --git a/target/arm/arm_hw_accel.c b/target/arm/arm_hw_accel.c new file mode 100644 index 00000000000..3a8ff007599 --- /dev/null +++ b/target/arm/arm_hw_accel.c @@ -0,0 +1,27 @@ +/* + * QEMU helpers for ARM hardware accelerators + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "cpu.h" + +bool host_cpu_feature_supported(enum arm_features feat, bool can_emulate) +{ +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + static enum { F_UNKN, F_SUPP, F_UNSUPP } supported[64] =3D { }; + + assert(feat < ARRAY_SIZE(supported)); + if (supported[feat] =3D=3D F_UNKN) { + supported[feat] =3D arm_hw_accel_cpu_feature_supported(feat, can_e= mulate); + } + return supported[feat] =3D=3D F_SUPP; +#elif defined(CONFIG_TCG) + return can_emulate; +#else +#error +#endif +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 07d9271aa4d..37718c85666 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,7 +11,7 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_system_ss =3D ss.source_set() arm_common_system_ss =3D ss.source_set() arm_system_ss.add(files( - 'arm-qmp-cmds.c', + 'arm-qmp-cmds.c', 'arm_hw_accel.c', )) arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm= .c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932116; cv=none; d=zohomail.com; s=zohoarc; b=NV4j0nanPO/rNYSqg0guUlLKa15ppJsBUILSmzJCplJRRQ2jddnS5tR4CJNZqtBiLvzllhaCQuSKzhD6b9Q+0VnCnP3Wkz/RJ4owF5H0DWs6nSOIdXUqZ5Hrz+lbMDe9gcWXhU5AaRJXWlRKOC35flvLvtCMZjMykdLAOTOh7j8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932116; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Xy66U/Y+GsoS7WvoAHDCbL+/HfooWzRIS+dCFcyd4Uo=; b=Y8IqEkFUgxEPZ9mOYsPpdKWKxgFspHEhbu2hsBW9CrcyRq+h2KKyPK1OGb8bNphgCnByR9UBipNsUtHCU9L8Ie+tUJ/aMaf0F55yGyAc6TfTb6tVxqkm3cOtymDSt2jCI71s2oSAqTn5QrJH+6zIKTNXpZkX3P7+bLLk92h8bjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932116707519.0543038126189; Mon, 11 Aug 2025 10:08:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzM-0004yD-PC; Mon, 11 Aug 2025 13:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzB-0004vm-R1 for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:01 -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 1ulVz5-0001qM-VR for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:01 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-459e210bd2dso16542745e9.1 for ; Mon, 11 Aug 2025 10:06:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c453aeasm42842421f8f.40.2025.08.11.10.06.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932012; x=1755536812; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xy66U/Y+GsoS7WvoAHDCbL+/HfooWzRIS+dCFcyd4Uo=; b=AI94lzQNdEppdkJ/fqjRpRDYdE7rrP3xT+FLCtZu99BYl94DH9/fLGoGD2OHi9ZNMI cF8l9xgShIwNhbeGFWdxV6E0tpKpGadIbvgNdPt1dXxpY0Jts6b7Zz7IS9wGoTrPj7rA cJPlJqBje2DvekR5jGjQbpHfxsCSry2oWGQmMyqGD2s6wTXrLwq3BuwE34EFA0AaHWfv cXWKq3XnH1C/xccR3l/gcGb3Ihusj1JgecksBc6RKWOK5X95RXzLy84i4gmSFyvzI5Jx 1jJgh33jTX+LJJR5QO0z0AcM5HfTYLkO/QmKQnCcL7OL3brsMmQp4qcIEqdrH/NFriHt kWyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932012; x=1755536812; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xy66U/Y+GsoS7WvoAHDCbL+/HfooWzRIS+dCFcyd4Uo=; b=EYB9guEvyETdUUwyak1Ug4WQXp7Fhnf1pCLmX68sHEf0vytPKWFSDLM6KEtZqFotMs m22xkGPNHi0YWXQmd7wEBgZ9+uKsjP+7+jygVaHp2a5Nz8NtKBogdAB6BLETRU/l/dpe wz7aLbKo1o6xSc9XL0zUhfwNFPjTzctfSrV1OgLHLfRZFNqrLeBzNIBbceuC+KKkEfTC i0QJutkhxSYiwHW/6LBXAinh0RpyXmJYBfhDdroZsy/f0qpWHEQVBaPT3ig0gsoiA+jd XQXctMSOu+VMgLmAEC+L0QTDE8M/o2sJaLuvfbVPrn0Fw+l7Imdq/+6IDqrP0j9r3Yoh ch1A== X-Gm-Message-State: AOJu0YwiPfjnZUwuXrgsJnsaVwpqjO1zeESsp9pZnMB4zf5DVk25WrNP nB0DlTnEqodZy10HrVaJWGM9E7NsCMr6pGyz96cHuARhrOwMEA/8xhXgvYsJNg05E3Nswm07l6Y x6v7J X-Gm-Gg: ASbGncvz8kBZD6tA/nlPoYhpldhIfChNlC+RvlRAxLU2Pc7kW2TkRoyMuyZ8PqmGzqU Yc6Iq+U/f6/XPorM4+MRUWC5ZBivfsaR4x1BKBIAuFp60ZTbdL/XeYK4ds4j8zOzSbf6MNyp6sJ zMN/LgKlfnCNsesss+XtqzRqV4/KsOCcK51a13mElutZSP7ZCAX768uMKlCmp7E62rOKJ2crZ9X RCJB/1VTSBPYmcUjNrzxHIBiDDGzbg47a81J7EWBOBffydioltP5EXFpyuxItHswZVz6cgRp9cd bSmIqpgn2SmNawF0M4xuYJCpCXIJBiDvzKuYzmQG6Rs6HrfybgB20FDc/I0ul3Y3N7Xq8/dZqBr 6j7BUgbcNqnCFLuPymhgwmc63Vqi/XSQtrTQKpIcreiIE8q1kaaDh3awEgJfL1skkfaV4avz9 X-Google-Smtp-Source: AGHT+IGmfphj2mVyIXTj/0jyub2rh0Wyucghu5fqob5NYPlURmtsCqqH6Zi92+hXGXffCLSOUjqF9w== X-Received: by 2002:a05:600c:1c27:b0:458:bd08:72a8 with SMTP id 5b1f17b1804b1-45a10dac800mr3454185e9.13.1754932011892; Mon, 11 Aug 2025 10:06:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 07/11] target/arm: Replace kvm_arm_pmu_supported by host_cpu_feature_supported Date: Mon, 11 Aug 2025 19:06:07 +0200 Message-ID: <20250811170611.37482-8-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@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, T_SPF_TEMPERROR=0.01 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: 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: 1754932117483116600 Use the generic host_cpu_feature_supported() helper to check for the PMU feature support. This will allow to expand to non-KVM accelerators such HVF. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/kvm_arm.h | 13 ------------- target/arm/cpu.c | 4 ++-- target/arm/kvm-stub.c | 5 ----- target/arm/kvm.c | 9 ++------- 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 6a9b6374a6d..364578c50d6 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -177,14 +177,6 @@ void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **= errp); */ bool kvm_arm_aarch32_supported(void); =20 -/** - * kvm_arm_pmu_supported: - * - * Returns: true if KVM can enable the PMU - * and false otherwise. - */ -bool kvm_arm_pmu_supported(void); - /** * kvm_arm_sve_supported: * @@ -212,11 +204,6 @@ static inline bool kvm_arm_aarch32_supported(void) return false; } =20 -static inline bool kvm_arm_pmu_supported(void) -{ - return false; -} - static inline bool kvm_arm_sve_supported(void) { return false; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1dc2a8330d8..c78a3c9cda8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1564,8 +1564,8 @@ static void arm_set_pmu(Object *obj, bool value, Erro= r **errp) ARMCPU *cpu =3D ARM_CPU(obj); =20 if (value) { - if (kvm_enabled() && !kvm_arm_pmu_supported()) { - error_setg(errp, "'pmu' feature not supported by KVM on this h= ost"); + if (host_cpu_feature_supported(ARM_FEATURE_PMU, false)) { + error_setg(errp, "'pmu' feature not supported by this host acc= elerator"); return; } set_feature(&cpu->env, ARM_FEATURE_PMU); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index c93462c5b9b..3beb336416d 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -32,11 +32,6 @@ bool kvm_arm_aarch32_supported(void) return false; } =20 -bool kvm_arm_pmu_supported(void) -{ - return false; -} - bool kvm_arm_sve_supported(void) { return false; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 82853e68d8d..0fe0f89f931 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -288,7 +288,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) 1 << KVM_ARM_VCPU_PTRAUTH_GENERIC); } =20 - if (kvm_arm_pmu_supported()) { + if (host_cpu_feature_supported(ARM_FEATURE_PMU, false)) { init.features[0] |=3D 1 << KVM_ARM_VCPU_PMU_V3; pmu_supported =3D true; features |=3D 1ULL << ARM_FEATURE_PMU; @@ -506,11 +506,6 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) "Set off to disable KVM steal time."); } =20 -bool kvm_arm_pmu_supported(void) -{ - return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3); -} - int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) { KVMState *s =3D KVM_STATE(ms->accelerator); @@ -1783,7 +1778,7 @@ bool arm_hw_accel_cpu_feature_supported(enum arm_feat= ures feat, bool can_emulate case ARM_FEATURE_GENERIC_TIMER: return true; case ARM_FEATURE_PMU: - return kvm_arm_pmu_supported(); + return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3); case ARM_FEATURE_EL2: return kvm_arm_el2_supported(); case ARM_FEATURE_EL3: --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932330; cv=none; d=zohomail.com; s=zohoarc; b=MGjWT4L/u+VUUlFOjosLypIL8+oCLd6CckMIB4GvMxJU5BLa08old3kBuKFA+N+4qyEXlTHWlp3hgua3S+idTkFeWK8qatI05GRW4jaBTHpvc8wp5XpcBs9iDCG9pMrXqRGlvkDqTCxy6iBSf3pQ1ZBIVReYZKD66zrJdpfnIa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932330; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tTxLOjP4FhmiKvW9Jt5SVA/50ytmZzwnIVFBfjDcbbg=; b=Rkt99mJyeeHQ2W+/AtbR9r9VJq5Sos7hfhuNvSNd5q6n+ZJlKuw/KFthGoUUdwYq7ShrBX9Q+msqLeTAXxaueHfQW6z1WR6WFcH65PbGIF5qouAYcqMnLpS942B0+U5tXm5aY0abqPbgxanG0GCzz6dj8ku5YIY60w45xl6m0AM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932330548990.2689744245143; Mon, 11 Aug 2025 10:12:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzu-0005Jf-T3; Mon, 11 Aug 2025 13:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzR-0004zu-94 for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:25 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ulVzC-0001qy-Nv for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-45a0dc77a15so5423285e9.2 for ; Mon, 11 Aug 2025 10:07:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459e5887b7fsm261545415e9.30.2025.08.11.10.06.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932017; x=1755536817; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tTxLOjP4FhmiKvW9Jt5SVA/50ytmZzwnIVFBfjDcbbg=; b=tWU74dEgB3EVpn7rAjr+e77kFYrWhEh06tRS+95tcgAINtDcISArOQ42gFZ03dJjb6 1I2D/UPUKEDeJUN6X618wcDu0YVHHA9DjQaWX1jYJarbkaOdjSaRSdKQZ3ItkGncYdZS /oLYGg5iruAv/mH5N90Ggfs36ExhhNomD/gkmtSlNXugSBSAxaxFt9Sn0YPGkD+C0aOT 0mL/XniRbs5+MpT7wbwpx11a6Ru/2Q8h9bMgZT6zMFBxKlhHagycgbo1CJ5Z+JtE7+Fs eyEq6akGqTly/RFcVyEIyT6cAuDnZVrYltGYNusEtsEf4B+qEI/Ue9MznlVPAOgNnhxi ZJyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932017; x=1755536817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tTxLOjP4FhmiKvW9Jt5SVA/50ytmZzwnIVFBfjDcbbg=; b=gMhZfmvO3U7Jr6i798hsEjpbGCZ4qwUJ6dQmTb/Ay3kzrrlseaLK+I3zAL7zYeFV8n jSMsI68P4SGowkPo/pKxQpDlFtCmkizkmGdjcVcsBjdlSbHl/u+wgzVInRlUo+goSdZ4 gb0Uwo2chOSbwUgAQGLBEy0lEgYOgpfOrzoE7zKzHxcNez3a47DnSukc3TsAeoxKRk+2 zIHzLFD6Z3ad3RDpPNTUs2sR8Vdrr3jL71xgZ9LGgrn1l2mDLLqUv0ORducx2vQa7FBj NbOvypq9a0uMniioDNdVdUUHC3oOKe2Lr18PK9DeOJffQU9WAEChAbHnaX+C7/4I2FwE qo9A== X-Gm-Message-State: AOJu0YwqN5ni+ujpCoNy9ziw6mmWhnJeYZVX9zwuUNx4mzaAPwsucXC5 RI1WzulV/Hsp8qQlELs+plEMW4om+RNNB5X+8KcReBU2+Cj/jtzQZYUK4d0X5Y8b8aJnxi1o88u TAK2W X-Gm-Gg: ASbGncvlmVHUSIyXggimya+tvDg6nz9XdB5Y+931ru/wC+mQSlTXJRATtUjqEtx4fVl zJC6g1/danlyZ7iAfUGXHOnXDMMNr0BFQeEZY7u5PgppvFf4cy2HwSrxsb59ZI5q7Co6oGMNg2U p3vFlaGTaO6+iriae/7Fx6QjywzUBEZxxkGfJiTNsDaIZy/mj/nTa+syEpzrsy9PXm2B8wtBNTY mS8jBUvSq4jkACYjd60DeEoofBgA8JOZyzSutSixWNvphg3kb7Zo7jVdEygHCHyNh2ipX54gepE BPHjSjNDAuSdNoVPq4iqpR0bj5sH3wqvBfaDfwXizyAA9Ol0gJVrseDb5kXyw153I0HXwRuS+lY 6x6rJ06McJa7HSUrgRSiU/HKUZ8oFxLfinegWeciuALDTJ+2L3mpi0qG1klJ9trm8WIE/tGHuNQ gtaoDQa1k= X-Google-Smtp-Source: AGHT+IEMcG/Ev4eyU/L7hIS6KC5DMgPfd5GRoRtRkLPDfgT0WRaP7S9VSCoMBvoitgce/yrC+B3d3w== X-Received: by 2002:a05:600c:470c:b0:459:d709:e5cf with SMTP id 5b1f17b1804b1-45a10bad987mr5229185e9.3.1754932017284; Mon, 11 Aug 2025 10:06:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 08/11] target/arm: Replace kvm_arm_el2_supported by host_cpu_feature_supported Date: Mon, 11 Aug 2025 19:06:08 +0200 Message-ID: <20250811170611.37482-9-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932332177124100 Use the generic host_cpu_feature_supported() helper to check for the EL2 feature support. This will allow to expand to non-KVM accelerators such HVF. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/kvm_arm.h | 11 ----------- hw/arm/virt.c | 8 +------- target/arm/kvm-stub.c | 5 ----- target/arm/kvm.c | 6 +++--- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 364578c50d6..7e5755d76b2 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -191,12 +191,6 @@ bool kvm_arm_sve_supported(void); */ bool kvm_arm_mte_supported(void); =20 -/** - * kvm_arm_el2_supported: - * - * Returns true if KVM can enable EL2 and false otherwise. - */ -bool kvm_arm_el2_supported(void); #else =20 static inline bool kvm_arm_aarch32_supported(void) @@ -213,11 +207,6 @@ static inline bool kvm_arm_mte_supported(void) { return false; } - -static inline bool kvm_arm_el2_supported(void) -{ - return false; -} #endif =20 /** diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ef6be3660f5..c2f71ecbfa7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2267,13 +2267,7 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->virt && kvm_enabled() && !kvm_arm_el2_supported()) { - error_report("mach-virt: host kernel KVM does not support providin= g " - "Virtualization extensions to the guest CPU"); - exit(1); - } - - if (vms->virt && !kvm_enabled() && !tcg_enabled() && !qtest_enabled())= { + if (vms->virt && !host_cpu_feature_supported(ARM_FEATURE_EL2, true)) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 3beb336416d..35afcc7d6f9 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -42,11 +42,6 @@ bool kvm_arm_mte_supported(void) return false; } =20 -bool kvm_arm_el2_supported(void) -{ - return false; -} - /* * These functions should never actually be called without KVM support. */ diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0fe0f89f931..a9f05bfa7ea 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -274,7 +274,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFea= tures *ahcf) /* * Ask for EL2 if supported. */ - el2_supported =3D kvm_arm_el2_supported(); + el2_supported =3D host_cpu_feature_supported(ARM_FEATURE_EL2, false); if (el2_supported) { init.features[0] |=3D 1 << KVM_ARM_VCPU_HAS_EL2; } @@ -1780,7 +1780,7 @@ bool arm_hw_accel_cpu_feature_supported(enum arm_feat= ures feat, bool can_emulate case ARM_FEATURE_PMU: return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3); case ARM_FEATURE_EL2: - return kvm_arm_el2_supported(); + return kvm_check_extension(kvm_state, KVM_CAP_ARM_EL2); case ARM_FEATURE_EL3: return false; default: @@ -1918,7 +1918,7 @@ int kvm_arch_init_vcpu(CPUState *cs) cpu->kvm_init_features[0] |=3D (1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS | 1 << KVM_ARM_VCPU_PTRAUTH_GENERIC); } - if (cpu->has_el2 && kvm_arm_el2_supported()) { + if (cpu->has_el2 && host_cpu_feature_supported(ARM_FEATURE_EL2, false)= ) { cpu->kvm_init_features[0] |=3D 1 << KVM_ARM_VCPU_HAS_EL2; } =20 --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932183; cv=none; d=zohomail.com; s=zohoarc; b=dIjPsiEW9c5R93i1xfEy9U2Vzoa8ibE3HwEEmraiR6+7khjnZzVQsrCgEmiyS1ykhxQlamfSjN86gGJhMN7t5mgZorpA7Lf/Q9iGFIe2jOrnW8fFYSAYN0loA3VDjodvdSWPCm/08E171ZIrNzBeRQFiUbgV61SER7a5Uhz4NNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932183; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wXHYeE/dbTRdflhUmCNmx7Q9a47atxr+CRA/ufWMQVM=; b=j3M34J2YZbu3iqsYGWbTFd3apKG3N8YYBaE/0TtxyQ4q65SEoNbnWm2KqCEes2ZWai31GnQRhx4ucU9BQyHLHFzstTzzlMp1k286R7aFz+sVdngMVOl2GqVKfscGyLUuzviE1p6/O9q5PEoCDo5qUFte/Cm0ZZWS70KGc4xe4qQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932183796359.6908280906779; Mon, 11 Aug 2025 10:09:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzu-0005II-Te; Mon, 11 Aug 2025 13:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzU-000512-8d for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:25 -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 1ulVzI-0001s3-NX for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3b7910123a0so4251316f8f.1 for ; Mon, 11 Aug 2025 10:07:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3abf33sm41526775f8f.7.2025.08.11.10.07.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932023; x=1755536823; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wXHYeE/dbTRdflhUmCNmx7Q9a47atxr+CRA/ufWMQVM=; b=SNku07GjtRGK5Zp5BGpsUb2eb3fJD/wrlu8en9z+x6mH1pzz0bLRmGgffnEKbipp0J cUMIIFvmbrZBMjaeVvgTbDKAhDbuG/Vy77kg8GqRG1yDW/AsYDIrIYBy9CytRViTipnZ eYiM+bI41NO7kYyT36qW7t/zRfqKzP+Yy3f+lpwI8ZMvydFr8EVVrmZ6GlIsdX6BpxUh MveaNjWsJG3epysNZRF8xVtMS72WDpRn7zcw6CfrZjAx+we2K4Ar6ia4zpMY+/9k3tgP 9T5yNNGc2k8io/PME7LVx7wLTbapeOZuDXCoiXrMiZnW4NObtU5hDDpjaeuvJrBd08Xu 4whw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932023; x=1755536823; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wXHYeE/dbTRdflhUmCNmx7Q9a47atxr+CRA/ufWMQVM=; b=QOAnRtxe6kOOdXTYMSNKSmef0XUCqRnS/238dcy01hJqZhjxkTYKW7EjIZP4yGa5dJ /ZuNmHbNmqA+PfCYXu5Za18toldD02uwJK/ACAis05CI1eWGYyP6oRrkomhOxMDYt2xW CFzeLw4C3CK6sJ9FchLSID3uqBPeHYQXOjqDLCBd2bv2YRu+hsGwc213vaeeg5nmpkSb QDQF8fvlkerJn74QmbOB3ZW3x1raP5yAUQaiWd3lPbjfL3vSrME4alVteiVpFebiS/O1 JXzxZ+mNfEDsjPVqpHDuo7dLWhW43UWUUT3LibxAHZImKB+XQCWu2xDpats3yOdfxnXx BhuA== X-Gm-Message-State: AOJu0Yx0KVsn/GHmjDOdIhq7GEHFCeEoOKhbxYc71z5PN6D9wVgiRga/ yj1Vu6aFjZsatBa7r9uurem63KApKPJ25w03cJNMfkBPTk+sneYkV6PEWoK61GbYqVyzyGL0ltv isEgA X-Gm-Gg: ASbGnctGHH3rkXOqzcw4hegc+pL1NKKjP4caj8Ss9/gjq6odVWEoDpvdTKnGeJiThjd +o/KNcB4EQPcB6o8wEdF0yb/qthS4FQ27F8XyIgXCa2550bEFJAfFK9pE/FeknHFPwyaHqTivBV onC3/gLjPXgCebdRwMrmFiFoMJ5BkHG73BiOTQkQRRHaBPlpi3vn+c+7dhDxs89qE65HXlVhsDR PmV3vgVXz53Ptsf4njmk+5dbbPmb9K+zKqRFL6tlkVat2OTBRQ9noXYz1QwwwZXLiwI7PMcVsq3 m6ZinYIay8NGq2gn7wopFUboVG78980v9rxr475jWgIfYoag3kzlzRGOLGBz+0ZMVadZTR/qF6B Ea+1Ogxaf955ljGnUFxFjC6AdxuxOrjTpgEnbdUX92h5xxHH6N25q7yiZ2nGkrjuqM8vobTN6 X-Google-Smtp-Source: AGHT+IFUuly7Dqrg66psU4QHCuRXsJhkEzRy6aRPP2+eyqivHdPhhh2IohEjZISBtH74GHrPxa9how== X-Received: by 2002:a05:6000:2c09:b0:3b7:806e:7773 with SMTP id ffacd0b85a97d-3b910fd97fbmr541303f8f.15.1754932022551; Mon, 11 Aug 2025 10:07:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 09/11] target/arm/hvf: Sync registers used at EL2 Date: Mon, 11 Aug 2025 19:06:09 +0200 Message-ID: <20250811170611.37482-10-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@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, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1754932186328124100 From: Mohamed Mediouni When starting up the VM at EL2, more sysregs are available. Sync the state = of those. Signed-off-by: Mohamed Mediouni [PMD: Adapted to host_cpu_feature_supported() API] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/hvf/hvf.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 5174973991f..778dc3cedf7 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -400,6 +400,7 @@ static const struct hvf_reg_match hvf_fpreg_match[] =3D= { struct hvf_sreg_match { int reg; uint32_t key; + bool el2; uint32_t cp_idx; }; =20 @@ -545,6 +546,27 @@ static struct hvf_sreg_match hvf_sreg_match[] =3D { { HV_SYS_REG_CNTV_CTL_EL0, HVF_SYSREG(14, 3, 3, 3, 1) }, { HV_SYS_REG_CNTV_CVAL_EL0, HVF_SYSREG(14, 3, 3, 3, 2) }, { HV_SYS_REG_SP_EL1, HVF_SYSREG(4, 1, 3, 4, 0) }, + /* EL2 */ + { HV_SYS_REG_CPTR_EL2, HVF_SYSREG(1, 1, 3, 4, 2), .el2 =3D true }, + { HV_SYS_REG_ELR_EL2, HVF_SYSREG(4, 0, 3, 4, 1), .el2 =3D true }, + { HV_SYS_REG_ESR_EL2, HVF_SYSREG(5, 2, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_FAR_EL2, HVF_SYSREG(6, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_HCR_EL2, HVF_SYSREG(1, 1, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_HPFAR_EL2, HVF_SYSREG(6, 0, 3, 4, 4), .el2 =3D true }, + { HV_SYS_REG_MAIR_EL2, HVF_SYSREG(10, 2, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_MDCR_EL2, HVF_SYSREG(1, 1, 3, 4, 1), .el2 =3D true }, + { HV_SYS_REG_SCTLR_EL2, HVF_SYSREG(1, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_SPSR_EL2, HVF_SYSREG(4, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_SP_EL2, HVF_SYSREG(4, 1, 3, 6, 0), .el2 =3D true}, + { HV_SYS_REG_TCR_EL2, HVF_SYSREG(2, 0, 3, 4, 2), .el2 =3D true }, + { HV_SYS_REG_TPIDR_EL2, HVF_SYSREG(13, 0, 3, 4, 2), .el2 =3D true }, + { HV_SYS_REG_TTBR0_EL2, HVF_SYSREG(2, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_TTBR1_EL2, HVF_SYSREG(2, 0, 3, 4, 1), .el2 =3D true }, + { HV_SYS_REG_VBAR_EL2, HVF_SYSREG(12, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_VMPIDR_EL2, HVF_SYSREG(0, 0, 3, 4, 5), .el2 =3D true }, + { HV_SYS_REG_VPIDR_EL2, HVF_SYSREG(0, 0, 3, 4, 0), .el2 =3D true }, + { HV_SYS_REG_VTCR_EL2, HVF_SYSREG(2, 1, 3, 4, 2), .el2 =3D true }, + { HV_SYS_REG_VTTBR_EL2, HVF_SYSREG(2, 1, 3, 4, 0), .el2 =3D true }, }; =20 int hvf_get_registers(CPUState *cpu) @@ -588,6 +610,12 @@ int hvf_get_registers(CPUState *cpu) continue; } =20 + if (hvf_sreg_match[i].el2 + && arm_feature(env, ARM_FEATURE_EL2) + && !host_cpu_feature_supported(ARM_FEATURE_EL2, false)) { + continue; + } + if (cpu->accel->guest_debug_enabled) { /* Handle debug registers */ switch (hvf_sreg_match[i].reg) { @@ -725,6 +753,12 @@ int hvf_put_registers(CPUState *cpu) continue; } =20 + if (hvf_sreg_match[i].el2 + && arm_feature(env, ARM_FEATURE_EL2) + && !host_cpu_feature_supported(ARM_FEATURE_EL2, false)) { + continue; + } + if (cpu->accel->guest_debug_enabled) { /* Handle debug registers */ switch (hvf_sreg_match[i].reg) { --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932132; cv=none; d=zohomail.com; s=zohoarc; b=ItWh3D9EIHyziNoejmF428kkZllVEvXDnC9rDB2v3dBSbRNXcyvuJ5wGi20cNTUzVUguRNSl0Sqy8v6rUVS7Ck+KifvRcTXg08GY5esXeqhIw0gaNE/j3HL95agRO28alik3CjxVI7NCexGdpTW3An/gy66/4EkZfTexXeoJJ2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932132; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SL9BjJEaO0GjattCvBT1sYPxfZkwHVSu+LlGdRsmcAg=; b=LKhdwqrn6gaLyckD5ykoonxfDlhDmgqhDhvRU3LENqyfyz5wpTEOkGRektgiA4HdCscjV+TCsUc38EK2RIlv06FgVVWw9WxghSEdcCSyYQ2SPSS0vUSw/3LlaqC/F1CUWoyrjJOszyxwG816nW60gr8bdXXsKG4i+MAqFAa5D0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17549321324517.824101223615344; Mon, 11 Aug 2025 10:08:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzx-0005Kl-2A; Mon, 11 Aug 2025 13:07:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzd-00054t-BW for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ulVzP-0001t1-C6 for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:26 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-458b885d6eeso29538855e9.3 for ; Mon, 11 Aug 2025 10:07:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459dcb86d6asm311891055e9.5.2025.08.11.10.07.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932028; x=1755536828; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SL9BjJEaO0GjattCvBT1sYPxfZkwHVSu+LlGdRsmcAg=; b=V8abu0MXhk47x0rElHb6U4LfPfhuu82xDMcWKcWrUTEo7W55rT36w8OeF6LN8rOsom VK3eBtojb9ufCF54hbGcORVUIviY6XUdasF3AIoTYRyFlL2bBhUa+LcQKuzJDfskQ31+ F+HrjYd4VX3gGnfWmsUYIHULHuowjJmbjsGbiZMTmYZDs8/8veCVG3DnO2AmCRvdC9Oe mEeK0je60+SWjBmam6QDVX9XPxm+IgPtHp9AsNBRh7Qfoh+FmkqfzmCh38IwpzQ4usuU Haj2YTBWpxS5iKVMzAxHhXheMbLE8AtrO1I+VTsEZegCqLAQFleLClrMQfWTYISnxH6F 8Zug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932028; x=1755536828; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SL9BjJEaO0GjattCvBT1sYPxfZkwHVSu+LlGdRsmcAg=; b=E5I47hiJysFfe8CUUtpNxWDt0ZJBY96H+YFwnev9tAGg8NBVn9MTiPXVH/oG1x3A6/ duVN5zUQQs1E6ZbZNDauyC02HSfys4CHOYGEAKkIc1ZuoUtzz4LBLLtkfEwpOkz2/b1T HMbSOBTme5u5R/X/CWlnVQBLy78hPCVAP8otSGynoGIM9ZdjdPd3PSq54LUUCn5nMGQl DFMhz0/UZZfBc6bTLCyJltUfGe1s4EpnUJnlf51vrGPovrILGMnMxwOPfn7Ob0iIc5rx o8MBxcigPy5TF4SNjkXQnDv2X97CWr1qy5RO1Ebe6HtgUGkkCqLKPOw0kQ48QZNzDUD2 4o4A== X-Gm-Message-State: AOJu0YyHYVZRu1gNRLvbmpPx8o6dZhaHfpJFFu4U5OQuERJJAyOlmvGO GynJ/mZ9luW9CWz6shoWMdYLuFz0SDd01PekS0yRml/WpZwZWme59J3ciQ+yTOUwKn8ZQCme5fi OVolM X-Gm-Gg: ASbGnctDhJ/QfDAH7dN7ZDHRXx0Y7ZpomkxND606+PmeXLcNwmsd8BSdRzx7Hjj5FDr K4vQ12V33ocm0OynAIyvSGbTxU3pYRraXrBwi/hHUvSZiLmj0VxVYwuDj1uyyBopFq2X+X1dQX1 uv2uV7fw3YiVMM0JxWQDS1MyiwFtc9DQuYWIE5eiHmdk1JKRpVhyiiUy6kCM2qpAi4gJ3X0SdAZ WNcF93OLmuDRA0yuk/gS2wH3zIzt/vZMYACLHpBOknCtJ27GHjETrDR3iquXMIFVNXWOctdFNBB htETtDINEIM45HHTFAC7u6oMt2SD9rZc69tZE4skD7mRckTHKIefYDKl4qNSDR9gDmBUIJuucBy 5wqEL6/Knrv8tp6KrYwrMKMLPH+K8LXbVnmP4vTLPuPk8eqSvv7S3T6Dp8qpw75R4MfEGcIYN X-Google-Smtp-Source: AGHT+IHfoaigvwFcg4KswaUsW5gj91pCHoOh4NHtbdx2nxS2EGq2EkpPF+O3AaqXm2LpMC3Avw3iGQ== X-Received: by 2002:a05:600c:1c12:b0:450:d386:1afb with SMTP id 5b1f17b1804b1-45a10baf6f9mr5082985e9.9.1754932027824; Mon, 11 Aug 2025 10:07:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 10/11] target/arm/hvf: Consider EL2 acceleration for Silicon M3+ chipsets Date: Mon, 11 Aug 2025 19:06:10 +0200 Message-ID: <20250811170611.37482-11-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1754932133643116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Just a proof-of-concept... --- target/arm/hvf/hvf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 778dc3cedf7..d74f576b103 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1000,6 +1000,9 @@ uint32_t hvf_arm_get_max_ipa_bit_size(void) =20 bool arm_hw_accel_cpu_feature_supported(enum arm_features feat, bool can_e= mulate) { + hv_return_t ret; + bool supported; + if (!hvf_enabled()) { return false; } @@ -1011,6 +1014,9 @@ bool arm_hw_accel_cpu_feature_supported(enum arm_feat= ures feat, bool can_emulate case ARM_FEATURE_GENERIC_TIMER: return true; case ARM_FEATURE_EL2: + ret =3D hv_vm_config_get_el2_supported(&supported); + assert_hvf_ok(ret); + return supported; case ARM_FEATURE_EL3: return false; default: --=20 2.49.0 From nobody Sat Nov 15 05:30:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1754932170; cv=none; d=zohomail.com; s=zohoarc; b=YaoghgeVcwBkw5AsxjB3mS1DRw/qfPS8Vydo0o7nWrDWQwWUszsu5Fb8jb9viLy6DfaeT29tDvMRiRfCXitTwc0qmDSVp+pIvm/y9WITRTtR+7Lia5j27sGaTGeshB6nh5A3PhwIGUI8/X8LKz+LNc7/sBYiuuDWM9lUsXDVPfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754932170; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/kpYoiyGaNwP9QeQLj/6KulYrhyYzjmCLEuykA1SH0I=; b=BOrDJEjubghQEJ9yUSXXshf3Rc6w8POtwrW+6H9FQ0jT9CVElVB5M1fawEzsuEcrZDreWoYMcsZrwouoc5LM+XhmMGkyj2CtwpRbRGm0biIKGaMaQkS14jaLgDCrZDY84bE/kqRFt1I+fC12tV/kL987Vou9hfCSVtCr9ZHMbDs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754932170960361.03487216661915; Mon, 11 Aug 2025 10:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulVzz-0005PV-1J; Mon, 11 Aug 2025 13:07:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ulVzf-00055l-LS for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:34 -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 1ulVzS-0001tb-Vt for qemu-devel@nongnu.org; Mon, 11 Aug 2025 13:07:31 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-45a11078618so72645e9.3 for ; Mon, 11 Aug 2025 10:07:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459e58553f8sm279207095e9.14.2025.08.11.10.07.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1754932033; x=1755536833; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/kpYoiyGaNwP9QeQLj/6KulYrhyYzjmCLEuykA1SH0I=; b=bj4dpKzRuDJ2ATnqsKN173uTtTqetauLwEaprycqgSaazZGpiCgCeuaGkY7e3uUUuq /9hvCWzG/YXoaF6mzghGvutHv0e22fN9MFe28D8dkXL9svaUBL9H2HBjKndvvHQoG7FV HwYvFhVs/AQ9b2B27WWjasbPuCncKwuGiMrpRRHrvfnL0c9xzIupAr9+3h9Jl60W2ltn 89aYLOYRXIVgLd5c6Vf6HYIjNpX/AwQJahPyR3rj83scGXA/DmGQDqHTGv4GE1Djc/m8 XqwPTxt5L2h8Vxxf6y8Gb9KBTZ9si2Ek/hhc4wtPtDzxnOFsZo6RzEEoKnGnrevSylis Md2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932033; x=1755536833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/kpYoiyGaNwP9QeQLj/6KulYrhyYzjmCLEuykA1SH0I=; b=vAidn/ONQxkoy3RVaDEbp6JZTCXdEMKpeHuotTwjzO5ou2EVqqtOotw9F+vL7EQ7mU V1VOHBxBwPQZ5o/DFlyrj9n6pbVPiRR5V6d7cWElHs905bNIkl0CEhP5LLvHuGi22nAx +DEtJz8yuigTLOIcXuRWfU2IXR5b3XU7n1FKx2S/hXW7IFuZffWSD9raGygYKW/1LwoP jrYcnEfIWmeugAkXz4XCsoWg7sLex01k5UtZsNvRzrjJM0U21XI0Yj33StiIgGfRvbNR DvK/CWa21ejpkbhzTyVvmUh6r8O3N634YEfGKibbv/VGPXnkmPTpmoXAjEZLiCv9e1xV HELQ== X-Gm-Message-State: AOJu0YxElkGR0Rj6pRJfBX2PxRTt+fg5vZD6lPtTzmZiR4Dr9nWJk4ev 2nWb8U4x9NlOma9XP/TEd8uyr1B16Ah8XOTCNpkiLHSMS6WmbbJBPa6XwJsqxPwAMr1PR0elXhu XWBms X-Gm-Gg: ASbGncvBbLkp3P8QZVTBWph9KZXsP5BNXzUdhRs7My19rbIP0Y+78nbcFI0PXUbVWz4 BSUwiszv6fBALJd4BhQGUPdAKunoSb8LGmPJq4tH9G+3srsjNKkuQuEGDQYVfFJ7vE4TVmZjLt0 a1fJIq8xRCYaDV75NaXwaVdh6hqOP02EydcMlXFx37Qe9kw5sKHkkLrQ5ySMKJ3L1yDThZmxD7k YB8QcAcLGK8+UjxapS+iG3WXmDy2pz0Vgc0SFuJZnjr+yURlScVeoz6bdioJVGEiUxDcsnSH5Y7 SJ9OXPUT0TNpb57Jk5eiuPjUdPWtvtdO1XF2rJYl183TNv/R41vbxuWqS6KnYFuSdBA7m8voQ/P js1KnD7QbMVCZvYq82n1S4BFSitKeyPo0cPstlRRVA0xHy1wolR0MeY2VTOtqeqBLxotpf0bl X-Google-Smtp-Source: AGHT+IGPNlPGCtPBypS+3QH5V8BmL3guma48smLhKJ8u6uzLKRJHeGM33dI4w+1pFfja9aZ7mD/1ew== X-Received: by 2002:a05:600c:35c5:b0:458:bfe1:4a91 with SMTP id 5b1f17b1804b1-45a10be7b42mr4144935e9.20.1754932033011; Mon, 11 Aug 2025 10:07:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Miguel Luis , Richard Henderson , kvm@vger.kernel.org, Peter Maydell , Paolo Bonzini , Haibo Xu , Mohamed Mediouni , Mark Burton , Alexander Graf , Claudio Fontana , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mads Ynddal , Eric Auger , qemu-arm@nongnu.org, Cameron Esfahani , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 11/11] target/arm/hvf: Allow EL2/EL3 emulation on Silicon M1 / M2 Date: Mon, 11 Aug 2025 19:06:11 +0200 Message-ID: <20250811170611.37482-12-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250811170611.37482-1-philmd@linaro.org> References: <20250811170611.37482-1-philmd@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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@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: 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: 1754932174119124100 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Another API PoC. --- target/arm/hvf/hvf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index d74f576b103..0519903c928 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -17,6 +17,7 @@ #include "system/hvf.h" #include "system/hvf_int.h" #include "system/hw_accel.h" +#include "system/tcg.h" #include "hvf_arm.h" #include "cpregs.h" #include "cpu-sysregs.h" @@ -1014,11 +1015,14 @@ bool arm_hw_accel_cpu_feature_supported(enum arm_fe= atures feat, bool can_emulate case ARM_FEATURE_GENERIC_TIMER: return true; case ARM_FEATURE_EL2: + if (can_emulate) { + return true; + } ret =3D hv_vm_config_get_el2_supported(&supported); assert_hvf_ok(ret); return supported; case ARM_FEATURE_EL3: - return false; + return can_emulate && tcg_enabled(); default: g_assert_not_reached(); } --=20 2.49.0