From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249327; cv=none; d=zohomail.com; s=zohoarc; b=eG/H6y9H7Pld2A+cYG2r7xVMsewSwrXALsvVqAGvuSBFyDoyJ7y7m36zEyvLOJXMtFk7OJUAigj3kFbYiC5YAR39Brbhgm+7BYIe73+4YFVoAr0RY/F/lNFzQ/MvlGezwDjU8tXDTSV4hsLZj6/DxWjgJMvNxW5CqlIDUfdjz1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249327; 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=8CqIF9FP8p96gb/VHbQI13ZloGCTmxSrkNwnf/ohF3E=; b=HIIE/x3yG458St+8Rl8aCmCXfjFwiNQZlEv9zN2ZFwW2bwNJr7M5Th11uHkQFn0uvRuqCIubpADJK5aziIJGVDp8ohDEU/i5w2TxL1OTKajThVz8UsQ38/kIvsU1dKdhSGserBnQHfTQjdnTksqKsv0VBoS94LzVPscuSZ9sM9U= 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 1710249326991565.0398645088375; Tue, 12 Mar 2024 06:15:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1xs-0007w1-JO; Tue, 12 Mar 2024 09:14:44 -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 1rk1xm-0007s5-LU; Tue, 12 Mar 2024 09:14:38 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1xj-0006nU-8y; Tue, 12 Mar 2024 09:14:38 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5d3912c9a83so3564549a12.3; Tue, 12 Mar 2024 06:14:33 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249272; x=1710854072; 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=8CqIF9FP8p96gb/VHbQI13ZloGCTmxSrkNwnf/ohF3E=; b=SXrY5xGwhmTQy+jS0QVzUsoXSqYcwc9hrbKrJKslutXhx6kQ659dTnGwtAJnxQi/Sm h+C1UrC1XStEtBTHbIMn+qwxwgI6mp9ltqrFuXAqPLsHXzOKjmCLKpU1ZxBHR0QAvx02 oe44ajczv5dRL7iDJjxPOkJ4Ow6vQkhfoTZkStZbvx/XnKRiy4VoibiEcULGjeviP6Q3 YlMvixJ5wRjuX4tSXwU8rZIAow08c5AE56b6XQFCYgXfVj5Q53nncIF/MsRK6dxQRKqW UNAfNoWkKulpu1LvJFA9cE+D+TbRwvk8371SrtzoAdClDY6fUiHNE4tG3YG/hZzp7HFB ji1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249272; x=1710854072; 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=8CqIF9FP8p96gb/VHbQI13ZloGCTmxSrkNwnf/ohF3E=; b=KwoupgJkGDGQRX8sXADE1iK3m8JIPJyLTf9kj1KvBSGhROUg70CDWhPaMYoqo+kf+0 exmy5FPyUddKMslBzj2l7hMUV4PwJX8KgeIyNQ0qlkIPSyd11UvMgQiapFWwTVwbvibN kVFzB9BlXFm9YrGFbZZBhAOORkMkmGj+h53mECHX1PFAtz0FnjJ1AHmUewpwLa+Kfgfb fY14EeY0DC6D7eiCuH72CiqKNlRKS6z1U4gOjR4YEqbZypM0dg5KYp1CHgw7ZeiP7OV8 jzXFLW9QV3nr1KxowR8RDhsf6w3ITGJVvO9cLh5YcbGfAlsjWo4qiToN/nne/P0+v4bV qgvg== X-Forwarded-Encrypted: i=1; AJvYcCUqY9ALEZ1qnmo7X8ALP4p6GsPkn9cbgYDHBLgqLKlm4WHkZIpZLyngRZKxe04TU1Xg+YBQqfwvt5MS4b4ScAEWgisqh5o= X-Gm-Message-State: AOJu0YwDodvuqOJJ8G7CIKokdUmBVPcTjT8IZSzVrJsBT6i/nFJzjHPX rwJXUIkbBrRUi+3HHc8POvSE8DoNVHoi9tNC88MpXtImnVyoyB1xmKXF8YCSEJA= X-Google-Smtp-Source: AGHT+IERaEWABXWuzVyVTGPfVXTFhjkWyW/l7+tpsbFO+PL53jiamDSUGyNyMflrfZtzFHACBlu5Eg== X-Received: by 2002:a05:6a20:8922:b0:1a3:f46:853e with SMTP id i34-20020a056a20892200b001a30f46853emr180173pzg.60.1710249272107; Tue, 12 Mar 2024 06:14:32 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 01/10] ppc: Drop support for POWER9 and POWER10 DD1 chips Date: Tue, 12 Mar 2024 23:14:10 +1000 Message-ID: <20240312131419.2196845-2-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::52e; envelope-from=npiggin@gmail.com; helo=mail-pg1-x52e.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249328128100003 Content-Type: text/plain; charset="utf-8" The POWER9 DD1 and POWER10 DD1 chips are not public and are no longer of any use in QEMU. Remove them. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_cpu_core.c | 2 -- target/ppc/cpu-models.c | 4 ---- target/ppc/cpu_init.c | 7 ++----- target/ppc/kvm.c | 11 ----------- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 40b7c52f7f..50523ead25 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -394,10 +394,8 @@ static const TypeInfo spapr_cpu_core_type_infos[] =3D { DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power8e_v2.1"), DEFINE_SPAPR_CPU_CORE_TYPE("power8nvl_v1.0"), - DEFINE_SPAPR_CPU_CORE_TYPE("power9_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power9_v2.2"), - DEFINE_SPAPR_CPU_CORE_TYPE("power10_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("power10_v2.0"), #ifdef CONFIG_KVM DEFINE_SPAPR_CPU_CORE_TYPE("host"), diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 36e465b390..f2301b43f7 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -728,14 +728,10 @@ "POWER8 v2.0") POWERPC_DEF("power8nvl_v1.0", CPU_POWERPC_POWER8NVL_v10, POWER= 8, "POWER8NVL v1.0") - POWERPC_DEF("power9_v1.0", CPU_POWERPC_POWER9_DD1, POWER= 9, - "POWER9 v1.0") POWERPC_DEF("power9_v2.0", CPU_POWERPC_POWER9_DD20, POWER= 9, "POWER9 v2.0") POWERPC_DEF("power9_v2.2", CPU_POWERPC_POWER9_DD22, POWER= 9, "POWER9 v2.2") - POWERPC_DEF("power10_v1.0", CPU_POWERPC_POWER10_DD1, POWER= 10, - "POWER10 v1.0") POWERPC_DEF("power10_v2.0", CPU_POWERPC_POWER10_DD20, POWER= 10, "POWER10 v2.0") #endif /* defined (TARGET_PPC64) */ diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 1d3d1db7c3..572cbdf25f 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -6350,10 +6350,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pc= c, uint32_t pvr, bool best) return false; } =20 - if ((pvr & 0x0f00) =3D=3D 0x100) { - /* DD1.x always matches power9_v1.0 */ - return true; - } else if ((pvr & 0x0f00) =3D=3D 0x200) { + if ((pvr & 0x0f00) =3D=3D 0x200) { if ((pvr & 0xf) < 2) { /* DD2.0, DD2.1 match power9_v2.0 */ if ((pcc->pvr & 0xf) =3D=3D 0) { @@ -6536,7 +6533,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pc= c, uint32_t pvr, bool best) } =20 if ((pvr & 0x0f00) =3D=3D (pcc->pvr & 0x0f00)) { - /* Major DD version matches to power10_v1.0 and power10_v2.0 */ + /* Major DD version matches power10_v2.0 */ return true; } =20 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index bcf30a5400..525fbe3892 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2369,17 +2369,6 @@ static void kvmppc_host_cpu_class_init(ObjectClass *= oc, void *data) =20 #if defined(TARGET_PPC64) pcc->radix_page_info =3D kvmppc_get_radix_page_info(); - - if ((pcc->pvr & 0xffffff00) =3D=3D CPU_POWERPC_POWER9_DD1) { - /* - * POWER9 DD1 has some bugs which make it not really ISA 3.00 - * compliant. More importantly, advertising ISA 3.00 - * architected mode may prevent guests from activating - * necessary DD1 workarounds. - */ - pcc->pcr_supported &=3D ~(PCR_COMPAT_3_00 | PCR_COMPAT_2_07 - | PCR_COMPAT_2_06 | PCR_COMPAT_2_05); - } #endif /* defined(TARGET_PPC64) */ } =20 --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249433; cv=none; d=zohomail.com; s=zohoarc; b=Z3eI+do6bY3um7oCaBbXH8iz3q7Wy/kKUDJvPjkyu39njM51Aw+hnjtXboh1c+QnV90qV24mjajYAScS56gUDkbG/DQEPxHyZh9HtKjMIpFv1//D4DSVX1tOLmuP14Chf0h/qnrM16t1o6KU5MfsXyTyA5pu4u7YVxzBF6j5EbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249433; 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=2hIrP+GOO7mqBVQBlneIZNaQyZ+Zlpvjob7t6Cp/ux0=; b=eK4M3mgsPUnPTo38G4besY/fI346wEk1sjVBIJWx0t0dblc869wA3OINiciqYD7Xnp2IooSDwKBctXsjguleeI7zwn8wRzNsTAMvJfXn1mjof9LcwPYprDyWOdVsPCvFxA17ELfwP6ah0jXjijG2oKsK8L9dxI1wLHHtbZ4Ck5U= 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 1710249433085125.45047014167767; Tue, 12 Mar 2024 06:17:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1xv-0007yh-G3; Tue, 12 Mar 2024 09:14: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 1rk1xo-0007sO-LE; Tue, 12 Mar 2024 09:14:40 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0: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 1rk1xm-0006oe-CF; Tue, 12 Mar 2024 09:14:39 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6e6adc557b6so305177b3a.2; Tue, 12 Mar 2024 06:14:36 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249275; x=1710854075; 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=2hIrP+GOO7mqBVQBlneIZNaQyZ+Zlpvjob7t6Cp/ux0=; b=fAKSh2Nfc7QU2xQqKdZ9EPIg+FfGiQu0Od6kNKEpp2wiJQG+VJJ+hZWPPOodRGHaJ/ STAUd0zfFUMTBLPZODb+PfcRFq1u0um6yTORuXDE+ZWimDu6gEgHvK3Q0tZiY9YXhd92 M6PXVfGWLFWtM9D4Nj/775rUCd11ds12BCYkI/aznkcoey0+pjrVGnoTUkDiW7xScwZW brRmmny8Y+oz2HK1Myv24kMa5mXwAT57ogKp2pfxTPnT4fPxnQGkHxfEtLsQ4zPoJlgD K59JWSaiZCLKhv9cIf5B33cBOtqlktI2XwlsWyOFy6Q1Zin+wno0TyEvF8/ap1ANDWV1 VnEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249275; x=1710854075; 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=2hIrP+GOO7mqBVQBlneIZNaQyZ+Zlpvjob7t6Cp/ux0=; b=FXsXXjptAd2/6T+WzPebx0wQeyOYnTm7it62CNFZdcTq8q92RhiYTYWAjy7Bn5OloE AqM33OVtAECsyRbMTkCLgcG/qp6Ee0AoXRtjKmhOfKC6SrpZJQEB94Zie2uVGmmkZSBN tmeDHRupLYNBIC879DZE0SbeGVq8cTgpKJVulIJh60u27xbt7+Zwwg4Lb+etye9u0PXi pi78an/+9nw3SpWIU5tYh6Gl9HVSw+nYltQ4FBrkBxcP7Kx0z2WIFH5Xf7u7lNmWWv/q i+ZY2YobhjYq6cqdV477wOWxM5v+o60UhWTWEX0ogLfAuBSrH4h/UIVO5qfGS4KNOFNW TPBg== X-Forwarded-Encrypted: i=1; AJvYcCXL7OzVFPytPdl+iZVFpTz8KuL+3H6H1jKC362kEQfk8D38jsIFlfpe8SQpiABhQzvcoFxNnmEAbRkB4JrVFTC5PHolKp4= X-Gm-Message-State: AOJu0Ywc6R4BS1X9z6VHc2LpBbbVsy+Cwnz3DOTDXhCXJSj75Nqio1m3 D/VelePR15yUHBba0k2EHmpZ+dZDrGb03vvZgGTl8mGmzQ5zHiaUErT1VUPoJEQ= X-Google-Smtp-Source: AGHT+IFHM5QqD+FFwWUSTdS0ckLdZ5o9YfQGZpazDX7iatZ5b4p9jenIQv/feUDAx46Gbaj6fFRucw== X-Received: by 2002:a05:6a00:3a2a:b0:6e5:599a:52b7 with SMTP id fj42-20020a056a003a2a00b006e5599a52b7mr241282pfb.28.1710249275542; Tue, 12 Mar 2024 06:14:35 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 02/10] target/ppc: POWER10 does not have transactional memory Date: Tue, 12 Mar 2024 23:14:11 +1000 Message-ID: <20240312131419.2196845-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::42e; envelope-from=npiggin@gmail.com; helo=mail-pf1-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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249434693100005 Content-Type: text/plain; charset="utf-8" POWER10 hardware implements a degenerate transactional memory facility in POWER8/9 PCR compatibility modes to permit migration from older CPUs, but POWER10 / ISA v3.1 mode does not support it so the CPU model should not support it. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- target/ppc/cpu_init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 572cbdf25f..b160926a93 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -6573,11 +6573,10 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64 | - PPC2_TM | PPC2_ISA300 | PPC2_PRCNTL | PPC2_ISA310 | + PPC2_ISA300 | PPC2_PRCNTL | PPC2_ISA310 | PPC2_MEM_LWSYNC | PPC2_BCDA_ISA206; pcc->msr_mask =3D (1ull << MSR_SF) | (1ull << MSR_HV) | - (1ull << MSR_TM) | (1ull << MSR_VR) | (1ull << MSR_VSX) | (1ull << MSR_EE) | @@ -6617,7 +6616,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->flags =3D POWERPC_FLAG_VRE | POWERPC_FLAG_SE | POWERPC_FLAG_BE | POWERPC_FLAG_PMM | POWERPC_FLAG_BUS_CLK | POWERPC_FLAG_CFAR | - POWERPC_FLAG_VSX | POWERPC_FLAG_TM | POWERPC_FLAG_SCV; + POWERPC_FLAG_VSX | POWERPC_FLAG_SCV; pcc->l1_dcache_size =3D 0x8000; pcc->l1_icache_size =3D 0x8000; } --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249447; cv=none; d=zohomail.com; s=zohoarc; b=b/a30fQ/kb9X30epWYPLVaPJ6AZTidw39x809Gwz/2qKuZM6ioQp0smrS0jTNJ/6U2rcFaw1QOLZUlNKZTz8spj0BFh9AyDDaTAH9alqm6Jf3H58ECI66UoPEAvMuql9ElNoryvNwzKqp5MxJikZOcRv73rsIz5nWN/ENEb23Bc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249447; 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=6B7WRsdl13z1HZyfIAIaADMcs0Ruf91d8bxZELsi1fE=; b=mkygPL9NuNd2Z5iTrdJa4aGJd0Xx7sZtjhS8QxpK0f+9ymzM1rZBppuuEZzEKDoYySyO1xU+xb7gzEKKpwkVIiJyye3V1DjXjS2W7+g2oT32LmD9ho6j3hnq7nDKU1UYkQqvnlQkcxntXH97DGXuioJlzaYB6dwoVWhZLpwwb98= 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 1710249447922748.4787617580919; Tue, 12 Mar 2024 06:17:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1xx-00080k-2z; Tue, 12 Mar 2024 09:14: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 1rk1xr-0007vg-TE; Tue, 12 Mar 2024 09:14:43 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1xp-0006p6-74; Tue, 12 Mar 2024 09:14:43 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6e6a9fafacdso319471b3a.2; Tue, 12 Mar 2024 06:14:40 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249279; x=1710854079; 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=6B7WRsdl13z1HZyfIAIaADMcs0Ruf91d8bxZELsi1fE=; b=I2UwWNdMyP/NeR2vKesjthn+crNjsqealjgmcrbIMjHiK9mFKVqAtY1N2Htzt9wGJV 2eA+4Vp3371yCj4GLOklT/8Wwh8q9LzXyFKnyOZ7rz1+Hy7dvGomL0Jz+/uYWVklJFYW ZDL2SOMjGSrs1XacvsdzNSQwO4FI9+9q6FE1OwB1in9MSgNB58dv0UYUZoeYRhhAeiiI 9wK1GGEWr9z6tZtWemy2Ziat7QafUdVpXTwu7aq90kDnUBBjy892kTqgfbVZFh6P/d1I PqQB4revXhUtiPtnwvVTl8xQkzaRg+D8Py9yHsEu9MVx3qyvP0b0jCQ5GDDHEpOdmrxY FyaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249279; x=1710854079; 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=6B7WRsdl13z1HZyfIAIaADMcs0Ruf91d8bxZELsi1fE=; b=TXAWhAMB1MyUx2j4RAOnl6gaT8LVYjhW1xcMk2k88oOhgopCLydpoUNXp2kTYYqq9j n7M0L/4frcmzeqDZ+cRX5VFh/J0Krol9P5aV9RsYSb63mNTuBZwYBi8eCbzWEbAE6LiV SsdteyWdlrG5mSX1nrRFW/KkWUXqiqPymuNj4kGWJDrVeDCLUimDM7NsVb97vznN8QCj OBCOTadVWMdQuTn/aB3DaoRefeo4HFhmvrOV+nFLTzm++AiXaHN+AxBxB5TSpeaH344n IlaYdIvsGfFsT+yTUoEl8e1DvA6W3eYYx77+W3W518fFY5ZNDqjccssHQx5LYxDx2DVU bCXA== X-Forwarded-Encrypted: i=1; AJvYcCUQI11dwQz3I6hnHXqMPSBp7KKFrMkyLCoMO+fpYCB3RVpQjy0gGVcAXYizOXtnc3hrqPQJzOSYumIaXLE6IDdHNGu1Cv4= X-Gm-Message-State: AOJu0YzNY1Lg15KfXyNzvhRtwjGfciWAvqVOj8eJp2VRGKKdoPtbLPME vHB7YLS1Pw5RU75F3Tb8ECtXBTLhOcFVvolTmTMQjDu5T3U5mO4obd+I9JJoyFA= X-Google-Smtp-Source: AGHT+IGE+6cpBgTHDXF4fVTWZ/G6Jz7rpOdQO30EQRe5U9k090hX6ixTbc4JnI+qcj1kkfZSYxaCYw== X-Received: by 2002:a05:6a00:c90:b0:6e6:9fdb:7323 with SMTP id a16-20020a056a000c9000b006e69fdb7323mr2726613pfv.4.1710249278950; Tue, 12 Mar 2024 06:14:38 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 03/10] ppc/spapr|pnv: Remove SAO from pa-features Date: Tue, 12 Mar 2024 23:14:12 +1000 Message-ID: <20240312131419.2196845-4-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::42a; envelope-from=npiggin@gmail.com; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249448789100001 Content-Type: text/plain; charset="utf-8" SAO is a page table attribute that strengthens the memory ordering of accesses. QEMU with MTTCG does not implement this, so clear it in ibm,pa-features. This is an obscure feature that has been removed from POWER10 ISA v3.1, there isn't much concern with removing it. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/pnv.c | 2 +- hw/ppc/spapr.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 0b47b92baa..aa9786e970 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -150,7 +150,7 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, voi= d *fdt) uint32_t page_sizes_prop[64]; size_t page_sizes_prop_size; const uint8_t pa_features[] =3D { 24, 0, - 0xf6, 0x3f, 0xc7, 0xc0, 0x80, 0xf0, + 0xf6, 0x3f, 0xc7, 0xc0, 0x00, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 55263f0815..3108d7c532 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -233,17 +233,23 @@ static void spapr_dt_pa_features(SpaprMachineState *s= papr, PowerPCCPU *cpu, void *fdt, int offset) { + /* + * SSO (SAO) ordering is supported on KVM and thread=3Dsingle hosts, + * but not MTTCG, so disable it. To advertise it, a cap would have + * to be added, or support implemented for MTTCG. + */ + uint8_t pa_features_206[] =3D { 6, 0, - 0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 }; + 0xf6, 0x1f, 0xc7, 0x00, 0x00, 0xc0 }; uint8_t pa_features_207[] =3D { 24, 0, - 0xf6, 0x1f, 0xc7, 0xc0, 0x80, 0xf0, + 0xf6, 0x1f, 0xc7, 0xc0, 0x00, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00 }; uint8_t pa_features_300[] =3D { 66, 0, /* 0: MMU|FPU|SLB|RUN|DABR|NX, 1: fri[nzpm]|DABRX|SPRG3|SLB0|PP110= */ - /* 2: VPM|DS205|PPR|DS202|DS206, 3: LSD|URG, SSO, 5: LE|CFAR|EB|LS= Q */ - 0xf6, 0x1f, 0xc7, 0xc0, 0x80, 0xf0, /* 0 - 5 */ + /* 2: VPM|DS205|PPR|DS202|DS206, 3: LSD|URG, 5: LE|CFAR|EB|LSQ */ + 0xf6, 0x1f, 0xc7, 0xc0, 0x00, 0xf0, /* 0 - 5 */ /* 6: DS207 */ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* 6 - 11 */ /* 16: Vector */ --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249394; cv=none; d=zohomail.com; s=zohoarc; b=SCtnK87zMMlbuVt2CrhbaQG9KxyEP6rUSuZSZ+iVpyt6njLg/FAbyKvpOTct0sYxAKGfQpsqlG9/6y4BILGhvhXlX1huZoJFTkVDc5gWnNaBRK378AsqxAwAPut0aYCr6oVPTUNLCIHw9zc22miNl6QEwkMF2fLv5TaXiayJ9Ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249394; 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=KRNFEd2YKSH0GA9c/OZVzyVQTq0v73fyutt9t+Ehgsc=; b=jR3zYe2MGE5qpSNRHu3s2D7XbWhaws4DTtGhJsufPBiRc9WHg1eWu7GZyJUFjo1yk9vbDRVgmONFAC791tCKnOP8/kuqGrHXfxlFHgMVa0H9jU+jSXHfdXY6KcbxC1y2un1OYb9AwJKKuEMoGJL16nlKbmRJhnz0UCyJSZgxhEo= 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 1710249394279372.24444782749174; Tue, 12 Mar 2024 06:16:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1xz-000832-Qi; Tue, 12 Mar 2024 09:14: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 1rk1xx-00080l-8L; Tue, 12 Mar 2024 09:14:49 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0: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 1rk1xs-0006pb-EE; Tue, 12 Mar 2024 09:14:48 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6e68bab3e4cso2108295b3a.0; Tue, 12 Mar 2024 06:14:43 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249282; x=1710854082; 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=KRNFEd2YKSH0GA9c/OZVzyVQTq0v73fyutt9t+Ehgsc=; b=ILcSMTkWs2IEqnth5+lQw2LshCCow/9GsCPhN6cjWA3V4V3x+CE1zGtEbg4sXAwFBm hdRGoMQcVtEgABJoha0elgOzHk22AIgZpya5C0PkdsE/vJb3Cqzev3vqX1PI9G00shg2 Yd9ZBdzLCsWd8EewOMNezBxzZlyygxTlN0I5l3gYAzlqH07AOR59DSvCX/zM15PYMRFN j1vxPBOPCeAShcOrQUbz5Zfz05uhdVY7VFvkjED3ttPAyv8P8/ttYa2uOY4d3Tfl41q1 rmXLgudEGX8peNzwxqAkaucz5YA7aXtDekAbMZPqgyPHDqRfwtV1WoK7JbKGf5GcgNqq BTWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249282; x=1710854082; 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=KRNFEd2YKSH0GA9c/OZVzyVQTq0v73fyutt9t+Ehgsc=; b=Ni2F3dPxRflVuTrId5zS5coNY70N83ZpfWV81pGNoxc46hgUst8hImIjgNJ8fdQuaF tksV32OjHCXvbb1hk2jw7w1VVB5WOfiXh/IpPjh/TecZSCLyz1jCBs3MVLbBEdQyVYYs hqNYp7WOaJQ86RbeVT9VErOgk8tB1dXmoPJTBfZiXD2Ivkz0CufWbajTWBqWMmgpEuTl 3PsM238lGUmuBMsyxpDrol2d2DfZO3GtTLH/1u2XgsqIg6Zn0WV0sydJ9xAlrasssyCN 0dYfJuKhqLI7MEU0GbzVmD1BKbQHz3LbpHx23ZLC4LiIpiyc7UxPEVShBPR7IwprXTFu yMUw== X-Forwarded-Encrypted: i=1; AJvYcCXdnkJ5e+DZzCuWgZqzIvE2dXJH7aHUkVGlEJJfjdoI189zImLU1+O2dv0YH06gkGgpO+Jlk/b9SWE3dTWHKohD4Shns3k= X-Gm-Message-State: AOJu0YyUygeYCeeokn28TkmQP3JmWQN6MWcbJBFIpdVCTWIWPwqVpjeN Lz6EtVzX5VWhMh1/T+VbV8VOsArgnv+B4HCGBEnm5fUUUAmBPw/k0kOWDwn+R0g= X-Google-Smtp-Source: AGHT+IHgx0iX78ZFSAt1Sg8Fi8zv1v5duSMN8J7u8UJXdU/WuVQsExzXkY22D7fzf2KwfDgwEYUb5g== X-Received: by 2002:a05:6a00:1788:b0:6e6:a0de:563a with SMTP id s8-20020a056a00178800b006e6a0de563amr2515115pfg.15.1710249282249; Tue, 12 Mar 2024 06:14:42 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 04/10] ppc/spapr: Remove copy-paste from pa-features Date: Tue, 12 Mar 2024 23:14:13 +1000 Message-ID: <20240312131419.2196845-5-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::435; envelope-from=npiggin@gmail.com; helo=mail-pf1-x435.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @gmail.com) X-ZM-MESSAGEID: 1710249394607100001 Content-Type: text/plain; charset="utf-8" TCG does not support copy/paste instructions. Remove it from ibm,pa-features. This has never been implemented under TCG or practically usable under KVM, so it won't be missed. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3108d7c532..4192cd8d6c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -237,6 +237,10 @@ static void spapr_dt_pa_features(SpaprMachineState *sp= apr, * SSO (SAO) ordering is supported on KVM and thread=3Dsingle hosts, * but not MTTCG, so disable it. To advertise it, a cap would have * to be added, or support implemented for MTTCG. + * + * Copy/paste is not supported by TCG, so it is not advertised. KVM + * can execute them but it has no accelerator drivers which are usable, + * so there isn't much need for it anyway. */ =20 uint8_t pa_features_206[] =3D { 6, 0, @@ -260,8 +264,8 @@ static void spapr_dt_pa_features(SpaprMachineState *spa= pr, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 24 - 29 */ /* 30: MMR, 32: LE atomic, 34: EBB + ext EBB */ 0x80, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ - /* 36: SPR SO, 38: Copy/Paste, 40: Radix MMU */ - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 36 - 41 */ + /* 36: SPR SO, 40: Radix MMU */ + 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ /* 42: PM, 44: PC RA, 46: SC vec'd */ 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 42 - 47 */ /* 48: SIMD, 50: QP BFP, 52: String */ --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249391; cv=none; d=zohomail.com; s=zohoarc; b=QpNXsUo1A3b6j43ES0xTwUL9cbRqOQ74YrJa4lSqr+FJsZwnPZH0oSNZXRSSUdDlsGnphfqiTI38+tFsSEHXKezrIInwfpgzIyXs2KoNJkT5a4nrI1dTct8j3nCB5RFzbo8pbq8Yrqug57PiDmk6yT6pmYri4ruNEuLgJ5VP28k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249391; 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=PcqLLu3u5PZ1llo42lrjUzLPqI0T1odBfRlVjyR5kEI=; b=Osnm9GOR05llJgcfc5YhljmXRhHPldts4sXHBgeK5y8WSgtpl8FjgMKDSkDUkv2p8WrDMcKWsmJ8WKAhqnawY5lihq3IkzS0yeRU768IeInWNOmia6S911b/2Xr8tHoPhc+KOtZP7knTWtRqquNHOnAIx186KtMEWtrZKqBBqLI= 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 1710249390860737.9730849250274; Tue, 12 Mar 2024 06:16:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1y0-00083L-Fg; Tue, 12 Mar 2024 09:14:52 -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 1rk1xx-00080x-NO; Tue, 12 Mar 2024 09:14:49 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1xw-0006q5-3R; Tue, 12 Mar 2024 09:14:49 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5ce2aada130so4682577a12.1; Tue, 12 Mar 2024 06:14:47 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249285; x=1710854085; 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=PcqLLu3u5PZ1llo42lrjUzLPqI0T1odBfRlVjyR5kEI=; b=LObvG6SSUM1JfYe6lIp5JeczvkffgRr0jtMeyFLxwj9J9Jt5lODlTrEp8DcxWHVyAS by+70Vpr5cqJV58D5H2Z+lvX2rRBCUmBjLxgnzLRitulm97V5sQHiMODS5Cigqu6va6J 4K9J22p0aoUMM51iegs6CD+vXzqZx671CcMzIlVqyncyV8Q6Z3lgsCLMdcv6DKCqjjF7 LQzbxLqx0Xz+iEoEWXUj9yOxXlz+lyCiv8VD2WBH47WdiZ2jDeDn1oHVOKF6vgCRIq/r 9NJj/qPt3O9nhcpSFsFII3suoK1T9AQe+tb0+9lNSzo56iVvYjnkVqSAlCXVTaViuNYf qXng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249285; x=1710854085; 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=PcqLLu3u5PZ1llo42lrjUzLPqI0T1odBfRlVjyR5kEI=; b=cVZ5xvopIodAPb7l9188yl+DTWbRmFyjPhMFqVagN1Vmso5Ipl7n43CJ5XgR9ioz1s hVvcA0jVTDa5cwuqEx77w8O0FcdesPYpYF9A8WzaENX/IoPmuvtVasDTBWydjgHYUKpQ Ryv5vhBe+7C4ZsDueU5SAJijr/y+LFroSZuebo0THj9Gpon9hZe/6g2BBd+j9SxQQv4j frVl2WgonJXI25oX/NLjrD8LeVGr0vWDzaeNMaJ8YjBe1HbbB83QdIkvxcTNPa38JFV8 6MmUNkIg51159BkD9nE1qwFMnZBPq97Aj/8q5uSHrO5yr2qptj3eMvU26uiPsCqzdz4N zrSQ== X-Forwarded-Encrypted: i=1; AJvYcCWxnIYV9OLMJVTYwfADpDFziDpynIcUrV0zUV1bgUwHL2zVF6DdKD0kfANnmmgzxqW8x9fx6vMG8xdIdirdtyNCXm50YXk= X-Gm-Message-State: AOJu0YyVGr1eWTTPWJYf+TqFUdqd9eW6RCqDlrAVINtGp8TjaGC1R/aq VTDa3+tGK6zsVz8WNwOoHE7T6/2st9MHHERlZ2XOACwVZNY9x/E9VH/X9lKEjOo= X-Google-Smtp-Source: AGHT+IHIqkGQN7alVJE2tBmGwDOFv4IWM9iNJIQZKFYVbfKYYAeqjuulbXif2ArixTPllbBU0WMKFQ== X-Received: by 2002:a05:6a20:7b01:b0:1a1:501e:814c with SMTP id s1-20020a056a207b0100b001a1501e814cmr2769845pzh.29.1710249285568; Tue, 12 Mar 2024 06:14:45 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 05/10] ppc/spapr: Adjust ibm,pa-features for POWER9 Date: Tue, 12 Mar 2024 23:14:14 +1000 Message-ID: <20240312131419.2196845-6-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::533; envelope-from=npiggin@gmail.com; helo=mail-pg1-x533.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249392448100007 Content-Type: text/plain; charset="utf-8" "MMR" and "SPR SO" are not implemented in POWER9, so clear those bits. HTM is not set by default, and only later if the cap is set, so remove the comment that suggests otherwise. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4192cd8d6c..5bbd0d7a04 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -258,14 +258,14 @@ static void spapr_dt_pa_features(SpaprMachineState *s= papr, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* 6 - 11 */ /* 16: Vector */ 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 12 - 17 */ - /* 18: Vec. Scalar, 20: Vec. XOR, 22: HTM */ + /* 18: Vec. Scalar, 20: Vec. XOR */ 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 18 - 23 */ /* 24: Ext. Dec, 26: 64 bit ftrs, 28: PM ftrs */ 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 24 - 29 */ - /* 30: MMR, 32: LE atomic, 34: EBB + ext EBB */ - 0x80, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ - /* 36: SPR SO, 40: Radix MMU */ - 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ + /* 32: LE atomic, 34: EBB + ext EBB */ + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ + /* 40: Radix MMU */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ /* 42: PM, 44: PC RA, 46: SC vec'd */ 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 42 - 47 */ /* 48: SIMD, 50: QP BFP, 52: String */ --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249485; cv=none; d=zohomail.com; s=zohoarc; b=nIkQ2rTv4EA7g7Nbw8cr24B9Vafb01Hc8XK5/NCyo7v7WJPCTYvl47it/8dy3TfQKMhPCGRaI9QuiOirUFo2ZucJNQKhY9WndaL2fehGUAaqTp3mxhAJdKPX0gaPKUZL2u+aw8Y+0a5MdMz58R6Q5z/eQZU3x4kHhZXMw9GLJhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249485; 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=tdyNcmPgux9//jKV7mWfb1o9E6QFQPrGkdX2/VZm364=; b=jIfUkGaLCiOMvOY9b53hjNdphDOyzBIReoo0fUPMdy1+E+5HSI1Ecjg3QqOk+A7xqpjMJObBZNJCmwfXg3nEC7qWzIONXtPoVHT0FJilnGNljvTQrghRH8O98RLjKvFqnE4+xJ8o1S9OowKSpeEi/VR9qxDNKAgoLHw7VZtoAV4= 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 1710249485511365.84877010967375; Tue, 12 Mar 2024 06:18:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1y3-0008CU-6w; Tue, 12 Mar 2024 09:14: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 1rk1y1-00084X-FD; Tue, 12 Mar 2024 09:14:53 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1xz-0006qm-SX; Tue, 12 Mar 2024 09:14:53 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6e617b39877so4013047b3a.3; Tue, 12 Mar 2024 06:14:51 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249289; x=1710854089; 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=tdyNcmPgux9//jKV7mWfb1o9E6QFQPrGkdX2/VZm364=; b=RCiaijaBFaV0dV+DOvMFsNhlCfgLrRjyg5tvxC8bNLO2whTs1SPQ9p1vdBgQ9RFrAI kXdh5/DFOzHWdEtABi2UdOJab9q28SXbHsjtnF3fm1ViPPDnBA9Gw1YuYPB19gS/EpAX QLJsHdCLWGsTeg1o8XrKTHDM2kInWsavXUvwH5ED9OQ1ve5W8tpqqgEII99d8aBJxOqU //kwrVxrjum4/AS7LIDF2DL8x87/4vd/07V7fmmDGcywOfJW8ZqbepJ5BpMiJRhYZpWg HQU7FDo025bc/8dOY/LZv8X+0UDcgOOszTd+UA5C9QJSmA/A6baYJATJWRqwbaWAg8p3 MDSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249289; x=1710854089; 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=tdyNcmPgux9//jKV7mWfb1o9E6QFQPrGkdX2/VZm364=; b=NPzlWCM2tnAdVTqre7wHhKocxBrnWe2+08pZPQYFJ6lHSqa7sLH2vnSrHiXr5I2Wx/ sm4vENe2SWLLUqnJX3EHT0QPj6nekrU7Q6z3+Z17wAkjunS7l+KjhYfZDhK5k0y0a3gK SWAOq5+QxkJ0MNPszx0935qQujj2IivUM3569+czy6BGaMJQ3YsLoUg/BbJMRD6tkG15 cKzQXKZU0HEsO3GIoJM9pFt5SFjnLcs7wRyVq3Boh35b6Oczdc/IpvgQGWK8/WLsCx13 ZGaQvibXveB5WA/05zl367Tt+wY2rWdcEKUrMaFk+F74k960nazQfJTTZwUYf+z0OaNQ p7eQ== X-Forwarded-Encrypted: i=1; AJvYcCVRMA5VeUtptSf9JJPxHgLnAbTVhSEey+AnGX8pc6b99k3cjr5aM9eHebtq07Gj59jUSw2WKTzzRuqnst0mwMtyhk09lzo= X-Gm-Message-State: AOJu0YyVRDcOe5X/1QCTUliTueq7akKwUmVwm1ZuuzqHeawAYReAy1G9 RvGSpa8YVbevwNcM6sD+4Q3Q4YdCbvvDxtAp3MuZMeZKLSZUV+HNRDzJPmlny9M= X-Google-Smtp-Source: AGHT+IEEP1B9GBRQHd0WfdS/0J2GAPcmiCROsOY+V7CNlkVar8cAnptlnJBcqC7FbYmQoHj48kI/Iw== X-Received: by 2002:a05:6a00:4b54:b0:6e6:9a11:ccd8 with SMTP id kr20-20020a056a004b5400b006e69a11ccd8mr4989449pfb.14.1710249289065; Tue, 12 Mar 2024 06:14:49 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , Benjamin Gray Subject: [PATCH v2 06/10] ppc/spapr: Add pa-features for POWER10 machines Date: Tue, 12 Mar 2024 23:14:15 +1000 Message-ID: <20240312131419.2196845-7-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::42d; envelope-from=npiggin@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249486911100003 Content-Type: text/plain; charset="utf-8" From: Benjamin Gray Add POWER10 pa-features entry. Notably DEXCR and [P]HASHST/[P]HASHCHK instruction support is advertised. Each DEXCR aspect is allocated a bit in the device tree, using the 68--71 byte range (inclusive). The functionality of the [P]HASHST/[P]HASHCHK instructions is separately declared in byte 72, bit 0 (BE). Reviewed-by: Harsh Prateek Bora Signed-off-by: Benjamin Gray [npiggin: reword title and changelog, adjust a few bits] Signed-off-by: Nicholas Piggin --- hw/ppc/spapr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5bbd0d7a04..a684e0d9dc 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -275,6 +275,36 @@ static void spapr_dt_pa_features(SpaprMachineState *sp= apr, /* 60: NM atomic, 62: RNG */ 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ }; + /* 3.1 removes SAO, HTM support */ + uint8_t pa_features_31[] =3D { 74, 0, + /* 0: MMU|FPU|SLB|RUN|DABR|NX, 1: fri[nzpm]|DABRX|SPRG3|SLB0|PP110= */ + /* 2: VPM|DS205|PPR|DS202|DS206, 3: LSD|URG, 5: LE|CFAR|EB|LSQ */ + 0xf6, 0x1f, 0xc7, 0xc0, 0x00, 0xf0, /* 0 - 5 */ + /* 6: DS207 */ + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* 6 - 11 */ + /* 16: Vector */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 12 - 17 */ + /* 18: Vec. Scalar, 20: Vec. XOR */ + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 18 - 23 */ + /* 24: Ext. Dec, 26: 64 bit ftrs, 28: PM ftrs */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 24 - 29 */ + /* 32: LE atomic, 34: EBB + ext EBB */ + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ + /* 40: Radix MMU */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ + /* 42: PM, 44: PC RA, 46: SC vec'd */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 42 - 47 */ + /* 48: SIMD, 50: QP BFP, 52: String */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 48 - 53 */ + /* 54: DecFP, 56: DecI, 58: SHA */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 54 - 59 */ + /* 60: NM atomic, 62: RNG */ + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ + /* 68: DEXCR[SBHE|IBRTPDUS|SRAPD|NPHIE|PHIE] */ + 0x00, 0x00, 0xce, 0x00, 0x00, 0x00, /* 66 - 71 */ + /* 72: [P]HASHST/[P]HASHCHK */ + 0x80, 0x00, /* 72 - 73 */ + }; uint8_t *pa_features =3D NULL; size_t pa_size; =20 @@ -290,6 +320,10 @@ static void spapr_dt_pa_features(SpaprMachineState *sp= apr, pa_features =3D pa_features_300; pa_size =3D sizeof(pa_features_300); } + if (ppc_check_compat(cpu, CPU_POWERPC_LOGICAL_3_10, 0, cpu->compat_pvr= )) { + pa_features =3D pa_features_31; + pa_size =3D sizeof(pa_features_31); + } if (!pa_features) { return; } --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710249433003332.69406490173424; Tue, 12 Mar 2024 06:17:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1y7-0008Rq-J8; Tue, 12 Mar 2024 09:14:59 -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 1rk1y5-0008M3-BN; Tue, 12 Mar 2024 09:14:57 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1y2-0006rA-EX; Tue, 12 Mar 2024 09:14:56 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6e6afb754fcso182342b3a.3; Tue, 12 Mar 2024 06:14:53 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249292; x=1710854092; 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=wmZJDwvj+FJgsSty74chMzftbuB5FvT0QJ9riUDcjhc=; b=QIBQRi36iQBSWemeOAhHEQ6XjXYSFAWLZPlMDKboovkltrGrYQ9t3QNQVG/yjbLq2h Njq+WpAbIm9o+pIIC0cmX83vb6DQj/+YgWAycacWUj4ckzs+aF7vwP8uISLhXNT42DzN NPU7nW2PIZVN1/3/6ztYpqhZSoYxkU5GwajIdfdru+fRw4/R96TIBDcDLvJrk/Iq2kcN rznbzOfXjuoWJzQE8Y5zUrhegFxv/zR0/1ByzxGcZ2FX5bhLmxEltqiaw/C4TKcrB/jW QrIPitpfQRJDTxc6+EG+yhlQ2yWpgb5XipRkFz2Cd8GLXrlvbwswccwf72demUATXZMd oVoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249292; x=1710854092; 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=wmZJDwvj+FJgsSty74chMzftbuB5FvT0QJ9riUDcjhc=; b=D8Wn9f82YHRqwsrsODpNFckqbnEz27Vz/154gNqIo/JDQK7H/zM/fjLNj5Ir6ixfiw e5POjhDgB9Zf4W2YgakK4h+SN5zWtWQwCmRgz6UCmyJmxHY08Z4sbbV9FYo1ExNhZuXU CHR1weCTeD0w02BEmJTkrin1V0fKW0GCNQ4N5bQco8mGaTkkdrGwLV0908GrbcHZ/18K aU5975o+rrIyLwLGXYHfYe0krn3XZvci6+HNQkvZ8w37GJ6IOVZhMm9PUrxEYxQTVDvQ 4R6Ci02hsdvVtro7ltbUEi7EiBI7bER40TeTn9bDw6Fzt/MsLA8E3PbI0Qb39YPpX46+ KSvQ== X-Forwarded-Encrypted: i=1; AJvYcCUCIIhE1PaV4nlfIRBt+Qch/RJSj+9p3sb+9E5SFtcUJJsEimrbRaUQHOI0Aijko3KpDtbBnyZcBuumjwr3ZQGT873alkw= X-Gm-Message-State: AOJu0Yx5iacWEmJ+yEWbfNKXxQYRvp81AfaSyqBoeB/Pgs/DBdCEu/D/ B/xSf3HoQk8Pw3fEsi1n6RWPbjIQcKOQVVZXerykPFjKl0AUqxtKgbTNfiA1BEM= X-Google-Smtp-Source: AGHT+IE3tLfO0e51FcEX4PzWYw1kIxCFxfpKOTLNUcLTV8224OUMCIIaCKuOk+/DM1XLkF4c8oO9Tw== X-Received: by 2002:a05:6a00:1944:b0:6e6:1bd6:95ab with SMTP id s4-20020a056a00194400b006e61bd695abmr14152332pfk.11.1710249292474; Tue, 12 Mar 2024 06:14:52 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 07/10] ppc/pnv: Permit ibm, pa-features set per machine variant Date: Tue, 12 Mar 2024 23:14:16 +1000 Message-ID: <20240312131419.2196845-8-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::434; envelope-from=npiggin@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1710249434696100006 Content-Type: text/plain; charset="utf-8" This allows different pa-features for powernv8/9/10. Signed-off-by: Nicholas Piggin Reviewed-by: Harsh Prateek Bora --- hw/ppc/pnv.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index aa9786e970..52d964f77a 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -133,7 +133,7 @@ static int get_cpus_node(void *fdt) * device tree, used in XSCOM to address cores and in interrupt * servers. */ -static void pnv_dt_core(PnvChip *chip, PnvCore *pc, void *fdt) +static int pnv_dt_core(PnvChip *chip, PnvCore *pc, void *fdt) { PowerPCCPU *cpu =3D pc->threads[0]; CPUState *cs =3D CPU(cpu); @@ -149,11 +149,6 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, vo= id *fdt) uint32_t cpufreq =3D 1000000000; uint32_t page_sizes_prop[64]; size_t page_sizes_prop_size; - const uint8_t pa_features[] =3D { 24, 0, - 0xf6, 0x3f, 0xc7, 0xc0, 0x00, 0xf0, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; int offset; char *nodename; int cpus_offset =3D get_cpus_node(fdt); @@ -236,15 +231,14 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, v= oid *fdt) page_sizes_prop, page_sizes_prop_size))); } =20 - _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", - pa_features, sizeof(pa_features)))); - /* Build interrupt servers properties */ for (i =3D 0; i < smt_threads; i++) { servers_prop[i] =3D cpu_to_be32(pc->pir + i); } _FDT((fdt_setprop(fdt, offset, "ibm,ppc-interrupt-server#s", servers_prop, sizeof(*servers_prop) * smt_threads))= ); + + return offset; } =20 static void pnv_dt_icp(PnvChip *chip, void *fdt, uint32_t pir, @@ -299,6 +293,17 @@ PnvChip *pnv_chip_add_phb(PnvChip *chip, PnvPHB *phb) return chip; } =20 +/* + * Same as spapr pa_features_207 except pnv always enables CI largepages b= it. + * HTM is always enabled because TCG does implement HTM, it's just a + * degenerate implementation. + */ +static const uint8_t pa_features_207[] =3D { 24, 0, + 0xf6, 0x3f, 0xc7, 0xc0, 0x00, 0xf0, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; + static void pnv_chip_power8_dt_populate(PnvChip *chip, void *fdt) { static const char compat[] =3D "ibm,power8-xscom\0ibm,xscom"; @@ -311,8 +316,12 @@ static void pnv_chip_power8_dt_populate(PnvChip *chip,= void *fdt) =20 for (i =3D 0; i < chip->nr_cores; i++) { PnvCore *pnv_core =3D chip->cores[i]; + int offset; + + offset =3D pnv_dt_core(chip, pnv_core, fdt); =20 - pnv_dt_core(chip, pnv_core, fdt); + _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", + pa_features_207, sizeof(pa_features_207)))); =20 /* Interrupt Control Presenters (ICP). One per core. */ pnv_dt_icp(chip, fdt, pnv_core->pir, CPU_CORE(pnv_core)->nr_thread= s); @@ -335,8 +344,12 @@ static void pnv_chip_power9_dt_populate(PnvChip *chip,= void *fdt) =20 for (i =3D 0; i < chip->nr_cores; i++) { PnvCore *pnv_core =3D chip->cores[i]; + int offset; =20 - pnv_dt_core(chip, pnv_core, fdt); + offset =3D pnv_dt_core(chip, pnv_core, fdt); + + _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", + pa_features_207, sizeof(pa_features_207)))); } =20 if (chip->ram_size) { @@ -358,8 +371,12 @@ static void pnv_chip_power10_dt_populate(PnvChip *chip= , void *fdt) =20 for (i =3D 0; i < chip->nr_cores; i++) { PnvCore *pnv_core =3D chip->cores[i]; + int offset; + + offset =3D pnv_dt_core(chip, pnv_core, fdt); =20 - pnv_dt_core(chip, pnv_core, fdt); + _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", + pa_features_207, sizeof(pa_features_207)))); } =20 if (chip->ram_size) { --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249490; cv=none; d=zohomail.com; s=zohoarc; b=gLxbyoabJ1C8BERl7rIa4Bl6BI0LcB0dpeX3oSEwnQGteFvRiDQMMVcT0kKwm9UIxcI2XjiAhhvJREZ4+1nEbPPxAOTgUCpDRigamKDMfWncBmKc1t0PRnCC5CEAWnlsY/HGQREk51DSDgjUZm+ApCCIRdaaxPo2g/+bEhhWzLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249490; 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=4dPpWXeXg/R19/iGDqlhShPAEv/UYaAvvOk7gE6evps=; b=Si9DzSw7topiwkZmjkzJQXRFvdIY1kPoTABuX/tBnsccGZeohxJ+WdsM8Sy9RRPFN+mTH00Fw2E/N6HqE6QZhYQqYjJ5CirQVedrQemMHMEcdrglpv/v0FNac6llwniiPUXJ5JG82FYANK8REs2q9t4VdIMV//FwoqC6g7wsODA= 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 1710249490261254.72598590581538; Tue, 12 Mar 2024 06:18:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1yA-0008Vw-3u; Tue, 12 Mar 2024 09:15:02 -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 1rk1y8-0008T3-9f; Tue, 12 Mar 2024 09:15:00 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1y6-0006rW-9m; Tue, 12 Mar 2024 09:14:59 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6e6afb754fcso182400b3a.3; Tue, 12 Mar 2024 06:14:57 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249296; x=1710854096; 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=4dPpWXeXg/R19/iGDqlhShPAEv/UYaAvvOk7gE6evps=; b=hNGgp6/iv0dxj6ard/vVJWa+1UcU49l4oab/oQwVvu/gLn1WHoGeqlevDTXA/PgM+r bmAIMO8WCWGRc9EnfO+VV1aKNmVuDDFicbYYPB6sihs3mJB3Ss1SEo5AH8EziG+XNnIJ vqqHC6xrZIX/WsHJUu4o+QeX7BdzrWeDmckLV9ffur5dX6LRCEJe+9k5u0QSyoCvcU7T IJyR2WCgBhwHYlsQsdP5eUtuk6RHgoVUC3y0MZSH6kvRrUJ31SuFGm/hms+KpctMqTsb ZZniawW7qObDQSE9ZThVu5M4BCzdkvXh5QXXCmljr1v7ykqtEhvOtharJ1ZNJZfmClcS M+9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249296; x=1710854096; 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=4dPpWXeXg/R19/iGDqlhShPAEv/UYaAvvOk7gE6evps=; b=xFX3WakNRpSK7hkJP/pMN+qtrSG++mrldKHdHcyNTszlvAP0RYDScvJtAp6gLTtWRp 7tqm1LBaey331W8d4XAoE3j14hAyMfgq11mMA8NUDapuqsxb+nqFROcxXWeNxtGr3JaZ ILzNEY4t1dl/s/0oYdTp53qits/xwcesOfTXP+BlB/BhE7FQZZapNYjwU6gpICW1Ia6D eKb/OBaRfWdsfOC9GsNPxoKIA+dS7lGQNJVNTNOCP2P4NkNSpQ49XOsi6NgV9fssqzF1 4tOcnih3a1XswIDWGApw31IOMDfnKSD7XNFrda9HMfhWhSUG7nVgj0osbtw8WqFbQxvc 1LRg== X-Forwarded-Encrypted: i=1; AJvYcCXZi1Y8U0kRDHywQ7GcroBiUfmNgMwR0yfTyCklRV7nzph/tUP+egDUcvPSg8690Csxal1i1Jnvctlwdshq7NifBCH4cJU= X-Gm-Message-State: AOJu0Yzx3Cz93u9f9HkkDs5PCDNntATE4y48ZdksqQnxpRhis7jEWs9R O9cVJtyHQzoUyP8/iMyWFDYAERumRttn6rkdJPlAjBItAhlt1rTwmsa28Rxe/JA= X-Google-Smtp-Source: AGHT+IE+h+tGLhUHcWhU9YF1QgttLqnbhyRF8xbrBSlh+1yWRGjJmtQHGgsOf39cw2VYD9VM200dzw== X-Received: by 2002:a05:6a00:1411:b0:6e6:8c8b:a45b with SMTP id l17-20020a056a00141100b006e68c8ba45bmr7624791pfu.18.1710249295807; Tue, 12 Mar 2024 06:14:55 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 08/10] ppc/pnv: Set POWER9, POWER10 ibm,pa-features bits Date: Tue, 12 Mar 2024 23:14:17 +1000 Message-ID: <20240312131419.2196845-9-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::436; envelope-from=npiggin@gmail.com; helo=mail-pf1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249492941100001 Content-Type: text/plain; charset="utf-8" Copy the pa-features arrays from spapr, adjusting slightly as described in comments. Signed-off-by: Nicholas Piggin Reviewed-by: Harsh Prateek Bora --- hw/ppc/pnv.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- hw/ppc/spapr.c | 1 + 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 52d964f77a..8a502dea90 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -332,6 +332,35 @@ static void pnv_chip_power8_dt_populate(PnvChip *chip,= void *fdt) } } =20 +/* + * Same as spapr pa_features_300 except pnv always enables CI largepages b= it. + */ +static const uint8_t pa_features_300[] =3D { 66, 0, + /* 0: MMU|FPU|SLB|RUN|DABR|NX, 1: CILRG|fri[nzpm]|DABRX|SPRG3|SLB0|PP1= 10 */ + /* 2: VPM|DS205|PPR|DS202|DS206, 3: LSD|URG, 5: LE|CFAR|EB|LSQ */ + 0xf6, 0x3f, 0xc7, 0xc0, 0x00, 0xf0, /* 0 - 5 */ + /* 6: DS207 */ + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* 6 - 11 */ + /* 16: Vector */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 12 - 17 */ + /* 18: Vec. Scalar, 20: Vec. XOR, 22: HTM */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 18 - 23 */ + /* 24: Ext. Dec, 26: 64 bit ftrs, 28: PM ftrs */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 24 - 29 */ + /* 32: LE atomic, 34: EBB + ext EBB */ + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ + /* 40: Radix MMU */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ + /* 42: PM, 44: PC RA, 46: SC vec'd */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 42 - 47 */ + /* 48: SIMD, 50: QP BFP, 52: String */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 48 - 53 */ + /* 54: DecFP, 56: DecI, 58: SHA */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 54 - 59 */ + /* 60: NM atomic, 62: RNG */ + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ +}; + static void pnv_chip_power9_dt_populate(PnvChip *chip, void *fdt) { static const char compat[] =3D "ibm,power9-xscom\0ibm,xscom"; @@ -349,7 +378,7 @@ static void pnv_chip_power9_dt_populate(PnvChip *chip, = void *fdt) offset =3D pnv_dt_core(chip, pnv_core, fdt); =20 _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", - pa_features_207, sizeof(pa_features_207)))); + pa_features_300, sizeof(pa_features_300)))); } =20 if (chip->ram_size) { @@ -359,6 +388,40 @@ static void pnv_chip_power9_dt_populate(PnvChip *chip,= void *fdt) pnv_dt_lpc(chip, fdt, 0, PNV9_LPCM_BASE(chip), PNV9_LPCM_SIZE); } =20 +/* + * Same as spapr pa_features_31 except pnv always enables CI largepages bi= t, + * always disables copy/paste. + */ +static const uint8_t pa_features_31[] =3D { 74, 0, + /* 0: MMU|FPU|SLB|RUN|DABR|NX, 1: CILRG|fri[nzpm]|DABRX|SPRG3|SLB0|PP1= 10 */ + /* 2: VPM|DS205|PPR|DS202|DS206, 3: LSD|URG, 5: LE|CFAR|EB|LSQ */ + 0xf6, 0x3f, 0xc7, 0xc0, 0x00, 0xf0, /* 0 - 5 */ + /* 6: DS207 */ + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, /* 6 - 11 */ + /* 16: Vector */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 12 - 17 */ + /* 18: Vec. Scalar, 20: Vec. XOR */ + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 18 - 23 */ + /* 24: Ext. Dec, 26: 64 bit ftrs, 28: PM ftrs */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 24 - 29 */ + /* 32: LE atomic, 34: EBB + ext EBB */ + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x00, /* 30 - 35 */ + /* 40: Radix MMU */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, /* 36 - 41 */ + /* 42: PM, 44: PC RA, 46: SC vec'd */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 42 - 47 */ + /* 48: SIMD, 50: QP BFP, 52: String */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 48 - 53 */ + /* 54: DecFP, 56: DecI, 58: SHA */ + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 54 - 59 */ + /* 60: NM atomic, 62: RNG */ + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ + /* 68: DEXCR[SBHE|IBRTPDUS|SRAPD|NPHIE|PHIE] */ + 0x00, 0x00, 0xce, 0x00, 0x00, 0x00, /* 66 - 71 */ + /* 72: [P]HASHST/[P]HASHCHK */ + 0x80, 0x00, /* 72 - 73 */ +}; + static void pnv_chip_power10_dt_populate(PnvChip *chip, void *fdt) { static const char compat[] =3D "ibm,power10-xscom\0ibm,xscom"; @@ -376,7 +439,7 @@ static void pnv_chip_power10_dt_populate(PnvChip *chip,= void *fdt) offset =3D pnv_dt_core(chip, pnv_core, fdt); =20 _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", - pa_features_207, sizeof(pa_features_207)))); + pa_features_31, sizeof(pa_features_31)))); } =20 if (chip->ram_size) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a684e0d9dc..abd484023a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -243,6 +243,7 @@ static void spapr_dt_pa_features(SpaprMachineState *spa= pr, * so there isn't much need for it anyway. */ =20 + /* These should be kept in sync with pnv */ uint8_t pa_features_206[] =3D { 6, 0, 0xf6, 0x1f, 0xc7, 0x00, 0x00, 0xc0 }; uint8_t pa_features_207[] =3D { 24, 0, --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249347; cv=none; d=zohomail.com; s=zohoarc; b=KGibqQ4bO7rSWGUA6N1K7nX8zR+esEkqof/m2Dfvr+UKczAKUAir5d6E9oCoSWHngD4+n7ZCZVMpvPiYWlZqODFUk0rZuM8Rj9KQs9JElRWZ1ICUWKNUGzUtzDmUL5DK/pZgKGzEPR1vd1B4cvrZ3OOAX6mmQxJzZ4ATdY8Pd8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249347; 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=GmKs3OLijRDjxbbgFJRC36Pyehi0EZh4ofDu2FesM1g=; b=G8T1mW5sciMhp21qAvv444E3RS6LmBVwIdyEzEHXBzZb8zlhM37KEfF99GoUvPPSDy1YqR2xQiRMJDAWtebIlm0gHGgea+mgvofX9eGG4yKu+2+TVoppuo6DYZZTu27dniUcgZP/Wt4GSvvpB9vzBPnpktdfEQnKLuIlu3N1UuA= 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 1710249347868414.65413514647014; Tue, 12 Mar 2024 06:15:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1yF-00009Q-5X; Tue, 12 Mar 2024 09:15:07 -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 1rk1yB-00006Y-R0; Tue, 12 Mar 2024 09:15:03 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1y9-0006s8-T8; Tue, 12 Mar 2024 09:15:03 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6e6adf257fdso274603b3a.0; Tue, 12 Mar 2024 06:15:00 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249299; x=1710854099; 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=GmKs3OLijRDjxbbgFJRC36Pyehi0EZh4ofDu2FesM1g=; b=X4Gr+ct06Dj9A/CysySkc18RGNB/vperkCuV/GaJJ0/YqfQ0ZwcugrLTZIW8215jg2 20f0bTwDWGg0gGvgzi+MZQaqjeddpa3a0BOwTRACYRFhArIn7XIuSNf8JqKYkD2iHsTV NTBNtCLq+Z2cwmfye06TJGBJxjgrwPtYCJA+QpVuzNarALTLGLi9bkwyPOlhlhoC0jHB SDT1LYmjOLgwLnZ/7bWgkTChXC4Tbipl2+bWCdpL3eQtO+OpBw3aId4CmVOuql8sHmke nLsa8yBnQ0Ku3FpxliyvdjG9hFebliRYaXFmnTmp7VLq2L40QDr5jRCRpwf0P6tTWfSf mtqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249299; x=1710854099; 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=GmKs3OLijRDjxbbgFJRC36Pyehi0EZh4ofDu2FesM1g=; b=Z32Puk8ta2RI87tEPn/y91VelFTuO0oYgSXZVrBVpSEX4otxaHfqgogQun8M15OtpH IS8+NCdMl2o1tupGCAQ4JokrJPWYjwBGBP16uSPnCTI5jyj/msgEMh+ZWnJEEu1oZvck ZL8LUC8okcMItNurKFWKE1ujJrcQSnRWy0fT1YxBwtl2PMM4FCV/U9v2NzHXm3SYeoar uahVLwMgQ/udU9VHyZFB5J7QrUWC0VxXCCZQHPZ2B3wMzHkw8KyW3Su8zzsaqD+G+ES4 moXQfu4XyK6tzZYEHHiSDBAFSQZfiglVaslMFZ6+L0XluK1K3Gv5QHWFEGgz6cWRudi4 S9pQ== X-Forwarded-Encrypted: i=1; AJvYcCXwAnN4NkkkmlHX4ik9OTDtT9XLqXeI17YMeDFKZyBJSMqbnsNUT+Kbc3zhStZWhJen8dgn12Sy1KthIWTNeumknYMb/5o= X-Gm-Message-State: AOJu0YzIb46PDH3gYYVC53lRYD1qpjjvMl4d+UJSPyqHEK4o9sf5RSyK 7tmBfjnLtI19c4CjmLZ+F2o8bxhrHsvdwY44phYDaGlj+T1BlDYqtW4C6qAOoOs= X-Google-Smtp-Source: AGHT+IGepATqylhpSSA/FQralTzzYOSVeR7wkdSwliSdSrAbd2oSsLJ6jN4vBvpX+qo/7zVozqzp5g== X-Received: by 2002:a05:6a00:2e9e:b0:6e6:6bef:c53c with SMTP id fd30-20020a056a002e9e00b006e66befc53cmr12045515pfb.0.1710249299023; Tue, 12 Mar 2024 06:14:59 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 09/10] target/ppc: Prevent supervisor from modifying MSR[ME] Date: Tue, 12 Mar 2024 23:14:18 +1000 Message-ID: <20240312131419.2196845-10-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::430; envelope-from=npiggin@gmail.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249348455100001 Content-Type: text/plain; charset="utf-8" Prevent guest state modifying the MSR[ME] bit. Per ISA: An attempt to modify MSR[ME] in privileged but non-hypervisor state is ignored (i.e., the bit is not changed). Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- target/ppc/helper_regs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c index 410b39c231..25258986e3 100644 --- a/target/ppc/helper_regs.c +++ b/target/ppc/helper_regs.c @@ -264,6 +264,11 @@ int hreg_store_msr(CPUPPCState *env, target_ulong valu= e, int alter_hv) value &=3D ~MSR_HVB; value |=3D env->msr & MSR_HVB; } + /* Attempt to modify MSR[ME] in guest state is ignored */ + if (is_book3s_arch2x(env) && !(env->msr & MSR_HVB)) { + value &=3D ~(1 << MSR_ME); + value |=3D env->msr & (1 << MSR_ME); + } if ((value ^ env->msr) & (R_MSR_IR_MASK | R_MSR_DR_MASK)) { cpu_interrupt_exittb(cs); } --=20 2.42.0 From nobody Sat May 11 09:11:51 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1710249382; cv=none; d=zohomail.com; s=zohoarc; b=PTQZTCNU3h4DHSFTI5hhEYIq2a16qe6aw+0TasGfAzuKB38QoM12+GcLe5iwlotsh+q98jF85OjdwdhLPPyK2raLLrdKd0NkD3ISpakMNXRxBlsArEib74e+FNt9QcH+Y+rEnXKhvfFKXUFVYvcdI47/2HXLnHsDgJ467QB5+WE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710249382; 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=snN27fvobYyrptE+93yJyph56eOVotswARSPWE4FtYw=; b=dufJ7XL0rHTDIFDl/qI1t2Fl2p16FniXPVUnCmbxvjhv1rgCftYdPZ/XqkIzuAqFnpRyLN4FbXj6k15RzidM6c3VENA0qAwZevvnO3AfkK1+4EQFlL01u0HWrRk8eUrl1A474Dq5jJF5zfcFqafsvoappsFfCLd2gl/dFX6ccwk= 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 1710249382511932.1082426365751; Tue, 12 Mar 2024 06:16:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk1yb-0000Hv-DQ; Tue, 12 Mar 2024 09:15:35 -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 1rk1yE-00008a-1B; Tue, 12 Mar 2024 09:15:06 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk1yC-0006sh-3l; Tue, 12 Mar 2024 09:15:05 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6e6ac00616cso347958b3a.0; Tue, 12 Mar 2024 06:15:03 -0700 (PDT) Received: from wheely.local0.net ([118.208.155.46]) by smtp.gmail.com with ESMTPSA id r15-20020aa78b8f000000b006e64f75c947sm6066084pfd.46.2024.03.12.06.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 06:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710249302; x=1710854102; 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=snN27fvobYyrptE+93yJyph56eOVotswARSPWE4FtYw=; b=jhYPJ99GP6I4Si2LzG+u6UR8MDeNaQvSx9ZWQe+K00VAce8zTCCoDRhmEcICjrpLFV fp+rGanxqGOTfPRVS7chvs3TDfdD4R2a/l+QrArdDgFPiPoQYn2R08fFJUXswCrMqgSo 2CPcFQV9gubt9YHlsN6hQqj7gbY+12PUa8sX8CXWzat5sJGrX4dNo5VAe6gAUxsyzuIC giFxfnM0UD4hN/8Qovg1zoeNnGjRQugIzOWxgXM+lHLEphHpOJUc6JZ5737fN7vJR2aX xNudKqjkeYPMuYscOfnBzwzMWiiupd4LQXvc0qM4wVVqKN2W1oM/nKj/whM1w6i4kkH4 DHrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249302; x=1710854102; 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=snN27fvobYyrptE+93yJyph56eOVotswARSPWE4FtYw=; b=vreWY2eOIVYeGRCbH0efLboi8K/hweRmVYJ3rescx2UiTFPxLJrlRj7JxjD68rEFZb /bHNnZoEhQ5DZJ//L6HKKQel7yEDH73J1/k/zRfd8NWZ1JxUfkeojqkWx65gWvMNr37f ohy9J3lRoH+Z71NPQw7bVd3KfgPYBrw2XoJmXfLyq+kGDRaxhbi2Rig8tqmvwr8jxkiB gWGOU7CDGZUfDAaRb0hER1Q0UrjZFM+2GbM95PouJyxny4ScafrxXjkoMVutwzvcXfeH loWW80wUZJL/RV6WoyEQqa8ypSwdTK4Te7Dr2EBtepqzNAZViuL7C+NZRm2oftVA/LJ2 PDYA== X-Forwarded-Encrypted: i=1; AJvYcCWkatODM+xsRBpPhDk4HKR7on41zLaCnlV9wh8xGAtjTKqEjhMyX5hNy/FjPN1uBuLMr9DtJeBhgLmGSXm8jifhFJ/Xf38= X-Gm-Message-State: AOJu0YzR+Ru2AQyP+AClljQBxdLKQDpih7r/KWCt5xzRBtEpZf7v/SmF o04odZJDrQ7+aOC7jJ8mHmbx4m7dBbeOuSQArUti6jDxCE6p58ir/YuT/qgrXHk= X-Google-Smtp-Source: AGHT+IHS9budt8by+5GT9e58gtz5j1+FLg6LGkeL40Sb6ceMt0YN8TjwvmqFfzzr6JGmfF6tWCUS4g== X-Received: by 2002:a62:b61a:0:b0:6e6:9561:5999 with SMTP id j26-20020a62b61a000000b006e695615999mr4613411pff.11.1710249302260; Tue, 12 Mar 2024 06:15:02 -0700 (PDT) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , qemu-devel@nongnu.org, Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora Subject: [PATCH v2 10/10] spapr: set MSR[ME] and MSR[FP] on client entry Date: Tue, 12 Mar 2024 23:14:19 +1000 Message-ID: <20240312131419.2196845-11-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240312131419.2196845-1-npiggin@gmail.com> References: <20240312131419.2196845-1-npiggin@gmail.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=2607:f8b0:4864:20::430; envelope-from=npiggin@gmail.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 @gmail.com) X-ZM-MESSAGEID: 1710249384404100003 Content-Type: text/plain; charset="utf-8" The initial MSR state for the OpenFirmware binding specifies MSR[ME] and MSR[FP] are set. Reviewed-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_cpu_core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 50523ead25..e7c9edd033 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -39,9 +39,13 @@ static void spapr_reset_vcpu(PowerPCCPU *cpu) =20 /* * "PowerPC Processor binding to IEEE 1275" defines the initial MSR st= ate - * as 32bit (MSR_SF=3D0) in "8.2.1. Initial Register Values". + * as 32bit (MSR_SF=3D0) with MSR_ME=3D1 and MSR_FP=3D1 in "8.2.1. Ini= tial + * Register Values". This can also be found in "LoPAPR 1.1" "C.9.2.1 + * Initial Register Values". */ env->msr &=3D ~(1ULL << MSR_SF); + env->msr |=3D (1ULL << MSR_ME) | (1ULL << MSR_FP); + env->spr[SPR_HIOR] =3D 0; =20 lpcr =3D env->spr[SPR_LPCR]; --=20 2.42.0