From patchwork Wed May 23 07:02:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Guo X-Patchwork-Id: 918882 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 40rRCn1VrCz9s15 for ; Wed, 23 May 2018 18:54:45 +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="NmWJha5X"; 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 40rRCm72fxzDqH4 for ; Wed, 23 May 2018 18:54:44 +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="NmWJha5X"; 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::242; helo=mail-pg0-x242.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="NmWJha5X"; dkim-atps=neutral Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (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 40rPlD0Fq8zDrbm for ; Wed, 23 May 2018 17:48:24 +1000 (AEST) Received: by mail-pg0-x242.google.com with SMTP id a3-v6so4100060pgt.13 for ; Wed, 23 May 2018 00:48:23 -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=NmWJha5XdQahVyTCSv3GzjO8ynp99oKuL+xIa7tmhdz2W+TFbQLOtzACuT5zMIPUMJ TrPT3UhUKENqwW2EmR6yIBV/JkOPk27We8TlV1WNZ8p0A4h/gzs1qeFjwmGgWYsA8zat cjefJjGD3/81WVXwxMcXemCGwynG9+n3foBZ09KgHpr04TC1YHKpvlTUXVNAfvSS6K1i nRLyI+MEvKaebf+NtRXPscLE/hcxNeloDjhHygfEo51FG6lort822Ocgc0fUN7QtVs0a GX4JDlIyxpvXRrDOGsST/vfJg4XvnT9QcIIGV6+eV/5o2K3PAXcMhLFiBitdL05VmXjK zBzw== 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=QWDW5LH2TG3roI9l/dX055qoOQg8XEXLXFd5urwnePcCgzksjpyGtOPquBnoWOhM8X ITYqjhfCl+2EwHvL1CObfHS0dlWmWjnEkb1qa3PKl8jg2NdEAP89gvtaM5bycYdstJpM emZttZ0lZdF/78vtF83k6y8yyK3gqa10Vx+/+Y5osi6fWyc5x5ak2mePDklOA22Ubd+8 F0iHARUupT/A6+ehplJg5wXWGXcjiNR/HiGeTvc33KgievJILBnupn6nikAger1FxmaA s7SjsD+iVqAWM4qAc3Ob+Nz8pN4MRODr6pLDrU8LGhU3kWM09QJGbFAtd4thndlFiWbJ yoeg== X-Gm-Message-State: ALKqPwd1Q9PX5r+LTHU05osCOJLi2GQBFr8ixWq9xDog4IgHzudYnNTH 4wwhLUg5QCq1XaDr2x0qdu7pCQ== X-Google-Smtp-Source: AB8JxZqricSp/tp/8ng5smW21l2R+hsWCGun/8yfZVvXWb3YMQoG+gd/zfqYCH4EDJppCrkqpayfJQ== X-Received: by 2002:a65:5d8e:: with SMTP id f14-v6mr1484536pgt.25.1527061702094; Wed, 23 May 2018 00:48:22 -0700 (PDT) Received: from simonLocalRHEL7.cn.ibm.com ([112.73.0.89]) by smtp.gmail.com with ESMTPSA id a4-v6sm39079171pfj.19.2018.05.23.00.48.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 00:48:21 -0700 (PDT) From: wei.guo.simon@gmail.com To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 25/29] KVM: PPC: Book3S PR: enable HTM for PR KVM for KVM_CHECK_EXTENSION ioctl Date: Wed, 23 May 2018 15:02:08 +0800 Message-Id: <1527058932-7434-26-git-send-email-wei.guo.simon@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527058932-7434-1-git-send-email-wei.guo.simon@gmail.com> References: <1527058932-7434-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: