Message ID | 1538127963-15645-13-git-send-email-paulus@ozlabs.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <kvm-ppc-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="HyFkGvO7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42M6K86jFFz9t1f for <incoming@patchwork.ozlabs.org>; Fri, 28 Sep 2018 19:47:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729311AbeI1QJv (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Fri, 28 Sep 2018 12:09:51 -0400 Received: from ozlabs.org ([203.11.71.1]:33449 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729120AbeI1QJT (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Fri, 28 Sep 2018 12:09:19 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 42M6JD6lK0z9sj2; Fri, 28 Sep 2018 19:46:20 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1538127981; bh=8V2j3xr2NE1HoPovoklhtLDx3tkVyeAgWcOstUXWzys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HyFkGvO7s+aZ6O4fJuwZCmx9fKdPWKKMYPVrEMuGCY/yFKaFnypf1hRKgmLhxNBeW RFujiW3VhLqr3RM6c3CaXTcxl1RtHzXRNUQ1l2Ac1dW4rOM1XpWWR8/9kzxTR/N71v 1+cXBHXRMv/vBiJQaoim7dq1vw+IlPsz8asdonOKEDgBZPHEVHIcTLxlNhMy4z8ok4 wRixiiz4Y7k3XNkW9Pa+38wHP7AW8Mb0U2IeKHpGjl9UJWb56Qenxcdyp5aQt+eiop qn44xULvYR3bQPIJN5NIO9jyqp4fv1OGk2iYiN4VJNPlhMO0YN66VPxbd0snamtrJ6 GafUDU0+swSSg== From: Paul Mackerras <paulus@ozlabs.org> To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, David Gibson <david@gibson.dropbear.id.au> Subject: [PATCH v2 12/33] powerpc: Turn off CPU_FTR_P9_TM_HV_ASSIST in non-hypervisor mode Date: Fri, 28 Sep 2018 19:45:42 +1000 Message-Id: <1538127963-15645-13-git-send-email-paulus@ozlabs.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538127963-15645-1-git-send-email-paulus@ozlabs.org> References: <1538127963-15645-1-git-send-email-paulus@ozlabs.org> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: <kvm-ppc.vger.kernel.org> X-Mailing-List: kvm-ppc@vger.kernel.org |
Series |
KVM: PPC: Book3S HV: Nested HV virtualization
|
expand
|
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S index 458b928..c317080 100644 --- a/arch/powerpc/kernel/cpu_setup_power.S +++ b/arch/powerpc/kernel/cpu_setup_power.S @@ -147,8 +147,8 @@ __init_hvmode_206: rldicl. r0,r3,4,63 bnelr ld r5,CPU_SPEC_FEATURES(r4) - LOAD_REG_IMMEDIATE(r6,CPU_FTR_HVMODE) - xor r5,r5,r6 + LOAD_REG_IMMEDIATE(r6,CPU_FTR_HVMODE | CPU_FTR_P9_TM_HV_ASSIST) + andc r5,r5,r6 std r5,CPU_SPEC_FEATURES(r4) blr