Message ID | 1527058932-7434-10-git-send-email-wei.guo.simon@gmail.com |
---|---|
State | Accepted |
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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qgzdGUOx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rPkW1BDcz9s4V for <incoming@patchwork.ozlabs.org>; Wed, 23 May 2018 17:47:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754372AbeEWHrq (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Wed, 23 May 2018 03:47:46 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:40562 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754378AbeEWHri (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Wed, 23 May 2018 03:47:38 -0400 Received: by mail-pl0-f66.google.com with SMTP id t12-v6so12509138plo.7; Wed, 23 May 2018 00:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G9cU21vxoCQ0p25Ua6QtVLiMsd2UnFM6la/gx2bKPuc=; b=qgzdGUOx0Pi18inTjOKqVxW+LxuuLHmeviFbXx4BeVcKCiRfEzcvFofX5ZRYQWze7G 9rCE0wjqCIjqYwEss3Nk5vwNlooSpdqE4Fad6MiwFoLVvJ7D8kvl7urb7iuKr6APoQf1 hGvHuAf8duGyYQyKHxT/g+QVnq5Ofu5gtjv9YQWFF5O7LnN+QL1huicf2by9vQhRsQsL iDeA1TxS4r8gpBUcAeS09PFUOoGdU2UUJOAMxPKRSBPrbq2uHw5hvkL/KaYP8W8EqVq7 MyeiSFhvIQEsyQMqM68fK1FchWqiYTkh7sNpXd8K0s+VDL9A+aTscMNfTPN9T3e2cy3g jj+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G9cU21vxoCQ0p25Ua6QtVLiMsd2UnFM6la/gx2bKPuc=; b=J6/MhptbQd4V4Sv7J/QqPOCptpnnTT+jr7/PbemjxUPb1DBzSOjZTsZyZy20A2PPjb awsZBXB1El0xwl/Y6IIMAuHi8ch9USr+jIwMMQZ+f7pxWGu7RxKi6LIvP287qvRh51OV yui64VD9gzDdpt4PWbg/3KQHTWokIF/yDDq5tLkSJlmx7MAJp6uWXjcz2dM1b+SwXUuZ 85mUBbmkDigXwtmElqcqvNFbLStCz3Mu7W/Ux59ZGyanHgVQfeQzSmppwDMOrKLnkLUh phg/p7O+Of+4hJCZQSvz4NA+ustGTaqYxP6VLzCja8aF/8QSm8pilY29FfS1uKfF/+86 PtfA== X-Gm-Message-State: ALKqPwfR67KKfbvhcA4ugxYIati2zRpREQagc3H7dbiUdBn04aUWq4Aa uhSvcnPM+fOknjXtA8QVxEo= X-Google-Smtp-Source: AB8JxZpH7nb75QQeY2DphM9e6DrfNd4SmleUT62NysAWAC3pPhZxEeyANFj35OB7ZdSxmBB1jps3+g== X-Received: by 2002:a17:902:6b86:: with SMTP id p6-v6mr1863082plk.75.1527061657837; Wed, 23 May 2018 00:47:37 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id a4-v6sm39079171pfj.19.2018.05.23.00.47.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 00:47:37 -0700 (PDT) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras <paulus@ozlabs.org>, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Simon Guo <wei.guo.simon@gmail.com> Subject: [PATCH v4 09/29] KVM: PPC: Book3S PR: PR KVM pass through MSR TM/TS bits to shadow_msr. Date: Wed, 23 May 2018 15:01:52 +0800 Message-Id: <1527058932-7434-10-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527058932-7434-1-git-send-email-wei.guo.simon@gmail.com> References: <1527058932-7434-1-git-send-email-wei.guo.simon@gmail.com> 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 PR: Transaction memory support on PR KVM
|
expand
|
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 67061d3..d3237f5 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -312,7 +312,12 @@ static void kvmppc_recalc_shadow_msr(struct kvm_vcpu *vcpu) ulong smsr = guest_msr; /* Guest MSR values */ +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + smsr &= MSR_FE0 | MSR_FE1 | MSR_SF | MSR_SE | MSR_BE | MSR_LE | + MSR_TM | MSR_TS_MASK; +#else smsr &= MSR_FE0 | MSR_FE1 | MSR_SF | MSR_SE | MSR_BE | MSR_LE; +#endif /* Process MSR values */ smsr |= MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_PR | MSR_EE; /* External providers the guest reserved */