From owner-p4-projects@FreeBSD.ORG Thu Aug 4 13:45:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E582816A421; Thu, 4 Aug 2005 13:45:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3B3016A41F; Thu, 4 Aug 2005 13:45:03 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from mv.twc.weather.com (mv.twc.weather.com [65.212.71.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4388743D48; Thu, 4 Aug 2005 13:45:03 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from [10.50.40.201] (Not Verified[65.202.103.25]) by mv.twc.weather.com with NetIQ MailMarshal (v6, 0, 3, 8) id ; Thu, 04 Aug 2005 09:59:42 -0400 From: John Baldwin To: Peter Wemm Date: Thu, 4 Aug 2005 09:24:02 -0400 User-Agent: KMail/1.8 References: <200508032229.j73MTQDL025132@repoman.freebsd.org> In-Reply-To: <200508032229.j73MTQDL025132@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200508040924.03004.jhb@FreeBSD.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 81419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2005 13:45:05 -0000 On Wednesday 03 August 2005 06:29 pm, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=81419 > > Change 81419 by peter@peter_overcee on 2005/08/03 22:29:12 > > Integ -b i386_hammer (extint stuff) Actually, I'm not sure that amd64 should have this as it's only a workaround for some old p3-based hardware, though it probably doesn't hurt to have it I guess. > Affected files ... > > .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#30 integrate > .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#40 integrate > > Differences ... > > ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#30 (text+ko) ==== > > > ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#40 (text+ko) ==== > > @@ -40,6 +40,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -130,6 +131,12 @@ > static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; > static u_int next_id, program_logical_dest; > > +SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); > +static int enable_extint; > +SYSCTL_INT(_hw_apic, OID_AUTO, enable_extint, CTLFLAG_RDTUN, > &enable_extint, 0, + "Enable the ExtINT pin in the first I/O APIC"); > +TUNABLE_INT("hw.apic.enable_extint", &enable_extint); > + > static __inline void > _ioapic_eoi_source(struct intsrc *isrc) > { > @@ -287,7 +294,7 @@ > switch (intpin->io_vector) { > case VECTOR_EXTINT: > KASSERT(intpin->io_edgetrigger, > - ("EXTINT not edge triggered")); > + ("ExtINT not edge triggered")); > low |= IOART_DELEXINT; > break; > case VECTOR_NMI: > @@ -681,7 +688,10 @@ > return (EINVAL); > io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; > io->io_pins[pin].io_vector = VECTOR_EXTINT; > - io->io_pins[pin].io_masked = 1; > + if (enable_extint) > + io->io_pins[pin].io_masked = 0; > + else > + io->io_pins[pin].io_masked = 1; > io->io_pins[pin].io_edgetrigger = 1; > io->io_pins[pin].io_activehi = 1; > if (bootverbose) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org