From nobody Fri Nov 14 16:48:28 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761843669; cv=none; d=zohomail.com; s=zohoarc; b=U9RyRwoEKhyYc0rZbe4U31j4Iq1v58O2MQVlXGQKTDXJTEjIE6yu/WUtdEoBaDloiRRzFE+P1fImV6YfobSiJe1eaP9kNQcA9C8CUWdsGLMHBiqRMzulLYELFciZf/BgH+5bKGQ+N8ZneB3/GOX1eXWn++4fTivXt30Vl7C5Zhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761843669; 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=hWmmkEUNuPGh9RNwegX9zD/J9TxS8gEM8JXHywhlakk=; b=lYLN8ZgNXo7epNYgcp/opLKmpvCzjYKkOhgTZkDL6bL0yE2tuLTEJtVIhmC2Gn2TxwHbbrZ+X92ydVhl735RQAVJnauKly9mSfRWTwQQgOFGPKT86wmSlIpuZOgTw9gKtLqyYJGjawOzgzZBJfVVQ9jf/1VwNByVxveFWcGPt6I= 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 1761843669753531.1826118518434; Thu, 30 Oct 2025 10:01:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEVzw-0002MQ-Bj; Thu, 30 Oct 2025 12:59:40 -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 1vEVzq-0002Le-Ux for qemu-devel@nongnu.org; Thu, 30 Oct 2025 12:59:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEVzg-0005HI-CV for qemu-devel@nongnu.org; Thu, 30 Oct 2025 12:59:33 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-fwTgCnxVNqWdbCr5oUbFCQ-1; Thu, 30 Oct 2025 12:59:13 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-471001b980eso8319635e9.1 for ; Thu, 30 Oct 2025 09:59:13 -0700 (PDT) Received: from rh.redhat.com (p200300f6af131a0027bd20bfc18c447d.dip0.t-ipconnect.de. [2003:f6:af13:1a00:27bd:20bf:c18c:447d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289e7cf5sm51104085e9.14.2025.10.30.09.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Oct 2025 09:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761843555; 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=hWmmkEUNuPGh9RNwegX9zD/J9TxS8gEM8JXHywhlakk=; b=aTTr0Z8EOWkcVgfeIvyXVyc0L1u/Fs+lXeoi8uIGrHwL/XpNCOzWvCXFPPGgGZywjavk6v EUwa5qrz4jCbq8CkSQfwK0l7fxwwryPAUiFwI3bEERDskzc3Wp3TGukeY6RzKvXIApmbRy Re0Q2c+1InH9mgRdJ3UmS/uwU1B8Luc= X-MC-Unique: fwTgCnxVNqWdbCr5oUbFCQ-1 X-Mimecast-MFC-AGG-ID: fwTgCnxVNqWdbCr5oUbFCQ_1761843552 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761843552; x=1762448352; 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=hWmmkEUNuPGh9RNwegX9zD/J9TxS8gEM8JXHywhlakk=; b=NRQwGMkKta7mXmzAylF6Uzr76a6CtnvRQGplYqzDDWExgJOETyqKFllo8l30OA+xic zwfb4+LbArD/f0jikSQTi4aVvlxCemZBUBPIhLrYUF65sfp+DFiBMhJFM3VL2D1i0opB JpCS07iPM8b407iA9OByt1XIL0jPTxuB9FzM2TV/MYOny2Pxeq0/sOAbpfvb+FHi8cyy zw8CVLMUD8t7HTa/dvlSfVmuikzbHLuy93SYzbNDBcxruRG960oocUwWzwK3CAliCtZw zNQ20KDMU5oiUA8yWvr1DJ8Ty+YnGrKlFN8yA/gcNCtVQdXt7DSRIyZ3fMNWf2KQ5pCD Qy1A== X-Forwarded-Encrypted: i=1; AJvYcCUSunt6nEM/TEa8JDHO6hFf9KZz6+EPU1bc9gfgi2QHEz1tFJvBOJ7IDWBxfQ9ENnIL0kIwFznOTWSD@nongnu.org X-Gm-Message-State: AOJu0YwISrAKrbS6znmnxVAuxJMZl0+7hw39uZq412KE3DAr/FzDjGxy PAvA5s0tr63/Nq2h/kuHazkjOwlOmqqhJdr2WST233jjGAHmWGyq8PehE3EMoBpwlhOO2r8QEIq kTDQANsLKvJXnUC8CUZ/XX760SqTtYAkvHR0luXcVSeD9Md5ySS8H5BMz X-Gm-Gg: ASbGncvfDYMwmcFOKwr3K3Y8GsOiUcfZ33BCnRzPubgyWO1gTn67M/vWiL91CZFMiSR 7x+ubhhhm8Sp/YoJ8IfRYBAx6Oqm1l2AoXCOJQNY9qj4TjFWbkQtjnph0JO18Tz/CZMYuMFAdJG Kuj5ND3B6Wo/aUVrN4ywaBzJ6/RnHDWf0D/mZ4U4lInDSU/dwVetIsj6aPhEMHFRrhFZaKG/zwU rLC5dVoH+tY8Jr4Vs+ILG2KzJJkUFuWlrJPg0JUjOp4zA47iN38ELKsOZR/vtV8hAqvElafwdEM SDt6D8LAojV6Jh971pzO0dUd+K8TlzkreW1qej2Xrwx990HWn3MgTsazprVaxbrpP0WOXXzYY+V a3/Hx2PMzOQ/HtXTWsws9HuXxQJOUB3R/FFGFJu2BueBNtFVAzXc38ZOzEKyeWvo= X-Received: by 2002:a05:600c:34d0:b0:471:114e:5894 with SMTP id 5b1f17b1804b1-477308721b1mr4431725e9.25.1761843552026; Thu, 30 Oct 2025 09:59:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdysDVvnycX2QFcyER9PBsXwHxfA4shM0ptgu5S+ePqTnpY3IFDLDiXiVx7sJ1KtjfLnplcg== X-Received: by 2002:a05:600c:34d0:b0:471:114e:5894 with SMTP id 5b1f17b1804b1-477308721b1mr4431485e9.25.1761843551618; Thu, 30 Oct 2025 09:59:11 -0700 (PDT) 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 v2 1/2] target/arm/kvm: add constants for new PSCI versions Date: Thu, 30 Oct 2025 17:59:04 +0100 Message-ID: <20251030165905.73295-2-sebott@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251030165905.73295-1-sebott@redhat.com> References: <20251030165905.73295-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.129.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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 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: 1761843672420154100 Content-Type: text/plain; charset="utf-8" Add constants for PSCI version 1_2 and 1_3. Signed-off-by: Sebastian Ott Reviewed-by: Eric Auger --- 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.42.0 From nobody Fri Nov 14 16:48:28 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1761843665; cv=none; d=zohomail.com; s=zohoarc; b=GFORvpFNVAusvc4SVo9uRpzbqVCamBPxu+27I3edJ7cr4f/+RgIGD9HJkjhIf5k3hzwExTc3L/HcywWw/jMvUQcr/Cu2GS97y3QLvdWVxaa5PUDTKEEGT6AO2nwN3+e09NxSCpkfCYVCKgWxvoaVuz6yXURz7+59h6s4IiqIXus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761843665; 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=y4ko4KBU7aEgwSx+DTL8x/7Jpcfxyw8R2e/RIc9ttX4=; b=EwV7cg175Zhnypl2oCwx/sFtiiyNDhGoU0BCD4LAnZPql2lHvy7tYTDL7g3r3TR2cKZzLoLT60FT9j+jIUGBWs2eeEqnqVTrC5KIn32VSNWiKURRlwc/jx+ql4YjYaiHsTnJbtdCNi0RLmOy+IElihVdbvgIpEFZP6NipXMPUmc= 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 1761843665212596.8167043431121; Thu, 30 Oct 2025 10:01:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEW02-0002Ny-3t; Thu, 30 Oct 2025 12:59: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 1vEVzu-0002MI-52 for qemu-devel@nongnu.org; Thu, 30 Oct 2025 12:59:38 -0400 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 1vEVze-0005HQ-UL for qemu-devel@nongnu.org; Thu, 30 Oct 2025 12:59:36 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-534-w4zoUO5LPrqNCv5_Orfk_g-1; Thu, 30 Oct 2025 12:59:14 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-429bd66fe65so143413f8f.0 for ; Thu, 30 Oct 2025 09:59:14 -0700 (PDT) Received: from rh.redhat.com (p200300f6af131a0027bd20bfc18c447d.dip0.t-ipconnect.de. [2003:f6:af13:1a00:27bd:20bf:c18c:447d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289e7cf5sm51104085e9.14.2025.10.30.09.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Oct 2025 09:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761843555; 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=y4ko4KBU7aEgwSx+DTL8x/7Jpcfxyw8R2e/RIc9ttX4=; b=iMLm+RIvZND1niHoDxYlYtDce9selnItfYBSIGmu94d3kB7XGgdt8blwL7PJXYjuDL4oEr 8moRFqZo/3XwpfgPQLNyDZAd/gz/ZDck5gaw2CdQ3hdE2e5AklgGOwB5ZSfX1jSw45I4/r AfbjGB4hGrWYHNw2dH296AlhtlMkPyg= X-MC-Unique: w4zoUO5LPrqNCv5_Orfk_g-1 X-Mimecast-MFC-AGG-ID: w4zoUO5LPrqNCv5_Orfk_g_1761843553 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761843553; x=1762448353; 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=y4ko4KBU7aEgwSx+DTL8x/7Jpcfxyw8R2e/RIc9ttX4=; b=SkITAqVpjwGWutwbqO/u8ZxxrsKM9FIejsJx3w/RgemoQ9u1XP1nV1eFQt+Puq+XaT G7kwApcvE0XRz1vhXxEqKdIJmM6jlXx5uiTSwL/dP2r2tIwkbNwD3/AFE7cQVyLHkEcd fOvfnAEs7KC31gSsAKT4oSAMWP6iCqT9fiRRpxcmthU6hCE1sYeJUAhHnbjj6A3//uCG MBu6GdWYvlK9lV5EkDfoeBS6l7JxAURYnZAlRRdbhjOQUsXtrAqWQa7Vk8GuEnxj1X3H Oy/pyBEUjzRX6iJ6sFOiH+ifKwCwEknwrJSbDC96FK40H7Hg7meJTrTm3Fep9LmuF1U6 yr5A== X-Forwarded-Encrypted: i=1; AJvYcCUPdad3Y3gZNp+RfWAUiBjxNrG+FsA0m6n+h4pV4YpLc2X03kgBKWRsR7LoOLwBtgTMHhIM+Hp/5MfE@nongnu.org X-Gm-Message-State: AOJu0YxDEgR2f7WODm5w8q4cgHm5QPygOddF1E3ymeFm0htI/x2VT90l lDQ8Y21pxhUs+gP/zdFY08hcH28rrn6iw6XK2ayWGjtXI/6foXyPEYwvTWkeExXUXZz2kyahu3I H8dvaRFGpvq76uW/cLR/nKqNTRTDQo8vHtsLozl/kx4LAwhQN4cAS+KCR X-Gm-Gg: ASbGncv38AkI64DDBqn45n2hVoFfBq7BvcC1EBvSMcQF+ZbgsovnjCFLDC1HErSH44b Nn6ogkYWA13rNH1Q0A7UxnoK5WRYqma3nrH5M7/WG82TlBw6xaWHW6SGngBFZQoM+w3TaStvZ9i kOaBqqzLAawF12d1QFViRt6QH4P8EsZ1U/z2uPjuJrUCv9b41n+0EHzmTD0sBfGNkl34JGRR7Ot SHrSJnlJQUXyRwOJGZaYjhp4+bwSaUp0dl7Iv47EvTZvqyR1Ue++QRapEmYegnCK+we85bEGWLu fzDzCcQRAOoe3cGaeZBvLNKTDElc8p0PMot0B5XjQ76a57udu2C391JI/Vb/+OjALnsQ1NpCARd TxzXdwejETZ+M3kVUWyWlTmodvtxCUcAQT9jU2nGpxIod9ELx82SKsNo4SkEb668= X-Received: by 2002:a05:600c:871a:b0:476:a25f:6a4d with SMTP id 5b1f17b1804b1-477305a6daamr3525445e9.1.1761843552951; Thu, 30 Oct 2025 09:59:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtxStmlfeeaS5Y8HP2+7UT81SENobqh4RvvVYY+Oiqs7Zmi4aE+qYv9gWYq8tm8LCZq3ZUGA== X-Received: by 2002:a05:600c:871a:b0:476:a25f:6a4d with SMTP id 5b1f17b1804b1-477305a6daamr3525165e9.1.1761843552439; Thu, 30 Oct 2025 09:59:12 -0700 (PDT) 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 v2 2/2] target/arm/kvm: add kvm-psci-version vcpu property Date: Thu, 30 Oct 2025 17:59:05 +0100 Message-ID: <20251030165905.73295-3-sebott@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251030165905.73295-1-sebott@redhat.com> References: <20251030165905.73295-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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, T_SPF_HELO_TEMPERROR=0.01, 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 @redhat.com) X-ZM-MESSAGEID: 1761843668605154100 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 Signed-off-by: Sebastian Ott --- docs/system/arm/cpu-features.rst | 5 +++ target/arm/cpu.h | 6 ++++ target/arm/kvm.c | 60 +++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-feature= s.rst index 37d5dfd15b..1d32ce0fee 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -204,6 +204,11 @@ 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`` + Override the default (as of kernel v6.13 that would be PSCI v1.3) + PSCI version emulated by the kernel. 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 39f2b2e54d..c2032070b7 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -981,6 +981,12 @@ struct ArchCPU { */ uint32_t psci_version; =20 + /* + * Intermediate value used during property parsing. + * Once finalized, the value should be read from psci_version. + */ + uint32_t prop_psci_version; + /* Current power state, access guarded by BQL */ ARMPSCIState power_state; =20 diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 0d57081e69..c53b307b76 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -484,6 +484,49 @@ 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 +struct psci_version { + uint32_t number; + const char *str; +}; + +static const struct psci_version 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" }, + { -1, NULL }, +}; + +static char *kvm_get_psci_version(Object *obj, Error **errp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + const struct psci_version *ver; + + for (ver =3D psci_versions; ver->number !=3D -1; ver++) { + if (ver->number =3D=3D cpu->prop_psci_version) + return g_strdup(ver->str); + } + + g_assert_not_reached(); +} + +static void kvm_set_psci_version(Object *obj, const char *value, Error **e= rrp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + const struct psci_version *ver; + + for (ver =3D psci_versions; ver->number !=3D -1; ver++) { + if (!strcmp(value, ver->str)) { + cpu->prop_psci_version =3D ver->number; + return; + } + } + + error_setg(errp, "Invalid PSCI-version value"); +} + /* KVM VCPU properties should be prefixed with "kvm-". */ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) { @@ -505,6 +548,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) @@ -1959,7 +2008,8 @@ 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->prop_psci_version !=3D QEMU_PSCI_VERSION_0_1 && + kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { cpu->psci_version =3D QEMU_PSCI_VERSION_0_2; cpu->kvm_init_features[0] |=3D 1 << KVM_ARM_VCPU_PSCI_0_2; } @@ -1998,6 +2048,14 @@ int kvm_arch_init_vcpu(CPUState *cs) } } =20 + if (cpu->prop_psci_version) { + psciver =3D cpu->prop_psci_version; + ret =3D kvm_set_one_reg(cs, KVM_REG_ARM_PSCI_VERSION, &psciver); + if (ret) { + error_report("PSCI version %"PRIx64" is not supported by KVM",= psciver); + 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.42.0