Module Name: src
Committed By: sborrill
Date: Sat Mar 6 22:10:46 UTC 2010
Modified Files:
src/sys/dev/ic [netbsd-5]: ahcisata_core.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1317):
sys/dev/ic/ahcisata_core.c: revision 1.23
Move ahci_channel_start() after BSY has cleared (do not touch SError while
BSY is asserted). Fixes random behaviour of Intel ESB2 controller with some
models of Hitachi drives (serial console corruption/misfunction, misbehavior
of USB controllers, crazy interrupts crashing the Xen hypervisor, etc.).
To generate a diff of this commit:
cvs rdiff -u -r1.18.4.1 -r1.18.4.2 src/sys/dev/ic/ahcisata_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.18.4.1 src/sys/dev/ic/ahcisata_core.c:1.18.4.2
--- src/sys/dev/ic/ahcisata_core.c:1.18.4.1 Thu Feb 19 20:30:15 2009
+++ src/sys/dev/ic/ahcisata_core.c Sat Mar 6 22:10:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.18.4.1 2009/02/19 20:30:15 snj Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.18.4.2 2010/03/06 22:10:46 sborrill Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.18.4.1 2009/02/19 20:30:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.18.4.2 2010/03/06 22:10:46 sborrill Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -510,7 +510,6 @@
chp->ch_queue->active_xfer->c_kill_xfer(chp,
chp->ch_queue->active_xfer, KILL_RESET);
}
- ahci_channel_start(sc, chp);
/* wait 31s for BSY to clear */
for (i = 0; i <3100; i++) {
tfd = AHCI_READ(sc, AHCI_P_TFD(chp->ch_channel));
@@ -526,6 +525,8 @@
DEBUG_PROBE);
/* clear port interrupt register */
AHCI_WRITE(sc, AHCI_P_IS(chp->ch_channel), 0xffffffff);
+ /* and start channel */
+ ahci_channel_start(sc, chp);
return;
}
@@ -570,8 +571,6 @@
switch (sata_reset_interface(chp, sc->sc_ahcit, achp->ahcic_scontrol,
achp->ahcic_sstatus)) {
case SStatus_DET_DEV:
- /* clear SErrors and start operations */
- ahci_channel_start(sc, chp);
/* wait 31s for BSY to clear */
for (i = 0; i <3100; i++) {
sig = AHCI_READ(sc, AHCI_P_TFD(chp->ch_channel));
@@ -580,9 +579,11 @@
break;
tsleep(&sc, PRIBIO, "ahcid2h", mstohz(10));
}
- if (i == 1500)
+ if (i == 1500) {
aprint_error("%s: BSY never cleared, TD 0x%x\n",
AHCINAME(sc), sig);
+ return;
+ }
AHCIDEBUG_PRINT(("%s: BSY took %d ms\n", AHCINAME(sc), i * 10),
DEBUG_PROBE);
sig = AHCI_READ(sc, AHCI_P_SIG(chp->ch_channel));
@@ -599,7 +600,11 @@
} else
chp->ch_drive[0].drive_flags |= DRIVE_ATA;
splx(s);
- /* enable interrupts */
+ /* clear port interrupt register */
+ AHCI_WRITE(sc, AHCI_P_IS(chp->ch_channel), 0xffffffff);
+ /* start channel */
+ ahci_channel_start(sc, chp);
+ /* and enable interrupts */
AHCI_WRITE(sc, AHCI_P_IE(chp->ch_channel),
AHCI_P_IX_TFES | AHCI_P_IX_HBFS | AHCI_P_IX_IFS |
AHCI_P_IX_OFS | AHCI_P_IX_DPS | AHCI_P_IX_UFS |
