From patchwork Fri Oct 2 13:24:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 54424 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id C1932218EF for ; Fri, 2 Oct 2015 13:33:43 +0000 (UTC) Received: by laer8 with SMTP id r8sf47903506lae.2 for ; Fri, 02 Oct 2015 06:33:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Cqq8pusoqiUylX3mcWtqavmeutX5CKu6U+cK229a6Cw=; b=WJ//2VgGdmncVXbBqzARtIyV4vmvf4+jJOIaivRP1L/+6lCVsc+f9tIEBIymMarc12 6QklsqQ6jU3+3WVim04p4WGfwcpz2oOpKSFqsoeR3T/nyqUqjkSlpGuy88D8KMFWFvKc Gdr1Pb7mMgGMCd3GsPpe5RfmN2zo33ZrjQu1OZjfXGgF3JvV0eyGGe51ChQBWK8wduOB 4nM1rQVtZU38T3+d6XPDtIIFpITF3RLa7Ri/QLZSNlrA0KNCI2P5da142qnUJJQ7+e1t kN8CURtOkpcc6ZcBPdoKPMrBRu1ASu1wg8BL2tWdJLzhaSXF3Oj43Mzm4gn854SQFBRr BOiA== X-Gm-Message-State: ALoCoQmTPnZIRTVZzB6WdEVS6U5ivHUTktbS17cKeYpsf5nYemYgHQgUtJn/M77sK8Apm9AZXHwA X-Received: by 10.112.132.6 with SMTP id oq6mr2571009lbb.1.1443792822449; Fri, 02 Oct 2015 06:33:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.15.156 with SMTP id 28ls249584lfp.5.gmail; Fri, 02 Oct 2015 06:33:42 -0700 (PDT) X-Received: by 10.25.37.7 with SMTP id l7mr3728391lfl.34.1443792822169; Fri, 02 Oct 2015 06:33:42 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id q20si6268194lfe.30.2015.10.02.06.33.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 06:33:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by laclj5 with SMTP id lj5so92573195lac.3 for ; Fri, 02 Oct 2015 06:33:42 -0700 (PDT) X-Received: by 10.112.163.131 with SMTP id yi3mr5651402lbb.36.1443792821921; Fri, 02 Oct 2015 06:33:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1248029lbq; Fri, 2 Oct 2015 06:33:40 -0700 (PDT) X-Received: by 10.50.171.161 with SMTP id av1mr4260661igc.6.1443792820085; Fri, 02 Oct 2015 06:33:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cz15si6120439igc.53.2015.10.02.06.33.39; Fri, 02 Oct 2015 06:33:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688AbbJBNdh (ORCPT + 30 others); Fri, 2 Oct 2015 09:33:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:39669 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045AbbJBNZq (ORCPT ); Fri, 2 Oct 2015 09:25:46 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 692CDACF2; Fri, 2 Oct 2015 13:25:44 +0000 (UTC) From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Will Deacon , Jiri Slaby Subject: [PATCH 3.12 40/84] arm64: head.S: initialise mdcr_el2 in el2_setup Date: Fri, 2 Oct 2015 15:24:45 +0200 Message-Id: <3ebb37283c93282592beba3f01e46c8f8371dee8.1443792303.git.jslaby@suse.cz> X-Mailer: git-send-email 2.6.0 In-Reply-To: <4386f737d429451d61358f771e315ed47e2f451f.1443792303.git.jslaby@suse.cz> References: <4386f737d429451d61358f771e315ed47e2f451f.1443792303.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Will Deacon 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit d10bcd473301888f957ec4b6b12aa3621be78d59 upstream. When entering the kernel at EL2, we fail to initialise the MDCR_EL2 register which controls debug access and PMU capabilities at EL1. This patch ensures that the register is initialised so that all traps are disabled and all the PMU counters are available to the host. When a guest is scheduled, KVM takes care to configure trapping appropriately. Acked-by: Marc Zyngier Signed-off-by: Will Deacon Signed-off-by: Jiri Slaby --- arch/arm64/kernel/head.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 7090c126797c..aca41b06dc7a 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -192,6 +192,11 @@ ENTRY(el2_setup) msr hstr_el2, xzr // Disable CP15 traps to EL2 #endif + /* EL2 debug */ + mrs x0, pmcr_el0 // Disable debug access traps + ubfx x0, x0, #11, #5 // to EL2 and allow access to + msr mdcr_el2, x0 // all PMU counters from EL1 + /* Stage-2 translation */ msr vttbr_el2, xzr