diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2020-12-28 14:08:42 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2020-12-28 14:08:42 +0000 |
| commit | 3fcded906bedf45894a09468a5fb62e45fad22ab (patch) | |
| tree | 630a2197084933a7c884df8905958714aed2d2aa /sys/dev/ic | |
| parent | 3f9eb80861e9429a9cbb5ffec70970de2fc7adad (diff) | |
Remove the AHCI_QUIRK_SKIP_RESET quirk now that the underlying issue is
fixed.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ahcisata_core.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/ahcisatavar.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ic/ahcisata_core.c b/sys/dev/ic/ahcisata_core.c index 4541ef7e11c..35eb6fc2d62 100644 --- a/sys/dev/ic/ahcisata_core.c +++ b/sys/dev/ic/ahcisata_core.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_core.c,v 1.91 2020/12/28 11:05:54 jmcneill Exp $ */ +/* $NetBSD: ahcisata_core.c,v 1.92 2020/12/28 14:08:42 jmcneill Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.91 2020/12/28 11:05:54 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.92 2020/12/28 14:08:42 jmcneill Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -872,9 +872,6 @@ again: KASSERT(sc->sc_ahci_cap & AHCI_CAP_SPM); } - if (sc->sc_ahci_quirks & AHCI_QUIRK_SKIP_RESET) - goto skip_reset; - /* polled command, assume interrupts are disabled */ cmd_h = &achp->ahcic_cmdh[c_slot]; @@ -946,7 +943,6 @@ again: goto end; } -skip_reset: /* * wait 31s for BSY to clear * This should not be needed, but some controllers clear the diff --git a/sys/dev/ic/ahcisatavar.h b/sys/dev/ic/ahcisatavar.h index 5b7526dfdc9..230e3565b3c 100644 --- a/sys/dev/ic/ahcisatavar.h +++ b/sys/dev/ic/ahcisatavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisatavar.h,v 1.25 2020/12/25 08:57:38 skrll Exp $ */ +/* $NetBSD: ahcisatavar.h,v 1.26 2020/12/28 14:08:42 jmcneill Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -58,8 +58,7 @@ struct ahci_softc { #define AHCI_PCI_QUIRK_FORCE __BIT(0) /* force attach */ #define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */ #define AHCI_QUIRK_BADPMP __BIT(2) /* broken PMP support, ignore */ -#define AHCI_QUIRK_SKIP_RESET __BIT(4) /* skip drive reset sequence */ -#define AHCI_QUIRK_BADNCQ __BIT(5) /* possibly broken NCQ support, ignore */ +#define AHCI_QUIRK_BADNCQ __BIT(3) /* possibly broken NCQ support, ignore */ uint32_t sc_ahci_cap; /* copy of AHCI_CAP */ int sc_ncmds; /* number of command slots */ |
