From owner-freebsd-bugs@FreeBSD.ORG Tue Jan 22 08:05:17 2008 Return-Path: Delivered-To: freebsd-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79ACB16A417 for ; Tue, 22 Jan 2008 08:05:17 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id BD2FE13C447 for ; Tue, 22 Jan 2008 08:05:16 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id m0LIMOPo011486; Mon, 21 Jan 2008 13:22:24 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: "Helmut Schneider" Date: Mon, 21 Jan 2008 13:22:12 -0500 User-Agent: KMail/1.6.2 References: <200801211410.m0LEA115064730@freefall.freebsd.org> In-Reply-To: <200801211410.m0LEA115064730@freefall.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_ZLOlH/0MpvMYsb9" Message-Id: <200801211322.17041.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.92/5510/Mon Jan 21 12:33:44 2008 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: freebsd-bugs@FreeBSD.org Subject: Re: kern/118308: 6.2 on IBM Blade HS20, Nortel Switches, hw.bge.fake_autoneg X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2008 08:05:17 -0000 --Boundary-00=_ZLOlH/0MpvMYsb9 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Monday 21 January 2008 09:10 am, Helmut Schneider wrote: > The following reply was made to PR kern/118308; it has been noted > by GNATS. > > From: "Helmut Schneider" > To: > Cc: > Subject: Re: kern/118308: 6.2 on IBM Blade HS20, Nortel Switches, > hw.bge.fake_autoneg Date: Mon, 21 Jan 2008 15:02:30 +0100 > > From: "Helmut Schneider" > > > Just as an update, 7.0-RC1 works fine. > > ...and, to complete it, 6.3-RELEASE does not work with the "new" > switches, too, while 7.0-RC1 works on both switches. Please try the attached patch. Thanks, Jung-uk Kim --Boundary-00=_ZLOlH/0MpvMYsb9 Content-Type: text/plain; charset="iso-8859-1"; name="bge.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bge.diff" --- src/sys/dev/bge/if_bge.c 21 Jan 2008 18:04:41 -0000 1.91.2.24 +++ src/sys/dev/bge/if_bge.c 21 Jan 2008 18:19:54 -0000 @@ -415,15 +415,11 @@ DRIVER_MODULE(bge, pci, bge_driver, bge_devclass, 0, 0); DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0); -static int bge_fake_autoneg = 0; static int bge_allow_asf = 0; -TUNABLE_INT("hw.bge.fake_autoneg", &bge_fake_autoneg); TUNABLE_INT("hw.bge.allow_asf", &bge_allow_asf); SYSCTL_NODE(_hw, OID_AUTO, bge, CTLFLAG_RD, 0, "BGE driver parameters"); -SYSCTL_INT(_hw_bge, OID_AUTO, fake_autoneg, CTLFLAG_RD, &bge_fake_autoneg, 0, - "Enable fake autonegotiation for certain blade systems"); SYSCTL_INT(_hw_bge, OID_AUTO, allow_asf, CTLFLAG_RD, &bge_allow_asf, 0, "Allow ASF mode if available"); @@ -3673,18 +3669,20 @@ * mechanism for programming the autoneg * advertisement registers in TBI mode. */ - if (bge_fake_autoneg == 0 && - sc->bge_asicrev == BGE_ASICREV_BCM5704) { + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) { uint32_t sgdig; - CSR_WRITE_4(sc, BGE_TX_TBI_AUTONEG, 0); - sgdig = CSR_READ_4(sc, BGE_SGDIG_CFG); - sgdig |= BGE_SGDIGCFG_AUTO | - BGE_SGDIGCFG_PAUSE_CAP | - BGE_SGDIGCFG_ASYM_PAUSE; - CSR_WRITE_4(sc, BGE_SGDIG_CFG, - sgdig | BGE_SGDIGCFG_SEND); - DELAY(5); - CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig); + sgdig = CSR_READ_4(sc, BGE_SGDIG_STS); + if (sgdig & BGE_SGDIGSTS_DONE) { + CSR_WRITE_4(sc, BGE_TX_TBI_AUTONEG, 0); + sgdig = CSR_READ_4(sc, BGE_SGDIG_CFG); + sgdig |= BGE_SGDIGCFG_AUTO | + BGE_SGDIGCFG_PAUSE_CAP | + BGE_SGDIGCFG_ASYM_PAUSE; + CSR_WRITE_4(sc, BGE_SGDIG_CFG, + sgdig | BGE_SGDIGCFG_SEND); + DELAY(5); + CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig); + } } break; case IFM_1000_SX: --Boundary-00=_ZLOlH/0MpvMYsb9--