[src/netbsd-2]: src/sys/dev/pci Pull up revision 1.9 via patch (requested by ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec33d652823e
branches:  netbsd-2
changeset: 563948:ec33d652823e
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Aug 07 15:51:32 2005 +0000

description:
Pull up revision 1.9 via patch (requested by bouyer in ticket #5555):
Add an optionnal controller callback for channel reset. If the callback
is set to NULL, use the generic reset code.
Use this to work around a bug in some Acer IDE controllers (like the
one found in some sparc systems) where a controller disable/enable
is required after a reset to avoid data corruption when Ultra-DMA is
used. Workaround from opensolaris, thanks to Hiroki Sato for testing.

diffstat:

 sys/dev/pci/pciide_acer_reg.h |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 184913f092b0 -r ec33d652823e sys/dev/pci/pciide_acer_reg.h
--- a/sys/dev/pci/pciide_acer_reg.h     Sun Aug 07 15:35:34 2005 +0000
+++ b/sys/dev/pci/pciide_acer_reg.h     Sun Aug 07 15:51:32 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_acer_reg.h,v 1.7 2003/10/05 17:48:49 bouyer Exp $       */
+/*     $NetBSD: pciide_acer_reg.h,v 1.7.6.1 2005/08/07 15:51:32 riz Exp $      */
 
 /*
  * Copyright (c) 1999 Manuel Bouyer.
@@ -90,6 +90,10 @@
 #define ACER_0x79_REVC2_EN     0x4
 #define ACER_0x79_EN           0x2
 
+/* OpenSolaris: channel enable/disable in the PCI-ISA bridge */
+#define ACER_PCIB_CTRL 0x58
+#define ACER_PCIB_CTRL_ENCHAN(chan) (0x4 << (chan))
+
 /*
  * IDE bus frequency (1 byte)
  * This should be setup by the BIOS - can we rely on this ?