From owner-cvs-src@FreeBSD.ORG  Mon Sep 20 06:12:19 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id A963C16A4CE; Mon, 20 Sep 2004 06:12:19 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9A3C843D2D; Mon, 20 Sep 2004 06:12:19 +0000 (GMT)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8K6CJas009867;
	Mon, 20 Sep 2004 06:12:19 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8K6CJ12009866;
	Mon, 20 Sep 2004 06:12:19 GMT
	(envelope-from imp)
Message-Id: <200409200612.i8K6CJ12009866@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 20 Sep 2004 06:12:19 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/fdc fdc_isa.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Sep 2004 06:12:19 -0000

imp         2004-09-20 06:12:19 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/fdc          fdc_isa.c 
  Log:
  das@ has a ACPI bios that lists 0x3f0-0x3f1, 0x3f2-0x3f3, 0x3f4-0x3f5
  and 0x3f7.  fdc_isa_alloc_resource() didn't work right in this case
  (it accessed FDOUT correctly due to an overflow of the first resource.
  It accesed FDSTS and FDDATA incorrectly via the second resource (which
  wound up accessing FDOUT and the tape register at 0x3f3) and badly for
  the CTL register (at location 0x3f4).  This is a minimal fix that just
  'eats' the first one if it covers two locations and has an offset of
  0.  This confusion lead the floppy driver to think there'd been a disk
  change, which uncovered a deadlock in the floppy/geom code which lead
  to a panic.  These changes fix that by fixing the underlying resource
  problem, but doesn't address the potential deadlock issue that might
  still be there.
  
  This is a minimal fix so it can more safely be merged into 5 w/o risk
  for known working configurations (hence the use of the ugly goto,
  which reduces case 8 to case 6 w/o affecting cases 1-7).  A more
  invasive fix that will handle more ACPI resource list diversity is in
  the pipeline that should kill these issues once and for all, while
  staying within the resources that we allocate.
  
  Tested/Reported by: das
  Reviewed by: njl
  MFC before: re->next_release_name(5.3-BETA5);
  
  Revision  Changes    Path
  1.15      +14 -4     src/sys/dev/fdc/fdc_isa.c