Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few things: 

* Kill off device nodes *before* we clear out the queue, to help prevent any
  new I/O being queued.
* More useful error reporting in wd_setcache() and wd_flushcache().
* Add a wd_standby() (tested but not used yet).

And the most important:
* In wddetach(), if the device was open, call adapt_delref() so that we
  propagate the disable up to our PCMCIA socket.
This commit is contained in:
mycroft 2004-08-10 02:33:58 +00:00
parent 6b72b5c789
commit 646cec1d1d
1 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
sys/dev/ata/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.285 2004/08/04 22:44:04 bouyer Exp $ */
/* $NetBSD: wd.c,v 1.286 2004/08/10 02:33:58 mycroft Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.285 2004/08/04 22:44:04 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.286 2004/08/10 02:33:58 mycroft Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
@ -188,6 +188,7 @@ void __wdstart(struct wd_softc*, struct buf *);
void wdrestart(void *);
void wddone(void *);
int wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *);
int wd_standby(struct wd_softc *, int);
int wd_flushcache(struct wd_softc *, int);
void wd_shutdown(void *);
@ -419,6 +420,13 @@ wddetach(struct device *self, int flags)
bmaj = bdevsw_lookup_major(&wd_bdevsw);
cmaj = cdevsw_lookup_major(&wd_cdevsw);
/* Nuke the vnodes for any open instances. */
for (i = 0; i < MAXPARTITIONS; i++) {
mn = WDMINOR(self->dv_unit, i);
vdevgone(bmaj, mn, mn, VBLK);
vdevgone(cmaj, mn, mn, VCHR);
}
s = splbio();
/* Kill off any queued buffers. */
@ -434,13 +442,6 @@ wddetach(struct device *self, int flags)
splx(s);
/* Nuke the vnodes for any open instances. */
for (i = 0; i < MAXPARTITIONS; i++) {
mn = WDMINOR(self->dv_unit, i);
vdevgone(bmaj, mn, mn, VBLK);
vdevgone(cmaj, mn, mn, VCHR);
}
/* Detach disk. */
disk_detach(&sc->sc_dk);
@ -956,7 +957,6 @@ wdclose(dev_t dev, int flag, int fmt, struct proc *p)
if (wd->sc_dk.dk_openmask == 0) {
wd_flushcache(wd, AT_WAIT);
/* XXXX Must wait for I/O to complete! */
if (! (wd->sc_flags & WDF_KLABEL))
wd->sc_flags &= ~WDF_LOADED;
@ -1605,6 +1605,8 @@ wd_getcache(struct wd_softc *wd, int *bitsp)
return 0;
}
const char at_errbits[] = "\20\10ERROR\11TIMEOU\12DF";
int
wd_setcache(struct wd_softc *wd, int bits)
{
@ -1639,12 +1641,42 @@ wd_setcache(struct wd_softc *wd, int bits)
return EIO;
}
if (wdc_c.flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
printf("%s: wd_setcache command error 0x%x\n",
wd->sc_dev.dv_xname, wdc_c.flags);
char sbuf[sizeof(at_errbits) + 64];
bitmask_snprintf(wdc_c.flags, at_errbits, sbuf, sizeof(sbuf));
printf("%s: wd_setcache: status=%s\n", wd->sc_dev.dv_xname,
sbuf);
return EIO;
}
return 0;
}
int
wd_standby(struct wd_softc *wd, int flags)
{
struct wdc_command wdc_c;
memset(&wdc_c, 0, sizeof(struct wdc_command));
wdc_c.r_command = WDCC_STANDBY_IMMED;
wdc_c.r_st_bmask = WDCS_DRDY;
wdc_c.r_st_pmask = WDCS_DRDY;
wdc_c.flags = flags;
wdc_c.timeout = 30000; /* 30s timeout */
if (wd->atabus->ata_exec_command(wd->drvp, &wdc_c) != WDC_COMPLETE) {
printf("%s: standby immediate command didn't complete\n",
wd->sc_dev.dv_xname);
return EIO;
}
if (wdc_c.flags & AT_ERROR) {
if (wdc_c.r_error == WDCE_ABRT) /* command not supported */
return ENODEV;
}
if (wdc_c.flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
char sbuf[sizeof(at_errbits) + 64];
bitmask_snprintf(wdc_c.flags, at_errbits, sbuf, sizeof(sbuf));
printf("%s: wd_standby: status=%s\n", wd->sc_dev.dv_xname,
sbuf);
return EIO;
}
if (wdc_c.flags & ERR_NODEV)
return ENODEV;
return 0;
}
@ -1670,23 +1702,15 @@ wd_flushcache(struct wd_softc *wd, int flags)
wd->sc_dev.dv_xname);
return EIO;
}
if (wdc_c.flags & ERR_NODEV)
return ENODEV;
if (wdc_c.flags & AT_TIMEOU) {
printf("%s: flush cache command timeout\n",
wd->sc_dev.dv_xname);
return EIO;
}
if (wdc_c.flags & AT_ERROR) {
if (wdc_c.r_error == WDCE_ABRT) /* command not supported */
return ENODEV;
printf("%s: flush cache command: error 0x%x\n",
wd->sc_dev.dv_xname, wdc_c.r_error);
return EIO;
}
if (wdc_c.flags & AT_DF) {
printf("%s: flush cache command: drive fault\n",
wd->sc_dev.dv_xname);
if (wdc_c.flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
char sbuf[sizeof(at_errbits) + 64];
bitmask_snprintf(wdc_c.flags, at_errbits, sbuf, sizeof(sbuf));
printf("%s: wd_flushcache: status=%s\n", wd->sc_dev.dv_xname,
sbuf);
return EIO;
}
return 0;