From joost@jodocus.org  Thu Aug 11 14:21:18 2005
Return-Path: <joost@jodocus.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0ABE016A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2005 14:21:18 +0000 (GMT)
	(envelope-from joost@jodocus.org)
Received: from bps.jodocus.org (g157016.upc-g.chello.nl [80.57.157.16])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 64A3943D49
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2005 14:21:16 +0000 (GMT)
	(envelope-from joost@jodocus.org)
Received: from jodocus.org (localhost [127.0.0.1])
	by bps.jodocus.org (8.13.3/8.13.1) with ESMTP id j7BELFaS016706
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Aug 2005 16:21:15 +0200 (CEST)
	(envelope-from joost@jodocus.org)
Received: (from joost@localhost)
	by jodocus.org (8.13.3/8.13.1/Submit) id j7BELEW7016705;
	Thu, 11 Aug 2005 16:21:14 +0200 (CEST)
	(envelope-from joost)
Message-Id: <200508111421.j7BELEW7016705@jodocus.org>
Date: Thu, 11 Aug 2005 16:21:14 +0200 (CEST)
From: Joost Bekkers <joost@jodocus.org>
Reply-To: Joost Bekkers <joost@jodocus.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: can't read beyond track 0 on fdc (IBM thinkpad G40)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84799
>Category:       kern
>Synopsis:       [fdc] [patch] can't read beyond track 0 on fdc (IBM thinkpad G40)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 11 14:30:16 GMT 2005
>Closed-Date:    
>Last-Modified:  Tue Sep 13 22:46:42 GMT 2005
>Originator:     Joost Bekkers
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD bps.jodocus.org 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Tue May 10 13:46:16 CEST 2005 joost@bps.jodocus.org:/mnt/storage/obj/usr/src/sys/bps i386


IBM thinkpad G40

all recent versions of FreeBSD

fdc0: <floppy drive controller (FDE)> port 0x3f0-0x3f5,0x3f7 irq 6 drq 2 on acpi0
fdc0: ic_type 90 part_id 73
fdc0: [MPSAFE]
fdc0: [FAST]
fd0: <1440-KB 3.5" drive> on fdc0 drive 0

>Description:

dev/fdc/fdc.c claims

* SEEK to where we want to be
*
* Enhanced controllers do implied seeks for read&write as long as
* we do not need multiple steps per track.

The fdc in this partucular portable however doesn't perform the implied seek.

>How-To-Repeat:
>Fix:



>Release-Note:
>Audit-Trail:

From: Joost Bekkers <joost@jodocus.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/84799: can't read beyond track 0 on fdc (IBM thinkpad G40)
Date: Fri, 12 Aug 2005 19:40:55 +0200

 This seems to me a nice way to work around the faulty hardware.
 (diff against 6.0-B2, but should work on 5 too)
 
 diff -u fdc.dist/fdc.c fdc/fdc.c
 --- fdc.dist/fdc.c	Fri Aug 12 19:24:39 2005
 +++ fdc/fdc.c	Fri Aug 12 19:27:15 2005
 @@ -736,7 +736,7 @@
  	struct bio *bp;
  	int i, nsect;
  	int st0, st3, cyl, mfm, steptrac, cylinder, descyl, sec;
 -	int head;
 +	int head,prev_track;
  	static int need_recal;
  	struct fdc_readid *idp;
  	struct fd_formb *finfo;
 @@ -953,7 +953,8 @@
  	if (cylinder != fd->track && (
  	    fdc->fdct != FDC_ENHANCED ||
  	    descyl != cylinder ||
 -	    (bp->bio_cmd & (BIO_RDID|BIO_FMT)))) {
 +	    (bp->bio_cmd & (BIO_RDID|BIO_FMT)) ||
 +	    (fdc->flags & FDC_NEEDSEEK))) {
  		retry_line = __LINE__;
  		if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, descyl, 0))
  			return (1);
 @@ -970,6 +971,7 @@
  		if (settle)
  			msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle);
  	}
 +	prev_track=fd->track;
  	fd->track = cylinder;
  
  	if (debugflags & 8)
 @@ -1114,6 +1116,11 @@
  		}
  		retry_line = __LINE__;
  		if(st0 == NE7_ST0_IC_AT && fdc->status[2] & NE7_ST2_WC) {
 +			if (prev_track==0 && 
 +			    cylinder!=0 &&
 +                            !(fdc->flags & FDC_NEEDSEEK)) {
 +				fdc->flags|=FDC_NEEDSEEK;
 +			}
  			need_recal |= (1 << fd->fdsu);
  			return (1);
  		}
 diff -u fdc.dist/fdcvar.h fdc/fdcvar.h
 --- fdc.dist/fdcvar.h	Fri Aug 12 19:25:05 2005
 +++ fdc/fdcvar.h	Thu Aug 11 18:27:43 2005
 @@ -40,6 +40,7 @@
  	int	dmachan;
  	int	flags;
  #define FDC_HASDMA	0x01
 +#define FDC_NEEDSEEK	0x02	/* enhanced controller that needs expl seek */
  #define FDC_STAT_VALID	0x08
  #define FDC_HAS_FIFO	0x10
  #define FDC_NEEDS_RESET	0x20
>Unformatted:
