From patchwork Mon May 21 04:09:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 917395 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 40q7G458DHz9s37 for ; Mon, 21 May 2018 15:52:12 +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="k2A8+95h"; 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 40q7G43SnTzF10l for ; Mon, 21 May 2018 15:52:12 +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="k2A8+95h"; 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::243; helo=mail-pg0-x243.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="k2A8+95h"; dkim-atps=neutral Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (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 40q5pF6JYjzF0dY for ; Mon, 21 May 2018 14:46:29 +1000 (AEST) Received: by mail-pg0-x243.google.com with SMTP id a3-v6so878399pgt.13 for ; Sun, 20 May 2018 21:46:29 -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=Y6zvCo6ZJ5JQoxmeDEJUnmRZz4VZ4HJ9X47H1M+iwQHIJ72bAsZvPi6dtp1BHMm5oV QVIl6LHPfGmg44PfZKgYXtuWU7qO33pW1jFYJAda708Wc7H3FdqhWDMJLtqBtBeXqTGq USwZgeyrV3U6exLSomDDaPjrtQfk5YrdVwY7K4dxm1jfvICLF9X/8p1e0aROa6hd9jQ+ /fxygLNsjJEobMButwjVASu7ERidUwcYzLne/YGCYh1BrHuFnlNRswK+CcE52GErhiR1 tPPcgb0v59kJyNAdwWqgmlj/uWNCXmWseER1xH+o+ovKfTeu81bVEq2DW72+BkuiNqar aNCQ== X-Gm-Message-State: ALKqPwdLWJ5h0r9BlmYyA6moWcESy7xN1pn4Tblm9w6REeN8fRg/7dqb 2I1FMsk32/FzzhJUcyd81xmI5w== 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 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> 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 With current patch set, PR KVM now supports HTM. So this patch turns it on for PR KVM. Tested with: https://github.com/justdoitqd/publicFiles/blob/master/test_kvm_htm_cap.c Signed-off-by: Simon Guo --- arch/powerpc/kvm/powerpc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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: