From patchwork Fri Jan 24 16:40:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adrien_Verg=C3=A9?= X-Patchwork-Id: 313940 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9E8302C0099 for ; Sat, 25 Jan 2014 03:44:15 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6jpr-0003fl-IA; Fri, 24 Jan 2014 16:42:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6jpZ-000672-9o; Fri, 24 Jan 2014 16:42:09 +0000 Received: from mail-ig0-x235.google.com ([2607:f8b0:4001:c05::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W6jpB-0005zS-T9 for linux-arm-kernel@lists.infradead.org; Fri, 24 Jan 2014 16:41:53 +0000 Received: by mail-ig0-f181.google.com with SMTP id j1so3023800iga.2 for ; Fri, 24 Jan 2014 08:41:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=w/XXxsxCt71EOI60i7rLDNvmyxMSjOaCHSnxgdC35qI=; b=S5rULQw4q4SN4sQSg94tqEAtyUS8i/KkN2bMboujaeWVnKa7HyK1KivGXJVjw5t+Mr Gl1Q1/vXK+ubFxJzx1d2r4moMeU9EyeLV+wF01yWI8wL7DNik9ddi4jsU1t7c+V0+15i X3yBzzRMrW3Nkbm4SEoO/X8IRHxOIDIEKIua6Yii3FWYSBZQZO+QgQeXJoMAKei7HDLu A5f1G/YmK56T+T4onD2UeM7VUjfXCoIiaODRCLQEXX897zW1thgbKYKEyOG3H6ANUWFJ 8bPDhrWqqsYxBwlkbrLyzlgQl4KW5ZxNEL7cVzrqQHUebkwDXkRJWbHC6fFLeNRMRmFN 1zDA== X-Received: by 10.43.141.4 with SMTP id jc4mr904756icc.87.1390581682888; Fri, 24 Jan 2014 08:41:22 -0800 (PST) Received: from station14.dorsal.polymtl.ca ([132.207.72.19]) by mx.google.com with ESMTPSA id f5sm10264221igc.4.2014.01.24.08.41.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jan 2014 08:41:22 -0800 (PST) From: =?UTF-8?q?Adrien=20Verg=C3=A9?= To: Russell King Subject: [PATCH V2 2/6] ARM CoreSight: ETM: Rename 'comparator' to 'address comparator' Date: Fri, 24 Jan 2014 11:40:52 -0500 Message-Id: <1390581656-16372-3-git-send-email-adrienverge@gmail.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390581656-16372-1-git-send-email-adrienverge@gmail.com> References: <1390581656-16372-1-git-send-email-adrienverge@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140124_114146_038746_D7DD3921 X-CRM114-Status: GOOD ( 15.93 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (adrienverge[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Dirk Behme , Mathieu Poirier , Catalin Marinas , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Michel Dagenais , Ben Dooks , Christopher Covington , =?UTF-8?q?Adrien=20Verg=C3=A9?= , Andrew Morton , linux-arm-kernel@lists.infradead.org, "zhangwei\(Jovi\)" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Since there are different types of comparators, and other kinds will be used (such as Context ID comparators), rename them properly. Signed-off-by: Adrien Vergé --- arch/arm/include/asm/hardware/coresight.h | 4 ++-- arch/arm/kernel/etm.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h index ad774f3..8c50cf6 100644 --- a/arch/arm/include/asm/hardware/coresight.h +++ b/arch/arm/include/asm/hardware/coresight.h @@ -95,8 +95,8 @@ #define ETMAAT_NSONLY (1 << 10) #define ETMAAT_SONLY (2 << 10) -#define ETMR_COMP_VAL(x) (0x40 + (x) * 4) -#define ETMR_COMP_ACC_TYPE(x) (0x80 + (x) * 4) +#define ETMR_ADDRCOMP_VAL(x) (0x40 + (x) * 4) +#define ETMR_ADDRCOMP_ACC_TYPE(x) (0x80 + (x) * 4) /* ETM status register, "ETM Architecture", 3.3.2 */ #define ETMR_STATUS (0x10) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index 2b1a307..7f7a0ee 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -39,7 +39,7 @@ struct tracectx { void __iomem *etb_regs; void __iomem *etm_regs; unsigned long flags; - int ncmppairs; + int naddrcmppairs; int etm_portsz; struct device *dev; struct clk *emu_clk; @@ -59,7 +59,7 @@ static int etm_setup_address_range(struct tracectx *t, int n, u32 flags = ETMAAT_ARM | ETMAAT_IGNCONTEXTID | ETMAAT_NSONLY | \ ETMAAT_NOVALCMP; - if (n < 1 || n > t->ncmppairs) + if (n < 1 || n > t->naddrcmppairs) return -EINVAL; /* comparators and ranges are numbered starting with 1 as opposed @@ -72,12 +72,12 @@ static int etm_setup_address_range(struct tracectx *t, int n, flags |= ETMAAT_IEXEC; /* first comparator for the range */ - etm_writel(t, flags, ETMR_COMP_ACC_TYPE(n * 2)); - etm_writel(t, start, ETMR_COMP_VAL(n * 2)); + etm_writel(t, flags, ETMR_ADDRCOMP_ACC_TYPE(n * 2)); + etm_writel(t, start, ETMR_ADDRCOMP_VAL(n * 2)); /* second comparator is right next to it */ - etm_writel(t, flags, ETMR_COMP_ACC_TYPE(n * 2 + 1)); - etm_writel(t, end, ETMR_COMP_VAL(n * 2 + 1)); + etm_writel(t, flags, ETMR_ADDRCOMP_ACC_TYPE(n * 2 + 1)); + etm_writel(t, end, ETMR_ADDRCOMP_VAL(n * 2 + 1)); flags = exclude ? ETMTE_INCLEXCL : 0; etm_writel(t, flags | (1 << n), ETMR_TRACEENCTRL); @@ -475,7 +475,8 @@ static ssize_t trace_info_show(struct device *dev, etm_st = etm_readl(&tracer, ETMR_STATUS); etm_lock(&tracer); - return sprintf(buf, "Trace buffer len: %d\nComparator pairs: %d\n" + return sprintf(buf, "Trace buffer len: %d\n" + "Addr comparator pairs: %d\n" "ETBR_WRITEADDR:\t%08x\n" "ETBR_READADDR:\t%08x\n" "ETBR_STATUS:\t%08x\n" @@ -483,7 +484,7 @@ static ssize_t trace_info_show(struct device *dev, "ETMR_CTRL:\t%08x\n" "ETMR_STATUS:\t%08x\n", datalen, - tracer.ncmppairs, + tracer.naddrcmppairs, etb_wa, etb_ra, etb_st, @@ -559,7 +560,7 @@ static int etm_probe(struct amba_device *dev, const struct amba_id *id) /* dummy first read */ (void)etm_readl(&tracer, ETMMR_OSSRR); - t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf; + t->naddrcmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf; etm_writel(t, 0x440, ETMR_CTRL); etm_lock(t);