From patchwork Wed Jun 20 22:47:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9527 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5100423E1B for ; Wed, 20 Jun 2012 22:49:31 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0B7EFA18290 for ; Wed, 20 Jun 2012 22:49:30 +0000 (UTC) Received: by ghbz12 with SMTP id z12so2220ghb.11 for ; Wed, 20 Jun 2012 15:49:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-content-scanned:x-cbid:x-gm-message-state; bh=xbmI4Rz+3GLzA8lWXi+TR2yy4UY2vTh7f7/JrC0d4CM=; b=LMl5bTStKirZ4FjjBr9QtLzawtDW8CDsw42lenUc6GeffZkVFWfmfUwC5YdfgVqPnC F54yaJvZvjG3tbRMHhx+A9MfbMpECTKGNBXa6zuun0l0sPjb567OOehAE6enCEhA+e0k ztDADoR4Y9CnfjcaxZiCcpk5vypkX2blcEH6c98AcZkfVl3MI6cjPFOzHfVbgG4Qbu3o 12m661FNX9Tw77j0cBg0jniS4XFmLBzX3jdF0MZbWJOQG0+n4QDWnXIqO8ecDqXdVQDJ ULCy8TXxck90IukanMENcfUjS6MO485WpUviaIj9DFiFZBpSEubqLJFd4z+Wkho4vr2U 2EQA== Received: by 10.50.46.232 with SMTP id y8mr5969977igm.57.1340232570366; Wed, 20 Jun 2012 15:49:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp204199ibb; Wed, 20 Jun 2012 15:49:29 -0700 (PDT) Received: by 10.68.222.38 with SMTP id qj6mr81370526pbc.6.1340232569500; Wed, 20 Jun 2012 15:49:29 -0700 (PDT) Received: from e37.co.us.ibm.com (e37.co.us.ibm.com. [32.97.110.158]) by mx.google.com with ESMTPS id nc7si2298914pbc.105.2012.06.20.15.49.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jun 2012 15:49:29 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.110.158 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.110.158; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.110.158 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Jun 2012 16:49:28 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 20 Jun 2012 16:49:23 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 248A119D804F; Wed, 20 Jun 2012 22:48:44 +0000 (WET) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5KMmKPx106238; Wed, 20 Jun 2012 16:48:25 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5KMm3TJ029425; Wed, 20 Jun 2012 16:48:04 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5KMls25028868; Wed, 20 Jun 2012 16:48:03 -0600 From: John Stultz To: LKML Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Russell King , Paul Gortmaker , Alexander Shishkin , John Stultz Subject: [PATCH 09/15] ARM: etm: Power down etm(s) when tracing is not enabled Date: Wed, 20 Jun 2012 18:47:41 -0400 Message-Id: <1340232467-6023-10-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340232467-6023-1-git-send-email-john.stultz@linaro.org> References: <1340232467-6023-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12062022-7408-0000-0000-0000060C8E79 X-Gm-Message-State: ALoCoQnAkc9+bPHAaMuMAlSwdnjIP+9yJSmbgnVM7imkhxmZLRTLkM04hv96mPYVYCLHx+4x24TK From: Arve Hjønnevåg Without this change a saw an 18% increase in idle power consumption on one deivce when trace support is compiled into the kernel. Now I see the same increase only when tracing. CC: Russell King CC: Paul Gortmaker CC: Alexander Shishkin Acked-by: Alexander Shishkin Signed-off-by: Arve Hjønnevåg Signed-off-by: John Stultz --- arch/arm/kernel/etm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index e3309ea..66bf592 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -200,7 +200,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) { @@ -739,7 +739,7 @@ static int __devinit etm_probe(struct amba_device *dev, const 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);