From patchwork Sat Apr 30 00:48:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 8986031 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B8E759F39D for ; Sat, 30 Apr 2016 00:49:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2307220142 for ; Sat, 30 Apr 2016 00:49:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 13C312013D for ; Sat, 30 Apr 2016 00:49:13 +0000 (UTC) Received: from localhost ([::1]:56923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awJ5o-00063G-LT for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Apr 2016 20:49:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awJ5c-0005pX-T3 for qemu-devel@nongnu.org; Fri, 29 Apr 2016 20:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awJ5R-00045r-9S for qemu-devel@nongnu.org; Fri, 29 Apr 2016 20:48:51 -0400 Received: from hr2.samba.org ([144.76.82.148]:57426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awJ5P-0003sF-Te; Fri, 29 Apr 2016 20:48:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42627210; h=Message-ID:Cc:To:From:Date; bh=JQif1UTtFnJBCBZdtoFUvMH8EHdabrq7VfEp3V9h75o=; b=SOn2VLueuJ3eBwH1BxMTIKTXr7/GjYHbf6/tCbR/+BAQ4uOyndYOn+gm5KhSSOUjsFkZN908yHupKBI49UzOizXQcRiS8kUdSez6i0SRwIrTpnA64TnaaoTc49Mm8zReppE57YBWp+tDykACWacz4vezmTwD0VpZn7TpGKBwJ0Y=; Received: from [127.0.0.2] (localhost [127.0.0.1]) by hr2.samba.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim) id 1awJ4s-0001Y5-B3; Sat, 30 Apr 2016 00:48:10 +0000 Date: Sat, 30 Apr 2016 10:48:00 +1000 From: Anton Blanchard To: Alexander Graf Message-ID: <20160430104800.0a7c1d11@kryten> In-Reply-To: References: <20160404164457.539a55f0@kryten> <57021123.6050506@ozlabs.ru> <20160404204346.1cf44df8@kryten> <20160404210928.0d9ae644@kryten> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 144.76.82.148 Subject: [Qemu-devel] [PATCH v2] spapr: Don't set the TM ibm, pa-features bit in PR KVM mode 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: Michael Neuling , Alexey Kardashevskiy , Michael Ellerman , qemu-devel@nongnu.org, Paul Mackerras , qemu-ppc@nongnu.org, linuxppc-dev@lists.ozlabs.org, David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We don't support transactional memory in PR KVM, so don't tell the OS that we do. Signed-off-by: Anton Blanchard --- v2: Fix build with CONFIG_KVM disabled, noticed by Alex. diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b69995e..dc3e3c9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -696,6 +696,14 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, } else /* env->mmu_model == POWERPC_MMU_2_07 */ { pa_features = pa_features_207; pa_size = sizeof(pa_features_207); + +#ifdef CONFIG_KVM + /* Don't enable TM in PR KVM mode */ + if (kvm_enabled() && + kvm_vm_check_extension(cs->kvm_state, KVM_CAP_PPC_GET_PVINFO)) { + pa_features[24] &= ~0x80; + } +#endif } if (env->ci_large_pages) { pa_features[3] |= 0x20;