From owner-cvs-all@FreeBSD.ORG Wed Mar 9 00:15:20 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 730D516A4CE; Wed, 9 Mar 2005 00:15:20 +0000 (GMT) Received: from mail.ntplx.net (mail.ntplx.net [204.213.176.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07D1F43D41; Wed, 9 Mar 2005 00:15:20 +0000 (GMT) (envelope-from deischen@freebsd.org) Received: from sea.ntplx.net (sea.ntplx.net [204.213.176.11]) j290FC9p022883; Tue, 8 Mar 2005 19:15:12 -0500 (EST) Date: Tue, 8 Mar 2005 19:15:12 -0500 (EST) From: Daniel Eischen X-X-Sender: eischen@sea.ntplx.net To: Scott Long In-Reply-To: <422E341E.3090900@samsco.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS and Clam AntiVirus (mail.ntplx.net) cc: src-committers@freebsd.org cc: Kevin Oberman cc: cvs-src@freebsd.org cc: cvs-all@freebsd.org cc: jeremie@le-hen.org cc: "M. Warner Losh" Subject: Re: cvs commit: src/sys/dev/cardbus cardbus.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Daniel Eischen List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2005 00:15:20 -0000 On Tue, 8 Mar 2005, Scott Long wrote: > Kevin Oberman wrote: > > Oops! I sent the wrong diff. Sorry, It was an older one. The current one > > is: > > --- sys/pci/if_dc.c.orig Thu Mar 3 16:00:57 2005 > > +++ sys/pci/if_dc.c Tue Mar 8 14:41:20 2005 [ ... ] > > I can confirm that this one makes my Xircom card work just fine. It > > would be nice to get this committed if it's an acceptable fix. I have no > > idea who should do this as if_dc does not show up in MAINTAINERS. I guess > > most any committer (Scott...Warner?) can do it. > > Done, thanks! Scott, you forgot a comma. See fix at end. To be clear, this commit does not address the problem from before this thread was hijacked ;-). With or without the dc commit, the dc driver either does not recognize the card at all, or it does and can't map the interrupt and panics when it tries to detach. It seems to be random as to which one occurs. I suspect something is not getting properly initialized or its getting stomped on. -- DE Index: if_dc.c =================================================================== RCS file: /home/ncvs/src/sys/pci/if_dc.c,v retrieving revision 1.156 diff -u -r1.156 if_dc.c --- if_dc.c 8 Mar 2005 23:25:46 -0000 1.156 +++ if_dc.c 9 Mar 2005 00:10:36 -0000 @@ -2148,7 +2148,7 @@ /* Allocate a busdma tag for mbufs. */ error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES DC_TX_LIST_CNT, MCLBYTES, + BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, DC_TX_LIST_CNT, MCLBYTES, 0, NULL, NULL, &sc->dc_mtag); if (error) { printf("dc%d: failed to allocate busdma tag\n", unit);