Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 24 Jun 2008 07:25:51 -0700
Received: from ausesmta2-3.messageone.com ([64.20.241.45]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 24 Jun 2008 07:25:50 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by ausesmta2-3.messageone.com (8.13.8/8.13.8) with ESMTP id m5OEPnUf028547
	for <andy.sharp@onstor.com>; Tue, 24 Jun 2008 09:25:50 -0500
Received: from localhost.localdomain ([127.0.0.1]:38629 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S20035913AbYFXOZh (ORCPT <rfc822;andy.sharp@onstor.com>);
	Tue, 24 Jun 2008 15:25:37 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 24 Jun 2008 15:25:20 +0100 (BST)
Received: from mba.ocn.ne.jp ([122.1.235.107]:37314 "HELO smtp.mba.ocn.ne.jp")
	by ftp.linux-mips.org with SMTP id S20035754AbYFXOZQ (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Tue, 24 Jun 2008 15:25:16 +0100
Received: from localhost (p7203-ipad213funabasi.chiba.ocn.ne.jp [124.85.72.203])
	by smtp.mba.ocn.ne.jp (Postfix) with ESMTP
	id 3AAEBAD23; Tue, 24 Jun 2008 23:25:09 +0900 (JST)
Date: 	Tue, 24 Jun 2008 23:26:38 +0900 (JST)
Message-Id: <20080624.232638.93018712.anemo@mba.ocn.ne.jp>
To: linux-mips@linux-mips.org
Cc: ralf@linux-mips.org
Subject: [PATCH] cevt-txx9: Reset timer counter on initialize
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
X-Fingerprint: 6ACA 1623 39BD 9A94 9B1A  B746 CA77 FE94 2874 D52F
X-Pgp-Public-Key: http://wwwkeys.pgp.net/pks/lookup?op=get&search=0x2874D52F
X-Mailer: Mew version 5.2 on Emacs 21.4 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-archive-position: 19613
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: anemo@mba.ocn.ne.jp
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-06-24_03:2008-06-24,2008-06-24,2008-06-24 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0806240054
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 24 Jun 2008 14:25:50.0787 (UTC) FILETIME=[33D60130:01C8D606]

The txx9_tmr_init() will not clear a timer counter register on certain
case.  The counter register is cleared on 1->0 transition of TCE bit
if CRE=1.  So just clearing TCE bit is not enough.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 795cb8f..b5fc4eb 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -161,6 +161,9 @@ void __init txx9_tmr_init(unsigned long baseaddr)
 	struct txx9_tmr_reg __iomem *tmrptr;
 
 	tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
+	/* Start once to make CounterResetEnable effective */
+	__raw_writel(TXx9_TMTCR_CRE | TXx9_TMTCR_TCE, &tmrptr->tcr);
+	/* Stop and reset the counter */
 	__raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr);
 	__raw_writel(0, &tmrptr->tisr);
 	__raw_writel(0xffffffff, &tmrptr->cpra);

