From patchwork Sat May 1 17:38:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shishkin X-Patchwork-Id: 96292 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o41HfJ17030043 for ; Sat, 1 May 2010 17:41:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123Ab0EARlS (ORCPT ); Sat, 1 May 2010 13:41:18 -0400 Received: from smtp.nokia.com ([192.100.105.134]:44762 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501Ab0EARlR (ORCPT ); Sat, 1 May 2010 13:41:17 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o41Hf8I7021641; Sat, 1 May 2010 12:41:11 -0500 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 1 May 2010 20:41:08 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Sat, 1 May 2010 20:41:08 +0300 Received: from trapdoor (esdhcp040182.research.nokia.com [172.21.40.182]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o41Hf7Rj027833 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sat, 1 May 2010 20:41:07 +0300 Received: from ash by trapdoor with local (Exim 4.71) (envelope-from ) id 1O8GgW-0001Bm-KP; Sat, 01 May 2010 20:41:00 +0300 From: virtuoso@slind.org To: tony@atomide.com Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com, r-woodruff2@ti.com, Alexander Shishkin Subject: [PATCH 3/6] etm: do a dummy read from OSSRR during initialization Date: Sat, 1 May 2010 20:38:18 +0300 Message-Id: <1272735501-2963-4-git-send-email-virtuoso@slind.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1272735501-2963-1-git-send-email-virtuoso@slind.org> References: <1272735501-2963-1-git-send-email-virtuoso@slind.org> X-OriginalArrivalTime: 01 May 2010 17:41:08.0197 (UTC) FILETIME=[7B33E150:01CAE955] X-Nokia-AV: Clean 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.3 (demeter.kernel.org [140.211.167.41]); Sat, 01 May 2010 17:41:21 +0000 (UTC) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index d08062b..73b824a 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -558,7 +558,9 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id) t->etm_portsz = 1; etm_unlock(t); - ret = etm_readl(t, ETMMR_PDSR); + (void)etm_readl(t, ETMMR_PDSR); + /* dummy first read */ + (void)etm_readl(&tracer, ETMMR_OSSRR); t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf; etm_writel(t, 0x440, ETMR_CTRL);