From patchwork Thu Jul 20 11:15:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 108324 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1991601qge; Thu, 20 Jul 2017 04:15:45 -0700 (PDT) X-Received: by 10.84.211.70 with SMTP id b64mr3702909pli.392.1500549345376; Thu, 20 Jul 2017 04:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500549345; cv=none; d=google.com; s=arc-20160816; b=QJpAACg2Ln59rUjXKW8UKf/KyEde1mg4XAKr7G2YwIhV8XERVIVDuIHjOJl9ILlpSj /hrnbJOhRaIiG/SrYJCQt1XGwtaq3nSfa9RHPpkW6Iu4FaPWUlwwvuX4x6m7jGZdll87 ZOPv9Cc5d/noN6Bv7jEpqbdvbHMkURXxlWofUclaGaPGgnCShTGvVDOLEdS/cMZnOuN4 XxeAeu1DUepHZl2czSx0rKihVDsnvLDrHvpRfTcg8D16aYRwqYLqtUV8PFBCJcmL5Sd4 b8+GtqpnBczBBdDVzYbqDgO2lRdrg7c1oycIaVdB1IbR//DDsWN0hRAVYMl5JAuyCke1 qWLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=78Jfj9hQUgSkMD1aEC2oFM/IKl6yQR5fsuq0Meoj/V4=; b=y+Ak+csh8hK677bdsx3w0ACk/jNenQC6OKlXXNCjev60yGTTK/EuT9SiaD1Vc5X3FV rv8FncpeJDY7WMLnZuwq8RDa1xpJFAJgnyzmgwHvaw5RAv7bFN3MFWD3F5cxUpNTriBr LbVEHBzKL8lSi4bMpAA76/ng+98uZyY4W4dFwKYgHvE9wnIdLFe6e1F/gQpvT59JxIjH qOqOB8H7oPjJeaZROblyplpaOuVfFtOPmzlEFBYwVVVJd+AuzkaWPpgfUTEKXCOdCj1c oC8F2CBWSfSSymymmet+TavwLQa6rSbGd5t2V/4qCnt1tZqmFXyizHXQh/hM/YN5q04o 5ShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=LbEd9pGb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a4si1513187pgc.170.2017.07.20.04.15.45; Thu, 20 Jul 2017 04:15:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=LbEd9pGb; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935468AbdGTLPo (ORCPT + 6 others); Thu, 20 Jul 2017 07:15:44 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36061 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934421AbdGTLPn (ORCPT ); Thu, 20 Jul 2017 07:15:43 -0400 Received: by mail-wm0-f45.google.com with SMTP id k69so21445782wmc.1 for ; Thu, 20 Jul 2017 04:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=78Jfj9hQUgSkMD1aEC2oFM/IKl6yQR5fsuq0Meoj/V4=; b=LbEd9pGbmvmHR5o8uOzxEb5A2Y7sHkSEcKglBxeJnYk1PWpDwMMoxvpBT4thZD0Kpj yEo6hjvC6dZ/69KFAKWI1MhZVUiA0KUsJ7i7tzp1ksJ2VI4Vaw8CRuKtoVx16/26D7+P 1DjY56fnGon8hr8BiMB8topOJ7FRuJpNbaOkE= 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; bh=78Jfj9hQUgSkMD1aEC2oFM/IKl6yQR5fsuq0Meoj/V4=; b=Q8kaviN5fjSPkzd+CL7ub7zmNjx/wdtsTh6fFLsZCQBE7rOfCj6gmsLsAh0uGF2fzX cbjHctLS5lumgqmeBds9j/9gbXiwm76NFVzLQGe5R+qEwH7UqMOZEO61iZ9B3gIQ+PgF d3u1MoeR82aOnOIbiis6CFB9cEEaiGMKunRkQa2FGa0XCZVKkTgttiE/ypw6cZ8/SEkX CGYsRCVbWRVB82ZWFdACSItFZjoVoHI5N6rJh3tVx9Wxm7oz9N7lDBN3NPtVg+KFSaAA W+2k+tAtOVBKUI/2DJ89M1ZTd6MGZZ281i+c36tTQaQKG6q3M2nSo7nTYHe/qYtsgUVJ YMuQ== X-Gm-Message-State: AIVw113Cg3v//73/BikwTSGRg3cPt7f8uzH7E06PcfPSEMuvWsz8hv31 497t5qjXsBex6XabrWFEmw== X-Received: by 10.80.131.101 with SMTP id 92mr1893704edh.257.1500549342364; Thu, 20 Jul 2017 04:15:42 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id e37sm1407946edb.65.2017.07.20.04.15.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 04:15:41 -0700 (PDT) From: Christoffer Dall To: Cc: Marc Zyngier , huhuajun@huawei.com, gregkh@linuxfoundation.org, Christoffer Dall Subject: [PATCH v4.11 backport] KVM: ARM64: fix phy counter access failure in guest. Date: Thu, 20 Jul 2017 13:15:34 +0200 Message-Id: <20170720111534.9845-1-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hu Huajun Commit 02d50cdaff36c135d222015cffdca3ff11d168ea upstream. When reading the cntpct_el0 in guest with VHE (Virtual Host Extension) enabled in host, the "Unsupported guest sys_reg access" error reported. The reason is cnthctl_el2.EL1PCTEN is not enabled, which is expected to be done in kvm_timer_init_vhe(). The problem is kvm_timer_init_vhe is called by cpu_init_hyp_mode, and which is called when VHE is disabled. This patch remove the incorrect call to kvm_timer_init_vhe() from cpu_init_hyp_mode(), and calls kvm_timer_init_vhe() to enable cnthctl_el2.EL1PCTEN in cpu_hyp_reinit(). Fixes: 488f94d7212b ("KVM: arm64: Access CNTHCTL_EL2 bit fields correctly on VHE systems") Cc: stable@vger.kernel.org Signed-off-by: Hu Huajun Reviewed-by: Christoffer Dall Acked-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kvm/arm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.9.0 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 314eb6a..dc18862 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -1106,9 +1106,6 @@ static void cpu_init_hyp_mode(void *dummy) __cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr); __cpu_init_stage2(); - if (is_kernel_in_hyp_mode()) - kvm_timer_init_vhe(); - kvm_arm_init_debug(); } @@ -1120,6 +1117,7 @@ static void cpu_hyp_reinit(void) * event was cancelled before the CPU was reset. */ __cpu_init_stage2(); + kvm_timer_init_vhe(); } else { if (__hyp_get_vectors() == hyp_default_vectors) cpu_init_hyp_mode(NULL);