From nobody Thu May 9 02:09:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495086721015415.66010569530624; Wed, 17 May 2017 22:52:01 -0700 (PDT) Received: from localhost ([::1]:51888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBELv-0003qF-Q1 for importer@patchew.org; Thu, 18 May 2017 01:51:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEFk-00084a-03 for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBEFi-0003SC-Mp for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:35 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:48231) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBEFi-0003R5-AD; Thu, 18 May 2017 01:45:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wT0X62l9Bz9s7M; Thu, 18 May 2017 15:45:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495086326; bh=fV6kBxIj2qH0gzkayI489RRrd/dQs/6tUeHlLDGPk6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kwa59naGwcBD8KkBjqB2VdRUamrfYf09BK3FLkyPQAshUzNLEUbdrSHEGxuQiKJ4y KF72w5hMCA24YwOQzQnmBDqzXw952EYdSCHTZCqg2AzgGVg6Ivucy5Ojjv5ZnvwtrG /UXZVKIPYt9bPuUY4r5uY8/wA+cvwX20xG0PcNIM= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Thu, 18 May 2017 15:45:20 +1000 Message-Id: <20170518054522.13141-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170518054522.13141-1-david@gibson.dropbear.id.au> References: <20170518054522.13141-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 1/3] pseries: Split CAS PVR negotiation out into a separate function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Guests of the qemu machine type go through a feature negotiation process known as "client architecture support" (CAS) during early boot. This does a number of things, one of which is finding a CPU compatibility mode which can be supported by both guest and host. In fact the CPU negotiation is probably the single most complex part of the CAS process, so this splits it out into a helper function. We've recently made some mistakes in maintaining backward compatibility for old machine types here. Splitting this out will also make it easier to fix this. This also adds a possibly useful error message if the negotiation fails (i.e. if there isn't a CPU mode that's suitable for both guest and host). Signed-off-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Laurent Vivier --- hw/ppc/spapr_hcall.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 2daace4..77d2d66 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1044,19 +1044,13 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *= cpu, } } =20 -static target_ulong h_client_architecture_support(PowerPCCPU *cpu, - sPAPRMachineState *spapr, - target_ulong opcode, - target_ulong *args) +static uint32_t cas_check_pvr(PowerPCCPU *cpu, target_ulong *addr, + Error **errp) { - target_ulong list =3D ppc64_phys_to_real(args[0]); - target_ulong ov_table; bool explicit_match =3D false; /* Matched the CPU's real PVR */ uint32_t max_compat =3D cpu->max_compat; uint32_t best_compat =3D 0; int i; - sPAPROptionVector *ov1_guest, *ov5_guest, *ov5_cas_old, *ov5_updates; - bool guest_radix; =20 /* * We scan the supplied table of PVRs looking for two things @@ -1066,9 +1060,9 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, for (i =3D 0; i < 512; ++i) { uint32_t pvr, pvr_mask; =20 - pvr_mask =3D ldl_be_phys(&address_space_memory, list); - pvr =3D ldl_be_phys(&address_space_memory, list + 4); - list +=3D 8; + pvr_mask =3D ldl_be_phys(&address_space_memory, *addr); + pvr =3D ldl_be_phys(&address_space_memory, *addr + 4); + *addr +=3D 8; =20 if (~pvr_mask & pvr) { break; /* Terminator record */ @@ -1087,17 +1081,38 @@ static target_ulong h_client_architecture_support(P= owerPCCPU *cpu, /* We couldn't find a suitable compatibility mode, and either * the guest doesn't support "raw" mode for this CPU, or raw * mode is disabled because a maximum compat mode is set */ - return H_HARDWARE; + error_setg(errp, "Couldn't negotiate a suitable PVR during CAS"); + return 0; } =20 /* Parsing finished */ trace_spapr_cas_pvr(cpu->compat_pvr, explicit_match, best_compat); =20 - /* Update CPUs */ - if (cpu->compat_pvr !=3D best_compat) { - Error *local_err =3D NULL; + return best_compat; +} =20 - ppc_set_compat_all(best_compat, &local_err); +static target_ulong h_client_architecture_support(PowerPCCPU *cpu, + sPAPRMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + /* Working address in data buffer */ + target_ulong addr =3D ppc64_phys_to_real(args[0]); + target_ulong ov_table; + uint32_t cas_pvr; + sPAPROptionVector *ov1_guest, *ov5_guest, *ov5_cas_old, *ov5_updates; + bool guest_radix; + Error *local_err =3D NULL; + + cas_pvr =3D cas_check_pvr(cpu, &addr, &local_err); + if (local_err) { + error_report_err(local_err); + return H_HARDWARE; + } + + /* Update CPUs */ + if (cpu->compat_pvr !=3D cas_pvr) { + ppc_set_compat_all(cas_pvr, &local_err); if (local_err) { error_report_err(local_err); return H_HARDWARE; @@ -1105,7 +1120,7 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, } =20 /* For the future use: here @ov_table points to the first option vecto= r */ - ov_table =3D list; + ov_table =3D addr; =20 ov1_guest =3D spapr_ovec_parse_vector(ov_table, 1); ov5_guest =3D spapr_ovec_parse_vector(ov_table, 5); --=20 2.9.4 From nobody Thu May 9 02:09:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495086589285225.39700751265696; Wed, 17 May 2017 22:49:49 -0700 (PDT) Received: from localhost ([::1]:51876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEJn-0002Rz-PG for importer@patchew.org; Thu, 18 May 2017 01:49:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEFk-00084g-5b for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBEFi-0003S5-L0 for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:36 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:52507) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBEFi-0003R3-8Y; Thu, 18 May 2017 01:45:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wT0X61W7cz9s65; Thu, 18 May 2017 15:45:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495086326; bh=QVn6SjDmG//QgB9ytiBoUYweEumLPQgP4JxpWCjfVxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gFE03Kd6l4mayxMB8sP23rLQS8e6wD19DVDTbeFsibHI1bp63P57hCUjn2BCtUvbl yEd4ylWUJX6qJ5qwCjUA25IGfBZGwoON7I8w71/Q1FFd5OCptqWH43uEtPK9HB1mvY jnF1yW8XN8o8TAU3OEN6mJR3u4vYICAi6wRx/IoI= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Thu, 18 May 2017 15:45:21 +1000 Message-Id: <20170518054522.13141-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170518054522.13141-1-david@gibson.dropbear.id.au> References: <20170518054522.13141-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 2/3] pseries: Restore PVR negotiation logic for pre-2.9 machine types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" "pseries" guests go through a hypervisor<->guest feature negotiation during early boot. Part of this is finding a CPU compatibility mode which works for both. In 152ef80 "pseries: Rewrite CAS PVR compatibility logic" this logic was changed to strongly prefer architecture defined CPU compatibility modes, rather than CPU "raw" modes. However, this change was made universally, which introduces a guest visible change for the previously existing machine types (pseries-2.8 and earlier). That's never supposed to happen. This corrects the behaviour, reverting to the old PVR negotiation logic for machine types prior to pseries-2.9. Fixes: 152ef803ceb1959e2380a1da7736b935b109222e Reported-by: Andrea Bolognani Signed-off-by: David Gibson Reviewed-by: Laurent Vivier Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++= +++- include/hw/ppc/spapr.h | 1 + 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 35dceb0..ad8ddf2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3313,9 +3313,12 @@ static void spapr_machine_2_8_instance_options(Machi= neState *machine) =20 static void spapr_machine_2_8_class_options(MachineClass *mc) { + sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); + spapr_machine_2_9_class_options(mc); SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8); mc->numa_mem_align_shift =3D 23; + smc->pre_2_9_cas_pvr =3D true; } =20 DEFINE_SPAPR_MACHINE(2_8, "2.8", false); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 77d2d66..a790da7 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1044,6 +1044,89 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *c= pu, } } =20 +/* + * Old logic for PVR negotiation, used old <2.9 machine types for + * compatibility with old qemu versions + */ +#define get_compat_level(cpuver) ( \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_05) ? 2050 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_06) ? 2060 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_06_PLUS) ? 2061 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_07) ? 2070 : 0) + +static void cas_handle_compat_cpu(PowerPCCPUClass *pcc, uint32_t pvr, + unsigned max_lvl, unsigned *compat_lvl, + unsigned *compat_pvr) +{ + unsigned lvl =3D get_compat_level(pvr); + bool is205, is206, is207; + + if (!lvl) { + return; + } + + /* If it is a logical PVR, try to determine the highest level */ + is205 =3D (pcc->pcr_supported & PCR_COMPAT_2_05) && + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_05)); + is206 =3D (pcc->pcr_supported & PCR_COMPAT_2_06) && + ((lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_06)) || + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_06_PLUS))); + is207 =3D (pcc->pcr_supported & PCR_COMPAT_2_07) && + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_07)); + + if (is205 || is206 || is207) { + if (!max_lvl) { + /* User did not set the level, choose the highest */ + if (*compat_lvl <=3D lvl) { + *compat_lvl =3D lvl; + *compat_pvr =3D pvr; + } + } else if (max_lvl >=3D lvl) { + /* User chose the level, don't set higher than this */ + *compat_lvl =3D lvl; + *compat_pvr =3D pvr; + } + } +} + +static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *cpu, target_ulong *addr, + Error **errp) +{ + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + int counter; + unsigned max_lvl =3D get_compat_level(cpu->max_compat); + bool cpu_match =3D false; + unsigned compat_lvl =3D 0, compat_pvr =3D 0; + + for (counter =3D 0; counter < 512; ++counter) { + uint32_t pvr, pvr_mask; + + pvr_mask =3D ldl_be_phys(&address_space_memory, *addr); + pvr =3D ldl_be_phys(&address_space_memory, *addr + 4); + *addr +=3D 8; + + if (~pvr_mask & pvr) { + break; /* Terminator record */ + } + + trace_spapr_cas_pvr_try(pvr); + if (!max_lvl && + ((cpu->env.spr[SPR_PVR] & pvr_mask) =3D=3D (pvr & pvr_mask))) { + cpu_match =3D true; + compat_pvr =3D 0; + } else if (pvr =3D=3D cpu->compat_pvr) { + cpu_match =3D true; + compat_pvr =3D cpu->compat_pvr; + } else if (!cpu_match) { + cas_handle_compat_cpu(pcc, pvr, max_lvl, &compat_lvl, &compat_= pvr); + } + } + + trace_spapr_cas_pvr(cpu->compat_pvr, cpu_match, compat_pvr); + + return compat_pvr; +} + static uint32_t cas_check_pvr(PowerPCCPU *cpu, target_ulong *addr, Error **errp) { @@ -1096,6 +1179,7 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, target_ulong opcode, target_ulong *args) { + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); /* Working address in data buffer */ target_ulong addr =3D ppc64_phys_to_real(args[0]); target_ulong ov_table; @@ -1104,7 +1188,11 @@ static target_ulong h_client_architecture_support(Po= werPCCPU *cpu, bool guest_radix; Error *local_err =3D NULL; =20 - cas_pvr =3D cas_check_pvr(cpu, &addr, &local_err); + if (smc->pre_2_9_cas_pvr) { + cas_pvr =3D cas_check_pvr_pre_2_9(cpu, &addr, &local_err); + } else { + cas_pvr =3D cas_check_pvr(cpu, &addr, &local_err); + } if (local_err) { error_report_err(local_err); return H_HARDWARE; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 93c4cfc..f875dc4 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -52,6 +52,7 @@ struct sPAPRMachineClass { /*< public >*/ bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs = */ bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ + bool pre_2_9_cas_pvr; /* Use old logic for PVR compat negotiation= */ const char *tcg_default_cpu; /* which (TCG) CPU to simulate by default= */ void (*phb_placement)(sPAPRMachineState *spapr, uint32_t index, uint64_t *buid, hwaddr *pio,=20 --=20 2.9.4 From nobody Thu May 9 02:09:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495086801052211.59607956916238; Wed, 17 May 2017 22:53:21 -0700 (PDT) Received: from localhost ([::1]:51898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEND-00051s-EY for importer@patchew.org; Thu, 18 May 2017 01:53:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBEFj-00084O-BZ for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBEFi-0003Rs-8K for qemu-devel@nongnu.org; Thu, 18 May 2017 01:45:35 -0400 Received: from ozlabs.org ([103.22.144.67]:48995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dBEFh-0003R7-TC; Thu, 18 May 2017 01:45:34 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wT0X63bMVz9s75; Thu, 18 May 2017 15:45:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495086326; bh=+3QDY/LX4HeSAvnPsyreOK7RKjmPHKesKMTQlr/jp3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MDW59B3JWl5zo/ZWXq2XTl+aKi7hwAX/dfXthUwMO04Z784Kr7pr2+bxPmSQPnAYy 9b/GKfhKb8Q+aHkCspodDmm5hBVH+lAzqyzpUvTwe/P/cI9Y8XhYNfyfY+QTaDR35M b3zvP9n/6/cRyXqrKFIqFqHXbjR8kzh1ivkH6TSo= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Thu, 18 May 2017 15:45:22 +1000 Message-Id: <20170518054522.13141-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170518054522.13141-1-david@gibson.dropbear.id.au> References: <20170518054522.13141-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 3/3] pseries: Improve tracing of CPU compatibility negotiation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, David Gibson , qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This makes some improvements to the debug tracepoints around the negotiation of CPU compatibility mode during CAS. The traces are reorganized to emphasise what the inputs and outputs of the process are, then distinguish the internal state of the two possible negotiation paths (current and pre-2.8 machine type compatibility). Signed-off-by: David Gibson Reviewed-by: Greg Kurz Reviewed-by: Laurent Vivier --- hw/ppc/spapr_hcall.c | 14 ++++++++------ hw/ppc/trace-events | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index a790da7..cea5d99 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1109,7 +1109,6 @@ static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *cpu= , target_ulong *addr, break; /* Terminator record */ } =20 - trace_spapr_cas_pvr_try(pvr); if (!max_lvl && ((cpu->env.spr[SPR_PVR] & pvr_mask) =3D=3D (pvr & pvr_mask))) { cpu_match =3D true; @@ -1120,10 +1119,10 @@ static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *c= pu, target_ulong *addr, } else if (!cpu_match) { cas_handle_compat_cpu(pcc, pvr, max_lvl, &compat_lvl, &compat_= pvr); } + trace_cas_check_pvr_pre_2_9(pvr, pvr_mask, cpu_match, + compat_lvl, compat_pvr); } =20 - trace_spapr_cas_pvr(cpu->compat_pvr, cpu_match, compat_pvr); - return compat_pvr; } =20 @@ -1158,6 +1157,7 @@ static uint32_t cas_check_pvr(PowerPCCPU *cpu, target= _ulong *addr, best_compat =3D pvr; } } + trace_cas_check_pvr(pvr, pvr_mask, explicit_match, best_compat); } =20 if ((best_compat =3D=3D 0) && (!explicit_match || max_compat)) { @@ -1168,9 +1168,6 @@ static uint32_t cas_check_pvr(PowerPCCPU *cpu, target= _ulong *addr, return 0; } =20 - /* Parsing finished */ - trace_spapr_cas_pvr(cpu->compat_pvr, explicit_match, best_compat); - return best_compat; } =20 @@ -1188,6 +1185,9 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, bool guest_radix; Error *local_err =3D NULL; =20 + trace_cas_check_pvr_start(cpu->compat_pvr, cpu->max_compat, + cpu->env.spr[SPR_PVR]); + if (smc->pre_2_9_cas_pvr) { cas_pvr =3D cas_check_pvr_pre_2_9(cpu, &addr, &local_err); } else { @@ -1198,6 +1198,8 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, return H_HARDWARE; } =20 + trace_cas_check_pvr_complete(cpu->compat_pvr, cas_pvr); + /* Update CPUs */ if (cpu->compat_pvr !=3D cas_pvr) { ppc_set_compat_all(cas_pvr, &local_err); diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 43d265f..5329740 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -14,8 +14,10 @@ spapr_cas_failed(unsigned long n) "DT diff buffer is too= small: %ld bytes" spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" =20 # hw/ppc/spapr_hcall.c -spapr_cas_pvr_try(uint32_t pvr) "%x" -spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "cu= rrent=3D%x, explicit_match=3D%u, new=3D%x" +cas_check_pvr_pre_2_9(uint32_t pvr, uint32_t mask, bool match, unsigned lv= l, uint32_t compat_pvr) "0x%08x/0x%08x match=3D%d lvl=3D%d compat_pvr=3D0x%= x" +cas_check_pvr(uint32_t pvr, uint32_t pvr_mask, bool explicit_match, uint32= _t best_compat) "0x%08x/0x%08x explicit_match=3D%d best_compat=3D0x%08x" +cas_check_pvr_start(uint32_t compat_pvr, uint32_t max_compat, uint32_t phy= s_pvr) "Initial compat PVR 0x%08x, max compat 0x%08x (real PVR 0x%08x)" +cas_check_pvr_complete(uint32_t old_pvr, uint32_t new_pvr) "Compatibility = PVR was 0x%08x, now 0x%08x" =20 # hw/ppc/spapr_iommu.c spapr_iommu_put(uint64_t liobn, uint64_t ioba, uint64_t tce, uint64_t ret)= "liobn=3D%"PRIx64" ioba=3D0x%"PRIx64" tce=3D0x%"PRIx64" ret=3D%"PRId64 --=20 2.9.4