Message ID | 1526875786-10372-26-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="k2A8+95h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40q5pr4xMfz9s8p for <incoming@patchwork.ozlabs.org>; Mon, 21 May 2018 14:47:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbeEUEqz (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 21 May 2018 00:46:55 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34977 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752661AbeEUEq2 (ORCPT <rfc822;kvm-ppc@vger.kernel.org>); Mon, 21 May 2018 00:46:28 -0400 Received: by mail-pg0-f65.google.com with SMTP id 11-v6so4177945pge.2; Sun, 20 May 2018 21:46:28 -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=Sv+wSEYi/P2U+FE66EXFTDQi/XsnGcmWDB6FPSk48is=; b=k2A8+95hkBdU+1ghOTKpyHa9+NQFx0vUO9cffc1QbZUPeyoSV5AxpZhD48OORl21JP BKPhFCnvliNXjhHRFRmFw3/4HhTHf95jqjH1H4HNMzufUFrAKEmuUqtI669RPdej1O0i iTgi/bK2a0cFsEmMabvE5fcAAcWOC+7X5nCGw6e/zPf/4E6z+Z1wqBRb+6HDKLjuKg9B 9hlIXmRo/ujqVL1/Y3ZrUdvRIz2LLe+Yw8S6yORDEXJNU/RN/JMFGMN9AHAvqFD3bSkr jnLoo4uGaSTmwZeunnT4msIssE/oETTQIjLGzPNEjmOFQdsBezVYbYZKvwiVKuxCcQPW pcZw== 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=Sv+wSEYi/P2U+FE66EXFTDQi/XsnGcmWDB6FPSk48is=; b=Gohm5LMx1cwHiwGEo8sJihrR9V2RfRfRvFAQZVYpIW+iAJ0XXEclejMnfS9D54xhkh aSYHv8XQzPc14iVgYjk7ymFMc5S6dwCoBCTgfHEsuT8d3JrjBQiPYThHAUz2XzFovNFl dxoE48PeuaZoXrddfePl/p6VgrnCBhmLvMV3nwDYrtCl+KXZ21XC9sCHEGFysg+50qU0 OljXN56AqC64PUXjelV0wSKaG4wCYHt8r4EVUvJ8ve5aIRy2Vnqn7nu+5tNjIBA8I96Y 6rnJRqEWg4h0QO+T/rU0T6VTv8m0vb6dxEBZGGmxXvGySfYxEpBUccjoL8eqOIHFM3Z6 Ersw== X-Gm-Message-State: ALKqPwdSVjkuSfblumEqu3VPH2B0RcoUg4K4qdTnx3Wo3LV7H+UM/bWJ yCPmUmmat5kR2g9/CdU96bU= X-Google-Smtp-Source: AB8JxZo1bXzZepFoxkOagllu6v83dwS7cP8SEgbcaO8OJ7CI+fmiqFWHpnB/UaqKwWcgTQZP7OYQQw== X-Received: by 2002:a62:481d:: with SMTP id v29-v6mr18387368pfa.57.1526877988015; Sun, 20 May 2018 21:46:28 -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.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 21:46:27 -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 25/29] KVM: PPC: Book3S PR: enable HTM for PR KVM for KVM_CHECK_EXTENSION ioctl Date: Mon, 21 May 2018 12:09:42 +0800 Message-Id: <1526875786-10372-26-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/powerpc.c b/arch/powerpc/kvm/powerpc.c index bef27b1..1fa5bbe 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -648,9 +648,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) #endif #ifdef CONFIG_PPC_TRANSACTIONAL_MEM case KVM_CAP_PPC_HTM: - r = hv_enabled && - (!!(cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM) || - cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST)); + r = !!(cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM) || + (hv_enabled && cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST)); break; #endif default: