diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2014-06-26 04:25:38 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2014-06-26 04:25:38 +0000 |
| commit | c1fa4dde2b79d9196fb5bf0f6c9d19c3d983efeb (patch) | |
| tree | 97107d2ba4f8e214340dcaaf9d0260e026dd5fb6 | |
| parent | Convert several calloc calls to reallocarray. These calloc calls were (diff) | |
| download | wireguard-openbsd-c1fa4dde2b79d9196fb5bf0f6c9d19c3d983efeb.tar.xz wireguard-openbsd-c1fa4dde2b79d9196fb5bf0f6c9d19c3d983efeb.zip | |
Work around compatibility problems with Intel ahci and Intel SSDs by retrying
device detection if the port is still busy after our normal timeout.
based on a diff by chris@, based on a change in dragonflybsd
tested by Peter J Philipp
ok dlg@
| -rw-r--r-- | sys/dev/ic/ahci.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index 6b1433cb316..2725e6220fe 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.13 2014/04/14 04:42:22 dlg Exp $ */ +/* $OpenBSD: ahci.c,v 1.14 2014/06/26 04:25:38 jmatthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -1363,7 +1363,7 @@ int ahci_port_portreset(struct ahci_port *ap, int pmp) { u_int32_t cmd, r; - int rc, s; + int rc, s, retries = 0; s = splbio(); DPRINTF(AHCI_D_VERBOSE, "%s: port reset\n", PORTNAME(ap)); @@ -1376,6 +1376,7 @@ ahci_port_portreset(struct ahci_port *ap, int pmp) /* Perform device detection */ ahci_pwrite(ap, AHCI_PREG_SCTL, 0); +retry: delay(10000); r = AHCI_PREG_SCTL_IPM_DISABLED | AHCI_PREG_SCTL_DET_INIT; if ((ap->ap_sc->sc_dev.dv_cfdata->cf_flags & 0x01) != 0) { @@ -1411,6 +1412,10 @@ ahci_port_portreset(struct ahci_port *ap, int pmp) /* even if the device doesn't wake up, check if there's * a port multiplier there */ + if (retries == 0) { + retries = 1; + goto retry; + } rc = EBUSY; } else { rc = 0; |