From patchwork Wed Jun 13 02:01:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9251 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 366C423E37 for ; Wed, 13 Jun 2012 02:01:57 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 00C92A18221 for ; Wed, 13 Jun 2012 02:01:56 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so52452ggn.11 for ; Tue, 12 Jun 2012 19:01:56 -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=MuHH7mT8gyJNBtI13CNcXJPo0dug8psp14XUczVNDQ0=; b=VyipEEhmBhChGppZLLuf7uSEHrsJVP8t5WLi3bJO+d4+rzXcAxqRIQ+AH4S9mTZdVp WaBcPBi42d7TrWrVHSOE5Z76sI+d+5A/l8NRXFI5X4KKYGM4r9LmrvDuhg30tltfipuD 1ZtZS7RAVZCz4vBYTe0V5SlwYUYrkmi90fIiGLMgyJeuF5y+iquoSK49QnnuafQ8VQJp 2Wuy3JzEg/Xjqb7tUoS8aFc6OkD0WQku04DlNPoLHkG4gTPy80+5Bnvo0v59XVOlGqjm e3k4r08Xvn6xs5wiAvzB3oxBEW24+FR2vxq3AkX44wvwMB5KnBrpQ4IFSpIBucR4DH2D 5L5A== Received: by 10.50.40.193 with SMTP id z1mr9774413igk.0.1339552916426; Tue, 12 Jun 2012 19:01:56 -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 v20csp200431ibb; Tue, 12 Jun 2012 19:01:55 -0700 (PDT) Received: by 10.236.181.133 with SMTP id l5mr30796865yhm.81.1339552915512; Tue, 12 Jun 2012 19:01:55 -0700 (PDT) Received: from e9.ny.us.ibm.com (e9.ny.us.ibm.com. [32.97.182.139]) by mx.google.com with ESMTPS id s46si1612904yhg.136.2012.06.12.19.01.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 19:01:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.139 as permitted sender) client-ip=32.97.182.139; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.139 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jun 2012 22:01:55 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Jun 2012 22:01:51 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 4F1E86E804A; Tue, 12 Jun 2012 22:01:51 -0400 (EDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5D21noa207574; Tue, 12 Jun 2012 22:01:50 -0400 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5D21hvR019764; Tue, 12 Jun 2012 20:01:43 -0600 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5D21h0e019705; Tue, 12 Jun 2012 20:01:43 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 362DEC062A; Tue, 12 Jun 2012 19:01:41 -0700 (PDT) From: John Stultz To: LKML Cc: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Russell King , Paul Gortmaker , Alexander Shishkin , Mathieu Poirier , John Stultz Subject: [PATCH 09/15] ARM: etm: Power down etm(s) when tracing is not enabled Date: Tue, 12 Jun 2012 19:01:27 -0700 Message-Id: <1339552887-17204-10-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1339552887-17204-1-git-send-email-john.stultz@linaro.org> References: <1339552887-17204-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061302-7182-0000-0000-000001BB35EA X-Gm-Message-State: ALoCoQnzclU9nWK/sD/+cCNTbQMocTGoKGVRXP+cmo0CDQQ0sveo6A1y1RH+Wq3DqGuK3hQBj3gr 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 CC: Mathieu Poirier Acked-by: Alexander Shishkin Signed-off-by: Arve Hjønnevåg Signed-off-by: John Stultz --- arch/arm/kernel/etm.c | 4 ++-- 1 files 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);