From owner-freebsd-stable@FreeBSD.ORG Sat May 29 20:09:05 2010 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 227A11065674; Sat, 29 May 2010 20:09:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 9A67F8FC20; Sat, 29 May 2010 20:09:04 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o4TK9D7e076462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 29 May 2010 23:09:13 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id o4TK90VH044098; Sat, 29 May 2010 23:09:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id o4TK8xJn044097; Sat, 29 May 2010 23:08:59 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 29 May 2010 23:08:59 +0300 From: Kostik Belousov To: Jung-uk Kim Message-ID: <20100529200859.GE83316@deviant.kiev.zoral.com.ua> References: <4BFFF013.7050005@uiowa.edu> <4C00085D.9000204@icyb.net.ua> <4C001B04.2040006@uiowa.edu> <201005281907.05833.jkim@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3e5zPOSaQk/kV0Ke" Content-Disposition: inline In-Reply-To: <201005281907.05833.jkim@FreeBSD.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-2.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_50, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: freebsd-stable@freebsd.org, Andriy Gapon Subject: Re: Floppy drive not detected after 8.0-RELEASE->8.1-PRERELEASE X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2010 20:09:05 -0000 --3e5zPOSaQk/kV0Ke Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 28, 2010 at 07:07:04PM -0400, Jung-uk Kim wrote: > On Friday 28 May 2010 03:35 pm, Scott Allendorf wrote: > > Andriy Gapon wrote: > > > on 28/05/2010 19:32 Scott Allendorf said the following: > > >> I recently upgraded to 8.1-PRERELEASE (amd64) on a Dell Optiplex > > >> 960 running 8.0-RELEASE. After the upgrade, my floppy drive was > > >> no longer detected. After a binary search, the following commit > > >> appears to be responsible: > > >> > > >> =20 > > >> http://svn.freebsd.org/viewvc/base?view=3Drevision&revision=3D203544 > > > > > > Can you check if reverting of MFC of the following helps (it's a > > > part of that big ACPI MFC)? > > > > > > r200554 | jkim | 2009-12-15 00:28:32 +0200 (Tue, 15 Dec 2009) | 3 > > > lines Remove _FDE quirk handling as these quirks are > > > automatically repaired by ACPICA layer since ACPICA 20091214. > > > > Thank you for your quick reply to my message. > > > > Reverting this change (src/sys/dev/fdc/fdc_acpi.c from 1.13.2.2 to > > 1.13.2.1) appears to have fixed the issue. The floppy drive is now > > detected and it is functional. There do not appear to be any side > > effects. >=20 > Please try the attached patch. Sorry, it was stupid. :-( >=20 > Jung-uk Kim > --- sys/dev/fdc/fdc_acpi.c (revision 208626) > +++ sys/dev/fdc/fdc_acpi.c (working copy) > @@ -96,6 +96,7 @@ fdc_acpi_attach(device_t dev) > { > struct fdc_data *sc; > ACPI_BUFFER buf; > + ACPI_OBJECT *obj; > device_t bus; > int error; > =20 > @@ -131,7 +132,8 @@ fdc_acpi_attach(device_t dev) > } > =20 > /* Add fd child devices as specified. */ > - error =3D fdc_acpi_probe_children(bus, dev, buf.Pointer); > + obj =3D buf.Pointer; > + error =3D fdc_acpi_probe_children(bus, dev, obj->Buffer.Pointer); > =20 > out: > if (buf.Pointer) Works for me as well. --3e5zPOSaQk/kV0Ke Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkwBdFsACgkQC3+MBN1Mb4iNkgCgyk+dp6292z7xKSm/FPuzisMX szAAoJ/bCkblOYOR9OPpG8ea4T4QSd21 =vkaS -----END PGP SIGNATURE----- --3e5zPOSaQk/kV0Ke--