From nobody Sun Sep 28 17:06: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=1757602239; cv=none; d=zohomail.com; s=zohoarc; b=CxoAAtg8f/kUxXxD7IxKKcv6kwkUA/ZeFpuT8K5WDu8pofXyPE7IEtq2MOjG83cxwU2wCHRgDMDFZANHZbzqBkRqYwgPAHLtBBqWeZcyRmUAt3vA0YWWB841WgdKpZHnN6EKgVYZStnwqKYaSeEEiU7LZj7riasxxjsjmXrXp4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757602239; 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=A0a4n2ZzYOr7lU8ApVVE4XfictzucsNLVIeb31abwSM=; b=jZP5QK5K3KE8OXP360yCjZGZCqajFUXxbzpzPGWTBpdChk4qie2wdrQslDUXNZdYosf6alkwI+qITHO6hd/wjGazbuyVdtJelX+wMD1BPPIVuDFX/mqmmngJBPCK+v1IiRy4Gs4SCYckfMKw87cDRMZhdiC9c1EH+Ut0MlhMDPk= 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 1757602239204781.9841679368411; Thu, 11 Sep 2025 07:50:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwicJ-0001C3-Bi; Thu, 11 Sep 2025 10:49: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 1uwicG-0001B6-IU for qemu-devel@nongnu.org; Thu, 11 Sep 2025 10:49:41 -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 1uwicC-0004IT-Ut for qemu-devel@nongnu.org; Thu, 11 Sep 2025 10:49:39 -0400 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-610-vTnwuHjxNsesqL5bEDCmeA-1; Thu, 11 Sep 2025 10:49:32 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45deddf34b9so11885975e9.1 for ; Thu, 11 Sep 2025 07:49:32 -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-45e0159c27csm14941575e9.8.2025.09.11.07.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 07:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757602176; 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=A0a4n2ZzYOr7lU8ApVVE4XfictzucsNLVIeb31abwSM=; b=MDs/29C3LGS8NpDgrYn+ncba6sg9SRHRzEYALHqyOCWZrm+xWwdl0gbNfeGVBHRLsNfeRo i0zgjbUizGCrstCPealqmXTIiwAEsIO2N6fFH8risF8HvpXQ3xNuI5kRkN64rbEmcA3uT6 td/EZAB/fdWGHsIDRl7LPOn28mVibZQ= X-MC-Unique: vTnwuHjxNsesqL5bEDCmeA-1 X-Mimecast-MFC-AGG-ID: vTnwuHjxNsesqL5bEDCmeA_1757602171 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757602171; x=1758206971; 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=A0a4n2ZzYOr7lU8ApVVE4XfictzucsNLVIeb31abwSM=; b=f9f6uKDJUUbTkx7JJLKtgM9VqwWvPwnfCyAhULOQwvXPXbvUnVh8s0M/iKL1KBQsCn bT2vVqtScED8y084nEwrZALxxSrGtPAHHMc1aWem3clfi/c72X7PgkoGcZ7j6LSyJOr0 86ifTU3SLmmtRvg0iwcAG91SYj2v/98xnnpD+tMkA770E7kZunRXxMsyRtGKVet0FLzO 245evbB7KFdHCLfvu5P60B1ZvXDqHqwtt6D2B+MMnMTW8AQpw2F8A4j3vsWoAIMS6NSM 3akeUB3Rp3w86BQy5izd5/gDaeUvpZyRDMqi84l+9iV0sIAwbyDjv5r2oRza9YqaEv68 w0sg== X-Forwarded-Encrypted: i=1; AJvYcCWl+bHL/SDz436R+nBaXEdCRWKEHJmp7dTJwHM4X1P084xZd2s20v0RygRwwwEv6LBQNdEPw+R+wRK4@nongnu.org X-Gm-Message-State: AOJu0YzMMybEkEM8nz/o2swuXSSMqDcQtEONJ/v/4M7Pata6EOQDqkkg UKN3YUIgKBvLzaygN6IqJqywHGSVI6UPdm0eQ5Keh0W/KeBupSdsvJihh2KEn68IttYSLimTlR8 tAfFyZOgwURMqCDWBEPX5QjGzUHTCiWyqJzDcSqY7crn5XFJePTiWFgmL X-Gm-Gg: ASbGncuGRokk3VbvOCPX7pNc0rYZVXbNC53TKmE1yE1aVsA7pAE3jL6XFKPs9wlYVAb UfV8zjmOU0tI64pAkn8nBljMkAvFqo24uL+numbWuPFjRocrcr/0d1LUWDaQfgYNQHcmSyuk0Rk QLNKPWhU8+4t9x809PWMIEgcy4f+8gK9wUUNKPx0XXJ4DY1uFKHO63gZY5uBU6X2wxtvaO8xZRK RyUGmjG7R/8fO+UfcblgIWko8sJqb944EKgN09zL57md8lkvJj5CAi92yjA6iyvAYYUFPIjfHVb XRX+QEZ0+FetxbVzUKrgUnmxfTFkpRvWIpW/LWvfnBC+UyBOogEmrOtTlR1Xvp1/zS+7R1tNcIx qDnOhkI27zPy/cpxfUnQPwsC/MDRT X-Received: by 2002:a5d:5885:0:b0:3e0:63dc:913c with SMTP id ffacd0b85a97d-3e75e0f0321mr3085767f8f.3.1757602171248; Thu, 11 Sep 2025 07:49:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEw1IcstkmaYZN9of6DaQnGTrA008KACS07maSaSJLOzYY0ys0I9zEDtisEheF3g2dnd82HYQ== X-Received: by 2002:a5d:5885:0:b0:3e0:63dc:913c with SMTP id ffacd0b85a97d-3e75e0f0321mr3085750f8f.3.1757602170839; Thu, 11 Sep 2025 07:49:30 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Paolo Bonzini Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.linux.dev, Sebastian Ott Subject: [PATCH 1/2] target/arm/kvm: add constants for new PSCI versions Date: Thu, 11 Sep 2025 16:49:22 +0200 Message-ID: <20250911144923.24259-2-sebott@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911144923.24259-1-sebott@redhat.com> References: <20250911144923.24259-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_H5=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=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 @redhat.com) X-ZM-MESSAGEID: 1757602239921116600 Content-Type: text/plain; charset="utf-8" Add constants for PSCI version 1_2 and 1_3. 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 c44d23dbe7..239a8801df 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 Sun Sep 28 17:06: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=1757602248; cv=none; d=zohomail.com; s=zohoarc; b=L1TkLg+H8d3vmEAXuyWUO88aVPZNGt9WrIOEvAEw+cXhgMkQCu44QOIsTTkvfuW+3fF+GsHsWbtg2wZdXUycU9i7c/Cx21BOuQ1721iFpbwziRONRIsToemMwDeU9wxPMc1RgI/1Q4ryBfhuigAO6J4TK3wHrOqU1RiT61WBTho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757602248; 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=qhARN+mNZ8/BVngVsPUupvVPf6ZiX6bQWjwA8ImXvMA=; b=Wzu4/mBH//lzEM9zskLlRlykd78PLJD4ecBuaY1I29xu26XXtvsa6JsrteQnp58N92SqUmoT6CVXseE34x21PWn2XUG6AaLpqWIkcNM5F7gGkkJ3PN32j4NB8zX3PiAWtaO/gHUV/cwCvmNne2CAptU70wcOvh/0sd8g49NRJJc= 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 1757602248621614.5253587604592; Thu, 11 Sep 2025 07:50:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwicJ-0001By-2X; Thu, 11 Sep 2025 10:49: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 1uwicG-0001B4-IX for qemu-devel@nongnu.org; Thu, 11 Sep 2025 10:49:40 -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 1uwicC-0004IX-Ug for qemu-devel@nongnu.org; Thu, 11 Sep 2025 10:49:39 -0400 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-672-IUJdMWADM1ah9u0uP6yPcw-1; Thu, 11 Sep 2025 10:49:34 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45df609b181so6530465e9.2 for ; Thu, 11 Sep 2025 07:49:33 -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-45e0159c27csm14941575e9.8.2025.09.11.07.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 07:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757602176; 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=qhARN+mNZ8/BVngVsPUupvVPf6ZiX6bQWjwA8ImXvMA=; b=egzkRDWoECenq9yh+Mfn4Zbk6NWSLTyaoXnQwCTWQxpCGuOtGKIk8SREeRIuwn5VVec3Pt k41WKn0F3DMdKVyFdiyeU1P6HDamsEwvGYdPlI/thuW3HheFaK67u2VfmopoF0apySpl17 UgWvoY6ZI67iB8vJwOmNXXdv1yjTRWY= X-MC-Unique: IUJdMWADM1ah9u0uP6yPcw-1 X-Mimecast-MFC-AGG-ID: IUJdMWADM1ah9u0uP6yPcw_1757602173 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757602172; x=1758206972; 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=qhARN+mNZ8/BVngVsPUupvVPf6ZiX6bQWjwA8ImXvMA=; b=ZfMdeuzmjMzM8CtJEkpk9HIa5vElChXx778cxwlV4redd6D4kK1wcyHVVEjKEMZUYZ ZV+xrm9OMDcXpLQCpuZkCMrcNjufYHREKF1Q3PmYi/2ZUr2+J1Hh/aQFoqUkfCZNz3k1 7ori8+NGUUB1DpFPhxQmkKWT9Y/SWlXEXGx8mQNzefr14NKZqQrauUGDl0+rBJXEbd08 iwnJPikwwogrXzpvtJHn3azErEVc8U+XvBqTBYMhVCgwnZA3VOAYAW7/+Nn/cJdLo9nL rqPLgIZpAl56b+qQrdsR8NJUn+PKdDcAQIs7mgpF5yukfq5irA8g+3XtRVDH2g1bOFR7 ysFQ== X-Forwarded-Encrypted: i=1; AJvYcCUbC9zp4ANqDv2Q4XWcqQhkbiuuYLJ1nyRUmmyyFDD7ZfX+Du4UkGMvR/alZXt/k8pg2a7Bkl3ir1cq@nongnu.org X-Gm-Message-State: AOJu0Yy68YW2UigSX2YeugTOGHx31Qk0TieWW+u21oSo8dpPudv22sB5 ODWITMOM8GQTMz+dSQXzLgKMzhc4Q9gcIjvg11u3YXnY8cErHMNrXrH9sGxvyme8Hrqibs5oL5E tneThCLHuVFrUtul3uBq3XWb/r8I6v0aG76Wz6V9q+mb8IyoSWEd4j2M4 X-Gm-Gg: ASbGncuxAfsH9/T9S2nha49aJ9Ya0W35TGU0x91e3VDCdBUzqn/DtS4eeefObFl8ZlD 1fxfK7AflPkOfyTH2whIueBZbAXlPDxF/M6ttqN68mmlhceUxSSlrPSiVjcinKlTZ1Xk+sKJOpI W7qdEK2Qz8AkMany+F5uG2tn+p43ao3xNZ2KanHo6XZtJqwQyCrGlhnFFQGN3CSDqbiR6T3dcvK mDJimnPYB1/0i+117uiM+GrNJZjoLMPn84aI5TJaHLRnvDmNMOLPwmJ3PIZ96MUoQkFvCOthk9O eFnR8I4hnYi8SNYGXh28MUAaxg+aFyxWSG4LxIx5JnpdLTk2Ncm9v7y9mUBhDeKeEC3+U61s03K NWOlVSDPm7Cw2H0hZc33OGIXVu0ub X-Received: by 2002:a05:600c:458d:b0:45d:d50d:c0db with SMTP id 5b1f17b1804b1-45dddea5102mr187737205e9.15.1757602172212; Thu, 11 Sep 2025 07:49:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+kA6YZTRhZd5X5QimgLs1ZYj0Z47mJrQEG6Ss0yU0cL2ujYrc0KdLoKgcnkha3tXuafRtVg== X-Received: by 2002:a05:600c:458d:b0:45d:d50d:c0db with SMTP id 5b1f17b1804b1-45dddea5102mr187736895e9.15.1757602171717; Thu, 11 Sep 2025 07:49:31 -0700 (PDT) From: Sebastian Ott To: Peter Maydell , Paolo Bonzini Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.linux.dev, Sebastian Ott Subject: [PATCH 2/2] target/arm/kvm: add kvm-psci-version vcpu property Date: Thu, 11 Sep 2025 16:49:23 +0200 Message-ID: <20250911144923.24259-3-sebott@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250911144923.24259-1-sebott@redhat.com> References: <20250911144923.24259-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_H5=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=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 @redhat.com) X-ZM-MESSAGEID: 1757602251062116600 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 | 70 +++++++++++++++++++++++++++++++- 3 files changed, 80 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 c15d79a106..44292aab32 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -974,6 +974,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 6672344855..bc6073f395 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -483,6 +483,59 @@ 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 +static char *kvm_get_psci_version(Object *obj, Error **errp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + const char *val; + + switch (cpu->prop_psci_version) { + case QEMU_PSCI_VERSION_0_1: + val =3D "0.1"; + break; + case QEMU_PSCI_VERSION_0_2: + val =3D "0.2"; + break; + case QEMU_PSCI_VERSION_1_0: + val =3D "1.0"; + break; + case QEMU_PSCI_VERSION_1_1: + val =3D "1.1"; + break; + case QEMU_PSCI_VERSION_1_2: + val =3D "1.2"; + break; + case QEMU_PSCI_VERSION_1_3: + val =3D "1.3"; + break; + default: + val =3D "0.2"; + break; + } + return g_strdup(val); +} + +static void kvm_set_psci_version(Object *obj, const char *value, Error **e= rrp) +{ + ARMCPU *cpu =3D ARM_CPU(obj); + + if (!strcmp(value, "0.1")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_0_1; + } else if (!strcmp(value, "0.2")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_0_2; + } else if (!strcmp(value, "1.0")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_1_0; + } else if (!strcmp(value, "1.1")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_1_1; + } else if (!strcmp(value, "1.2")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_1_2; + } else if (!strcmp(value, "1.3")) { + cpu->prop_psci_version =3D QEMU_PSCI_VERSION_1_3; + } else { + error_setg(errp, "Invalid PSCI-version value"); + error_append_hint(errp, "Valid values are 0.1, 0.2, 1.0, 1.1, 1.2,= 1.3\n"); + } +} + /* KVM VCPU properties should be prefixed with "kvm-". */ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) { @@ -504,6 +557,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) @@ -1883,7 +1942,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; } @@ -1922,6 +1982,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 %lx is not supported by KVM", psciv= er); + 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