[src/trunk]: src/sys/dev/ic Don't permanantly disable port if drive probe tim...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f38c17d6886a
branches:  trunk
changeset: 347857:f38c17d6886a
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Sep 19 19:07:53 2016 +0000

description:
Don't permanantly disable port if drive probe times out,
reinitialize port instead.

diffstat:

 sys/dev/ic/siisata.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 0ef9aef58aaa -r f38c17d6886a sys/dev/ic/siisata.c
--- a/sys/dev/ic/siisata.c      Mon Sep 19 19:06:57 2016 +0000
+++ b/sys/dev/ic/siisata.c      Mon Sep 19 19:07:53 2016 +0000
@@ -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 @@
                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;
                }