From owner-freebsd-current@FreeBSD.ORG Tue Jan 20 15:25:21 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9819616A4F6 for ; Tue, 20 Jan 2004 15:25:21 -0800 (PST) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2E7643D60 for ; Tue, 20 Jan 2004 15:24:53 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from ns1.xcllnt.net (localhost [127.0.0.1]) by ns1.xcllnt.net (8.12.10/8.12.10) with ESMTP id i0KNOWOE067885; Tue, 20 Jan 2004 15:24:32 -0800 (PST) (envelope-from marcel@ns1.xcllnt.net) Received: (from marcel@localhost) by ns1.xcllnt.net (8.12.10/8.12.10/Submit) id i0KNOWn8067884; Tue, 20 Jan 2004 15:24:32 -0800 (PST) (envelope-from marcel) Date: Tue, 20 Jan 2004 15:24:32 -0800 From: Marcel Moolenaar To: Vladimir Kushnir Message-ID: <20040120232432.GB67810@ns1.xcllnt.net> References: <200401210059.24928.vkushnir@Alfacom.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="k1lZvvs/B4yU6o8G" Content-Disposition: inline In-Reply-To: <200401210059.24928.vkushnir@Alfacom.net> User-Agent: Mutt/1.5.5.1i X-Mailman-Approved-At: Wed, 21 Jan 2004 05:01:44 -0800 cc: current@freebsd.org Subject: Re: ATA still broken X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jan 2004 23:25:21 -0000 --k1lZvvs/B4yU6o8G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jan 21, 2004 at 12:59:24AM +0200, Vladimir Kushnir wrote: > Hello, > An ATA problem seems to persist here. With last night's sources I still cannot > boot my -CURRENT box. Setup: > MB - oldish 440BX - based ChainTech > ata0: master - NEC CDRW, slave - none > ata1: master - CDROM. slave - none > External card (CMD649-based): > ata2: master - 60G WD (the only HD), slave - none > ata3 - nothing > Tried both my customized config (with atapicam) and GENERIC, with or without > apic/ACPI - no difference. I see you have a CMD649. Can you try the attached patch. Thanks, -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net --k1lZvvs/B4yU6o8G Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="ata.diff" Index: sys/dev/ata/ata-chipset.c =================================================================== RCS file: /home/ncvs/src/sys/dev/ata/ata-chipset.c,v retrieving revision 1.57 diff -u -r1.57 ata-chipset.c --- sys/dev/ata/ata-chipset.c 17 Jan 2004 23:34:13 -0000 1.57 +++ sys/dev/ata/ata-chipset.c 20 Jan 2004 03:34:23 -0000 @@ -103,7 +103,6 @@ static int ata_sii_mio_allocate(device_t, struct ata_channel *); static void ata_sii_reset(struct ata_channel *); static void ata_sii_intr(void *); -static void ata_cmd_intr(void *); static void ata_cmd_old_intr(void *); static void ata_sii_setmode(struct ata_device *, int); static void ata_cmd_setmode(struct ata_device *, int); @@ -1667,7 +1666,7 @@ else { if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, ctlr->chip->cfg2 & SIIINTR ? - ata_cmd_intr : ata_cmd_old_intr, + ata_cmd_old_intr : ata_cmd_old_intr, ctlr, &ctlr->handle))) { device_printf(dev, "unable to setup interrupt\n"); return ENXIO; @@ -1756,6 +1755,7 @@ } } +#if 0 static void ata_cmd_intr(void *data) { @@ -1785,6 +1785,7 @@ } } } +#endif static void ata_cmd_old_intr(void *data) --k1lZvvs/B4yU6o8G--