From owner-svn-src-head@freebsd.org  Sat Nov 25 22:43:53 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6AA6DF2778;
 Sat, 25 Nov 2017 22:43:53 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B31CE72852;
 Sat, 25 Nov 2017 22:43:53 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAPMhqIQ077163;
 Sat, 25 Nov 2017 22:43:52 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAPMhqqV077162;
 Sat, 25 Nov 2017 22:43:52 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201711252243.vAPMhqqV077162@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 25 Nov 2017 22:43:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326216 - head/sys/powerpc/powerpc
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/sys/powerpc/powerpc
X-SVN-Commit-Revision: 326216
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Nov 2017 22:43:54 -0000

Author: nwhitehorn
Date: Sat Nov 25 22:43:52 2017
New Revision: 326216
URL: https://svnweb.freebsd.org/changeset/base/326216

Log:
  On AIM systems, it is not actually possible to stop the CPU timer, so we
  just set it to a large default value (and inherit any previously existing
  value), hoping it never turns over. Instead, silently allow spurious
  one-shots from rollovers.
  
  MFC after:	10 days

Modified:
  head/sys/powerpc/powerpc/clock.c

Modified: head/sys/powerpc/powerpc/clock.c
==============================================================================
--- head/sys/powerpc/powerpc/clock.c	Sat Nov 25 22:42:05 2017	(r326215)
+++ head/sys/powerpc/powerpc/clock.c	Sat Nov 25 22:43:52 2017	(r326216)
@@ -141,6 +141,9 @@ decr_intr(struct trapframe *frame)
 	} else if (s->mode == 2) {
 		nticks = 1;
 		decr_et_stop(NULL);
+	} else if (s->mode == 0) {
+		/* Potemkin timer ran out without an event. Just reset it. */
+		decr_et_stop(NULL);
 	}
 
 	while (nticks-- > 0) {