From owner-cvs-src@FreeBSD.ORG Sat Sep 15 10:56:02 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77D5916A418; Sat, 15 Sep 2007 10:56:02 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD9713C45B; Sat, 15 Sep 2007 10:56:02 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8FAu1gx038528; Sat, 15 Sep 2007 10:56:01 GMT (envelope-from marius@repoman.freebsd.org) Received: (from marius@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FAu1IY038525; Sat, 15 Sep 2007 10:56:01 GMT (envelope-from marius) Message-Id: <200709151056.l8FAu1IY038525@repoman.freebsd.org> From: Marius Strobl Date: Sat, 15 Sep 2007 10:56:00 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/dev/le am7990.c am79900.c if_le_ledma.c if_le_pci.c lance.c lancevar.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 10:56:02 -0000 marius 2007-09-15 10:56:00 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/le am7990.c am79900.c if_le_ledma.c if_le_pci.c lance.c lancevar.h Log: MFC: am7990.c 1.4; am79900.c 1.4; if_le_ledma.c 1.3; if_le_pci.c 1.5, 1.6; lance.c 1.3, 1.4; lancevar.h 1.3 - Use our own callout instead of if_slowtimo() for driving lance_watchdog() in order to avoid races accessing if_timer. - Use bus_get_dma_tag() to obtain the parent DMA tag so le(4) works on platforms requiring this. - Remove BUS_DMA_WAITOK from bus_dma_tag_create() invocations as it's no valid flag there. - For setting the port PCnet chips must be powered down or stopped and unlike documented may not take effect without an initialization. So don't invoke (*sc_mediachange) directly in lance_mediachange() but go through lance_init_locked(). It's suboptimal to impose this for all chips but given that besides the affected PCI bus front-end the only other front-end which supports media selection is and likely ever will be the 'ledma' front-end I see not enough reason to break the in-driver API for this (though one could argue both ways here). Revision Changes Path 1.1.2.4 +2 -2 src/sys/dev/le/am7990.c 1.1.2.4 +2 -2 src/sys/dev/le/am79900.c 1.1.2.3 +1 -1 src/sys/dev/le/if_le_ledma.c 1.1.2.3 +3 -3 src/sys/dev/le/if_le_pci.c 1.1.2.3 +34 -15 src/sys/dev/le/lance.c 1.1.2.3 +2 -0 src/sys/dev/le/lancevar.h