from NetBSD

support CMD 648/649 UDMA66 controllers
fix promise UDMA66 cable check

1 files changed, 36 insertions, 26 deletions

diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h
index e792e9f277f..62410cbeba3 100644
--- a/sys/dev/pci/pciide_cmd_reg.h
+++ b/sys/dev/pci/pciide_cmd_reg.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: pciide_cmd_reg.h,v 1.2 1999/10/04 22:54:18 deraadt Exp $	*/
-/*	$NetBSD: pciide_cmd_reg.h,v 1.4 1998/12/02 10:52:25 bouyer Exp $	*/
+/*	$OpenBSD: pciide_cmd_reg.h,v 1.3 2000/06/26 17:51:17 chris Exp $	*/
+/*	$NetBSD: pciide_cmd_reg.h,v 1.7 2000/06/26 10:07:52 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1998 Manuel Bouyer.
@@ -20,17 +20,16 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,     
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -41,21 +40,21 @@
 
 /* Configuration (RO) */
 #define CMD_CONF 0x50
-#define CMD_CONF_REV_MASK	0x03
+#define CMD_CONF_REV_MASK	0x03 /* 0640/3/6 only */
 #define CMD_CONF_DRV0_INTR	0x04
-#define CMD_CONF_DEVID		0x18
-#define CMD_CONF_VESAPRT	0x20
+#define CMD_CONF_DEVID		0x18 /* 0640/3/6 only */
+#define CMD_CONF_VESAPRT	0x20 /* 0640/3/6 only */
 #define CMD_CONF_DSA1		0x40
-#define CMD_CONF_DSA0		0x80
+#define CMD_CONF_DSA0		0x80 /* 0640/3/6 only */
 
 /* Control register (RW) */
 #define CMD_CTRL 0x51
-#define CMD_CTRL_HR_FIFO		0x01
-#define CMD_CTRL_HW_FIFO		0x02
+#define CMD_CTRL_HR_FIFO		0x01 /* 0640/3/6 only */
+#define CMD_CTRL_HW_FIFO		0x02 /* 0640/3/6 only */
 #define CMD_CTRL_DEVSEL			0x04
 #define CMD_CTRL_2PORT			0x08
-#define CMD_CTRL_PAR			0x10
-#define CMD_CTRL_HW_HLD			0x20
+#define CMD_CTRL_PAR			0x10 /* 0640/3/6 only */
+#define CMD_CTRL_HW_HLD			0x20 /* 0640/3/6 only */
 #define CMD_CTRL_DRV0_RAHEAD		0x40
 #define CMD_CTRL_DRV1_RAHEAD		0x80
 
@@ -70,7 +69,7 @@
 		((drive) == 0) ? 0x58 : 0x5b)
 
 /* secondary channel status and addr timings */
-#define CMD_ARTTIM23		0x57
+#define CMD_ARTTIM23	0x57
 #define CMD_ARTTIM23_IRQ	0x10
 #define CMD_ARTTIM23_RHAEAD(d)	((0x4) << (d))
 
@@ -79,12 +78,23 @@
 #define CMD_DMA			0x00
 #define CMD_DMA_MULTIPLE	0x01
 #define CMD_DMA_LINE		0x10
-		
+
+/* the followings are only for 0648/9 */
+/* busmaster control/status register */
+#define CMD_BICSR	0x79
+#define CMD_BICSR_80(chan)	(0x01 << (chan))
+/* Ultra/DMA timings reg */
+#define CMD_UDMATIM(channel)	(0x73 + (8 * (channel)))
+#define CMD_UDMATIM_UDMA(drive)	(0x01 << (drive))
+#define CMD_UDMATIM_UDMA33(drive) (0x04 << (drive))
+#define CMD_UDMATIM_TIM_MASK	0x3
+#define CMD_UDMATIM_TIM_OFF(drive) (4 + ((drive) * 2))
+static int8_t cmd0648_9_tim_udma[] = {0x03, 0x02, 0x01, 0x02, 0x01};
 
 /*
- * timings values for the 0643 and 0x646
+ * timings values for the 0643/6/8/9
  * for all dma_mode we have to have
  * DMA_timings(dma_mode) >= PIO_timings(dma_mode + 2)
  */
-static int8_t cmd0643_6_data_tim_pio[] = {0xA9, 0x57, 0x44, 0x32, 0x3F};
-static int8_t cmd0643_6_data_tim_dma[] = {0x87, 0x32, 0x3F};
+static int8_t cmd0643_9_data_tim_pio[] = {0xA9, 0x57, 0x44, 0x32, 0x3F};
+static int8_t cmd0643_9_data_tim_dma[] = {0x87, 0x32, 0x3F};