Module Name: src
Committed By: jmcneill
Date: Mon Dec 28 14:08:42 UTC 2020
Modified Files:
src/sys/arch/arm/nvidia: tegra_ahcisata.c
src/sys/dev/ic: ahcisata_core.c ahcisatavar.h
Log Message:
Remove the AHCI_QUIRK_SKIP_RESET quirk now that the underlying issue is
fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_ahcisata.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/ahcisatavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_ahcisata.c
diff -u src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.12 src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.13
--- src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.12 Fri Dec 14 12:29:22 2018
+++ src/sys/arch/arm/nvidia/tegra_ahcisata.c Mon Dec 28 14:08:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ahcisata.c,v 1.12 2018/12/14 12:29:22 skrll Exp $ */
+/* $NetBSD: tegra_ahcisata.c,v 1.13 2020/12/28 14:08:42 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.12 2018/12/14 12:29:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.13 2020/12/28 14:08:42 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -202,7 +202,6 @@ tegra_ahcisata_attach(device_t parent, d
aprint_error(": couldn't map ahci registers: %d\n", error);
return;
}
- sc->sc.sc_ahci_quirks = AHCI_QUIRK_SKIP_RESET;
aprint_naive("\n");
aprint_normal(": SATA\n");
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.91 src/sys/dev/ic/ahcisata_core.c:1.92
--- src/sys/dev/ic/ahcisata_core.c:1.91 Mon Dec 28 11:05:54 2020
+++ src/sys/dev/ic/ahcisata_core.c Mon Dec 28 14:08:42 2020
@@ -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
Index: src/sys/dev/ic/ahcisatavar.h
diff -u src/sys/dev/ic/ahcisatavar.h:1.25 src/sys/dev/ic/ahcisatavar.h:1.26
--- src/sys/dev/ic/ahcisatavar.h:1.25 Fri Dec 25 08:57:38 2020
+++ src/sys/dev/ic/ahcisatavar.h Mon Dec 28 14:08:42 2020
@@ -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 */
