From patchwork Mon May 21 04:09:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 917384 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40q6f21Xlbz9s3D for ; Mon, 21 May 2018 15:24:26 +1000 (AEST) 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="Wr4V2PFM"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40q6f16RvjzDqG0 for ; Mon, 21 May 2018 15:24:25 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wr4V2PFM"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::241; helo=mail-pg0-x241.google.com; envelope-from=wei.guo.simon@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Wr4V2PFM"; dkim-atps=neutral Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40q5nl2tbWzF0dl for ; Mon, 21 May 2018 14:46:03 +1000 (AEST) Received: by mail-pg0-x241.google.com with SMTP id 63-v6so3656422pgg.3 for ; Sun, 20 May 2018 21:46:03 -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=0BnlMFirdBjGvIK5bFJxQUrHat5Z/6NyE//oliZxzOY=; b=Wr4V2PFMNBX5nEmob8ohE1pyNgeLPzW1+7cbCo6E6XV777Xbdo7ofpsK8Y5pgdDfMM 0blO4tH6lclY7Ux6PbVISnwuAV8OujobBBe5OVSYsLf+Y9br0FM2o/ikGuqYNgheF2K/ 8KIEOoEHuJoItl5bgM4wbsT/EcZ2yhAdvRd+fiItLwT10oT/VqZM10xRQ8xxDSZUC3Fg pPdmrkB6eK6JTzQ6jLJ4Bgx/ysO0M9KzwDN/kl9lDqWwd+pJCfUsgvZvkWw9GFv2XNv1 Q4p+Pw01PjJ0YZXr02lUcnWyaUdbEvs1kYSDWV1qkGJ/A52UR36TjYEPXdR4KBtJ42eh czgw== 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=0BnlMFirdBjGvIK5bFJxQUrHat5Z/6NyE//oliZxzOY=; b=fDah/twTyB6k3Nffp8mnZgvLxo3zpfPBN57KpB/KTjy4WYJDbYmOzrXXDZ/Zx3Tpsw k2iu9AL3AmTkaVo5soxB5QdogBCU7czzQKM7yYHb/RBtYXK39nKx+smmelepPVfsXP59 ajKpPnJ/Op4FpRYGtJ5kS9eCvDcN0JGyABsCZos9Qv5n0prV6ClIexWABexZrYAPmpL9 cmy634vvDEJayZO2hfRGBYqKjJNL/4BkLPuJ6TxrJTAVUGhkz+vK40jw0yE1gf3k0RU0 ZXR2xK1f8mPtPOoRVJ7nLUe8Tnp8MNPGk21aP/03bC2+Vgfrfe/Q4P1JGox/jaQ7ESPG 4y1Q== X-Gm-Message-State: ALKqPwcTM3JNBC1R3E3zLNTD8mmNfqBwkqW+x4mYnMpjlNSUtO9CRXLe 7S/8D7f3d6nG0hSlJtd1KGW/3w== X-Google-Smtp-Source: AB8JxZpsI5uL9LHikmBG4ne+IfsbVHrUIqKAOjfTWp+uglfrhkRvsBQMyfgozEnZN/6P0b23aTEQGw== X-Received: by 2002:a62:8785:: with SMTP id i127-v6mr18755003pfe.201.1526877960268; Sun, 20 May 2018 21:46:00 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id t14-v6sm24575514pfa.31.2018.05.20.21.45.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:45:59 -0700 (PDT) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 14/29] KVM: PPC: Book3S PR: add kvmppc_save/restore_tm_sprs() APIs Date: Mon, 21 May 2018 12:09:31 +0800 Message-Id: <1526875786-10372-15-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526875786-10372-1-git-send-email-wei.guo.simon@gmail.com> References: <1526875786-10372-1-git-send-email-wei.guo.simon@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Guo , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Simon Guo This patch adds 2 new APIs kvmppc_save_tm_sprs()/kvmppc_restore_tm_sprs() for the purpose of TEXASR/TFIAR/TFHAR save/restore. Signed-off-by: Simon Guo Reviewed-by: Paul Mackerras --- arch/powerpc/kvm/book3s_pr.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index f2ae5a3..7d4905a 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "book3s.h" @@ -284,6 +285,27 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu) svcpu_put(svcpu); } +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +static inline void kvmppc_save_tm_sprs(struct kvm_vcpu *vcpu) +{ + tm_enable(); + vcpu->arch.tfhar = mfspr(SPRN_TFHAR); + vcpu->arch.texasr = mfspr(SPRN_TEXASR); + vcpu->arch.tfiar = mfspr(SPRN_TFIAR); + tm_disable(); +} + +static inline void kvmppc_restore_tm_sprs(struct kvm_vcpu *vcpu) +{ + tm_enable(); + mtspr(SPRN_TFHAR, vcpu->arch.tfhar); + mtspr(SPRN_TEXASR, vcpu->arch.texasr); + mtspr(SPRN_TFIAR, vcpu->arch.tfiar); + tm_disable(); +} + +#endif + static int kvmppc_core_check_requests_pr(struct kvm_vcpu *vcpu) { int r = 1; /* Indicate we want to get back into the guest */