From patchwork Thu Feb 24 01:36:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?= X-Patchwork-Id: 586171 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1O1b447030619 for ; Thu, 24 Feb 2011 01:37:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755665Ab1BXBgd (ORCPT ); Wed, 23 Feb 2011 20:36:33 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:55091 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754205Ab1BXBgc (ORCPT ); Wed, 23 Feb 2011 20:36:32 -0500 Received: by gyh20 with SMTP id 20so20913gyh.19 for ; Wed, 23 Feb 2011 17:36:32 -0800 (PST) Received: by 10.151.77.5 with SMTP id e5mr894228ybl.432.1298511391932; Wed, 23 Feb 2011 17:36:31 -0800 (PST) Received: from localhost.localdomain (arve.mtv.corp.google.com [172.18.103.168]) by mx.google.com with ESMTPS id y21sm5233325yhc.18.2011.02.23.17.36.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Feb 2011 17:36:30 -0800 (PST) From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Russell King , Alexander Shishkin , Jason Wessel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH 9/9 (originally 8)] ARM: etm: Power down etm(s) when tracing is not enabled Date: Wed, 23 Feb 2011 17:36:09 -0800 Message-Id: <1298511369-20257-1-git-send-email-arve@android.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com> References: <1296701663-12168-1-git-send-email-arve@android.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 24 Feb 2011 01:37:04 +0000 (UTC) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index 48de5a4..f2bc95e 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -199,7 +199,7 @@ static int trace_stop_etm(struct tracectx *t, int id) etm_unlock(t, id); - etm_writel(t, id, 0x440, ETMR_CTRL); + etm_writel(t, id, 0x441, ETMR_CTRL); while (!(etm_readl(t, id, ETMR_CTRL) & ETMCTRL_PROGRAM) && --timeout) ; if (!timeout) { @@ -738,7 +738,7 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id) (void)etm_readl(&tracer, t->etm_regs_count, ETMMR_OSSRR); t->ncmppairs = etm_readl(t, t->etm_regs_count, ETMR_CONFCODE) & 0xf; - etm_writel(t, t->etm_regs_count, 0x440, ETMR_CTRL); + etm_writel(t, t->etm_regs_count, 0x441, ETMR_CTRL); etm_writel(t, t->etm_regs_count, new_count, ETMR_TRACEIDR); etm_lock(t, t->etm_regs_count);