From patchwork Tue Feb 27 17:52:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 878761 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zrRv36Vs1z9s1t for ; Wed, 28 Feb 2018 05:25:03 +1100 (AEDT) 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="dVxwda7K"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zrRv34F3GzF0ZB for ; Wed, 28 Feb 2018 05:25:03 +1100 (AEDT) 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="dVxwda7K"; 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="dVxwda7K"; 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 3zrRMc3WSWzF1X5 for ; Wed, 28 Feb 2018 05:01:16 +1100 (AEDT) Received: by mail-pg0-x241.google.com with SMTP id i14so2897527pgv.3 for ; Tue, 27 Feb 2018 10:01:16 -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=O58sc66A5r0YBXNMnZfWv2e7eakMWsy1D3Xe6S8BbvM=; b=dVxwda7KSVRNFylWPBwRgXvzrbmdAAet05XgblJ+10DSPoMsbwwm5aVsH1ZhE3tYkv LqWwcDwkOayDcfkQtYdzFpaIEGYsZeJghTBxxIycr9F/4I8xSt9fglwhZRkQQ1lJX4pP kRDaCMwpriMHxMfUOTGXr0XkiE8UoGzRkmgW+c53zR/fy2gjX1Gu3jZSXeO5433L63Y4 tcIb1wE6esUZWlqrJ72+c7S3oQswTHFGDVfnuNi+YHTsGiLhlepDP6D4xPdc85H9Ltr0 fhJul6pR2lhkOCMk9mKEYlmKGhTnEnjSlSKr5tBK1Em4Kg/wko3uFZlKosPu8zYb60gv UDOQ== 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=O58sc66A5r0YBXNMnZfWv2e7eakMWsy1D3Xe6S8BbvM=; b=MMwLhWgExjmdevypinV9ZzeWHjSSUtEhwhonGK0NrXMqmcSwYbIWIPs0qGv+WfvWAn hVk1rDz3M2/6o4Iy2d2wQ7mOsIEdltz8QvUgMjMOFhv7XHB7jyF6Ek5SPxIXkzSZz+wj J7eg7JW3WgBbxH2Vq6HRD8RXYfgZ0BXtZyiU++W3/phGD7n1w/vZONSvY1/RLjBWmwfN sdZ0z3E67uJWz1+UPF5eZr5Tj9c6siC3GaI4maj3CkSMgYQ0jyGqMLvOrWD5lpdeX93z MaLa0nHKsNLZQQ+8H4KKs3GM0n0+0Qd6TRGadYNB/1nmOiv09bHAEF43QW5EqX0Gyhoc ob0g== X-Gm-Message-State: APf1xPDA90vOZoUpUOTRdjggHgwUy3rfjyr1ULxlhIc7OQMtrhqqMQHn uw0NZ9x3Xue9AFZMuHo4GCBnbg== X-Google-Smtp-Source: AH8x227DOQI1qH35Xxqw6J3NH31zPwoRn/giW3Ke7UPxP1z7ux18s+ixhKppeKGiuZoxo7FO7csS6g== X-Received: by 10.98.162.26 with SMTP id m26mr14920600pff.217.1519754474101; Tue, 27 Feb 2018 10:01:14 -0800 (PST) Received: from simonLocalRHEL7.x64 ([101.80.181.226]) by smtp.gmail.com with ESMTPSA id m83sm24360910pfk.107.2018.02.27.10.01.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 10:01:13 -0800 (PST) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 14/30] KVM: PPC: Book3S PR: add kvmppc_save/restore_tm_sprs() APIs Date: Wed, 28 Feb 2018 01:52:22 +0800 Message-Id: <1519753958-11756-4-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1519753958-11756-1-git-send-email-wei.guo.simon@gmail.com> References: <1519753958-11756-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 4bf76c9..91d0e59 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" @@ -286,6 +287,27 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu, preempt_enable(); } +#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 */