patch-2.0.12 linux/drivers/block/cmd640.c

• Lines: 95
• Date: Wed Aug 7 12:31:22 1996
• Orig file: v2.0.11/linux/drivers/block/cmd640.c
• Orig date: Mon Aug 5 10:13:50 1996

diff -u --recursive --new-file v2.0.11/linux/drivers/block/cmd640.c linux/drivers/block/cmd640.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/block/cmd640.c	Version 0.97  Aug  4, 1996
+ *  linux/drivers/block/cmd640.c	Version 0.99  Aug  6, 1996
  *
  *  Copyright (C) 1995-1996  Linus Torvalds & authors (see below)
  */
@@ -90,6 +90,8 @@
  *  Version 0.96	prevent use of io_32bit when prefetch is off
  *  Version 0.97	fix VLB secondary interface for sjd@slip.net
  *			other minor tune-ups:  0.96 was very good.
+ *  Version 0.98	ignore PCI version when disabled by BIOS
+ *  Version 0.99	display setup/active/recovery clocks with PIO mode
  */
 
 #undef REALLY_SLOW_IO		/* most systems can safely undef this */
@@ -119,6 +121,7 @@
 #define VID		0x00
 #define DID		0x02
 #define PCMD		0x04
+#define   PCMD_ENA	0x01
 #define PSTTS		0x06
 #define REVID		0x08
 #define PROGIF		0x09
@@ -288,6 +291,10 @@
 		if (get_cmd640_reg(i) != ven_dev[i])
 			return 0;
 	}
+	if ((get_cmd640_reg(PCMD) & PCMD_ENA) == 0) {
+		printk("ide: cmd640 on PCI disabled by BIOS\n");
+		return 0;
+	}
 	return 1; /* success */
 }
 
@@ -458,6 +465,24 @@
 }
 
 /*
+ * Dump out current drive clocks settings
+ */
+static void display_clocks (unsigned int index)
+{
+	byte active_count, recovery_count;
+
+	active_count = active_counts[index];
+	if (active_count == 1)
+		++active_count;
+	recovery_count = recovery_counts[index];
+	if (active_count > 3 && recovery_count == 1)
+		++recovery_count;
+	if (cmd640_chip_version > 1)
+		recovery_count += 1;  /* cmd640b uses (count + 1)*/
+	printk(", clocks=%d/%d/%d\n", setup_counts[index], active_count, recovery_count);
+}
+
+/*
  * Pack active and recovery counts into single byte representation
  * used by controller
  */
@@ -564,7 +589,7 @@
 	active_time = ide_pio_timings[pio_mode].active_time;
 	recovery_time = cycle_time - (setup_time + active_time);
 	clock_time = 1000 / bus_speed;
-	cycle_count = (cycle_time + clock_time - 1) / clock_time; 
+	cycle_count = (cycle_time + clock_time - 1) / clock_time;
 
 	setup_count = (setup_time + clock_time - 1) / clock_time;
 
@@ -635,12 +660,13 @@
 	(void) ide_get_best_pio_mode (drive, mode_wanted, 5, &d);
 	cmd640_set_mode (index, d.pio_mode, d.cycle_time);
 
-	printk ("%s: selected cmd640 PIO mode%d (%dns) %s/IORDY%s\n",
+	printk ("%s: selected cmd640 PIO mode%d (%dns) %s/IORDY%s",
 		drive->name,
 		d.pio_mode,
 		d.cycle_time,
 		d.use_iordy ? "w" : "wo",
 		d.overridden ? " (overriding vendor mode)" : "");
+	display_clocks(index);
 }
 
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
@@ -784,8 +810,9 @@
 			 */
 			retrieve_drive_counts (index);
 			check_prefetch (index);
-			printk("cmd640: drive%d timings/prefetch(%s) preserved\n",
+			printk("cmd640: drive%d timings/prefetch(%s) preserved",
 				index, drive->no_io_32bit ? "off" : "on");
+			display_clocks(index);
 		}
 #else
 		/*