From owner-freebsd-stable@FreeBSD.ORG Fri May 28 23:07:13 2010 Return-Path: Delivered-To: freebsd-stable@FreeBSD.org Received: from [127.0.0.1] (unknown [IPv6:2001:4f8:fff6::28]) by hub.freebsd.org (Postfix) with ESMTP id 9C10A1065675; Fri, 28 May 2010 23:07:13 +0000 (UTC) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: freebsd-stable@FreeBSD.org Date: Fri, 28 May 2010 19:07:04 -0400 User-Agent: KMail/1.6.2 References: <4BFFF013.7050005@uiowa.edu> <4C00085D.9000204@icyb.net.ua> <4C001B04.2040006@uiowa.edu> In-Reply-To: <4C001B04.2040006@uiowa.edu> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_ZyEAMh5rRCG2sJm" Message-Id: <201005281907.05833.jkim@FreeBSD.org> Cc: Konstantin Belousov , 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: Fri, 28 May 2010 23:07:13 -0000 --Boundary-00=_ZyEAMh5rRCG2sJm Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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: > >> > >> > >> http://svn.freebsd.org/viewvc/base?view=revision&revision=203544 > > > > 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. Please try the attached patch. Sorry, it was stupid. :-( Jung-uk Kim --Boundary-00=_ZyEAMh5rRCG2sJm Content-Type: text/plain; charset="iso-8859-1"; name="fdc.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fdc.diff" --- 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; @@ -131,7 +132,8 @@ fdc_acpi_attach(device_t dev) } /* Add fd child devices as specified. */ - error = fdc_acpi_probe_children(bus, dev, buf.Pointer); + obj = buf.Pointer; + error = fdc_acpi_probe_children(bus, dev, obj->Buffer.Pointer); out: if (buf.Pointer) --Boundary-00=_ZyEAMh5rRCG2sJm--