Module Name: src
Committed By: jakllsch
Date: Mon Sep 19 19:07:53 UTC 2016
Modified Files:
src/sys/dev/ic: siisata.c
Log Message:
Don't permanantly disable port if drive probe times out,
reinitialize port instead.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/siisata.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/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.28 src/sys/dev/ic/siisata.c:1.29
--- src/sys/dev/ic/siisata.c:1.28 Mon May 2 19:18:29 2016
+++ src/sys/dev/ic/siisata.c Mon Sep 19 19:07:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.28 2016/05/02 19:18:29 christos Exp $ */
+/* $NetBSD: siisata.c,v 1.29 2016/09/19 19:07:53 jakllsch Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.28 2016/05/02 19:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.29 2016/09/19 19:07:53 jakllsch Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -724,11 +724,10 @@ siisata_probe_drive(struct ata_channel *
if (timed_out) {
aprint_error_dev(sc->sc_atac.atac_dev,
"SOFT_RESET failed on port %d (error %d PSS 0x%x), "
- "disabling\n", chp->ch_channel,
+ "resetting\n", chp->ch_channel,
PRREAD(sc, PRX(chp->ch_channel, PRO_PCE)),
PRREAD(sc, PRX(chp->ch_channel, PRO_PSS)));
- PRWRITE(sc, PRX(chp->ch_channel, PRO_PCS),
- PR_PC_PORT_RESET);
+ siisata_reinit_port(chp);
break;
}
