Message ID | 1515665499-31710-6-git-send-email-wei.guo.simon@gmail.com |
---|---|
State | Changes Requested |
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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rlAiGuCk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHMB45lRWz9t4t for <incoming@patchwork.ozlabs.org>; Thu, 11 Jan 2018 21:12:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933119AbeAKKML (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Thu, 11 Jan 2018 05:12:11 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43176 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932684AbeAKKMK (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Thu, 11 Jan 2018 05:12:10 -0500 Received: by mail-pf0-f194.google.com with SMTP id e3so1306156pfi.10; Thu, 11 Jan 2018 02:12:10 -0800 (PST) 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=RtWOQENhvsiUnDxkcXPhmW4BvfvsgOyddlcayjaGgyY=; b=rlAiGuCkKdP5A7Apqsvanp/n5CtqFJEsdScNohIoKmd7+cl5pyzX0hgg30rAWEe/Uh nGPJKCE8cQe/n1w+GAzpmlX2RwkJbCN/hznal8X0P/LF/PLBo0KBgqPFnmdNI2Uv+brw 79o8rht1IfsnVH48mXkGsU5ZptfctJtRflyQpMxVHZ887ah9mOlY/eqbqPLQ890/bksT isPNWzXmNnRqjtt4isG0/y7rs9aVg2feIYSt1ONFUa4BSykeQrvDsrnNgYLKOz+YBtSX oUNojoLSj+H5tJJDBIDMQADvE6nD4RxoBxbR/OLOEaovNHsHucOrG02k/QxywPH8xthk bfOQ== 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=RtWOQENhvsiUnDxkcXPhmW4BvfvsgOyddlcayjaGgyY=; b=qS++NUdJCLlsXrFNiD8kh7AM71f/4v3+ly+a9+EGeqmSietAM3PrwXoqU/dT5jgjCh I8vavrrxG+KDmUK0iagR7gE/FYo/blzAOaxhBiGBxhkAsZdrkabtYr6PzHKs4cOzQ34B dOj43JzRl/qdplxzcFR2yf3lkHOQTdiDdMgz6BWMUJn0cOCQBEsmV6JdgQskYvVkDia7 ikkOG/gZV4orx5nEwEVXac91e82pAQWnG6hopw4Fc0g5fHoOpmwS2jN2J6AjMCACqBZB +hZW5vOO11f046eXmd+oUeUa7Ds+0fIiqos7cdrZq2CVr7rmLKmg986yVaiqT5nU0ZwC zILg== X-Gm-Message-State: AKGB3mJ4hjymTmoZsMuYmjRnoSV2E7l89G4Fs8Kkpnn/8qQfd3Tcb34t R/zSnxaP61np0MNDEnGnTrlcug== X-Google-Smtp-Source: ACJfBosj236ZGPXDqxi1H1Y2i3vk22pBCz3gx4Z5lWJl96rt+ZFiXG9aSozNc77Z0dcEJey0r+2k2Q== X-Received: by 10.99.99.129 with SMTP id x123mr15111493pgb.437.1515665529761; Thu, 11 Jan 2018 02:12:09 -0800 (PST) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.88]) by smtp.gmail.com with ESMTPSA id m11sm34336122pgt.56.2018.01.11.02.12.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 02:12:09 -0800 (PST) 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 05/26] KVM: PPC: Book3S PR: In PR KVM suspends Transactional state when inject an interrupt. Date: Thu, 11 Jan 2018 18:11:18 +0800 Message-Id: <1515665499-31710-6-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1515665499-31710-1-git-send-email-wei.guo.simon@gmail.com> References: <1515665499-31710-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 |
[01/26] KVM: PPC: Book3S PR: Move kvmppc_save_tm/kvmppc_restore_tm to separate file
|
expand
|
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c index 29ebe2f..6048dbd 100644 --- a/arch/powerpc/kvm/book3s_64_mmu.c +++ b/arch/powerpc/kvm/book3s_64_mmu.c @@ -38,7 +38,16 @@ static void kvmppc_mmu_book3s_64_reset_msr(struct kvm_vcpu *vcpu) { - kvmppc_set_msr(vcpu, vcpu->arch.intr_msr); + unsigned long msr = vcpu->arch.intr_msr; + unsigned long cur_msr = kvmppc_get_msr(vcpu); + + /* If transactional, change to suspend mode on IRQ delivery */ + if (MSR_TM_TRANSACTIONAL(cur_msr)) + msr |= MSR_TS_S; + else + msr |= cur_msr & MSR_TS_MASK; + + kvmppc_set_msr(vcpu, msr); } static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(