From owner-svn-src-head@FreeBSD.ORG  Tue Jun  4 09:33:04 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 066C93A4;
 Tue,  4 Jun 2013 09:33:04 +0000 (UTC)
 (envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D23251660;
 Tue,  4 Jun 2013 09:33:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r549X3U8025169;
 Tue, 4 Jun 2013 09:33:03 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r549X3J7025167;
 Tue, 4 Jun 2013 09:33:03 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201306040933.r549X3J7025167@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 4 Jun 2013 09:33:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251371 - head/sys/arm/mv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jun 2013 09:33:04 -0000

Author: gber
Date: Tue Jun  4 09:33:03 2013
New Revision: 251371
URL: http://svnweb.freebsd.org/changeset/base/251371

Log:
  Fix the passing of time on Armada XP.
  
  In order to become independent of Coherency Fabric frequency, configure
  Timer and Watchdog to operate in 25MHz mode.
  
  Submitted by:	Zbigniew Bodek <zbb@semihalf.com>

Modified:
  head/sys/arm/mv/mvreg.h
  head/sys/arm/mv/timer.c

Modified: head/sys/arm/mv/mvreg.h
==============================================================================
--- head/sys/arm/mv/mvreg.h	Tue Jun  4 09:21:18 2013	(r251370)
+++ head/sys/arm/mv/mvreg.h	Tue Jun  4 09:33:03 2013	(r251371)
@@ -215,6 +215,10 @@
 #define CPU_TIMER1_AUTO		0x00000008
 #define CPU_TIMER_WD_EN		0x00000010
 #define CPU_TIMER_WD_AUTO	0x00000020
+/* 25MHz mode is Armada XP - specific */
+#define CPU_TIMER_WD_25MHZ_EN	0x00000400
+#define CPU_TIMER0_25MHZ_EN	0x00000800
+#define CPU_TIMER1_25MHZ_EN	0x00001000
 #define CPU_TIMER0_REL		0x10
 #define CPU_TIMER0		0x14
 

Modified: head/sys/arm/mv/timer.c
==============================================================================
--- head/sys/arm/mv/timer.c	Tue Jun  4 09:21:18 2013	(r251370)
+++ head/sys/arm/mv/timer.c	Tue Jun  4 09:33:03 2013	(r251371)
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #define MAX_WATCHDOG_TICKS	(0xffffffff)
 
 #if defined(SOC_MV_ARMADAXP)
-#define MV_CLOCK_SRC		get_l2clk()
+#define MV_CLOCK_SRC		25000000	/* Timers' 25MHz mode */
 #else
 #define MV_CLOCK_SRC		get_tclk()
 #endif
@@ -323,6 +323,9 @@ mv_watchdog_enable(void)
 
 	val = mv_get_timer_control();
 	val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO;
+#if defined(SOC_MV_ARMADAXP)
+	val |= CPU_TIMER_WD_25MHZ_EN;
+#endif
 	mv_set_timer_control(val);
 }
 
@@ -440,6 +443,10 @@ mv_setup_timers(void)
 	val = mv_get_timer_control();
 	val &= ~(CPU_TIMER0_EN | CPU_TIMER0_AUTO);
 	val |= CPU_TIMER1_EN | CPU_TIMER1_AUTO;
+#if defined(SOC_MV_ARMADAXP)
+	/* Enable 25MHz mode */
+	val |= CPU_TIMER0_25MHZ_EN | CPU_TIMER1_25MHZ_EN;
+#endif
 	mv_set_timer_control(val);
 	timers_initialized = 1;
 }