Module Name: src
Committed By: snj
Date: Sun Jul 23 14:27:24 UTC 2017
Modified Files:
src/sys/dev/pci [netbsd-6]: aceride.c pciide_acer_reg.h
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #1463):
sys/dev/pci/aceride.c: revision 1.37
sys/dev/pci/pciide_acer_reg.h: revision 1.13
Apply workaround from FreeBSD to fix read data corruption observed
on Fire V100 and mSATA-SSD with mSATA to IDE adapter.
The patch is from port-sparc64@.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.10.1 src/sys/dev/pci/aceride.c
cvs rdiff -u -r1.12 -r1.12.18.1 src/sys/dev/pci/pciide_acer_reg.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/dev/pci/aceride.c
diff -u src/sys/dev/pci/aceride.c:1.30 src/sys/dev/pci/aceride.c:1.30.10.1
--- src/sys/dev/pci/aceride.c:1.30 Mon Apr 4 20:37:56 2011
+++ src/sys/dev/pci/aceride.c Sun Jul 23 14:27:24 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: aceride.c,v 1.30 2011/04/04 20:37:56 dyoung Exp $ */
+/* $NetBSD: aceride.c,v 1.30.10.1 2017/07/23 14:27:24 snj Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.30 2011/04/04 20:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.30.10.1 2017/07/23 14:27:24 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -193,8 +193,13 @@ acer_chip_map(struct pciide_softc *sc, c
interface = PCI_INTERFACE(pci_conf_read(sc->sc_pc, sc->sc_tag,
PCI_CLASS_REG));
- /* From linux: enable "Cable Detection" */
if (rev >= 0xC2) {
+ /* From FreeBSD: use device interrupt as byte count end */
+ pciide_pci_write(sc->sc_pc, sc->sc_tag, ACER_0x4A,
+ pciide_pci_read(sc->sc_pc, sc->sc_tag, ACER_0x4A)
+ | ACER_0x4A_BCEINT);
+
+ /* From linux: enable "Cable Detection" */
pciide_pci_write(sc->sc_pc, sc->sc_tag, ACER_0x4B,
pciide_pci_read(sc->sc_pc, sc->sc_tag, ACER_0x4B)
| ACER_0x4B_CDETECT);
Index: src/sys/dev/pci/pciide_acer_reg.h
diff -u src/sys/dev/pci/pciide_acer_reg.h:1.12 src/sys/dev/pci/pciide_acer_reg.h:1.12.18.1
--- src/sys/dev/pci/pciide_acer_reg.h:1.12 Mon Oct 19 18:41:15 2009
+++ src/sys/dev/pci/pciide_acer_reg.h Sun Jul 23 14:27:24 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_acer_reg.h,v 1.12 2009/10/19 18:41:15 bouyer Exp $ */
+/* $NetBSD: pciide_acer_reg.h,v 1.12.18.1 2017/07/23 14:27:24 snj Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
@@ -37,6 +37,8 @@
* bit 1 is 0 -> secondary has 80 pin cable
*/
#define ACER_0x4A_80PIN(chan) (0x1 << (chan))
+/* From FreeBSD, use device interrupt as byte count end */
+#define ACER_0x4A_BCEINT 0x20
/* From FreeBSD, for UDMA mode > 2 */
#define ACER_0x4B 0x4b
