From owner-svn-src-all@FreeBSD.ORG Tue Aug 24 16:08:02 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0EA1510656A4;
Tue, 24 Aug 2010 16:08:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id F247E8FC16;
Tue, 24 Aug 2010 16:08:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7OG810M081013;
Tue, 24 Aug 2010 16:08:01 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7OG814P081011;
Tue, 24 Aug 2010 16:08:01 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201008241608.o7OG814P081011@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 24 Aug 2010 16:08:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r211756 - head/sys/x86/x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Aug 2010 16:08:02 -0000
Author: mav
Date: Tue Aug 24 16:08:01 2010
New Revision: 211756
URL: http://svn.freebsd.org/changeset/base/211756
Log:
Enable timer interrupt before starting timer. This allows to handle very
short periods without interrupt loss.
Modified:
head/sys/x86/x86/local_apic.c
Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c Tue Aug 24 13:38:53 2010 (r211755)
+++ head/sys/x86/x86/local_apic.c Tue Aug 24 16:08:01 2010 (r211756)
@@ -369,12 +369,13 @@ lapic_setup(int boot)
if (la->la_timer_mode != 0) {
KASSERT(la->la_timer_period != 0, ("lapic%u: zero divisor",
lapic_id()));
+ lapic_timer_stop();
lapic_timer_set_divisor(lapic_timer_divisor);
+ lapic_timer_enable_intr();
if (la->la_timer_mode == 1)
lapic_timer_periodic(la->la_timer_period);
else
lapic_timer_oneshot(la->la_timer_period);
- lapic_timer_enable_intr();
}
/* Program error LVT and clear any existing errors. */
@@ -505,12 +506,10 @@ lapic_et_start(struct eventtimer *et,
et->et_max_period.frac =
((0xfffffffeLLU << 32) / et->et_frequency) << 32;
}
- la = &lapics[lapic_id()];
- /*
- * Start up the timer on the BSP. The APs will kick off their
- * timer during lapic_setup().
- */
+ lapic_timer_stop();
lapic_timer_set_divisor(lapic_timer_divisor);
+ lapic_timer_enable_intr();
+ la = &lapics[lapic_id()];
if (period != NULL) {
la->la_timer_mode = 1;
la->la_timer_period =
@@ -526,7 +525,6 @@ lapic_et_start(struct eventtimer *et,
la->la_timer_period += et->et_frequency * first->sec;
lapic_timer_oneshot(la->la_timer_period);
}
- lapic_timer_enable_intr();
return (0);
}
@@ -862,8 +860,9 @@ lapic_timer_stop(void)
value = lapic->lvt_timer;
value &= ~APIC_LVTT_TM;
- value &= ~APIC_LVT_M;
+ value |= APIC_LVT_M;
lapic->lvt_timer = value;
+ lapic->icr_timer = 0;
}
static void