Message ID | 1526875786-10372-13-git-send-email-wei.guo.simon@gmail.com |
---|---|
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=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="qEUACODD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40q5nt1lVMz9s8y for <incoming@patchwork.ozlabs.org>; Mon, 21 May 2018 14:46:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbeEUEqJ (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 21 May 2018 00:46:09 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:39678 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbeEUEpz (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Mon, 21 May 2018 00:45:55 -0400 Received: by mail-pl0-f67.google.com with SMTP id c19-v6so8046411pls.6; Sun, 20 May 2018 21:45:55 -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=qtfidES1XXcEeq7E3Jry9h3skYXwVWKgywLgcFkA6L0=; b=qEUACODDKdFoDgiBugvUL3wHFFezEswq4ulTybpikzklRNnHCBSfqSHsXYODk6deUh rR6VJXS2blM6ENeiBf2yHHhpy/RUZLGIFFw/qFpSahfVr3vqELvc1kNqc5O7FLTGhpZ5 Cqp4O09b4fKNAd+xGIlawHMJkSz2DFxBtk0BAw0GnIwNa8D7a94AvzluykDpFK4mkrJr q1TtolFyOs/q/zkg1uMEhge5k8aqvWRQbgiPTxEfF/hdN6Oa+VJC6wY0ks5y3bbE0fRl QA8j8iJv4NaukR4tAJsdsrPZ1BwyLr9NOai5XaggBKTotvP11Dw7+g4E/94vrbAyATRN lW8Q== 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=qtfidES1XXcEeq7E3Jry9h3skYXwVWKgywLgcFkA6L0=; b=eFPqSvVdSfiwgBQVs0zQKHQULmUdqz20G0S+cD7+1LSWIecA8tAaizxAgXI+aS/KmD b9zh+2BD8J2JZMH4JO308YA7u4yHfChYygKScjTC/nc53nxhc45dvhPUBySGRtN5e/6s slRJfwVA2SiUDIanLvTwhk/956pgi6mHN6gQnVE0AoBbci1hPoyH/+t6ag9O1Ue06qHc YOA/VtIPG9xOcUywgfCp4si0nwg2iJUpfB0pL5flehCkYE0Q9pZTfw8epnQ4a2m7eDFc PyEVQk6i8ZF+14z1yj5XqQCxvOCs9x7R9vgtTzfr7L/KX60/ooCSedzaCHmaSPWkwgov POmQ== X-Gm-Message-State: ALKqPwcmSdxoUybUrOaugvRX39w1d6s4Aku5T73Hq+jlmXvgtFurl2W1 vALgaRegMytl7y8J5n8iv6A= X-Google-Smtp-Source: AB8JxZrS5AibM3Fv4EkngB5SyE/7AqNnqY464J1o1RsMAlfs/HJ+NItFKE5W4NBA9zKB07FfpyVn4w== X-Received: by 2002:a17:902:d891:: with SMTP id b17-v6mr19391987plz.0.1526877955250; Sun, 20 May 2018 21:45:55 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:45:54 -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 v3 12/29] KVM: PPC: Book3S PR: prevent TS bits change in kvmppc_interrupt_pr() Date: Mon, 21 May 2018 12:09:29 +0800 Message-Id: <1526875786-10372-13-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> 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_segment.S b/arch/powerpc/kvm/book3s_segment.S index 93a180c..98ccc7e 100644 --- a/arch/powerpc/kvm/book3s_segment.S +++ b/arch/powerpc/kvm/book3s_segment.S @@ -383,6 +383,19 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) */ PPC_LL r6, HSTATE_HOST_MSR(r13) +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + /* + * We don't want to change MSR[TS] bits via rfi here. + * The actual TM handling logic will be in host with + * recovered DR/IR bits after HSTATE_VMHANDLER. + * And MSR_TM can be enabled in HOST_MSR so rfid may + * not suppress this change and can lead to exception. + * Manually set MSR to prevent TS state change here. + */ + mfmsr r7 + rldicl r7, r7, 64 - MSR_TS_S_LG, 62 + rldimi r6, r7, MSR_TS_S_LG, 63 - MSR_TS_T_LG +#endif PPC_LL r8, HSTATE_VMHANDLER(r13) #ifdef CONFIG_PPC64