From patchwork Tue Feb 3 19:02:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 44277 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8750F2034D for ; Tue, 3 Feb 2015 19:02:38 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id u56sf22184259wes.2 for ; Tue, 03 Feb 2015 11:02:37 -0800 (PST) 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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=xSbS+151Sr1m8A3yu782etXUJ7iLE+2Fu0mRpvfWVWk=; b=BOPMVfdRbQv2yit7zB+Xg0CmDChXv5r/II/4ZjXEn3i2qUdNx9HGk0/49YxbA3hVFi 8ay+83ly1GZgf8bQirNlqM0wv/NL9R5NS314+q3SEw7bBRytX+tG4uSf92ITUvQG3ph/ 1kL2HvRZ+XoUO1gy2RCTLqJnwbX7kkFqo+N7IGTZNotMOlXD7kHD0kiaK5a4US2cdO9k ajHUpxl7ltjSNlLR7A+cBZ3PLVvdcfSrE+TFMQiBwB74+CqoFAtQiWd1K4s1pQi3DTgt O+Rcw1FP9qr14DIMPeIyOT+CsWyWKwMZBZcGMugNrQSrGpm/V9FBIymGVG0o5h5zzv82 KOvQ== X-Gm-Message-State: ALoCoQl2DAhcd+cQwJAbxL5E0ROhFdWcUePX32RGKtoCw5ayHIRDc8lRn2/aL8hb54Omp4zjAk01 X-Received: by 10.194.239.41 with SMTP id vp9mr324520wjc.5.1422990157863; Tue, 03 Feb 2015 11:02:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.4 with SMTP id 4ls265012lay.65.gmail; Tue, 03 Feb 2015 11:02:37 -0800 (PST) X-Received: by 10.152.5.167 with SMTP id t7mr15503406lat.32.1422990157586; Tue, 03 Feb 2015 11:02:37 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id xw4si20032840lbb.105.2015.02.03.11.02.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Feb 2015 11:02:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id s18so54201375lam.3 for ; Tue, 03 Feb 2015 11:02:37 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr26919613laa.80.1422990157474; Tue, 03 Feb 2015 11:02:37 -0800 (PST) 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.35.133 with SMTP id h5csp23610lbj; Tue, 3 Feb 2015 11:02:36 -0800 (PST) X-Received: by 10.66.66.46 with SMTP id c14mr40142271pat.136.1422990155512; Tue, 03 Feb 2015 11:02:35 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp13si3566101pab.68.2015.02.03.11.02.30; Tue, 03 Feb 2015 11:02:35 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756226AbbBCTC0 (ORCPT + 29 others); Tue, 3 Feb 2015 14:02:26 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:51146 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756188AbbBCTCZ (ORCPT ); Tue, 3 Feb 2015 14:02:25 -0500 Received: by mail-pa0-f51.google.com with SMTP id fb1so99895619pad.10 for ; Tue, 03 Feb 2015 11:02:24 -0800 (PST) X-Received: by 10.70.52.234 with SMTP id w10mr40005816pdo.50.1422990144546; Tue, 03 Feb 2015 11:02:24 -0800 (PST) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPSA id fu1sm2886315pdb.80.2015.02.03.11.02.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Feb 2015 11:02:23 -0800 (PST) From: mathieu.poirier@linaro.org To: linux@arm.linux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] coresight: Adding coresight support for arm64 architecture Date: Tue, 3 Feb 2015 12:02:13 -0700 Message-Id: <1422990133-26342-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 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: mathieu.poirier@linaro.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.44 as permitted sender) smtp.mail=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: Mathieu Poirier Most CoreSight blocks are 64-bit ready. As such move configuration entries from "arch/arm/Kconfig.config" to the driver's subdirectory and source the newly created Kconfig from architecture specific Kconfig.debug files. Also fixing a couple of warnings generated by the 64-bit compiler. Signed-off-by: Mathieu Poirier --- arch/arm/Kconfig.debug | 55 +--------------------------------- arch/arm64/Kconfig.debug | 2 ++ drivers/coresight/Kconfig | 60 +++++++++++++++++++++++++++++++++++++ drivers/coresight/coresight-etb10.c | 2 +- drivers/coresight/coresight-tmc.c | 2 +- 5 files changed, 65 insertions(+), 56 deletions(-) create mode 100644 drivers/coresight/Kconfig diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 5ddd4906f7a7..4fdbb0c012e6 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1478,59 +1478,6 @@ config DEBUG_SET_MODULE_RONX against certain classes of kernel exploits. If in doubt, say "N". -menuconfig CORESIGHT - bool "CoreSight Tracing Support" - select ARM_AMBA - help - This framework provides a kernel interface for the CoreSight debug - and trace drivers to register themselves with. It's intended to build - a topological view of the CoreSight components based on a DT - specification and configure the right serie of components when a - trace source gets enabled. - -if CORESIGHT -config CORESIGHT_LINKS_AND_SINKS - bool "CoreSight Link and Sink drivers" - help - This enables support for CoreSight link and sink drivers that are - responsible for transporting and collecting the trace data - respectively. Link and sinks are dynamically aggregated with a trace - entity at run time to form a complete trace path. - -config CORESIGHT_LINK_AND_SINK_TMC - bool "Coresight generic TMC driver" - depends on CORESIGHT_LINKS_AND_SINKS - help - This enables support for the Trace Memory Controller driver. Depending - on its configuration the device can act as a link (embedded trace router - - ETR) or sink (embedded trace FIFO). The driver complies with the - generic implementation of the component without special enhancement or - added features. - -config CORESIGHT_SINK_TPIU - bool "Coresight generic TPIU driver" - depends on CORESIGHT_LINKS_AND_SINKS - help - This enables support for the Trace Port Interface Unit driver, responsible - for bridging the gap between the on-chip coresight components and a trace - port collection engine, typically connected to an external host for use - case capturing more traces than the on-board coresight memory can handle. - -config CORESIGHT_SINK_ETBV10 - bool "Coresight ETBv1.0 driver" - depends on CORESIGHT_LINKS_AND_SINKS - help - This enables support for the Embedded Trace Buffer version 1.0 driver - that complies with the generic implementation of the component without - special enhancement or added features. +source "drivers/coresight/Kconfig" -config CORESIGHT_SOURCE_ETM3X - bool "CoreSight Embedded Trace Macrocell 3.x driver" - select CORESIGHT_LINKS_AND_SINKS - help - This driver provides support for processor ETM3.x and PTM1.x modules, - which allows tracing the instructions that a processor is executing - This is primarily useful for instruction level tracing. Depending - the ETM version data tracing may also be available. -endif endmenu diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug index 5fdd6dce8061..650e46056c55 100644 --- a/arch/arm64/Kconfig.debug +++ b/arch/arm64/Kconfig.debug @@ -66,4 +66,6 @@ config DEBUG_SET_MODULE_RONX against certain classes of kernel exploits. If in doubt, say "N". +source "drivers/coresight/Kconfig" + endmenu diff --git a/drivers/coresight/Kconfig b/drivers/coresight/Kconfig new file mode 100644 index 000000000000..271fad830ae4 --- /dev/null +++ b/drivers/coresight/Kconfig @@ -0,0 +1,60 @@ +# +# Coresight configuration +# +menuconfig CORESIGHT + bool "CoreSight Tracing Support" + select ARM_AMBA + help + This framework provides a kernel interface for the CoreSight debug + and trace drivers to register themselves with. It's intended to build + a topological view of the CoreSight components based on a DT + specification and configure the right serie of components when a + trace source gets enabled. + +config CORESIGHT_LINKS_AND_SINKS + bool "CoreSight Link and Sink drivers" + depends on CORESIGHT + help + This enables support for CoreSight link and sink drivers that are + responsible for transporting and collecting the trace data + respectively. Link and sinks are dynamically aggregated with a trace + entity at run time to form a complete trace path. + +config CORESIGHT_LINK_AND_SINK_TMC + bool "Coresight generic TMC driver" + depends on CORESIGHT && CORESIGHT_LINKS_AND_SINKS + help + This enables support for the Trace Memory Controller driver. + Depending on its configuration the device can act as a link (embedded + trace router - ETR) or sink (embedded trace FIFO). The driver + complies with the generic implementation of the component without + special enhancement or added features. + +config CORESIGHT_SINK_TPIU + bool "Coresight generic TPIU driver" + depends on CORESIGHT && CORESIGHT_LINKS_AND_SINKS + help + This enables support for the Trace Port Interface Unit driver, + responsible for bridging the gap between the on-chip coresight + components and a trace for bridging the gap between the on-chip + coresight components and a trace port collection engine, typically + connected to an external host for use case capturing more traces than + the on-board coresight memory can handle. + +config CORESIGHT_SINK_ETBV10 + bool "Coresight ETBv1.0 driver" + depends on CORESIGHT && CORESIGHT_LINKS_AND_SINKS + help + This enables support for the Embedded Trace Buffer version 1.0 driver + that complies with the generic implementation of the component without + special enhancement or added features. + +config CORESIGHT_SOURCE_ETM3X + bool "CoreSight Embedded Trace Macrocell 3.x driver" + depends on CORESIGHT && !ARM64 + select CORESIGHT_LINKS_AND_SINKS + help + This driver provides support for processor ETM3.x and PTM1.x modules, + which allows tracing the instructions that a processor is executing + This is primarily useful for instruction level tracing. Depending + the ETM version data tracing may also be available. diff --git a/drivers/coresight/coresight-etb10.c b/drivers/coresight/coresight-etb10.c index c9acd406f0d0..aa47d31fe2a2 100644 --- a/drivers/coresight/coresight-etb10.c +++ b/drivers/coresight/coresight-etb10.c @@ -314,7 +314,7 @@ static ssize_t etb_read(struct file *file, char __user *data, *ppos += len; dev_dbg(drvdata->dev, "%s: %d bytes copied, %d bytes left\n", - __func__, len, (int) (depth * 4 - *ppos)); + __func__, (int)len, (int)(depth * 4 - *ppos)); return len; } diff --git a/drivers/coresight/coresight-tmc.c b/drivers/coresight/coresight-tmc.c index 3ff232f9ddf7..d08460327bd2 100644 --- a/drivers/coresight/coresight-tmc.c +++ b/drivers/coresight/coresight-tmc.c @@ -534,7 +534,7 @@ static ssize_t tmc_read(struct file *file, char __user *data, size_t len, *ppos += len; dev_dbg(drvdata->dev, "%s: %d bytes copied, %d bytes left\n", - __func__, len, (int) (drvdata->size - *ppos)); + __func__, (int)len, (int)(drvdata->size - *ppos)); return len; }