From owner-freebsd-amd64@FreeBSD.ORG Wed Feb 16 05:28:27 2005 Return-Path: Delivered-To: freebsd-amd64@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABF8916A4CE; Wed, 16 Feb 2005 05:28:27 +0000 (GMT) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id E479643D41; Wed, 16 Feb 2005 05:28:26 +0000 (GMT) (envelope-from jkim@niksun.com) Received: from [10.70.0.244] (daemon.mj.niksun.com [10.70.0.244]) by anuket.mj.niksun.com (8.13.1/8.12.11) with ESMTP id j1G5RvT8036265; Wed, 16 Feb 2005 00:27:58 -0500 (EST) (envelope-from jkim@niksun.com) From: Jung-uk Kim Organization: Niksun, Inc. To: freebsd-amd64@freebsd.org, cokane@cokane.org Date: Wed, 16 Feb 2005 00:27:55 -0500 User-Agent: KMail/1.6.2 References: <200502141722.10259.jhb@FreeBSD.org> <200502151659.42594.nb_root@videotron.ca> <346a80220502151437627a9ef6@mail.gmail.com> In-Reply-To: <346a80220502151437627a9ef6@mail.gmail.com> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_bntECfMDi4sZ2i6" Message-Id: <200502160027.55420.jkim@niksun.com> X-Virus-Scanned: clamd / ClamAV version 0.75.1, clamav-milter version 0.75c on anuket.mj.niksun.com X-Virus-Status: Clean Subject: Re: [PATCH] Updated quirk-driven R3000Z patches X-BeenThere: freebsd-amd64@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting FreeBSD to the AMD64 platform List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2005 05:28:27 -0000 --Boundary-00=_bntECfMDi4sZ2i6 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tuesday 15 February 2005 05:37 pm, Coleman Kane wrote: > Hi, I tested the patch posted by John on a compaq R3000. Works > great, except still requires device atpic (for the mixed_mode > operation I think). Kim posted a patch in this email: > http://lists.freebsd.org/pipermail/freebsd-amd64/2005-January/00337 >6.html. I dunno if the patch is kosher or not, however. It does > allow me to run without using atpic. Ouch, you're absolutely correct. jhb's patch wasn't complete for amd64. The missing piece is attached. Can you please re-test? Thanks, Jung-uk Kim --Boundary-00=_bntECfMDi4sZ2i6 Content-Type: text/plain; charset="iso-8859-1"; name="r3000-amd64.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="r3000-amd64.diff" --- src/sys/amd64/amd64/io_apic.c.orig Mon Aug 16 19:12:29 2004 +++ src/sys/amd64/amd64/io_apic.c Wed Feb 16 00:21:23 2005 @@ -548,10 +548,11 @@ /* * Assume that pin 0 on the first I/O APIC is an ExtINT pin - * and that pins 1-15 are ISA interrupts. Assume that all + * if mixed mode is enabled and an ISA interrupt if not. + * Assume that pins 1-15 are ISA interrupts and that all * other pins are PCI interrupts. */ - if (intpin->io_vector == 0) + if (intpin->io_vector == 0 && mixed_mode_enabled) ioapic_set_extint(io, i); else if (intpin->io_vector < IOAPIC_ISA_INTS) { intpin->io_bus = APIC_BUS_ISA; --Boundary-00=_bntECfMDi4sZ2i6--