From nobody Thu Feb 12 05:55:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770823892; cv=none; d=zohomail.com; s=zohoarc; b=fkmkdDSq9cMA/cxaiN7uuM+NqjX3O225EijMc7cr0K5uIl+INMPpb12KGOA0Gw4eFTlD0C0Vpsya3E7EMRc06TRuGvqca8H/rMEtPk0dz+caSRlH4oB4xX4YzFp8Cjet8uavR3syw49S5M4c4YMs+/4XB6jXxvqLq3LEaaFZj/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770823892; 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=4uMBqfdZsQbe7YIFKz45QFjnUCRjbkXzgrDvDI+qPJ8=; b=OyrIemC2L9Qj0XynBq4jQvI0enXPLgRNXObk3s+xxrq8d+nXlI+YsFfki3YZIybEG1QjfTGwKEE4MVdkEMlDjPovFfJYeKpS/3zvdMuHbuhhLY4kXKCvjmIQ1yeuBilAr4LDBSDEIQXr5ywmbVJIXwfK6zwcUKieNmkOJvKueFw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770823892791445.55887158899; Wed, 11 Feb 2026 07:31:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqCBJ-0007LG-Kv; Wed, 11 Feb 2026 10:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqCBE-0007K2-8u for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:31:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqCBC-0008Ao-2o for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:31:03 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-568-KN8z6zOqO5afZSASDe-_xQ-1; Wed, 11 Feb 2026 10:31:00 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4801e3aab32so37767455e9.3 for ; Wed, 11 Feb 2026 07:31:00 -0800 (PST) Received: from rh.fritz.box (p200300f6af2d8700b4c2d356c3fafe63.dip0.t-ipconnect.de. [2003:f6:af2d:8700:b4c2:d356:c3fa:fe63]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43783d34657sm6448511f8f.6.2026.02.11.07.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 07:30:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770823861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4uMBqfdZsQbe7YIFKz45QFjnUCRjbkXzgrDvDI+qPJ8=; b=ML4BygmdBp7iX8wOsQ3F6MHrutvG2CphHLe2TjV8hPJSLbGe7WfPx/A7mCaxndDREzpXyS QlSvB7a8kYq22wXXttK5583xlCc8O7nAnttxVwu/80KzOcpvg3QEtAuO8sGqVoD8JpXsM5 n47FEw4UwUCSiPxaUR0nvIkLJdL3/PE= X-MC-Unique: KN8z6zOqO5afZSASDe-_xQ-1 X-Mimecast-MFC-AGG-ID: KN8z6zOqO5afZSASDe-_xQ_1770823859 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770823859; x=1771428659; 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=4uMBqfdZsQbe7YIFKz45QFjnUCRjbkXzgrDvDI+qPJ8=; b=ng0p2PzXfd/P6mB5sjJBW7JDY4C3XrrjsUtAQjJHdJB9bLxnzkwk7t3LaK/S6Fm5ET 0gI6rPW3EyHXKN6cAuIsHMYosmNtKDaj6bRcxVJjDl8tMFZn9j8AAeLmaEhkl1SJX72z A7MhI95cbjjHCC7n5W3tX3SmCrevslDMMIGU4Polcv85ZK4f4pMy4DPHpwgN4UVdxcQx QjUSemiGu40H4emln7j2dxsL9h8fA95xekl44CA6PTYpB2stZ/MPBldHYPWElG4RNg5J PV7ng8ETBy3DzpQDCRwpTYMH7gUl3CA6Jg7hzwQAmlNLVlrqAHyfHa9MIcpzMDcLljeL D7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770823859; x=1771428659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4uMBqfdZsQbe7YIFKz45QFjnUCRjbkXzgrDvDI+qPJ8=; b=Fc59xV3Tnh+D9I1yyCXG3wO4c3CRiQLgGXhJrloTTy3lV9B526qUME7ohaTTEO+QQB uSPEhqPNUdJUrxwnj/u6VR4jx5PNa0mN3tX54oain7uINJrA98ADaqc1sq11XNCI9GwD 4sB8mPgOimi4Qg75roDVgkmE9EkDksfqiUElBJEHd36TESPXV6NKOzR0anYk+MeUAoHH 96F1+KJOPxmp9dAUX9TYtqboD0LqVvZRFaPXtIEcbIADBNpiSnotGrIIfeLYdjk7+4Nm wL+1/+Am9oYuFB0xevEHLrEzYfV2zLIBln2tLXWoMJ/wEBmxjaskMTfTwXux4v8uqezg GsBA== X-Forwarded-Encrypted: i=1; AJvYcCXbBJNHIi1pWNdN08ijOAd7qGQH6gvffT0MNGMorOrCdONx+GWnKCQWCR4upXgjPjsW/DsChdyBE0xD@nongnu.org X-Gm-Message-State: AOJu0YwzPBlrEslOsTLMgBVCKpjhHZciL0yUHiPuhtY/meionkbg7CLy lol2If3MCfvDbLldJ131h4LyrLZGFSWiGC4tZDeZrBtWOdnf7eQUNI+vkvedVhm7ylUHO4PPtgD 6zWC4h951et4ShLlQe8s5+w8yEK0leK9x7LHlbknLi0Mf8r2TVuHSZ3LX X-Gm-Gg: AZuq6aJPXIPRqWDzZxspxBdTbE7fAXe4Xo7/qAkMdtLrUHigLVSrgAq1kr4qLUhk8Dc KStZl32SjadWXCf8nL4bNZUmx7tA3zhzEEO+qtu8ffvUth1162R0P11LqALH1KZtRUappkXIwQk oQylcuVT02eZIqRSTAAgSczYYMfew58mQ6ewU3u4gkAMQ19KzrW1xR57ovp3oVi54QEEYuNXc/C 1jAaZtHrbf+ka1DIbhAqTCthuguc46QcsWEwElQtyN3wXGft4OSZ36CTmnrRtwggDYZ1ftFEyNe Wa3OwGiRqwp7/KDfGnkZxx2ZcYGCEYpvKJJRJXSF2T16hjcHnotb9UeUIpR4X/6FfdAKNjXJkeS 1Ortnmum28pqCwuHvr/ZXViCJtQfRDTiIsqaS/w4aEwC9E3997ORcN4HtJPfpXFZ3CPQ3mGp/U6 vwrKJOXP8w X-Received: by 2002:a05:600c:46cb:b0:483:ea6:8767 with SMTP id 5b1f17b1804b1-4835e2cd408mr35512085e9.36.1770823858850; Wed, 11 Feb 2026 07:30:58 -0800 (PST) X-Received: by 2002:a05:600c:46cb:b0:483:ea6:8767 with SMTP id 5b1f17b1804b1-4835e2cd408mr35511455e9.36.1770823858114; Wed, 11 Feb 2026 07:30:58 -0800 (PST) From: Sebastian Ott To: Peter Maydell , Paolo Bonzini , Eric Auger Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.linux.dev, Sebastian Ott , Stefan Weil , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 1/2] target/arm/kvm: add constants for new PSCI versions Date: Wed, 11 Feb 2026 16:30:31 +0100 Message-ID: <20260211153032.19327-2-sebott@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260211153032.19327-1-sebott@redhat.com> References: <20260211153032.19327-1-sebott@redhat.com> 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=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770823895085158500 Add constants for PSCI version 1_2 and 1_3. Reviewed-by: Eric Auger Reviewed-by: Stefan Weil Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Eric Auger Signed-off-by: Sebastian Ott --- target/arm/kvm-consts.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/arm/kvm-consts.h b/target/arm/kvm-consts.h index 54ae5da7ce..9fba3e886d 100644 --- a/target/arm/kvm-consts.h +++ b/target/arm/kvm-consts.h @@ -97,6 +97,8 @@ MISMATCH_CHECK(QEMU_PSCI_1_0_FN_PSCI_FEATURES, PSCI_1_0_F= N_PSCI_FEATURES); #define QEMU_PSCI_VERSION_0_2 0x00002 #define QEMU_PSCI_VERSION_1_0 0x10000 #define QEMU_PSCI_VERSION_1_1 0x10001 +#define QEMU_PSCI_VERSION_1_2 0x10002 +#define QEMU_PSCI_VERSION_1_3 0x10003 =20 MISMATCH_CHECK(QEMU_PSCI_0_2_RET_TOS_MIGRATION_NOT_REQUIRED, PSCI_0_2_TOS_= MP); /* We don't bother to check every possible version value */ --=20 2.52.0 From nobody Thu Feb 12 05:55:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770823925; cv=none; d=zohomail.com; s=zohoarc; b=P1U5RHKQonSN2Yx6ayLa5s8KgW8o8jZmk8iIkd9t2rjg0WcfDsRVlX7OgtC8c9wTQuvW3ef8VUHxvQbJ8/EsC8x7yuwxIh6jCl3X8NpT8pcekbf5u7aCCRgbOMU1L1+CqfiFaUaL9V6w1DfJPDRzLw7DJeBQj90vXwA9SRPy1sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770823925; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KgZLxYej2+Jm/2mAtMCoJI/wRP+Se5cFtNVR14mJ03o=; b=Dg0AHi1ALXNH/hs6Uz2oYSfHxbi9TLzRh9zQ4/m6cwTDyvdKeQxXQiy4xVWmvahqYoOndHilGGyprGTX9o3CMGBx3QAaUYpPgfz6n0LX4/hYJjBI5glhPfLmu9NI8qNUSFxo7n+B4pUG23auN0EPhRHhZ9CW3udwXEhOcBYfL3k= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770823925783616.9275349431233; Wed, 11 Feb 2026 07:32:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqCBK-0007LL-PM; Wed, 11 Feb 2026 10:31:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqCBH-0007KE-41 for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:31:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqCBF-0008BB-DV for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:31:06 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-zcy5oeLQND-MeMkzb8lSxg-1; Wed, 11 Feb 2026 10:31:03 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4801c1056c7so13181185e9.2 for ; Wed, 11 Feb 2026 07:31:03 -0800 (PST) Received: from rh.fritz.box (p200300f6af2d8700b4c2d356c3fafe63.dip0.t-ipconnect.de. [2003:f6:af2d:8700:b4c2:d356:c3fa:fe63]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43783d34657sm6448511f8f.6.2026.02.11.07.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 07:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770823864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KgZLxYej2+Jm/2mAtMCoJI/wRP+Se5cFtNVR14mJ03o=; b=DhANDHcRXKNAhk1zfPyKPsBAVJN+dj5Y1b2l+JLcy7wTmTr9tBFywwKzmLE+RwsReP3Vo+ +yJUrW51LAbujNfZgRQxIh1BFDgRsN2/jPK2R0zpKthPcx/pFJzfaBRct4bBJY9WD7ks0U l+ngbRNG3nYvi99F10kbsq8B9WZr1uY= X-MC-Unique: zcy5oeLQND-MeMkzb8lSxg-1 X-Mimecast-MFC-AGG-ID: zcy5oeLQND-MeMkzb8lSxg_1770823862 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770823862; x=1771428662; 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=KgZLxYej2+Jm/2mAtMCoJI/wRP+Se5cFtNVR14mJ03o=; b=qxNSZeMy2Xa+snOgS1c+/Ne31i7lbW/YnPv93gZ7IWPWClQtSoIrg1juy0reSNS0o4 +WIff21KjqQ9mgX+h5PNVFTtiirsoFufnphEmzNtfc5VMDIQj1tPQZGF8hcPy4aKtJCm 8/xl7gdsQviKDM8fjsUrGk+lUTXZYhObZMqjYIl46ITVO/FfK9qG5QFPHrsmevIpc+zl yPHi2Gv8Xu8a3G3jtSao7686sLvzxV5pGYHxAsnMIsDi8UXnlh3NVDEYF/f5Cqz7Jbm7 b0DcLSpJiKMmiPhfPnmqI01PeWiwaU3xH1xXf3xeY9CDsLpb6CKo31GtbXGqFC1tt8d9 zFMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770823862; x=1771428662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KgZLxYej2+Jm/2mAtMCoJI/wRP+Se5cFtNVR14mJ03o=; b=K3CcSda8FVV963jxywHCPz5CqUFXzUBJhIFtcEThFtHp3o9cyWoEQNBP2wF4roZ3Ai R8LBfXP7r1aCCID4mOwySIvms1jGhbMFfPCBPu7eLqau+7Dzo5KEVc8wRyNI/0sIUUhQ WpBzdHo9NOTx3r0t9b4GF7yHAUqHps3hqae2YJMAIzNcIq6G47eU+FYKqisZEfO1+VCp lRa/zK7q70J/cGZEIjWlJ0sSsJXZKOJIjnwudMCEHaP9qJU5FWHlpXXZDDz/XAZbOLNt UZ0Jgwlpol/QRFRJTD1AcDXrzcbxORdAxZy+MF6ZBo600nZF7TpbBaAczcR/dkNgu+2J 6/pg== X-Forwarded-Encrypted: i=1; AJvYcCXGR4pn8SZuUzmuf5RE8k+HucIczMGeZW18DPhrMvQyOA+VFrGpkduxytW7n4D4cJH+rDV78cv3LKOH@nongnu.org X-Gm-Message-State: AOJu0YylzJ7Ko2a/pNFQ+qGvY9zzdjxcR4/ceDS57YqqBy5jLC6bIJ95 rFwUCOgJIQiTCtfDZfb05QSA6cSzXxy+Cyt3fdazekHQzskGLm66d6oE3ledpj/+3ivzA+TEHct pGflwoHVVQV6xQv2Ms/afyODybqZq3X8SKU2DE1zevk7XuIoEP96YHBbB X-Gm-Gg: AZuq6aJ+6L9m1ImUOu17AFdFwBDkgZYpMA0387UkRN1RJrYMLXewe15NembctsTgzXQ rw9WmV0bQM94oHtfdC00vt1sCUhNL7Ygtq52/cR4uEr/PkdzzOnhUboS/6XbUpW2eCZ7ceuQaxS 8Xxihp6m7FqkqlJKs3jWDUOgB6cfYeBRGa7Jj5xJHed1x7IBcLPJW/HXL3PNT5fsRIwVNltjWue dLvcFKnoHYcwL9Z+Wy0a3HkAlr9N9K6zW+2EG1Gmhke8ZAB+qoGq8vHOpHLbuP8StMp7Gi2PKIV x2s1tRFECN6GvdRRNlmNZDSz1wmHpEwxl8Luz8OrjNLx0y5lkPBryFoRBruIsNycdVrrkTzzDSl ltHO08GWPSviEfpTUxWhFl87lCosQ0eG1JQjPN3cMepu3MMJZuqTx8456BvTtUqIk9J28QRgA91 xJ4NoOQt1N X-Received: by 2002:a05:600c:c16d:b0:480:4a90:1b00 with SMTP id 5b1f17b1804b1-4832021605bmr226049955e9.20.1770823861888; Wed, 11 Feb 2026 07:31:01 -0800 (PST) X-Received: by 2002:a05:600c:c16d:b0:480:4a90:1b00 with SMTP id 5b1f17b1804b1-4832021605bmr226049465e9.20.1770823861415; Wed, 11 Feb 2026 07:31:01 -0800 (PST) From: Sebastian Ott To: Peter Maydell , Paolo Bonzini , Eric Auger Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.linux.dev, Sebastian Ott Subject: [PATCH v5 2/2] target/arm/kvm: add kvm-psci-version vcpu property Date: Wed, 11 Feb 2026 16:30:32 +0100 Message-ID: <20260211153032.19327-3-sebott@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260211153032.19327-1-sebott@redhat.com> References: <20260211153032.19327-1-sebott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770823927381158500 Content-Type: text/plain; charset="utf-8" Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3 Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case. Reviewed-by: Eric Auger Tested-by: Eric Auger Signed-off-by: Sebastian Ott --- docs/system/arm/cpu-features.rst | 11 ++++++ target/arm/cpu.h | 6 +++ target/arm/kvm.c | 65 +++++++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-feature= s.rst index 37d5dfd15b..50b106f2eb 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -204,6 +204,17 @@ the list of KVM VCPU features and their descriptions. the guest scheduler behavior and/or be exposed to the guest userspace. =20 +``kvm-psci-version`` + Set the Power State Coordination Interface (PSCI) firmware ABI version + that KVM provides to the guest. By default KVM will use the newest + version that it knows about (which is PSCI v1.3 in Linux v6.13). + + You only need to set this if you want to be able to migrate this + VM to a host machine running an older kernel that does not + recognize the PSCI version that this host's kernel defaults to. + + Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3. + TCG VCPU Features =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index e146f7e6c4..d3cfd444e8 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1036,6 +1036,12 @@ struct ArchCPU { bool kvm_vtime_dirty; uint64_t kvm_vtime; =20 + /* + * Intermediate value used during property parsing. + * Once finalized, the value should be read from psci_version. + */ + uint32_t kvm_prop_psci_version; + /* KVM steal time */ OnOffAuto kvm_steal_time; =20 diff --git a/target/arm/kvm.c b/target/arm/kvm.c index ded582e0da..6d13cb4f3c 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -485,6 +485,46 @@ static void kvm_steal_time_set(Object *obj, bool value= , Error **errp) ARM_CPU(obj)->kvm_steal_time =3D value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_= OFF; } =20 +typedef struct PSCIVersion { + uint32_t number; + const char *str; +} PSCIVersion; + +static const PSCIVersion psci_versions[] =3D { + { QEMU_PSCI_VERSION_0_1, "0.1" }, + { QEMU_PSCI_VERSION_0_2, "0.2" }, + { QEMU_PSCI_VERSION_1_0, "1.0" }, + { QEMU_PSCI_VERSION_1_1, "1.1" }, + { QEMU_PSCI_VERSION_1_2, "1.2" }, + { QEMU_PSCI_VERSION_1_3, "1.3" }, +}; + +static char *kvm_get_psci_version(Object *obj, Error **errp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + + for (int i =3D 0; i < ARRAY_SIZE(psci_versions); i++) { + if (psci_versions[i].number =3D=3D cpu->psci_version) + return g_strdup(psci_versions[i].str); + } + + return g_strdup_printf("Unknown PSCI-version: %x", cpu->psci_version); +} + +static void kvm_set_psci_version(Object *obj, const char *value, Error **e= rrp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + + for (int i =3D 0; i < ARRAY_SIZE(psci_versions); i++) { + if (!strcmp(value, psci_versions[i].str)) { + cpu->kvm_prop_psci_version =3D psci_versions[i].number; + return; + } + } + + error_setg(errp, "Invalid PSCI version."); +} + /* KVM VCPU properties should be prefixed with "kvm-". */ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) { @@ -506,6 +546,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) kvm_steal_time_set); object_property_set_description(obj, "kvm-steal-time", "Set off to disable KVM steal time."); + + object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version, + kvm_set_psci_version); + object_property_set_description(obj, "kvm-psci-version", + "Set PSCI version. " + "Valid values are 0.1, 0.2, 1.0, 1.1, = 1.2, 1.3"); } =20 bool kvm_arm_pmu_supported(void) @@ -1976,7 +2022,12 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cs->start_powered_off) { cpu->kvm_init_features[0] |=3D 1 << KVM_ARM_VCPU_POWER_OFF; } - if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + if (cpu->kvm_prop_psci_version !=3D QEMU_PSCI_VERSION_0_1 && + kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + /* + * Versions >=3D v0.2 are backward compatible with v0.2 + * omit the feature flag for v0.1 . + */ cpu->psci_version =3D QEMU_PSCI_VERSION_0_2; cpu->kvm_init_features[0] |=3D 1 << KVM_ARM_VCPU_PSCI_0_2; } @@ -2015,6 +2066,18 @@ int kvm_arch_init_vcpu(CPUState *cs) } } =20 + if (cpu->kvm_prop_psci_version) { + psciver =3D cpu->kvm_prop_psci_version; + ret =3D kvm_set_one_reg(cs, KVM_REG_ARM_PSCI_VERSION, &psciver); + if (ret) { + error_report("KVM in this kernel does not support PSCI version= %d.%d", + (int) PSCI_VERSION_MAJOR(psciver), + (int) PSCI_VERSION_MINOR(psciver)); + error_printf("Consider setting the kvm-psci-version property o= n the " + "migration source.\n"); + return ret; + } + } /* * KVM reports the exact PSCI version it is implementing via a * special sysreg. If it is present, use its contents to determine --=20 2.52.0