[src/trunk]: src/sys/dev/ic also set WDCTL_4BIT for the softreset, seems this...

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

details:   https://anonhg.NetBSD.org/src/rev/7826ee1200fa
branches:  trunk
changeset: 994750:7826ee1200fa
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Nov 20 08:47:55 2018 +0000

description:
also set WDCTL_4BIT for the softreset, seems this one is actually also
required to fully resolve the problem

PR kern/48214 PR kern/53307 PR kern/53524

diffstat:

 sys/dev/ic/ahcisata_core.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d0a5514cb5d4 -r 7826ee1200fa sys/dev/ic/ahcisata_core.c
--- a/sys/dev/ic/ahcisata_core.c        Tue Nov 20 07:30:17 2018 +0000
+++ b/sys/dev/ic/ahcisata_core.c        Tue Nov 20 08:47:55 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahcisata_core.c,v 1.69 2018/11/19 22:05:22 jdolecek Exp $      */
+/*     $NetBSD: ahcisata_core.c,v 1.70 2018/11/20 08:47:55 jdolecek Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.69 2018/11/19 22:05:22 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.70 2018/11/20 08:47:55 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -829,7 +829,7 @@
        memset(cmd_tbl->cmdt_cfis, 0, 64);
        cmd_tbl->cmdt_cfis[fis_type] = RHD_FISTYPE;
        cmd_tbl->cmdt_cfis[rhd_c] = drive;
-       cmd_tbl->cmdt_cfis[rhd_control] = WDCTL_RST;
+       cmd_tbl->cmdt_cfis[rhd_control] = WDCTL_RST | WDCTL_4BIT;
        switch (ahci_exec_fis(chp, 100, flags, c_slot)) {
        case ERR_DF:
        case TIMEOUT:
@@ -854,7 +854,7 @@
        memset(cmd_tbl->cmdt_cfis, 0, 64);
        cmd_tbl->cmdt_cfis[fis_type] = RHD_FISTYPE;
        cmd_tbl->cmdt_cfis[rhd_c] = drive;
-       cmd_tbl->cmdt_cfis[rhd_control] = 0;
+       cmd_tbl->cmdt_cfis[rhd_control] = WDCTL_4BIT;
        switch (ahci_exec_fis(chp, 310, flags, c_slot)) {
        case ERR_DF:
        case TIMEOUT: