From owner-cvs-all@FreeBSD.ORG Wed Sep 15 15:28:27 2004 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 F381416A4CF; Wed, 15 Sep 2004 15:28:26 +0000 (GMT) Received: from green.homeunix.org (pcp04368961pcs.nrockv01.md.comcast.net [69.140.212.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB3D543D5E; Wed, 15 Sep 2004 15:28:25 +0000 (GMT) (envelope-from green@green.homeunix.org) Received: from green.homeunix.org (green@localhost [127.0.0.1]) by green.homeunix.org (8.13.1/8.13.1) with ESMTP id i8FFSOsH053397; Wed, 15 Sep 2004 11:28:24 -0400 (EDT) (envelope-from green@green.homeunix.org) Received: (from green@localhost) by green.homeunix.org (8.13.1/8.13.1/Submit) id i8FFSNQH053396; Wed, 15 Sep 2004 11:28:23 -0400 (EDT) (envelope-from green) Date: Wed, 15 Sep 2004 11:28:23 -0400 From: Brian Fundakowski Feldman To: Poul-Henning Kamp Message-ID: <20040915152822.GD36708@green.homeunix.org> References: <200409151209.i8FC9p2t077569@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200409151209.i8FC9p2t077569@repoman.freebsd.org> User-Agent: Mutt/1.5.6i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/alpha/isa isa_dma.c src/sys/amd64/isa isa_dma.c src/sys/i386/isa isa_dma.c src/sys/ia64/isa isa_dma.c src/sys/pc98/pc98 isa_dma.c src/sys/isa isavar.h src/sys/vm vm_page.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2004 15:28:27 -0000 On Wed, Sep 15, 2004 at 12:09:51PM +0000, Poul-Henning Kamp wrote: > phk 2004-09-15 12:09:51 UTC > > FreeBSD src repository > > Modified files: > sys/alpha/isa isa_dma.c > sys/amd64/isa isa_dma.c > sys/i386/isa isa_dma.c > sys/ia64/isa isa_dma.c > sys/pc98/pc98 isa_dma.c > sys/isa isavar.h > sys/vm vm_page.c > Log: > Add new a function isa_dma_init() which returns an errno when it fails > and which takes a M_WAITOK/M_NOWAIT flag argument. > > Add compatibility isa_dmainit() macro which whines loudly if > isa_dma_init() fails. > > Problem uncovered by: tegge David Yeske is running into a problem with it failing in fdc(4). I am not sure how 40KB of memory is too big for it to allocate... but I think it might be appropriate to try some sort of fallback. --- /usr/src/sys/dev/fdc/fdc.c Fri Aug 27 19:15:22 2004 +++ tmp/fdc.c Tue Sep 7 21:44:26 2004 @@ -1334,7 +1334,11 @@ if (!(fdc->flags & FDC_NODMA) && fdc->dmacnt++ == 0) { mtx_lock(&Giant); isa_dma_acquire(fdc->dmachan); - isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL); + if (isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL) != 0) { + isa_dma_release(fdc->dmachan); + fdc->dmacnt--; + fdc->flags |= FDC_NODMA; + } mtx_unlock(&Giant); } } -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\