Module Name: src
Committed By: jdolecek
Date: Mon Jan 14 21:29:56 UTC 2019
Modified Files:
src/sys/dev/ic: ahcisatavar.h
src/sys/dev/pci: ahcisata_pci.c
Log Message:
nothing handles AHCI_QUIRK_BADPMPRESET quirk, remove and change all entries
using it (ATI SB600/SB700) to instead use AHCI_QUIRK_BADPMP
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/ahcisatavar.h
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/ahcisata_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ahcisatavar.h
diff -u src/sys/dev/ic/ahcisatavar.h:1.21 src/sys/dev/ic/ahcisatavar.h:1.22
--- src/sys/dev/ic/ahcisatavar.h:1.21 Fri Dec 7 22:22:12 2018
+++ src/sys/dev/ic/ahcisatavar.h Mon Jan 14 21:29:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisatavar.h,v 1.21 2018/12/07 22:22:12 jdolecek Exp $ */
+/* $NetBSD: ahcisatavar.h,v 1.22 2019/01/14 21:29:56 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -58,7 +58,6 @@ 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_BADPMPRESET __BIT(3) /* broken PMP support for reset */
#define AHCI_QUIRK_SKIP_RESET __BIT(4) /* skip drive reset sequence */
uint32_t sc_ahci_cap; /* copy of AHCI_CAP */
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.50 src/sys/dev/pci/ahcisata_pci.c:1.51
--- src/sys/dev/pci/ahcisata_pci.c:1.50 Sat Dec 8 15:31:30 2018
+++ src/sys/dev/pci/ahcisata_pci.c Mon Jan 14 21:29:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.50 2018/12/08 15:31:30 jdolecek Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.51 2019/01/14 21:29:56 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.50 2018/12/08 15:31:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.51 2019/01/14 21:29:56 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_ahcisata_pci.h"
@@ -175,17 +175,17 @@ static const struct ahci_pci_quirk ahci_
AHCI_PCI_QUIRK_FORCE },
/* ATI SB600 AHCI 64-bit DMA only works on some boards/BIOSes */
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB600_SATA_1,
- AHCI_PCI_QUIRK_BAD64 | AHCI_QUIRK_BADPMPRESET },
+ AHCI_PCI_QUIRK_BAD64 | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI,
- AHCI_QUIRK_BADPMPRESET },
+ AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID,
- AHCI_QUIRK_BADPMPRESET },
+ AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_RAID5,
- AHCI_QUIRK_BADPMPRESET },
+ AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI2,
- AHCI_QUIRK_BADPMPRESET },
+ AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_STORAGE,
- AHCI_QUIRK_BADPMPRESET },
+ AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237R_SATA,
AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA,
