diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2019-06-25 14:12:45 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2019-06-25 14:12:45 +0000 |
| commit | 713d48bb238cf8cfab34e2799eff47c3bcdb7951 (patch) | |
| tree | eaf43ff9f1a7815e5fb20c4f7cc8214f23dc91d4 /sys/dev/ic | |
| parent | ba01078c562b9a3131234642ca15ada4e476d677 (diff) | |
Turn off the code which waits for AHCI_PREG_CMD_CR to be set by the
HBA after ahci_default_port_start() sets AHCI_PREG_CMD_ST. The AHCI
spec. rev. 1.3 only requires the inverse to be true, i. e. that a
HBA clears AHCI_PREG_CMD_CR when AHCI_PREG_CMD_ST gets cleared by
software/driver. In fact, some HBAs will not raise AHCI_PREG_CMD_CR
as an immediate consequence of AHCI_PREG_CMD_ST being set. Actually
neither the FreeBSD, Linux nor NetBSD counterpart of ahci(4) has an
analogous check. Disabling that wait fixes "failed to start command
DMA on port N, disabling" bails during attach.
From Marius Strobl
ok deraadt@ jmatthew@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ahci.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index 39adbaa563c..b8ef46a6532 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.32 2017/08/21 21:43:46 jmatthew Exp $ */ +/* $OpenBSD: ahci.c,v 1.33 2019/06/25 14:12:44 patrick Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -922,11 +922,6 @@ ahci_default_port_start(struct ahci_port *ap, int fre_only) } #endif - /* Wait for CR to come on */ - if (!fre_only && - ahci_pwait_set(ap, AHCI_PREG_CMD, AHCI_PREG_CMD_CR, 1)) - return (1); - return (0); } |