patch-2.3.34 linux/drivers/block/ide-tape.c

Next file: linux/drivers/block/ide.c
Previous file: linux/drivers/block/ide-pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.33/linux/drivers/block/ide-tape.c linux/drivers/block/ide-tape.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/block/ide-tape.c	Version 1.15		Jul   4, 1999
+ * linux/drivers/block/ide-tape.c	Version 1.16e		Oct   3, 1999
  *
  * Copyright (C) 1995 - 1999 Gadi Oxman <gadio@netvision.net.il>
  *
@@ -216,7 +216,14 @@
  *                       Replace cli()/sti() with hwgroup spinlocks.
  * Ver 1.15  Mar 25 99   Fix SMP race condition by replacing hwgroup
  *                        spinlock with private per-tape spinlock.
- *                       Fix use of freed memory.
+ * Ver 1.16  Sep  1 99   Add OnStream tape support.
+ *                       Abort read pipeline on EOD.
+ *                       Wait for the tape to become ready in case it returns
+ *                        "in the process of becoming ready" on open().
+ *                       Fix zero padding of the last written block in
+ *                        case the tape block size is larger than PAGE_SIZE.
+ *                       Decrease the default disconnection time to tn.
+ * Ver 1.16e Oct  3 99   Minor fixes.
  *
  * Here are some words from the first releases of hd.c, which are quoted
  * in ide.c and apply here as well:
@@ -326,7 +333,7 @@
  *		sharing a (fast) ATA-2 disk with any (slow) new ATAPI device.
  */
 
-#define IDETAPE_VERSION "1.13"
+#define IDETAPE_VERSION "1.16e"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -352,12 +359,114 @@
 #include <asm/bitops.h>
 
 /*
- *	For general magnetic tape device compatibility.
+ *	OnStream support
  */
+#define ONSTREAM_DEBUG		(0)
+#define OS_CONFIG_PARTITION	(0xff)
+#define OS_DATA_PARTITION	(0)
+#define OS_PARTITION_VERSION	(1)
+
+/*
+ * partition
+ */
+typedef struct os_partition_s {
+	__u8	partition_num;
+	__u8	par_desc_ver;
+	__u16	wrt_pass_cntr;
+	__u32	first_frame_addr;
+	__u32	last_frame_addr;
+	__u32	eod_frame_addr;
+} os_partition_t;
+
+/*
+ * DAT entry
+ */
+typedef struct os_dat_entry_s {
+	__u32	blk_sz;
+	__u16	blk_cnt;
+	__u8	flags;
+	__u8	reserved;
+} os_dat_entry_t;
+
+/*
+ * DAT
+ */
+#define OS_DAT_FLAGS_DATA	(0xc)
+#define OS_DAT_FLAGS_MARK	(0x1)
+
+typedef struct os_dat_s {
+	__u8		dat_sz;
+	__u8		reserved1;
+	__u8		entry_cnt;
+	__u8		reserved3;
+	os_dat_entry_t	dat_list[16];
+} os_dat_t;
+
+/*
+ * Frame types
+ */
+#define OS_FRAME_TYPE_FILL	(0)
+#define OS_FRAME_TYPE_EOD	(1 << 0)
+#define OS_FRAME_TYPE_MARKER	(1 << 1)
+#define OS_FRAME_TYPE_HEADER	(1 << 3)
+#define OS_FRAME_TYPE_DATA	(1 << 7)
+
+/*
+ * AUX
+ */
+typedef struct os_aux_s {
+	__u32		format_id;		/* hardware compability AUX is based on */
+	char		application_sig[4];	/* driver used to write this media */
+	__u32		hdwr;			/* reserved */
+	__u32		update_frame_cntr;	/* for configuration frame */
+	__u8		frame_type;
+	__u8		frame_type_reserved;
+	__u8		reserved_18_19[2];
+	os_partition_t	partition;
+	__u8		reserved_36_43[8];
+	__u32		frame_seq_num;
+	__u32		logical_blk_num_high;
+	__u32		logical_blk_num;
+	os_dat_t	dat;
+	__u8		reserved188_191[4];
+	__u32		filemark_cnt;
+	__u32		phys_fm;
+	__u32		last_mark_addr;
+	__u8		reserved204_223[20];
+
+	/*
+	 * __u8		app_specific[32];
+	 *
+	 * Linux specific fields:
+	 */
+	 __u32		next_mark_addr;		/* when known, points to next marker */
+	 __u8		linux_specific[28];
+
+	__u8		reserved_256_511[256];
+} os_aux_t;
+
+typedef struct os_header_s {
+	char		ident_str[8];
+	__u8		major_rev;
+	__u8		minor_rev;
+	__u8		reserved10_15[6];
+	__u8		par_num;
+	__u8		reserved1_3[3];
+	os_partition_t	partition;
+} os_header_t;
+
+/*
+ * OnStream ADRL frame
+ */
+#define OS_FRAME_SIZE	(32 * 1024 + 512)
+#define OS_DATA_SIZE	(32 * 1024)
+#define OS_AUX_SIZE	(512)
+
 #include <linux/mtio.h>
 
 /**************************** Tunable parameters *****************************/
 
+
 /*
  *	Pipelined mode parameters.
  *
@@ -372,36 +481,13 @@
  *
  *	Setting the following parameter to 0 will disable the pipelined mode.
  */
-#define IDETAPE_MIN_PIPELINE_STAGES	100
-#define IDETAPE_MAX_PIPELINE_STAGES	200
+#define IDETAPE_MIN_PIPELINE_STAGES	200
+#define IDETAPE_MAX_PIPELINE_STAGES	400
 #define IDETAPE_INCREASE_STAGES_RATE	 20
 
 /*
- *	Assuming the tape shares an interface with another device, the default
- *	behavior is to service our pending pipeline requests as soon as
- *	possible, but to gracefully postpone them in favor of the other device
- *	when the tape is busy. This has the potential to maximize our
- *	throughput and in the same time, to make efficient use of the IDE bus.
- *
- *	Note that when we transfer data to / from the tape, we co-operate with
- *	the relatively fast tape buffers and the tape will perform the
- *	actual media access in the background, without blocking the IDE
- *	bus. This means that as long as the maximum IDE bus throughput is much
- *	higher than the sum of our maximum throughput and the maximum
- *	throughput of the other device, we should probably leave the default
- *	behavior.
- *
- *	However, if it is still desired to give the other device a share even
- *	in our own (small) bus bandwidth, you can set IDETAPE_LOW_TAPE_PRIORITY
- *	to 1. This will let the other device finish *all* its pending requests
- *	before we even check if we can service our next pending request.
- */
-#define IDETAPE_LOW_TAPE_PRIORITY	0
-
-/*
  *	The following are used to debug the driver:
  *
- *	Setting IDETAPE_INFO_LOG to 1 will log driver vender information.
  *	Setting IDETAPE_DEBUG_LOG to 1 will log driver flow control.
  *	Setting IDETAPE_DEBUG_BUGS to 1 will enable self-sanity checks in
  *	some places.
@@ -416,15 +502,9 @@
  *	is verified to be stable enough. This will make it much more
  *	esthetic.
  */
-#define IDETAPE_INFO_LOG		0
 #define IDETAPE_DEBUG_LOG		0
 #define IDETAPE_DEBUG_BUGS		1
 
-#if IDETAPE_DEBUG_LOG
-#undef IDETAPE_INFO_LOG
-#define IDETAPE_INFO_LOG		IDETAPE_DEBUG_LOG
-#endif
-
 /*
  *	After each failed packet command we issue a request sense command
  *	and retry the packet command IDETAPE_MAX_PC_RETRIES times.
@@ -448,6 +528,20 @@
 #define IDETAPE_PC_STACK		(10 + IDETAPE_MAX_PC_RETRIES)
 
 /*
+ *	Some tape drives require a long irq timeout
+ */
+#define IDETAPE_WAIT_CMD		(60*HZ)
+
+/*
+ *	The following parameter is used to select the point in the internal
+ *	tape fifo in which we will start to refill the buffer. Decreasing
+ *	the following parameter will improve the system's latency and
+ *	interactive response, while using a high value might improve sytem
+ *	throughput.
+ */
+#define IDETAPE_FIFO_THRESHOLD 		2
+
+/*
  *	DSC polling parameters.
  *
  *	Polling for DSC (a single bit in the status register) is a very
@@ -479,20 +573,6 @@
  */
  
 /*
- *	The following parameter is used to select the point in the internal
- *	tape fifo in which we will start to refill the buffer. Decreasing
- *	the following parameter will improve the system's latency and
- *	interactive response, while using a high value might improve sytem
- *	throughput.
- */
-#define IDETAPE_FIFO_THRESHOLD 		2
-
-/*
- *	Some tape drives require a long irq timeout
- */
-#define IDETAPE_WAIT_CMD		(60*HZ)
-
-/*
  *	DSC timings.
  */
 #define IDETAPE_DSC_RW_MIN		5*HZ/100	/* 50 msec */
@@ -505,6 +585,25 @@
 
 /*************************** End of tunable parameters ***********************/
 
+/*
+ *	Debugging/Performance analysis
+ *
+ *	I/O trace support
+ */
+#define USE_IOTRACE	0
+#if USE_IOTRACE
+#include <linux/io_trace.h>
+#define IO_IDETAPE_FIFO	500
+#endif
+
+/*
+ *	Read/Write error simulation
+ */
+#define SIMULATE_ERRORS			0
+
+/*
+ *	For general magnetic tape device compatibility.
+ */
 typedef enum {
 	idetape_direction_none,
 	idetape_direction_read,
@@ -569,8 +668,9 @@
 	unsigned	blk512		:1;	/* Supports 512 bytes block size */
 	unsigned	blk1024		:1;	/* Supports 1024 bytes block size */
 	unsigned	reserved7_3_6	:4;
-	unsigned	slowb		:1;	/* The device restricts the byte count for PIO */
+	unsigned	blk32768	:1;	/* slowb - the device restricts the byte count for PIO */
 						/* transfers for slow buffer memory ??? */
+						/* Also 32768 block size in some cases */
 	u16		max_speed;		/* Maximum speed supported in KBps */
 	u8		reserved10, reserved11;
 	u16		ctl;			/* Continuous Transfer Limit in blocks */
@@ -580,15 +680,60 @@
 } idetape_capabilities_page_t;
 
 /*
+ *	Block Size Page
+ */
+typedef struct {
+	unsigned	page_code	:6;	/* Page code - Should be 0x30 */
+	unsigned	reserved1_6	:1;
+	unsigned	ps		:1;
+	u8		page_length;		/* Page Length - Should be 2 */
+	u8		reserved2;
+	unsigned	play32		:1;
+	unsigned	play32_5	:1;
+	unsigned	reserved2_23	:2;
+	unsigned	record32	:1;
+	unsigned	record32_5	:1;
+	unsigned	reserved2_6	:1;
+	unsigned	one		:1;
+} idetape_block_size_page_t;
+
+/*
  *	A pipeline stage.
  */
 typedef struct idetape_stage_s {
 	struct request rq;			/* The corresponding request */
 	struct buffer_head *bh;			/* The data buffers */
 	struct idetape_stage_s *next;		/* Pointer to the next stage */
+	os_aux_t *aux;				/* OnStream aux ptr */
 } idetape_stage_t;
 
 /*
+ *	REQUEST SENSE packet command result - Data Format.
+ */
+typedef struct {
+	unsigned	error_code	:7;	/* Current of deferred errors */
+	unsigned	valid		:1;	/* The information field conforms to QIC-157C */
+	u8		reserved1	:8;	/* Segment Number - Reserved */
+	unsigned	sense_key	:4;	/* Sense Key */
+	unsigned	reserved2_4	:1;	/* Reserved */
+	unsigned	ili		:1;	/* Incorrect Length Indicator */
+	unsigned	eom		:1;	/* End Of Medium */
+	unsigned	filemark 	:1;	/* Filemark */
+	u32		information __attribute__ ((packed));
+	u8		asl;			/* Additional sense length (n-7) */
+	u32		command_specific;	/* Additional command specific information */
+	u8		asc;			/* Additional Sense Code */
+	u8		ascq;			/* Additional Sense Code Qualifier */
+	u8		replaceable_unit_code;	/* Field Replaceable Unit Code */
+	unsigned	sk_specific1 	:7;	/* Sense Key Specific */
+	unsigned	sksv		:1;	/* Sense Key Specific information is valid */
+	u8		sk_specific2;		/* Sense Key Specific */
+	u8		sk_specific3;		/* Sense Key Specific */
+	u8		pad[2];			/* Padding to 20 bytes */
+} idetape_request_sense_result_t;
+
+
+/*
  *	Most of our global data which we need to save even as we leave the
  *	driver due to an interrupt or a timer event is stored in a variable
  *	of type idetape_tape_t, defined below.
@@ -637,10 +782,12 @@
 	unsigned long dsc_timeout;		/* Maximum waiting time */
 
 	/*
-	 *	Position information
+	 *	Read position information
 	 */
 	byte partition;
-	unsigned int block_address;		/* Current block */
+	unsigned int first_frame_position;		/* Current block */
+	unsigned int last_frame_position;
+	unsigned int blocks_in_buffer;
 
 	/*
 	 *	Last error information
@@ -701,9 +848,109 @@
 
 	unsigned int flags;			/* Status/Action flags */
 	spinlock_t spinlock;			/* protects the ide-tape queue */
+
+	/*
+	 * Measures average tape speed
+	 */
+	unsigned long avg_time;
+	int avg_size;
+	int avg_speed;
+
+	idetape_request_sense_result_t sense;	/* last sense information */
+
+	char vendor_id[10];
+	char product_id[18];
+	char firmware_revision[6];
+	int firmware_revision_num;
+
+	int door_locked;			/* the door is currently locked */
+
+	/*
+	 * OnStream flags
+	 */
+	int onstream;				/* the tape is an OnStream tape */
+	int raw;				/* OnStream raw access (32.5KB block size) */
+	int cur_frames;				/* current number of frames in internal buffer */
+	int max_frames;				/* max number of frames in internal buffer */
+	int logical_blk_num;			/* logical block number */
+	__u16 wrt_pass_cntr;			/* write pass counter */
+	__u32 update_frame_cntr;		/* update frame counter */
+	struct semaphore *sem;
+	int onstream_write_error;		/* write error recovery active */
+	int header_ok;				/* header frame verified ok */
+	int linux_media;			/* reading linux-specifc media */
+	int linux_media_version;
+	char application_sig[5];		/* application signature */
+	int filemark_cnt;
+	int first_mark_addr;
+	int last_mark_addr;
+	int eod_frame_addr;
+	unsigned long cmd_start_time;
+	unsigned long max_cmd_time;
+
+	/*
+	 * Optimize the number of "buffer filling"
+	 * mode sense commands.
+	 */
+	unsigned long last_buffer_fill;		/* last time in which we issued fill cmd */
+	int req_buffer_fill;			/* buffer fill command requested */
+	int writes_since_buffer_fill;
+	int reads_since_buffer_fill;
+
+	/*
+	 * Limit the number of times a request can
+	 * be postponed, to avoid an infinite postpone
+	 * deadlock.
+	 */
+	int postpone_cnt;			/* request postpone count limit */
+
+	/*
+	 * Measures number of frames:
+	 *
+	 * 1. written/read to/from the driver pipeline (pipeline_head).
+	 * 2. written/read to/from the tape buffers (buffer_head).
+	 * 3. written/read by the tape to/from the media (tape_head).
+	 */
+	int pipeline_head;
+	int buffer_head;
+	int tape_head;
+	int last_tape_head;
+
+	/*
+	 * Speed control at the tape buffers input/output
+	 */
+	unsigned long insert_time;
+	int insert_size;
+	int insert_speed;
+	int max_insert_speed;
+	int measure_insert_time;
+
+	/*
+	 * Measure tape still time, in milliseconds
+	 */
+	unsigned long tape_still_time_begin;
+	int tape_still_time;
+
+	/*
+	 * Speed regulation negative feedback loop
+	 */
+	int speed_control;
+	int pipeline_head_speed, controlled_pipeline_head_speed, uncontrolled_pipeline_head_speed;
+	int controlled_last_pipeline_head, uncontrolled_last_pipeline_head;
+	unsigned long uncontrolled_pipeline_head_time, controlled_pipeline_head_time;
+	int controlled_previous_pipeline_head, uncontrolled_previous_pipeline_head;
+	unsigned long controlled_previous_head_time, uncontrolled_previous_head_time;
+	int restart_speed_control_req;
 } idetape_tape_t;
 
 /*
+ *	Tape door status
+ */
+#define DOOR_UNLOCKED			0
+#define DOOR_LOCKED			1
+#define DOOR_EXPLICITLY_LOCKED		2
+
+/*
  *	Tape flag bits values.
  */
 #define IDETAPE_IGNORE_DSC		0
@@ -713,6 +960,8 @@
 #define IDETAPE_DETECT_BS		4	/* Attempt to auto-detect the current user block size */
 #define IDETAPE_FILEMARK		5	/* Currently on a filemark */
 #define IDETAPE_DRQ_INTERRUPT		6	/* DRQ interrupt device */
+#define IDETAPE_READ_ERROR		7
+#define IDETAPE_PIPELINE_ACTIVE		8	/* pipeline active */
 
 /*
  *	Supported ATAPI tape drives packet commands
@@ -727,9 +976,18 @@
 #define IDETAPE_INQUIRY_CMD		0x12
 #define IDETAPE_ERASE_CMD		0x19
 #define IDETAPE_MODE_SENSE_CMD		0x1a
+#define IDETAPE_MODE_SELECT_CMD		0x15
 #define IDETAPE_LOAD_UNLOAD_CMD		0x1b
+#define IDETAPE_PREVENT_CMD		0x1e
 #define IDETAPE_LOCATE_CMD		0x2b
 #define IDETAPE_READ_POSITION_CMD	0x34
+#define IDETAPE_READ_BUFFER_CMD		0x3c
+#define IDETAPE_SET_SPEED_CMD		0xbb
+
+/*
+ *	Some defines for the READ BUFFER command
+ */
+#define IDETAPE_RETRIEVE_FAULTY_BLOCK	6
 
 /*
  *	Some defines for the SPACE command
@@ -768,8 +1026,10 @@
 #define IDETAPE_READ_RQ			92
 #define IDETAPE_WRITE_RQ		93
 #define IDETAPE_ABORTED_WRITE_RQ	94
+#define IDETAPE_ABORTED_READ_RQ		95
+#define IDETAPE_READ_BUFFER_RQ		96
 
-#define IDETAPE_LAST_RQ			94
+#define IDETAPE_LAST_RQ			96
 
 /*
  *	A macro which can be used to check if a we support a given
@@ -947,36 +1207,12 @@
 } idetape_read_position_result_t;
 
 /*
- *	REQUEST SENSE packet command result - Data Format.
- */
-typedef struct {
-	unsigned	error_code	:7;	/* Current of deferred errors */
-	unsigned	valid		:1;	/* The information field conforms to QIC-157C */
-	u8		reserved1	:8;	/* Segment Number - Reserved */
-	unsigned	sense_key	:4;	/* Sense Key */
-	unsigned	reserved2_4	:1;	/* Reserved */
-	unsigned	ili		:1;	/* Incorrect Length Indicator */
-	unsigned	eom		:1;	/* End Of Medium */
-	unsigned	filemark 	:1;	/* Filemark */
-	u32		information __attribute__ ((packed));
-	u8		asl;			/* Additional sense length (n-7) */
-	u32		command_specific;	/* Additional command specific information */
-	u8		asc;			/* Additional Sense Code */
-	u8		ascq;			/* Additional Sense Code Qualifier */
-	u8		replaceable_unit_code;	/* Field Replaceable Unit Code */
-	unsigned	sk_specific1 	:7;	/* Sense Key Specific */
-	unsigned	sksv		:1;	/* Sense Key Specific information is valid */
-	u8		sk_specific2;		/* Sense Key Specific */
-	u8		sk_specific3;		/* Sense Key Specific */
-	u8		pad[2];			/* Padding to 20 bytes */
-} idetape_request_sense_result_t;
-
-/*
  *	Follows structures which are related to the SELECT SENSE / MODE SENSE
  *	packet commands. Those packet commands are still not supported
  *	by ide-tape.
  */
 #define	IDETAPE_CAPABILITIES_PAGE	0x2a
+#define IDETAPE_BLOCK_SIZE_PAGE		0x30
 
 /*
  *	Mode Parameter Header for the MODE SENSE packet command
@@ -1140,46 +1376,6 @@
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
 /*
- *	idetape_postpone_request postpones the current request so that
- *	ide.c will be able to service requests from another device on
- *	the same hwgroup while we are polling for DSC.
- */
-static void idetape_postpone_request (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
-
-	tape->postponed_rq = HWGROUP(drive)->rq;
-	ide_stall_queue(drive, tape->dsc_polling_frequency);
-}
-
-/*
- *	idetape_queue_pc_head generates a new packet command request in front
- *	of the request queue, before the current request, so that it will be
- *	processed immediately, on the next pass through the driver.
- *
- *	idetape_queue_pc_head is called from the request handling part of
- *	the driver (the "bottom" part). Safe storage for the request should
- *	be allocated with idetape_next_pc_storage and idetape_next_rq_storage
- *	before calling idetape_queue_pc_head.
- *
- *	Memory for those requests is pre-allocated at initialization time, and
- *	is limited to IDETAPE_PC_STACK requests. We assume that we have enough
- *	space for the maximum possible number of inter-dependent packet commands.
- *
- *	The higher level of the driver - The ioctl handler and the character
- *	device handling functions should queue request to the lower level part
- *	and wait for their completion using idetape_queue_pc_tail or
- *	idetape_queue_rw_tail.
- */
-static void idetape_queue_pc_head (ide_drive_t *drive,idetape_pc_t *pc,struct request *rq)
-{
-	ide_init_drive_cmd (rq);
-	rq->buffer = (char *) pc;
-	rq->cmd = IDETAPE_PC_RQ1;
-	(void) ide_do_drive_cmd (drive, rq, ide_preempt);
-}
-
-/*
  *	idetape_next_pc_storage returns a pointer to a place in which we can
  *	safely store a packet command, even though we intend to leave the
  *	driver. A storage space for a maximum of IDETAPE_PC_STACK packet
@@ -1223,196 +1419,116 @@
 }
 
 /*
- *	Pipeline related functions
+ *	idetape_init_pc initializes a packet command.
  */
-
-static inline int idetape_pipeline_active (idetape_tape_t *tape)
+static void idetape_init_pc (idetape_pc_t *pc)
 {
-	return tape->active_data_request != NULL;
+	memset (pc->c, 0, 12);
+	pc->retries = 0;
+	pc->flags = 0;
+	pc->request_transfer = 0;
+	pc->buffer = pc->pc_buffer;
+	pc->buffer_size = IDETAPE_PC_BUFFER_SIZE;
+	pc->bh = NULL;
+	pc->b_data = NULL;
 }
 
 /*
- *	idetape_kfree_stage calls kfree to completely free a stage, along with
- *	its related buffers.
+ *	idetape_analyze_error is called on each failed packet command retry
+ *	to analyze the request sense. We currently do not utilize this
+ *	information.
  */
-static void __idetape_kfree_stage (idetape_stage_t *stage)
+static void idetape_analyze_error (ide_drive_t *drive,idetape_request_sense_result_t *result)
 {
-	struct buffer_head *prev_bh, *bh = stage->bh;
-	int size;
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_pc_t *pc = tape->failed_pc;
 
-	while (bh != NULL) {
-		if (bh->b_data != NULL) {
-			size = (int) bh->b_size;
-			while (size > 0) {
-				free_page ((unsigned long) bh->b_data);
-				size -= PAGE_SIZE;
-				bh->b_data += PAGE_SIZE;
-			}
+	tape->sense = *result;
+	tape->sense_key = result->sense_key; tape->asc = result->asc; tape->ascq = result->ascq;
+#if IDETAPE_DEBUG_LOG
+	/*
+	 *	Without debugging, we only log an error if we decided to
+	 *	give up retrying.
+	 */
+	printk (KERN_INFO "ide-tape: pc = %x, sense key = %x, asc = %x, ascq = %x\n",pc->c[0],result->sense_key,result->asc,result->ascq);
+#endif /* IDETAPE_DEBUG_LOG */
+
+	if (tape->onstream && result->sense_key == 2 && result->asc == 0x53 && result->ascq == 2) {
+		clear_bit(PC_DMA_ERROR, &pc->flags);
+		ide_stall_queue(drive, HZ / 2);
+		return;
+	}
+#ifdef CONFIG_BLK_DEV_IDEDMA
+
+	/*
+	 *	Correct pc->actually_transferred by asking the tape.
+	 */
+	if (test_bit (PC_DMA_ERROR, &pc->flags)) {
+		pc->actually_transferred = pc->request_transfer - tape->tape_block_size * ntohl (get_unaligned (&result->information));
+		idetape_update_buffers (pc);
+	}
+#endif /* CONFIG_BLK_DEV_IDEDMA */
+	if (pc->c[0] == IDETAPE_READ_CMD && result->filemark) {
+		pc->error = IDETAPE_ERROR_FILEMARK;
+		set_bit (PC_ABORT, &pc->flags);
+	}
+	if (pc->c[0] == IDETAPE_WRITE_CMD) {
+		if (result->eom || (result->sense_key == 0xd && result->asc == 0x0 && result->ascq == 0x2)) {
+			pc->error = IDETAPE_ERROR_EOD;
+			set_bit (PC_ABORT, &pc->flags);
 		}
-		prev_bh = bh;
-		bh = bh->b_reqnext;
-		kfree (prev_bh);
 	}
-	kfree (stage);
+	if (pc->c[0] == IDETAPE_READ_CMD || pc->c[0] == IDETAPE_WRITE_CMD) {
+		if (result->sense_key == 8) {
+			pc->error = IDETAPE_ERROR_EOD;
+			set_bit (PC_ABORT, &pc->flags);
+		}
+		if (!test_bit (PC_ABORT, &pc->flags) && (tape->onstream || pc->actually_transferred))
+			pc->retries = IDETAPE_MAX_PC_RETRIES + 1;
+	}
 }
 
-static void idetape_kfree_stage (idetape_tape_t *tape, idetape_stage_t *stage)
+static void idetape_abort_pipeline (ide_drive_t *drive)
 {
-	if (tape->cache_stage == NULL)
-		tape->cache_stage = stage;
-	else
-		__idetape_kfree_stage (stage);
-}
-
-/*
- *	idetape_kmalloc_stage uses __get_free_page to allocate a pipeline
- *	stage, along with all the necessary small buffers which together make
- *	a buffer of size tape->stage_size (or a bit more). We attempt to
- *	combine sequential pages as much as possible.
- *
- *	Returns a pointer to the new allocated stage, or NULL if we
- *	can't (or don't want to) allocate a stage.
- *
- *	Pipeline stages are optional and are used to increase performance.
- *	If we can't allocate them, we'll manage without them.
- */
-static idetape_stage_t *__idetape_kmalloc_stage (idetape_tape_t *tape)
-{
-	idetape_stage_t *stage;
-	struct buffer_head *prev_bh, *bh;
-	int pages = tape->pages_per_stage;
-	char *b_data;
-
-	if ((stage = (idetape_stage_t *) kmalloc (sizeof (idetape_stage_t),GFP_KERNEL)) == NULL)
-		return NULL;
-	stage->next = NULL;
-
-	bh = stage->bh = (struct buffer_head *) kmalloc (sizeof (struct buffer_head), GFP_KERNEL);
-	if (bh == NULL)
-		goto abort;
-	bh->b_reqnext = NULL;
-	if ((bh->b_data = (char *) __get_free_page (GFP_KERNEL)) == NULL)
-		goto abort;
-	bh->b_size = PAGE_SIZE;
-	set_bit (BH_Lock, &bh->b_state);
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage = tape->next_stage;
 
-	while (--pages) {
-		if ((b_data = (char *) __get_free_page (GFP_KERNEL)) == NULL)
-			goto abort;
-		if (bh->b_data == b_data + PAGE_SIZE && virt_to_bus (bh->b_data) == virt_to_bus (b_data) + PAGE_SIZE) {
-			bh->b_size += PAGE_SIZE;
-			bh->b_data -= PAGE_SIZE;
-			continue;
-		}
-		if (b_data == bh->b_data + bh->b_size && virt_to_bus (b_data) == virt_to_bus (bh->b_data) + bh->b_size) {
-			bh->b_size += PAGE_SIZE;
-			continue;
-		}
-		prev_bh = bh;
-		if ((bh = (struct buffer_head *) kmalloc (sizeof (struct buffer_head), GFP_KERNEL)) == NULL) {
-			free_page ((unsigned long) b_data);
-			goto abort;
-		}
-		bh->b_reqnext = NULL;
-		bh->b_data = b_data;
-		bh->b_size = PAGE_SIZE;
-		set_bit (BH_Lock, &bh->b_state);
-		prev_bh->b_reqnext = bh;
+#if IDETAPE_DEBUG_LOG
+	printk(KERN_INFO "ide-tape: %s: idetape_abort_pipeline called\n", tape->name);
+#endif
+	while (stage) {
+		if (stage->rq.cmd == IDETAPE_WRITE_RQ)
+			stage->rq.cmd = IDETAPE_ABORTED_WRITE_RQ;
+		else if (stage->rq.cmd == IDETAPE_READ_RQ)
+			stage->rq.cmd = IDETAPE_ABORTED_READ_RQ;
+		stage = stage->next;
 	}
-	bh->b_size -= tape->excess_bh_size;
-	return stage;
-abort:
-	__idetape_kfree_stage (stage);
-	return NULL;
 }
 
-static idetape_stage_t *idetape_kmalloc_stage (idetape_tape_t *tape)
+/*
+ *	idetape_active_next_stage will declare the next stage as "active".
+ */
+static void idetape_active_next_stage (ide_drive_t *drive)
 {
-	idetape_stage_t *cache_stage = tape->cache_stage;
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage=tape->next_stage;
+	struct request *rq = &stage->rq;
 
 #if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_kmalloc_stage\n");
+	printk (KERN_INFO "Reached idetape_active_next_stage\n");
 #endif /* IDETAPE_DEBUG_LOG */
-
-	if (tape->nr_stages >= tape->max_stages)
-		return NULL;
-	if (cache_stage != NULL) {
-		tape->cache_stage = NULL;
-		return cache_stage;
-	}
-	return __idetape_kmalloc_stage (tape);
-}
-
-static void idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t *stage, const char *buf, int n)
-{
-	struct buffer_head *bh = tape->bh;
-	int count;
-
-	while (n) {
-#if IDETAPE_DEBUG_BUGS
-		if (bh == NULL) {
-			printk (KERN_ERR "ide-tape: bh == NULL in idetape_copy_stage_from_user\n");
-			return;
-		}
-#endif /* IDETAPE_DEBUG_BUGS */
-		count = IDE_MIN (bh->b_size - atomic_read(&bh->b_count), n);
-		copy_from_user (bh->b_data + atomic_read(&bh->b_count), buf, count);
-		n -= count; atomic_add(count, &bh->b_count); buf += count;
-		if (atomic_read(&bh->b_count) == bh->b_size) {
-			bh = bh->b_reqnext;
-			if (bh)
-				atomic_set(&bh->b_count, 0);
-		}
-	}
-	tape->bh = bh;
-}
-
-static void idetape_copy_stage_to_user (idetape_tape_t *tape, char *buf, idetape_stage_t *stage, int n)
-{
-	struct buffer_head *bh = tape->bh;
-	int count;
-
-	while (n) {
 #if IDETAPE_DEBUG_BUGS
-		if (bh == NULL) {
-			printk (KERN_ERR "ide-tape: bh == NULL in idetape_copy_stage_to_user\n");
-			return;
-		}
-#endif /* IDETAPE_DEBUG_BUGS */
-		count = IDE_MIN (tape->b_count, n);
-		copy_to_user (buf, tape->b_data, count);
-		n -= count; tape->b_data += count; tape->b_count -= count; buf += count;
-		if (!tape->b_count) {
-			tape->bh = bh = bh->b_reqnext;
-			if (bh) {
-				tape->b_data = bh->b_data;
-				tape->b_count = atomic_read(&bh->b_count);
-			}
-		}
-	}
-}
-
-static void idetape_init_merge_stage (idetape_tape_t *tape)
-{
-	struct buffer_head *bh = tape->merge_stage->bh;
-	
-	tape->bh = bh;
-	if (tape->chrdev_direction == idetape_direction_write)
-		atomic_set(&bh->b_count, 0);
-	else {
-		tape->b_data = bh->b_data;
-		tape->b_count = atomic_read(&bh->b_count);
+	if (stage == NULL) {
+		printk (KERN_ERR "ide-tape: bug: Trying to activate a non existing stage\n");
+		return;
 	}
-}
-
-static void idetape_switch_buffers (idetape_tape_t *tape, idetape_stage_t *stage)
-{
-	struct buffer_head *tmp;
+#endif /* IDETAPE_DEBUG_BUGS */	
 
-	tmp = stage->bh;
-	stage->bh = tape->merge_stage->bh;
-	tape->merge_stage->bh = tmp;
-	idetape_init_merge_stage (tape);
+	rq->buffer = NULL;
+	rq->bh = stage->bh;
+	tape->active_data_request=rq;
+	tape->active_stage=stage;
+	tape->next_stage=stage->next;
 }
 
 /*
@@ -1437,28 +1553,33 @@
 }
 
 /*
- *	idetape_add_stage_tail adds a new stage at the end of the pipeline.
+ *	idetape_kfree_stage calls kfree to completely free a stage, along with
+ *	its related buffers.
  */
-static void idetape_add_stage_tail (ide_drive_t *drive,idetape_stage_t *stage)
+static void __idetape_kfree_stage (idetape_stage_t *stage)
 {
-	idetape_tape_t *tape = drive->driver_data;
-	unsigned long flags;
-	
-#if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_add_stage_tail\n");
-#endif /* IDETAPE_DEBUG_LOG */
-	spin_lock_irqsave(&tape->spinlock, flags);
-	stage->next=NULL;
-	if (tape->last_stage != NULL)
-		tape->last_stage->next=stage;
-	else
-		tape->first_stage=tape->next_stage=stage;
-	tape->last_stage=stage;
-	if (tape->next_stage == NULL)
-		tape->next_stage=tape->last_stage;
-	tape->nr_stages++;
-	tape->nr_pending_stages++;
-	spin_unlock_irqrestore(&tape->spinlock, flags);
+	struct buffer_head *prev_bh, *bh = stage->bh;
+	int size;
+
+	while (bh != NULL) {
+		if (bh->b_data != NULL) {
+			size = (int) bh->b_size;
+			while (size > 0) {
+				free_page ((unsigned long) bh->b_data);
+				size -= PAGE_SIZE;
+				bh->b_data += PAGE_SIZE;
+			}
+		}
+		prev_bh = bh;
+		bh = bh->b_reqnext;
+		kfree (prev_bh);
+	}
+	kfree (stage);
+}
+
+static void idetape_kfree_stage (idetape_tape_t *tape, idetape_stage_t *stage)
+{
+	__idetape_kfree_stage (stage);
 }
 
 /*
@@ -1499,83 +1620,35 @@
 }
 
 /*
- *	idetape_active_next_stage will declare the next stage as "active".
+ *	idetape_end_request is used to finish servicing a request, and to
+ *	insert a pending pipeline request into the main device queue.
  */
-static void idetape_active_next_stage (ide_drive_t *drive)
+static void idetape_end_request (byte uptodate, ide_hwgroup_t *hwgroup)
 {
+	ide_drive_t *drive = hwgroup->drive;
+	struct request *rq = hwgroup->rq;
 	idetape_tape_t *tape = drive->driver_data;
-	idetape_stage_t *stage=tape->next_stage;
-	struct request *rq = &stage->rq;
+	unsigned long flags;
+	int error;
+	int remove_stage = 0;
+#if ONSTREAM_DEBUG
+	idetape_stage_t *stage;
+	os_aux_t *aux;
+	unsigned char *p;
+#endif
 
 #if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_active_next_stage\n");
+	printk (KERN_INFO "Reached idetape_end_request\n");
 #endif /* IDETAPE_DEBUG_LOG */
-#if IDETAPE_DEBUG_BUGS
-	if (stage == NULL) {
-		printk (KERN_ERR "ide-tape: bug: Trying to activate a non existing stage\n");
-		return;
-	}
-#endif /* IDETAPE_DEBUG_BUGS */	
-
-	rq->buffer = NULL;
-	rq->bh = stage->bh;
-	tape->active_data_request=rq;
-	tape->active_stage=stage;
-	tape->next_stage=stage->next;
-}
-
-/*
- *	idetape_insert_pipeline_into_queue is used to start servicing the
- *	pipeline stages, starting from tape->next_stage.
- */
-static void idetape_insert_pipeline_into_queue (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
 
-	if (tape->next_stage == NULL)
-		return;
-	if (!idetape_pipeline_active (tape)) {
-		idetape_active_next_stage (drive);
-		(void) ide_do_drive_cmd (drive, tape->active_data_request, ide_end);
+	switch (uptodate) {
+		case 0:	error = IDETAPE_ERROR_GENERAL; break;
+		case 1: error = 0; break;
+		default: error = uptodate;
 	}
-}
-
-static void idetape_abort_pipeline (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
-	idetape_stage_t *stage = tape->next_stage;
-
-	while (stage) {
-		stage->rq.cmd = IDETAPE_ABORTED_WRITE_RQ;
-		stage = stage->next;
-	}
-}
-
-/*
- *	idetape_end_request is used to finish servicing a request, and to
- *	insert a pending pipeline request into the main device queue.
- */
-static void idetape_end_request (byte uptodate, ide_hwgroup_t *hwgroup)
-{
-	ide_drive_t *drive = hwgroup->drive;
-	struct request *rq = hwgroup->rq;
-	idetape_tape_t *tape = drive->driver_data;
-	unsigned long flags;
-	int error;
-	int remove_stage = 0;
-
-#if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_end_request\n");
-#endif /* IDETAPE_DEBUG_LOG */
-
-	switch (uptodate) {
-		case 0:	error = IDETAPE_ERROR_GENERAL; break;
-		case 1: error = 0; break;
-		default: error = uptodate;
-	}
-	rq->errors = error;
-	if (error)
-		tape->failed_pc = NULL;
+	rq->errors = error;
+	if (error)
+		tape->failed_pc = NULL;
 
 	spin_lock_irqsave(&tape->spinlock, flags);
 	if (tape->active_data_request == rq) {		/* The request was a pipelined data transfer request */
@@ -1583,83 +1656,68 @@
 		tape->active_data_request = NULL;
 		tape->nr_pending_stages--;
 		if (rq->cmd == IDETAPE_WRITE_RQ) {
+#if ONSTREAM_DEBUG
+			if (tape->onstream) {
+				stage = tape->first_stage;
+				aux = stage->aux;
+				p = stage->bh->b_data;
+				if (ntohl(aux->logical_blk_num) < 11300 && ntohl(aux->logical_blk_num) > 11100)
+					printk(KERN_INFO "finished writing logical blk %lu (data %x %x %x %x)\n", ntohl(aux->logical_blk_num), *p++, *p++, *p++, *p++);
+			}
+#endif
+			if (tape->onstream && !tape->raw) {
+				if (tape->first_frame_position == 0xba4) {
+#if ONSTREAM_DEBUG
+					printk("ide-tape: %s: skipping over config parition..\n", tape->name);
+#endif
+					tape->onstream_write_error = 2;
+					if (tape->sem)
+						up(tape->sem);
+				}
+			}
+			remove_stage = 1;
 			if (error) {
 				set_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
 				if (error == IDETAPE_ERROR_EOD)
 					idetape_abort_pipeline (drive);
+				if (tape->onstream && !tape->raw && error == IDETAPE_ERROR_GENERAL && tape->sense.sense_key == 3) {
+					clear_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
+					printk(KERN_ERR "ide-tape: %s: write error, enabling error recovery\n", tape->name);
+					tape->onstream_write_error = 1;
+					remove_stage = 0;
+					tape->nr_pending_stages++;
+					tape->next_stage = tape->first_stage;
+					rq->current_nr_sectors = rq->nr_sectors;
+					if (tape->sem)
+						up(tape->sem);
+				}
+			}
+		} else if (rq->cmd == IDETAPE_READ_RQ) {
+			if (error == IDETAPE_ERROR_EOD) {
+				set_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
+				idetape_abort_pipeline(drive);
 			}
-			remove_stage = 1;
 		}
-		if (tape->next_stage != NULL) {
+		if (tape->next_stage != NULL && !tape->onstream_write_error) {
 			idetape_active_next_stage (drive);
 
 			/*
 			 *	Insert the next request into the request queue.
-			 *	The choice of using ide_next or ide_end is now left to the user.
 			 */
-#if IDETAPE_LOW_TAPE_PRIORITY
 			(void) ide_do_drive_cmd (drive, tape->active_data_request, ide_end);
-#else
-			(void) ide_do_drive_cmd (drive, tape->active_data_request, ide_next);
-#endif /* IDETAPE_LOW_TAPE_PRIORITY */
-		} else if (!error)
-			idetape_increase_max_pipeline_stages (drive);
+		} else if (!error) {
+			if (!tape->onstream)
+				idetape_increase_max_pipeline_stages (drive);
+		}
 	}
 	ide_end_drive_cmd (drive, 0, 0);
 	if (remove_stage)
 		idetape_remove_stage_head (drive);
+	if (tape->active_data_request == NULL)
+		clear_bit(IDETAPE_PIPELINE_ACTIVE, &tape->flags);
 	spin_unlock_irqrestore(&tape->spinlock, flags);
 }
 
-/*
- *	idetape_analyze_error is called on each failed packet command retry
- *	to analyze the request sense. We currently do not utilize this
- *	information.
- */
-static void idetape_analyze_error (ide_drive_t *drive,idetape_request_sense_result_t *result)
-{
-	idetape_tape_t *tape = drive->driver_data;
-	idetape_pc_t *pc = tape->failed_pc;
-		
-	tape->sense_key = result->sense_key; tape->asc = result->asc; tape->ascq = result->ascq;
-#if IDETAPE_DEBUG_LOG
-	/*
-	 *	Without debugging, we only log an error if we decided to
-	 *	give up retrying.
-	 */
-	printk (KERN_INFO "ide-tape: pc = %x, sense key = %x, asc = %x, ascq = %x\n",pc->c[0],result->sense_key,result->asc,result->ascq);
-#endif /* IDETAPE_DEBUG_LOG */
-
-#ifdef CONFIG_BLK_DEV_IDEDMA
-
-	/*
-	 *	Correct pc->actually_transferred by asking the tape.
-	 */
-	if (test_bit (PC_DMA_ERROR, &pc->flags)) {
-		pc->actually_transferred = pc->request_transfer - tape->tape_block_size * ntohl (get_unaligned (&result->information));
-		idetape_update_buffers (pc);
-	}
-#endif /* CONFIG_BLK_DEV_IDEDMA */
-	if (pc->c[0] == IDETAPE_READ_CMD && result->filemark) {
-		pc->error = IDETAPE_ERROR_FILEMARK;
-		set_bit (PC_ABORT, &pc->flags);
-	}
-	if (pc->c[0] == IDETAPE_WRITE_CMD) {
-		if (result->eom || (result->sense_key == 0xd && result->asc == 0x0 && result->ascq == 0x2)) {
-			pc->error = IDETAPE_ERROR_EOD;
-			set_bit (PC_ABORT, &pc->flags);
-		}
-	}
-	if (pc->c[0] == IDETAPE_READ_CMD || pc->c[0] == IDETAPE_WRITE_CMD) {
-		if (result->sense_key == 8) {
-			pc->error = IDETAPE_ERROR_EOD;
-			set_bit (PC_ABORT, &pc->flags);
-		}
-		if (!test_bit (PC_ABORT, &pc->flags) && pc->actually_transferred)
-			pc->retries = IDETAPE_MAX_PC_RETRIES + 1;
-	}
-}
-
 static ide_startstop_t idetape_request_sense_callback (ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
@@ -1677,31 +1735,43 @@
 	return ide_stopped;
 }
 
-/*
- *	idetape_init_pc initializes a packet command.
- */
-static void idetape_init_pc (idetape_pc_t *pc)
-{
-	memset (pc->c, 0, 12);
-	pc->retries = 0;
-	pc->flags = 0;
-	pc->request_transfer = 0;
-	pc->buffer = pc->pc_buffer;
-	pc->buffer_size = IDETAPE_PC_BUFFER_SIZE;
-	pc->bh = NULL;
-	pc->b_data = NULL;
-}
-
 static void idetape_create_request_sense_cmd (idetape_pc_t *pc)
 {
 	idetape_init_pc (pc);	
 	pc->c[0] = IDETAPE_REQUEST_SENSE_CMD;
-	pc->c[4] = 255;
+	pc->c[4] = 20;
 	pc->request_transfer = 18;
 	pc->callback = &idetape_request_sense_callback;
 }
 
 /*
+ *	idetape_queue_pc_head generates a new packet command request in front
+ *	of the request queue, before the current request, so that it will be
+ *	processed immediately, on the next pass through the driver.
+ *
+ *	idetape_queue_pc_head is called from the request handling part of
+ *	the driver (the "bottom" part). Safe storage for the request should
+ *	be allocated with idetape_next_pc_storage and idetape_next_rq_storage
+ *	before calling idetape_queue_pc_head.
+ *
+ *	Memory for those requests is pre-allocated at initialization time, and
+ *	is limited to IDETAPE_PC_STACK requests. We assume that we have enough
+ *	space for the maximum possible number of inter-dependent packet commands.
+ *
+ *	The higher level of the driver - The ioctl handler and the character
+ *	device handling functions should queue request to the lower level part
+ *	and wait for their completion using idetape_queue_pc_tail or
+ *	idetape_queue_rw_tail.
+ */
+static void idetape_queue_pc_head (ide_drive_t *drive,idetape_pc_t *pc,struct request *rq)
+{
+	ide_init_drive_cmd (rq);
+	rq->buffer = (char *) pc;
+	rq->cmd = IDETAPE_PC_RQ1;
+	(void) ide_do_drive_cmd (drive, rq, ide_preempt);
+}
+
+/*
  *	idetape_retry_pc is called when an error was detected during the
  *	last packet command. We queue a request sense packet command in
  *	the head of the request list.
@@ -1723,6 +1793,22 @@
 }
 
 /*
+ *	idetape_postpone_request postpones the current request so that
+ *	ide.c will be able to service requests from another device on
+ *	the same hwgroup while we are polling for DSC.
+ */
+static void idetape_postpone_request (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+#if IDETAPE_DEBUG_LOG
+	printk(KERN_INFO "idetape_postpone_request\n");
+#endif
+	tape->postponed_rq = HWGROUP(drive)->rq;
+	ide_stall_queue(drive, tape->dsc_polling_frequency);
+}
+
+/*
  *	idetape_pc_intr is the usual interrupt handler which will be called
  *	during a packet command. We will transfer some of the data (as
  *	requested by the drive) and will re-point interrupt handler to us.
@@ -1737,12 +1823,19 @@
 	idetape_bcount_reg_t bcount;
 	idetape_ireason_reg_t ireason;
 	idetape_pc_t *pc=tape->pc;
+
 	unsigned int temp;
+	unsigned long cmd_time;
+#if SIMULATE_ERRORS
+	static int error_sim_count = 0;
+#endif
 
 #if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "ide-tape: Reached idetape_pc_intr interrupt handler\n");
 #endif /* IDETAPE_DEBUG_LOG */	
 
+	status.all = GET_STAT();					/* Clear the interrupt */
+
 #ifdef CONFIG_BLK_DEV_IDEDMA
 	if (test_bit (PC_DMA_IN_PROGRESS, &pc->flags)) {
 		if (HWIF(drive)->dmaproc(ide_dma_end, drive)) {
@@ -1758,7 +1851,7 @@
 			 * information from the DMA engine on most chipsets).
 			 */
 			set_bit (PC_DMA_ERROR, &pc->flags);
-		} else {
+		} else if (!status.b.check) {
 			pc->actually_transferred=pc->request_transfer;
 			idetape_update_buffers (pc);
 		}
@@ -1768,9 +1861,9 @@
 	}
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
-	status.all = GET_STAT();					/* Clear the interrupt */
-
 	if (!status.b.drq) {						/* No more interrupts */
+		cmd_time = (jiffies - tape->cmd_start_time) * 1000 / HZ;
+		tape->max_cmd_time = IDE_MAX(cmd_time, tape->max_cmd_time);
 #if IDETAPE_DEBUG_LOG
 		printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred);
 #endif /* IDETAPE_DEBUG_LOG */
@@ -1778,6 +1871,12 @@
 
 		ide__sti();	/* local CPU only */
 
+#if SIMULATE_ERRORS
+		if ((pc->c[0] == IDETAPE_WRITE_CMD || pc->c[0] == IDETAPE_READ_CMD) && (++error_sim_count % 100) == 0) {
+			printk(KERN_INFO "ide-tape: %s: simulating error\n", tape->name);
+			status.b.check = 1;
+		}
+#endif
 		if (status.b.check && pc->c[0] == IDETAPE_REQUEST_SENSE_CMD)
 			status.b.check = 0;
 		if (status.b.check || test_bit (PC_DMA_ERROR, &pc->flags)) {	/* Error detected */
@@ -1788,10 +1887,13 @@
 				printk (KERN_ERR "ide-tape: I/O error in request sense command\n");
 				return ide_do_reset (drive);
 			}
-			return idetape_retry_pc (drive);		/* Retry operation */
+#if IDETAPE_DEBUG_LOG
+			printk(KERN_INFO "[cmd %x]: check condition\n", pc->c[0]);
+#endif
+			return idetape_retry_pc (drive);				/* Retry operation */
 		}
 		pc->error = 0;
-		if (test_bit (PC_WAIT_FOR_DSC, &pc->flags) && !status.b.dsc) {	/* Media access command */
+		if (!tape->onstream && test_bit (PC_WAIT_FOR_DSC, &pc->flags) && !status.b.dsc) {	/* Media access command */
 			tape->dsc_polling_start = jiffies;
 			tape->dsc_polling_frequency = IDETAPE_DSC_MA_FAST;
 			tape->dsc_timeout = jiffies + IDETAPE_DSC_MA_TIMEOUT;
@@ -1850,7 +1952,9 @@
 	}
 	pc->actually_transferred+=bcount.all;					/* Update the current position */
 	pc->current_position+=bcount.all;
-
+#if IDETAPE_DEBUG_LOG
+	printk(KERN_INFO "[cmd %x] transferred %d bytes on that interrupt\n", pc->c[0], bcount.all);
+#endif
 	ide_set_handler (drive,&idetape_pc_intr,IDETAPE_WAIT_CMD,NULL);		/* And set the interrupt handler again */
 	return ide_started;
 }
@@ -1897,7 +2001,6 @@
  *		we will handle the next request.
  *
  */
-
 static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
@@ -1906,7 +2009,7 @@
 	int retries = 100;
 	ide_startstop_t startstop;
 
-	if (ide_wait_stat(&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) {
+	if (ide_wait_stat (&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) {
 		printk (KERN_ERR "ide-tape: Strange, packet command initiated yet DRQ isn't asserted\n");
 		return startstop;
 	}
@@ -1925,6 +2028,7 @@
 		printk (KERN_ERR "ide-tape: (IO,CoD) != (0,1) while issuing a packet command\n");
 		return ide_do_reset (drive);
 	}
+	tape->cmd_start_time = jiffies;
 	ide_set_handler(drive, &idetape_pc_intr, IDETAPE_WAIT_CMD, NULL);	/* Set the interrupt routine */
 	atapi_output_bytes (drive,pc->c,12);			/* Send the actual packet */
 	return ide_started;
@@ -1954,8 +2058,12 @@
 		 *	example).
 		 */
 		if (!test_bit (PC_ABORT, &pc->flags)) {
-			printk (KERN_ERR "ide-tape: %s: I/O error, pc = %2x, key = %2x, asc = %2x, ascq = %2x\n",
-				tape->name, pc->c[0], tape->sense_key, tape->asc, tape->ascq);
+			if (!(pc->c[0] == 0 && tape->sense_key == 2 && tape->asc == 4 && (tape->ascq == 1 || tape->ascq == 8))) {
+				printk (KERN_ERR "ide-tape: %s: I/O error, pc = %2x, key = %2x, asc = %2x, ascq = %2x\n",
+					tape->name, pc->c[0], tape->sense_key, tape->asc, tape->ascq);
+				if (tape->onstream && pc->c[0] == 8 && tape->sense_key == 3 && tape->asc == 11)
+					printk(KERN_ERR "ide-tape: %s: enabling read error recovery\n", tape->name);
+			}
 			pc->error = IDETAPE_ERROR_GENERAL;		/* Giving up */
 		}
 		tape->failed_pc=NULL;
@@ -2001,17 +2109,139 @@
 	}
 }
 
+/*
+ *	General packet command callback function.
+ */
+static ide_startstop_t idetape_pc_callback (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	
+#if IDETAPE_DEBUG_LOG
+	printk (KERN_INFO "ide-tape: Reached idetape_pc_callback\n");
+#endif /* IDETAPE_DEBUG_LOG */
+
+	idetape_end_request (tape->pc->error ? 0:1, HWGROUP(drive));
+	return ide_stopped;
+}
+
+/*
+ *	A mode sense command is used to "sense" tape parameters.
+ */
+static void idetape_create_mode_sense_cmd (idetape_pc_t *pc, byte page_code)
+{
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_MODE_SENSE_CMD;
+	pc->c[1] = 8;				/* DBD = 1 - Don't return block descriptors for now */
+	pc->c[2] = page_code;
+	pc->c[3] = 255;				/* Don't limit the returned information */
+	pc->c[4] = 255;				/* (We will just discard data in that case) */
+	if (page_code == IDETAPE_CAPABILITIES_PAGE)
+		pc->request_transfer = 24;
+	else
+		pc->request_transfer = 50;
+	pc->callback = &idetape_pc_callback;
+}
+
+static ide_startstop_t idetape_onstream_buffer_fill_callback (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	tape->max_frames = tape->pc->buffer[4 + 2];
+	tape->cur_frames = tape->pc->buffer[4 + 3];
+	if (tape->chrdev_direction == idetape_direction_write)
+		tape->tape_head = tape->buffer_head - tape->cur_frames;
+	else
+		tape->tape_head = tape->buffer_head + tape->cur_frames;
+	if (tape->tape_head != tape->last_tape_head) {
+		tape->last_tape_head = tape->tape_head;
+		tape->tape_still_time_begin = jiffies;
+		if (tape->tape_still_time > 200)
+			tape->measure_insert_time = 1;
+	}
+	tape->tape_still_time = (jiffies - tape->tape_still_time_begin) * 1000 / HZ;
+#if USE_IOTRACE
+	IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+#endif
+#if IDETAPE_DEBUG_LOG
+	printk(KERN_INFO "buffer fill callback, %d/%d\n", tape->cur_frames, tape->max_frames);
+#endif
+	idetape_end_request (tape->pc->error ? 0:1, HWGROUP(drive));
+	return ide_stopped;
+}
+
+static void idetape_queue_onstream_buffer_fill (ide_drive_t *drive)
+{
+	idetape_pc_t *pc;
+	struct request *rq;
+
+	pc = idetape_next_pc_storage (drive);
+	rq = idetape_next_rq_storage (drive);
+	idetape_create_mode_sense_cmd (pc, 0x33);
+	pc->callback = idetape_onstream_buffer_fill_callback;
+	idetape_queue_pc_head (drive, pc, rq);
+}
+
+static void calculate_speeds(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int full = 125, empty = 75;
+
+	if (jiffies > tape->controlled_pipeline_head_time + 120 * HZ) {
+		tape->controlled_previous_pipeline_head = tape->controlled_last_pipeline_head;
+		tape->controlled_previous_head_time = tape->controlled_pipeline_head_time;
+		tape->controlled_last_pipeline_head = tape->pipeline_head;
+		tape->controlled_pipeline_head_time = jiffies;
+	}
+	if (jiffies > tape->controlled_pipeline_head_time + 60 * HZ)
+		tape->controlled_pipeline_head_speed = (tape->pipeline_head - tape->controlled_last_pipeline_head) * 32 * HZ / (jiffies - tape->controlled_pipeline_head_time);
+	else if (jiffies > tape->controlled_previous_head_time)
+		tape->controlled_pipeline_head_speed = (tape->pipeline_head - tape->controlled_previous_pipeline_head) * 32 * HZ / (jiffies - tape->controlled_previous_head_time);
+
+	if (tape->nr_pending_stages < tape->max_stages /*- 1 */) { /* -1 for read mode error recovery */
+		if (jiffies > tape->uncontrolled_previous_head_time + 10 * HZ) {
+			tape->uncontrolled_pipeline_head_time = jiffies;
+			tape->uncontrolled_pipeline_head_speed = (tape->pipeline_head - tape->uncontrolled_previous_pipeline_head) * 32 * HZ / (jiffies - tape->uncontrolled_previous_head_time);
+		}
+	} else {
+		tape->uncontrolled_previous_head_time = jiffies;
+		tape->uncontrolled_previous_pipeline_head = tape->pipeline_head;
+		if (jiffies > tape->uncontrolled_pipeline_head_time + 30 * HZ) {
+			tape->uncontrolled_pipeline_head_time = jiffies;
+		}
+	}
+	tape->pipeline_head_speed = IDE_MAX(tape->uncontrolled_pipeline_head_speed, tape->controlled_pipeline_head_speed);
+	if (tape->speed_control == 0) {
+		tape->max_insert_speed = 5000;
+	} else if (tape->speed_control == 1) {
+		if (tape->nr_pending_stages >= tape->max_stages / 2)
+			tape->max_insert_speed = tape->pipeline_head_speed +
+				(1100 - tape->pipeline_head_speed) * 2 * (tape->nr_pending_stages - tape->max_stages / 2) / tape->max_stages;
+		else
+			tape->max_insert_speed = 500 +
+				(tape->pipeline_head_speed - 500) * 2 * tape->nr_pending_stages / tape->max_stages;
+		if (tape->nr_pending_stages >= tape->max_stages * 99 / 100)
+			tape->max_insert_speed = 5000;
+	} else if (tape->speed_control == 2) {
+		tape->max_insert_speed = tape->pipeline_head_speed * empty / 100 +
+			(tape->pipeline_head_speed * full / 100 - tape->pipeline_head_speed * empty / 100) * tape->nr_pending_stages / tape->max_stages;
+	} else
+		tape->max_insert_speed = tape->speed_control;
+	tape->max_insert_speed = IDE_MAX(tape->max_insert_speed, 500);
+}
+
 static ide_startstop_t idetape_media_access_finished (ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
 	idetape_pc_t *pc = tape->pc;
 	idetape_status_reg_t status;
 
+	if (tape->onstream)
+		printk(KERN_INFO "ide-tape: bug: onstream, media_access_finished\n");
 	status.all = GET_STAT();
 	if (status.b.dsc) {
 		if (status.b.check) {					/* Error detected */
 			printk (KERN_ERR "ide-tape: %s: I/O error, ",tape->name);
-			return idetape_retry_pc (drive);		/* Retry operation */
+			return idetape_retry_pc (drive);			/* Retry operation */
 		}
 		pc->error = 0;
 		if (tape->failed_pc == pc)
@@ -2023,32 +2253,34 @@
 	return pc->callback (drive);
 }
 
-/*
- *	General packet command callback function.
- */
-static ide_startstop_t idetape_pc_callback (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
-	
-#if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "ide-tape: Reached idetape_pc_callback\n");
-#endif /* IDETAPE_DEBUG_LOG */
-
-	idetape_end_request (tape->pc->error ? 0:1, HWGROUP(drive));
-	return ide_stopped;
-}
-
 static ide_startstop_t idetape_rw_callback (ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
 	struct request *rq = HWGROUP(drive)->rq;
 	int blocks = tape->pc->actually_transferred / tape->tape_block_size;
 
+	tape->avg_size += blocks * tape->tape_block_size;
+	tape->insert_size += blocks * tape->tape_block_size;
+	if (tape->insert_size > 1024 * 1024)
+		tape->measure_insert_time = 1;
+	if (tape->measure_insert_time) {
+		tape->measure_insert_time = 0;
+		tape->insert_time = jiffies;
+		tape->insert_size = 0;
+	}
+	if (jiffies > tape->insert_time)
+		tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
+	if (jiffies - tape->avg_time >= HZ) {
+		tape->avg_speed = tape->avg_size * HZ / (jiffies - tape->avg_time) / 1024;
+		tape->avg_size = 0;
+		tape->avg_time = jiffies;
+	}
+
 #if IDETAPE_DEBUG_LOG	
 	printk (KERN_INFO "ide-tape: Reached idetape_rw_callback\n");
 #endif /* IDETAPE_DEBUG_LOG */
 
-	tape->block_address += blocks;
+	tape->first_frame_position += blocks;
 	rq->current_nr_sectors -= blocks;
 
 	if (!tape->pc->error)
@@ -2058,82 +2290,9 @@
 	return ide_stopped;
 }
 
-static void idetape_create_locate_cmd (idetape_pc_t *pc, unsigned int block, byte partition)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_LOCATE_CMD;
-	pc->c[1] = 2;
-	put_unaligned (htonl (block), (unsigned int *) &pc->c[3]);
-	pc->c[8] = partition;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
-	pc->callback = &idetape_pc_callback;
-}
-
-static void idetape_create_rewind_cmd (idetape_pc_t *pc)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_REWIND_CMD;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
-	pc->callback = &idetape_pc_callback;
-}
-
-/*
- *	A mode sense command is used to "sense" tape parameters.
- */
-static void idetape_create_mode_sense_cmd (idetape_pc_t *pc, byte page_code)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_MODE_SENSE_CMD;
-	pc->c[1] = 8;				/* DBD = 1 - Don't return block descriptors for now */
-	pc->c[2] = page_code;
-	pc->c[3] = 255;				/* Don't limit the returned information */
-	pc->c[4] = 255;				/* (We will just discard data in that case) */
-	if (page_code == IDETAPE_CAPABILITIES_PAGE)
-		pc->request_transfer = 24;
-#if IDETAPE_DEBUG_BUGS
-	else
-		printk (KERN_ERR "ide-tape: unsupported page code in create_mode_sense_cmd\n");
-#endif /* IDETAPE_DEBUG_BUGS */
-	pc->callback = &idetape_pc_callback;
-}
-
-/*
- *	idetape_create_write_filemark_cmd will:
- *
- *		1.	Write a filemark if write_filemark=1.
- *		2.	Flush the device buffers without writing a filemark
- *			if write_filemark=0.
- *
- */
-static void idetape_create_write_filemark_cmd (idetape_pc_t *pc,int write_filemark)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_WRITE_FILEMARK_CMD;
-	pc->c[4] = write_filemark;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
-	pc->callback = &idetape_pc_callback;
-}
-
-static void idetape_create_load_unload_cmd (idetape_pc_t *pc,int cmd)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_LOAD_UNLOAD_CMD;
-	pc->c[4] = cmd;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
-	pc->callback = &idetape_pc_callback;
-}
-
-static void idetape_create_erase_cmd (idetape_pc_t *pc)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_ERASE_CMD;
-	pc->c[1] = 1;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
-	pc->callback = &idetape_pc_callback;
-}
-
-static void idetape_create_read_cmd (idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct buffer_head *bh)
+static void idetape_create_read_cmd (idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct buffer_head *bh)
 {
+	struct buffer_head *p = bh;
 	idetape_init_pc (pc);
 	pc->c[0] = IDETAPE_READ_CMD;
 	put_unaligned (htonl (length), (unsigned int *) &pc->c[1]);
@@ -2142,77 +2301,76 @@
 	pc->bh = bh;
 	atomic_set(&bh->b_count, 0);
 	pc->buffer = NULL;
-	pc->request_transfer = pc->buffer_size = length * tape->tape_block_size;
-	if (pc->request_transfer == tape->stage_size)
-		set_bit (PC_DMA_RECOMMENDED, &pc->flags);
+	if (tape->onstream) {
+		while (p) {
+			atomic_set(&p->b_count, 0);
+			p = p->b_reqnext;
+		}
+	}
+	if (!tape->onstream) {
+		pc->request_transfer = pc->buffer_size = length * tape->tape_block_size;
+		if (pc->request_transfer == tape->stage_size)
+			set_bit (PC_DMA_RECOMMENDED, &pc->flags);
+	} else  {
+		if (length) {
+			pc->request_transfer = pc->buffer_size = 32768 + 512;
+			set_bit (PC_DMA_RECOMMENDED, &pc->flags);
+		} else
+			pc->request_transfer = 0;
+	}
 }
 
-static void idetape_create_space_cmd (idetape_pc_t *pc,int count,byte cmd)
+static void idetape_create_read_buffer_cmd(idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct buffer_head *bh)
 {
+	int size = 32768;
+
+	struct buffer_head *p = bh;
 	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_SPACE_CMD;
-	put_unaligned (htonl (count), (unsigned int *) &pc->c[1]);
-	pc->c[1] = cmd;
-	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->c[0] = IDETAPE_READ_BUFFER_CMD;
+	pc->c[1] = IDETAPE_RETRIEVE_FAULTY_BLOCK;
+	pc->c[7] = size >> 8;
+	pc->c[8] = size & 0xff;
 	pc->callback = &idetape_pc_callback;
+	pc->bh = bh;
+	atomic_set(&bh->b_count, 0);
+	pc->buffer = NULL;
+	while (p) {
+		atomic_set(&p->b_count, 0);
+		p = p->b_reqnext;
+	}
+	pc->request_transfer = pc->buffer_size = size;
 }
 
 static void idetape_create_write_cmd (idetape_tape_t *tape, idetape_pc_t *pc, unsigned int length, struct buffer_head *bh)
 {
+	struct buffer_head *p = bh;
 	idetape_init_pc (pc);
 	pc->c[0] = IDETAPE_WRITE_CMD;
 	put_unaligned (htonl (length), (unsigned int *) &pc->c[1]);
 	pc->c[1] = 1;
 	pc->callback = &idetape_rw_callback;
 	set_bit (PC_WRITING, &pc->flags);
+	if (tape->onstream) {
+		while (p) {
+			atomic_set(&p->b_count, p->b_size);
+			p = p->b_reqnext;
+		}
+	}
 	pc->bh = bh;
 	pc->b_data = bh->b_data;
 	pc->b_count = atomic_read(&bh->b_count);
 	pc->buffer = NULL;
-	pc->request_transfer = pc->buffer_size = length * tape->tape_block_size;
-	if (pc->request_transfer == tape->stage_size)
-		set_bit (PC_DMA_RECOMMENDED, &pc->flags);
-}
-
-static ide_startstop_t idetape_read_position_callback (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
-	idetape_read_position_result_t *result;
-	
-#if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "ide-tape: Reached idetape_read_position_callback\n");
-#endif /* IDETAPE_DEBUG_LOG */
-
-	if (!tape->pc->error) {
-		result = (idetape_read_position_result_t *) tape->pc->buffer;
-#if IDETAPE_DEBUG_LOG
-		printk (KERN_INFO "BOP - %s\n",result->bop ? "Yes":"No");
-		printk (KERN_INFO "EOP - %s\n",result->eop ? "Yes":"No");
-#endif /* IDETAPE_DEBUG_LOG */
-		if (result->bpu) {
-			printk (KERN_INFO "ide-tape: Block location is unknown to the tape\n");
-			clear_bit (IDETAPE_ADDRESS_VALID, &tape->flags);
-			idetape_end_request (0,HWGROUP (drive));
-		} else {
-#if IDETAPE_DEBUG_LOG
-			printk (KERN_INFO "Block Location - %lu\n", ntohl (result->first_block));
-#endif /* IDETAPE_DEBUG_LOG */
-			tape->partition = result->partition;
-			tape->block_address = ntohl (result->first_block);
-			set_bit (IDETAPE_ADDRESS_VALID, &tape->flags);
-			idetape_end_request (1,HWGROUP (drive));
-		}
-	} else
-		idetape_end_request (0,HWGROUP (drive));
-	return ide_stopped;
-}
-
-static void idetape_create_read_position_cmd (idetape_pc_t *pc)
-{
-	idetape_init_pc (pc);
-	pc->c[0] = IDETAPE_READ_POSITION_CMD;
-	pc->request_transfer = 20;
-	pc->callback = &idetape_read_position_callback;
+	if (!tape->onstream) {
+		pc->request_transfer = pc->buffer_size = length * tape->tape_block_size;
+		if (pc->request_transfer == tape->stage_size)
+			set_bit (PC_DMA_RECOMMENDED, &pc->flags);
+	} else  {
+		if (length) {
+			pc->request_transfer = pc->buffer_size = 32768 + 512;
+			set_bit (PC_DMA_RECOMMENDED, &pc->flags);
+		} else
+			pc->request_transfer = 0;
+	}
 }
 
 /*
@@ -2261,8 +2419,54 @@
 	 *	the other device meanwhile.
 	 */
 	status.all = GET_STAT();
+
+	/*
+	 * The OnStream tape drive doesn't support DSC. Assume
+	 * that DSC is always set.
+	 */
+	if (tape->onstream)
+		status.b.dsc = 1;
 	if (!drive->dsc_overlap && rq->cmd != IDETAPE_PC_RQ2)
 		set_bit (IDETAPE_IGNORE_DSC, &tape->flags);
+
+	/*
+	 * For the OnStream tape, check the current status of the tape
+	 * internal buffer using data gathered from the buffer fill
+	 * mode page, and postpone our request, effectively "disconnecting"
+	 * from the IDE bus, in case the buffer is full (writing) or
+	 * empty (reading), and there is a danger that our request will
+	 * hold the IDE bus during actual media access.
+	 */
+	if (tape->tape_still_time > 100 && tape->tape_still_time < 200)
+		tape->measure_insert_time = 1;
+	if (tape->req_buffer_fill && (rq->cmd == IDETAPE_WRITE_RQ || rq->cmd == IDETAPE_READ_RQ)) {
+		tape->req_buffer_fill = 0;
+		tape->writes_since_buffer_fill = 0;
+		tape->reads_since_buffer_fill = 0;
+		tape->last_buffer_fill = jiffies;
+		idetape_queue_onstream_buffer_fill(drive);
+		if (jiffies > tape->insert_time)
+			tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
+		return ide_stopped;
+	}
+	if (jiffies > tape->insert_time)
+		tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
+	calculate_speeds(drive);
+	if (tape->onstream && tape->max_frames &&
+	   ((rq->cmd == IDETAPE_WRITE_RQ && (tape->cur_frames == tape->max_frames || (tape->speed_control && tape->cur_frames > 5 && (tape->insert_speed > tape->max_insert_speed || (0 /* tape->cur_frames > 30 && tape->tape_still_time > 200 */))))) ||
+	    (rq->cmd == IDETAPE_READ_RQ && (tape->cur_frames == 0 || (tape->speed_control && (tape->cur_frames < tape->max_frames - 5) && tape->insert_speed > tape->max_insert_speed)) && rq->nr_sectors))) {
+#if IDETAPE_DEBUG_LOG
+		printk(KERN_INFO "postponing request, cmd %d, cur %d, max %d\n",
+			rq->cmd, tape->cur_frames, tape->max_frames);
+#endif
+		if (tape->postpone_cnt++ < 500) {
+			status.b.dsc = 0;
+			tape->req_buffer_fill = 1;
+		}
+#if ONSTREAM_DEBUG
+		else printk(KERN_INFO "ide-tape: %s: postpone_cnt %d\n", tape->name, tape->postpone_cnt);
+#endif
+	}
 	if (!test_and_clear_bit (IDETAPE_IGNORE_DSC, &tape->flags) && !status.b.dsc) {
 		if (postponed_rq == NULL) {
 			tape->dsc_polling_start = jiffies;
@@ -2283,17 +2487,53 @@
 	}
 	switch (rq->cmd) {
 		case IDETAPE_READ_RQ:
+			tape->buffer_head++;
+#if USE_IOTRACE
+			IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+#endif
+			tape->postpone_cnt = 0;
+			tape->reads_since_buffer_fill++;
+			if (tape->onstream) {
+				if (tape->cur_frames - tape->reads_since_buffer_fill <= 0)
+					tape->req_buffer_fill = 1;
+				if (jiffies > tape->last_buffer_fill + 5 * HZ / 100)
+					tape->req_buffer_fill = 1;
+			}
 			pc=idetape_next_pc_storage (drive);
 			idetape_create_read_cmd (tape, pc, rq->current_nr_sectors, rq->bh);
 			break;
 		case IDETAPE_WRITE_RQ:
+			tape->buffer_head++;
+#if USE_IOTRACE
+			IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+#endif
+			tape->postpone_cnt = 0;
+			tape->writes_since_buffer_fill++;
+			if (tape->onstream) {
+				if (tape->cur_frames + tape->writes_since_buffer_fill >= tape->max_frames)
+					tape->req_buffer_fill = 1;
+				if (jiffies > tape->last_buffer_fill + 5 * HZ / 100)
+					tape->req_buffer_fill = 1;
+				calculate_speeds(drive);
+			}
 			pc=idetape_next_pc_storage (drive);
 			idetape_create_write_cmd (tape, pc, rq->current_nr_sectors, rq->bh);
 			break;
+		case IDETAPE_READ_BUFFER_RQ:
+			tape->postpone_cnt = 0;
+			pc=idetape_next_pc_storage (drive);
+			idetape_create_read_buffer_cmd (tape, pc, rq->current_nr_sectors, rq->bh);
+			break;
 		case IDETAPE_ABORTED_WRITE_RQ:
 			rq->cmd = IDETAPE_WRITE_RQ;
-			rq->errors = IDETAPE_ERROR_EOD;
-			idetape_end_request (1, HWGROUP(drive));
+			idetape_end_request (IDETAPE_ERROR_EOD, HWGROUP(drive));
+			return ide_stopped;
+		case IDETAPE_ABORTED_READ_RQ:
+#if IDETAPE_DEBUG_LOG
+			printk(KERN_INFO "ide-tape: %s: detected aborted read rq\n", tape->name);
+#endif
+			rq->cmd = IDETAPE_READ_RQ;
+			idetape_end_request (IDETAPE_ERROR_EOD, HWGROUP(drive));
 			return ide_stopped;
 		case IDETAPE_PC_RQ1:
 			pc=(idetape_pc_t *) rq->buffer;
@@ -2311,153 +2551,889 @@
 }
 
 /*
- *	idetape_queue_pc_tail is based on the following functions:
- *
- *	ide_do_drive_cmd from ide.c
- *	cdrom_queue_request and cdrom_queue_packet_command from ide-cd.c
- *
- *	We add a special packet command request to the tail of the request queue,
- *	and wait for it to be serviced.
- *
- *	This is not to be called from within the request handling part
- *	of the driver ! We allocate here data in the stack, and it is valid
- *	until the request is finished. This is not the case for the bottom
- *	part of the driver, where we are always leaving the functions to wait
- *	for an interrupt or a timer event.
- *
- *	From the bottom part of the driver, we should allocate safe memory
- *	using idetape_next_pc_storage and idetape_next_rq_storage, and add
- *	the request to the request list without waiting for it to be serviced !
- *	In that case, we usually use idetape_queue_pc_head.
+ *	Pipeline related functions
  */
-static int idetape_queue_pc_tail (ide_drive_t *drive,idetape_pc_t *pc)
+static inline int idetape_pipeline_active (idetape_tape_t *tape)
 {
-	struct request rq;
+	int rc1, rc2;
 
-	ide_init_drive_cmd (&rq);
-	rq.buffer = (char *) pc;
-	rq.cmd = IDETAPE_PC_RQ1;
-	return ide_do_drive_cmd (drive, &rq, ide_wait);
+	rc1 = test_bit(IDETAPE_PIPELINE_ACTIVE, &tape->flags);
+	rc2 = (tape->active_data_request != NULL);
+	return rc1;
 }
 
 /*
- *	idetape_wait_for_request installs a semaphore in a pending request
- *	and sleeps until it is serviced.
+ *	idetape_kmalloc_stage uses __get_free_page to allocate a pipeline
+ *	stage, along with all the necessary small buffers which together make
+ *	a buffer of size tape->stage_size (or a bit more). We attempt to
+ *	combine sequential pages as much as possible.
  *
- *	The caller should ensure that the request will not be serviced
- *	before we install the semaphore (usually by disabling interrupts).
+ *	Returns a pointer to the new allocated stage, or NULL if we
+ *	can't (or don't want to) allocate a stage.
+ *
+ *	Pipeline stages are optional and are used to increase performance.
+ *	If we can't allocate them, we'll manage without them.
  */
-static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq)
+static idetape_stage_t *__idetape_kmalloc_stage (idetape_tape_t *tape, int full, int clear)
 {
-	DECLARE_MUTEX_LOCKED(sem);
-	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage;
+	struct buffer_head *prev_bh, *bh;
+	int pages = tape->pages_per_stage;
+	char *b_data;
 
-#if IDETAPE_DEBUG_BUGS
-	if (rq == NULL || !IDETAPE_RQ_CMD (rq->cmd)) {
-		printk (KERN_ERR "ide-tape: bug: Trying to sleep on non-valid request\n");
-		return;
+	if ((stage = (idetape_stage_t *) kmalloc (sizeof (idetape_stage_t),GFP_KERNEL)) == NULL)
+		return NULL;
+	stage->next = NULL;
+
+	bh = stage->bh = (struct buffer_head *) kmalloc (sizeof (struct buffer_head), GFP_KERNEL);
+	if (bh == NULL)
+		goto abort;
+	bh->b_reqnext = NULL;
+	if ((bh->b_data = (char *) __get_free_page (GFP_KERNEL)) == NULL)
+		goto abort;
+	if (clear)
+		memset(bh->b_data, 0, PAGE_SIZE);
+	bh->b_size = PAGE_SIZE;
+	atomic_set(&bh->b_count, full ? bh->b_size : 0);
+	set_bit (BH_Lock, &bh->b_state);
+
+	while (--pages) {
+		if ((b_data = (char *) __get_free_page (GFP_KERNEL)) == NULL)
+			goto abort;
+		if (clear)
+			memset(b_data, 0, PAGE_SIZE);
+		if (bh->b_data == b_data + PAGE_SIZE && virt_to_bus (bh->b_data) == virt_to_bus (b_data) + PAGE_SIZE) {
+			bh->b_size += PAGE_SIZE;
+			bh->b_data -= PAGE_SIZE;
+			if (full)
+				atomic_add(PAGE_SIZE, &bh->b_count);
+			continue;
+		}
+		if (b_data == bh->b_data + bh->b_size && virt_to_bus (b_data) == virt_to_bus (bh->b_data) + bh->b_size) {
+			bh->b_size += PAGE_SIZE;
+			if (full)
+				atomic_add(PAGE_SIZE, &bh->b_count);
+			continue;
+		}
+		prev_bh = bh;
+		if ((bh = (struct buffer_head *) kmalloc (sizeof (struct buffer_head), GFP_KERNEL)) == NULL) {
+			free_page ((unsigned long) b_data);
+			goto abort;
+		}
+		bh->b_reqnext = NULL;
+		bh->b_data = b_data;
+		bh->b_size = PAGE_SIZE;
+		atomic_set(&bh->b_count, full ? bh->b_size : 0);
+		set_bit (BH_Lock, &bh->b_state);
+		prev_bh->b_reqnext = bh;
 	}
-#endif /* IDETAPE_DEBUG_BUGS */
-	rq->sem = &sem;
-	spin_unlock(&tape->spinlock);
-	down(&sem);
-	spin_lock_irq(&tape->spinlock);
+	bh->b_size -= tape->excess_bh_size;
+	if (full)
+		atomic_sub(tape->excess_bh_size, &bh->b_count);
+	if (tape->onstream)
+		stage->aux = (os_aux_t *) (bh->b_data + bh->b_size - OS_AUX_SIZE);
+	return stage;
+abort:
+	__idetape_kfree_stage (stage);
+	return NULL;
 }
 
-/*
- *	idetape_queue_rw_tail generates a read/write request for the block
- *	device interface and wait for it to be serviced.
- */
-static int idetape_queue_rw_tail (ide_drive_t *drive, int cmd, int blocks, struct buffer_head *bh)
+static idetape_stage_t *idetape_kmalloc_stage (idetape_tape_t *tape)
 {
-	idetape_tape_t *tape = drive->driver_data;
-	struct request rq;
+	idetape_stage_t *cache_stage = tape->cache_stage;
 
 #if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "idetape_queue_rw_tail: cmd=%d\n",cmd);
+	printk (KERN_INFO "Reached idetape_kmalloc_stage\n");
 #endif /* IDETAPE_DEBUG_LOG */
-#if IDETAPE_DEBUG_BUGS
-	if (idetape_pipeline_active (tape)) {
-		printk (KERN_ERR "ide-tape: bug: the pipeline is active in idetape_queue_rw_tail\n");
-		return (0);
-	}
-#endif /* IDETAPE_DEBUG_BUGS */	
 
-	ide_init_drive_cmd (&rq);
-	rq.bh = bh;
-	rq.cmd = cmd;
-	rq.sector = tape->block_address;
+	if (tape->nr_stages >= tape->max_stages)
+		return NULL;
+	if (cache_stage != NULL) {
+		tape->cache_stage = NULL;
+		return cache_stage;
+	}
+	return __idetape_kmalloc_stage (tape, 0, 0);
+}
+
+static void idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t *stage, const char *buf, int n)
+{
+	struct buffer_head *bh = tape->bh;
+	int count;
+
+	while (n) {
+#if IDETAPE_DEBUG_BUGS
+		if (bh == NULL) {
+			printk (KERN_ERR "ide-tape: bh == NULL in idetape_copy_stage_from_user\n");
+			return;
+		}
+#endif /* IDETAPE_DEBUG_BUGS */
+		count = IDE_MIN (bh->b_size - atomic_read(&bh->b_count), n);
+		copy_from_user (bh->b_data + atomic_read(&bh->b_count), buf, count);
+		n -= count; atomic_add(count, &bh->b_count); buf += count;
+		if (atomic_read(&bh->b_count) == bh->b_size) {
+			bh = bh->b_reqnext;
+			if (bh)
+				atomic_set(&bh->b_count, 0);
+		}
+	}
+	tape->bh = bh;
+}
+
+static void idetape_copy_stage_to_user (idetape_tape_t *tape, char *buf, idetape_stage_t *stage, int n)
+{
+	struct buffer_head *bh = tape->bh;
+	int count;
+
+	while (n) {
+#if IDETAPE_DEBUG_BUGS
+		if (bh == NULL) {
+			printk (KERN_ERR "ide-tape: bh == NULL in idetape_copy_stage_to_user\n");
+			return;
+		}
+#endif /* IDETAPE_DEBUG_BUGS */
+		count = IDE_MIN (tape->b_count, n);
+		copy_to_user (buf, tape->b_data, count);
+		n -= count; tape->b_data += count; tape->b_count -= count; buf += count;
+		if (!tape->b_count) {
+			tape->bh = bh = bh->b_reqnext;
+			if (bh) {
+				tape->b_data = bh->b_data;
+				tape->b_count = atomic_read(&bh->b_count);
+			}
+		}
+	}
+}
+
+static void idetape_init_merge_stage (idetape_tape_t *tape)
+{
+	struct buffer_head *bh = tape->merge_stage->bh;
+	
+	tape->bh = bh;
+	if (tape->chrdev_direction == idetape_direction_write)
+		atomic_set(&bh->b_count, 0);
+	else {
+		tape->b_data = bh->b_data;
+		tape->b_count = atomic_read(&bh->b_count);
+	}
+}
+
+static void idetape_switch_buffers (idetape_tape_t *tape, idetape_stage_t *stage)
+{
+	struct buffer_head *tmp;
+	os_aux_t *tmp_aux;
+
+	tmp = stage->bh; tmp_aux = stage->aux;
+	stage->bh = tape->merge_stage->bh; stage->aux = tape->merge_stage->aux;
+	tape->merge_stage->bh = tmp; tape->merge_stage->aux = tmp_aux;
+	idetape_init_merge_stage (tape);
+}
+
+/*
+ *	idetape_add_stage_tail adds a new stage at the end of the pipeline.
+ */
+static void idetape_add_stage_tail (ide_drive_t *drive,idetape_stage_t *stage)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	unsigned long flags;
+	
+#if IDETAPE_DEBUG_LOG
+	printk (KERN_INFO "Reached idetape_add_stage_tail\n");
+#endif /* IDETAPE_DEBUG_LOG */
+	spin_lock_irqsave(&tape->spinlock, flags);
+	stage->next=NULL;
+	if (tape->last_stage != NULL)
+		tape->last_stage->next=stage;
+	else
+		tape->first_stage=tape->next_stage=stage;
+	tape->last_stage=stage;
+	if (tape->next_stage == NULL)
+		tape->next_stage=tape->last_stage;
+	tape->nr_stages++;
+	tape->nr_pending_stages++;
+	spin_unlock_irqrestore(&tape->spinlock, flags);
+}
+
+/*
+ * Initialize the OnStream AUX
+ */
+static void idetape_init_stage(ide_drive_t *drive, idetape_stage_t *stage, int frame_type, int logical_blk_num)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	os_aux_t *aux = stage->aux;
+	os_partition_t *par = &aux->partition;
+	os_dat_t *dat = &aux->dat;
+
+	if (!tape->onstream || tape->raw)
+		return;
+	memset(aux, 0, sizeof(*aux));
+	aux->format_id = htonl(0);
+	memcpy(aux->application_sig, "LIN3", 4);
+	aux->hdwr = htonl(0);
+	aux->frame_type = frame_type;
+
+	if (frame_type == OS_FRAME_TYPE_HEADER) {
+		aux->update_frame_cntr = htonl(tape->update_frame_cntr);
+		par->partition_num = OS_CONFIG_PARTITION;
+		par->par_desc_ver = OS_PARTITION_VERSION;
+		par->wrt_pass_cntr = htons(0xffff);
+		par->first_frame_addr = htonl(0);
+		par->last_frame_addr = htonl(0xbb7);
+	} else {
+		aux->update_frame_cntr = htonl(0);
+		par->partition_num = OS_DATA_PARTITION;
+		par->par_desc_ver = OS_PARTITION_VERSION;
+		par->wrt_pass_cntr = htons(tape->wrt_pass_cntr);
+		par->first_frame_addr = htonl(0x14);
+		par->last_frame_addr = htonl(19239 * 24);
+	}
+	if (frame_type != OS_FRAME_TYPE_HEADER) {
+		aux->frame_seq_num = htonl(logical_blk_num);
+		aux->logical_blk_num_high = htonl(0);
+		aux->logical_blk_num = htonl(logical_blk_num);
+	} else {
+		aux->frame_seq_num = htonl(0);
+		aux->logical_blk_num_high = htonl(0);
+		aux->logical_blk_num = htonl(0);
+	}
+
+	if (frame_type != OS_FRAME_TYPE_HEADER) {
+		dat->dat_sz = 8;
+		dat->reserved1 = 0;
+		dat->entry_cnt = 1;
+		dat->reserved3 = 0;
+		if (frame_type == OS_FRAME_TYPE_DATA)
+			dat->dat_list[0].blk_sz = htonl(32 * 1024);
+		else
+			dat->dat_list[0].blk_sz = 0;
+		dat->dat_list[0].blk_cnt = htons(1);
+		if (frame_type == OS_FRAME_TYPE_MARKER)
+			dat->dat_list[0].flags = OS_DAT_FLAGS_MARK;
+		else
+			dat->dat_list[0].flags = OS_DAT_FLAGS_DATA;
+		dat->dat_list[0].reserved = 0;
+	} else
+		aux->next_mark_addr = htonl(tape->first_mark_addr);
+	aux->filemark_cnt = ntohl(tape->filemark_cnt);
+	aux->phys_fm = ntohl(0xffffffff);
+	aux->last_mark_addr = ntohl(tape->last_mark_addr);
+}
+
+/*
+ *	idetape_wait_for_request installs a semaphore in a pending request
+ *	and sleeps until it is serviced.
+ *
+ *	The caller should ensure that the request will not be serviced
+ *	before we install the semaphore (usually by disabling interrupts).
+ */
+static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq)
+{
+	DECLARE_MUTEX_LOCKED(sem);
+	idetape_tape_t *tape = drive->driver_data;
+
+#if IDETAPE_DEBUG_BUGS
+	if (rq == NULL || !IDETAPE_RQ_CMD (rq->cmd)) {
+		printk (KERN_ERR "ide-tape: bug: Trying to sleep on non-valid request\n");
+		return;
+	}
+#endif /* IDETAPE_DEBUG_BUGS */
+	rq->sem = &sem;
+	tape->sem = &sem;
+	spin_unlock(&tape->spinlock);
+	down(&sem);
+	rq->sem = NULL;
+	tape->sem = NULL;
+	spin_lock_irq(&tape->spinlock);
+}
+
+static ide_startstop_t idetape_read_position_callback (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_read_position_result_t *result;
+	
+#if IDETAPE_DEBUG_LOG
+	printk (KERN_INFO "ide-tape: Reached idetape_read_position_callback\n");
+#endif /* IDETAPE_DEBUG_LOG */
+
+	if (!tape->pc->error) {
+		result = (idetape_read_position_result_t *) tape->pc->buffer;
+#if IDETAPE_DEBUG_LOG
+		printk (KERN_INFO "BOP - %s\n",result->bop ? "Yes":"No");
+		printk (KERN_INFO "EOP - %s\n",result->eop ? "Yes":"No");
+#endif /* IDETAPE_DEBUG_LOG */
+		if (result->bpu) {
+			printk (KERN_INFO "ide-tape: Block location is unknown to the tape\n");
+			clear_bit (IDETAPE_ADDRESS_VALID, &tape->flags);
+			idetape_end_request (0,HWGROUP (drive));
+		} else {
+#if IDETAPE_DEBUG_LOG
+			printk (KERN_INFO "Block Location - %lu\n", ntohl (result->first_block));
+#endif /* IDETAPE_DEBUG_LOG */
+			tape->partition = result->partition;
+			tape->first_frame_position = ntohl (result->first_block);
+			tape->last_frame_position = ntohl (result->last_block);
+			tape->blocks_in_buffer = result->blocks_in_buffer[2];
+			set_bit (IDETAPE_ADDRESS_VALID, &tape->flags);
+			idetape_end_request (1,HWGROUP (drive));
+		}
+	} else {
+		idetape_end_request (0,HWGROUP (drive));
+	}
+	return ide_stopped;
+}
+
+/*
+ *	idetape_create_write_filemark_cmd will:
+ *
+ *		1.	Write a filemark if write_filemark=1.
+ *		2.	Flush the device buffers without writing a filemark
+ *			if write_filemark=0.
+ *
+ */
+static void idetape_create_write_filemark_cmd (ide_drive_t *drive, idetape_pc_t *pc,int write_filemark)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_WRITE_FILEMARK_CMD;
+	if (tape->onstream)
+		pc->c[1] = 1;
+	pc->c[4] = write_filemark;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_test_unit_ready_cmd(idetape_pc_t *pc)
+{
+	idetape_init_pc(pc);
+	pc->c[0] = IDETAPE_TEST_UNIT_READY_CMD;
+	pc->callback = &idetape_pc_callback;
+}
+
+/*
+ *	idetape_queue_pc_tail is based on the following functions:
+ *
+ *	ide_do_drive_cmd from ide.c
+ *	cdrom_queue_request and cdrom_queue_packet_command from ide-cd.c
+ *
+ *	We add a special packet command request to the tail of the request queue,
+ *	and wait for it to be serviced.
+ *
+ *	This is not to be called from within the request handling part
+ *	of the driver ! We allocate here data in the stack, and it is valid
+ *	until the request is finished. This is not the case for the bottom
+ *	part of the driver, where we are always leaving the functions to wait
+ *	for an interrupt or a timer event.
+ *
+ *	From the bottom part of the driver, we should allocate safe memory
+ *	using idetape_next_pc_storage and idetape_next_rq_storage, and add
+ *	the request to the request list without waiting for it to be serviced !
+ *	In that case, we usually use idetape_queue_pc_head.
+ */
+static int __idetape_queue_pc_tail (ide_drive_t *drive,idetape_pc_t *pc)
+{
+	struct request rq;
+
+	ide_init_drive_cmd (&rq);
+	rq.buffer = (char *) pc;
+	rq.cmd = IDETAPE_PC_RQ1;
+	return ide_do_drive_cmd (drive, &rq, ide_wait);
+}
+
+static void idetape_create_load_unload_cmd (ide_drive_t *drive, idetape_pc_t *pc,int cmd)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_LOAD_UNLOAD_CMD;
+	pc->c[4] = cmd;
+	if (tape->onstream)
+		pc->c[1] = 1;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
+}
+
+static int idetape_wait_ready(ide_drive_t *drive, unsigned long long timeout)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_pc_t pc;
+
+	/*
+	 * Wait for the tape to become ready
+	 */
+	timeout += jiffies;
+	while (jiffies < timeout) {
+		idetape_create_test_unit_ready_cmd(&pc);
+		if (!__idetape_queue_pc_tail(drive, &pc))
+			return 0;
+		if (tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2) {
+			idetape_create_load_unload_cmd (drive, &pc, IDETAPE_LU_LOAD_MASK);
+			__idetape_queue_pc_tail(drive,&pc);
+			idetape_create_test_unit_ready_cmd(&pc);
+			if (!__idetape_queue_pc_tail(drive, &pc))
+				return 0;
+		}
+		if (!(tape->sense_key == 2 && tape->asc == 4 && (tape->ascq == 1 || tape->ascq == 8)))
+			break;
+		current->state = TASK_INTERRUPTIBLE;
+		schedule_timeout(HZ / 10);
+	}
+	return -EIO;
+}
+
+static int idetape_queue_pc_tail (ide_drive_t *drive,idetape_pc_t *pc)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int rc;
+
+	rc = __idetape_queue_pc_tail(drive, pc);
+	if (rc)	return rc;
+	if (tape->onstream && test_bit(PC_WAIT_FOR_DSC, &pc->flags))
+		rc = idetape_wait_ready(drive, 60 * 5 * HZ);
+	return rc;
+}
+
+static int idetape_flush_tape_buffers (ide_drive_t *drive)
+{
+	idetape_pc_t pc;
+	int rc;
+
+	idetape_create_write_filemark_cmd(drive, &pc, 0);
+	if ((rc = idetape_queue_pc_tail (drive,&pc)))
+		return rc;
+	idetape_wait_ready(drive, 60 * 5 * HZ);
+	return 0;
+}
+
+static void idetape_create_read_position_cmd (idetape_pc_t *pc)
+{
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_READ_POSITION_CMD;
+	pc->request_transfer = 20;
+	pc->callback = &idetape_read_position_callback;
+}
+
+static int idetape_read_position(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_pc_t pc;
+	int position;
+
+	idetape_flush_tape_buffers(drive);
+	idetape_create_read_position_cmd(&pc);
+	if (idetape_queue_pc_tail (drive,&pc))
+		return -1;
+	position = tape->first_frame_position;
+	if (tape->onstream) {
+		if ((position != tape->last_frame_position - tape->blocks_in_buffer) &&
+		    (position != tape->last_frame_position + tape->blocks_in_buffer)) {
+			if (tape->blocks_in_buffer == 0) {
+				printk("ide-tape: %s: correcting read position %d, %d, %d\n", tape->name, position, tape->last_frame_position, tape->blocks_in_buffer);
+				position = tape->last_frame_position;
+				tape->first_frame_position = position;
+			}
+		}
+	}
+	return position;
+}
+
+static void idetape_create_locate_cmd (ide_drive_t *drive, idetape_pc_t *pc, unsigned int block, byte partition, int skip)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_LOCATE_CMD;
+	if (tape->onstream)
+		pc->c[1] = 1;
+	else
+		pc->c[1] = 2;
+	put_unaligned (htonl (block), (unsigned int *) &pc->c[3]);
+	pc->c[8] = partition;
+	if (tape->onstream)
+		pc->c[9] = skip << 7;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_prevent_cmd(ide_drive_t *drive, idetape_pc_t *pc, int prevent)
+{
+	idetape_init_pc(pc);
+	pc->c[0] = IDETAPE_PREVENT_CMD;
+	pc->c[4] = prevent;
+	pc->callback = &idetape_pc_callback;
+}
+
+static int __idetape_discard_read_pipeline (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	unsigned long flags;
+	int cnt;
+
+	if (tape->chrdev_direction != idetape_direction_read)
+		return 0;
+	tape->merge_stage_size = 0;
+	if (tape->merge_stage != NULL) {
+		__idetape_kfree_stage (tape->merge_stage);
+		tape->merge_stage = NULL;
+	}
+	tape->chrdev_direction = idetape_direction_none;
+	
+	if (tape->first_stage == NULL)
+		return 0;
+
+	spin_lock_irqsave(&tape->spinlock, flags);
+	tape->next_stage = NULL;
+	if (idetape_pipeline_active (tape))
+		idetape_wait_for_request(drive, tape->active_data_request);
+	spin_unlock_irqrestore(&tape->spinlock, flags);
+
+	cnt = tape->nr_stages - tape->nr_pending_stages;
+	while (tape->first_stage != NULL)
+		idetape_remove_stage_head (drive);
+	tape->nr_pending_stages = 0;
+	tape->max_stages = tape->min_pipeline;
+	return cnt;
+}
+
+/*
+ *	idetape_position_tape positions the tape to the requested block
+ *	using the LOCATE packet command. A READ POSITION command is then
+ *	issued to check where we are positioned.
+ *
+ *	Like all higher level operations, we queue the commands at the tail
+ *	of the request queue and wait for their completion.
+ *	
+ */
+static int idetape_position_tape (ide_drive_t *drive, unsigned int block, byte partition, int skip)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int retval;
+	idetape_pc_t pc;
+
+	if (tape->chrdev_direction == idetape_direction_read)
+		__idetape_discard_read_pipeline(drive);
+	idetape_wait_ready(drive, 60 * 5 * HZ);
+	idetape_create_locate_cmd (drive, &pc, block, partition, skip);
+	retval=idetape_queue_pc_tail (drive,&pc);
+	if (retval) return (retval);
+
+	idetape_create_read_position_cmd (&pc);
+	return (idetape_queue_pc_tail (drive,&pc));
+}
+
+static void idetape_discard_read_pipeline (ide_drive_t *drive, int restore_position)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int cnt;
+	int seek, position;
+
+	cnt = __idetape_discard_read_pipeline(drive);
+	if (restore_position) {
+		position = idetape_read_position(drive);
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: address %u, nr_stages %d\n", position, cnt);
+#endif
+		seek = position > cnt ? position - cnt : 0;
+		if (idetape_position_tape(drive, seek, 0, 0)) {
+			printk(KERN_INFO "ide-tape: %s: position_tape failed in discard_pipeline()\n", tape->name);
+			return;
+		}
+	}
+}
+
+static void idetape_update_stats(ide_drive_t *drive)
+{
+	idetape_pc_t pc;
+
+	idetape_create_mode_sense_cmd (&pc, 0x33);
+	pc.callback = idetape_onstream_buffer_fill_callback;
+	(void) idetape_queue_pc_tail(drive, &pc);
+}
+
+/*
+ *	idetape_queue_rw_tail generates a read/write request for the block
+ *	device interface and wait for it to be serviced.
+ */
+static int idetape_queue_rw_tail (ide_drive_t *drive, int cmd, int blocks, struct buffer_head *bh)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	struct request rq;
+
+#if IDETAPE_DEBUG_LOG
+	printk (KERN_INFO "idetape_queue_rw_tail: cmd=%d\n",cmd);
+#endif /* IDETAPE_DEBUG_LOG */
+#if IDETAPE_DEBUG_BUGS
+	if (idetape_pipeline_active (tape)) {
+		printk (KERN_ERR "ide-tape: bug: the pipeline is active in idetape_queue_rw_tail\n");
+		return (0);
+	}
+#endif /* IDETAPE_DEBUG_BUGS */	
+
+	ide_init_drive_cmd (&rq);
+	rq.bh = bh;
+	rq.cmd = cmd;
+	rq.sector = tape->first_frame_position;
 	rq.nr_sectors = rq.current_nr_sectors = blocks;
+	if (tape->onstream)
+		tape->postpone_cnt = 600;
 	(void) ide_do_drive_cmd (drive, &rq, ide_wait);
 
-	idetape_init_merge_stage (tape);
-	if (rq.errors == IDETAPE_ERROR_GENERAL)
-		return -EIO;
-	return (tape->tape_block_size * (blocks-rq.current_nr_sectors));
+	if (cmd != IDETAPE_READ_RQ && cmd != IDETAPE_WRITE_RQ)
+		return 0;
+
+	if (tape->merge_stage)
+		idetape_init_merge_stage (tape);
+	if (rq.errors == IDETAPE_ERROR_GENERAL)
+		return -EIO;
+	return (tape->tape_block_size * (blocks-rq.current_nr_sectors));
+}
+
+/*
+ * Read back the drive's internal buffer contents, as a part
+ * of the write error recovery mechanism for old OnStream
+ * firmware revisions.
+ */
+static void idetape_onstream_read_back_buffer(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int frames, i, logical_blk_num;
+	idetape_stage_t *stage, *first = NULL, *last = NULL;
+	os_aux_t *aux;
+	struct request *rq;
+	unsigned char *p;
+	unsigned long flags;
+
+	idetape_update_stats(drive);
+	frames = tape->cur_frames;
+	logical_blk_num = ntohl(tape->first_stage->aux->logical_blk_num) - frames;
+	printk(KERN_INFO "ide-tape: %s: reading back %d frames from the drive's internal buffer\n", tape->name, frames);
+	for (i = 0; i < frames; i++) {
+		stage = __idetape_kmalloc_stage(tape, 0, 0);
+		if (!first)
+			first = stage;
+		aux = stage->aux;
+		p = stage->bh->b_data;
+		idetape_queue_rw_tail(drive, IDETAPE_READ_BUFFER_RQ, tape->capabilities.ctl, stage->bh);
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: %s: read back logical block %d, data %x %x %x %x\n", tape->name, logical_blk_num, *p++, *p++, *p++, *p++);
+#endif
+		rq = &stage->rq;
+		ide_init_drive_cmd (rq);
+		rq->cmd = IDETAPE_WRITE_RQ;
+		rq->sector = tape->first_frame_position;
+		rq->nr_sectors = rq->current_nr_sectors = tape->capabilities.ctl;
+		idetape_init_stage(drive, stage, OS_FRAME_TYPE_DATA, logical_blk_num++);
+		stage->next = NULL;
+		if (last)
+			last->next = stage;
+		last = stage;
+	}
+	if (frames) {
+		spin_lock_irqsave(&tape->spinlock, flags);
+		last->next = tape->first_stage;
+		tape->next_stage = tape->first_stage = first;
+		tape->nr_stages += frames;
+		tape->nr_pending_stages += frames;
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	idetape_update_stats(drive);
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "ide-tape: %s: frames left in buffer: %d\n", tape->name, tape->cur_frames);
+#endif
+}
+
+/*
+ * Error recovery algorithm for the OnStream tape.
+ */
+static void idetape_onstream_write_error_recovery(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	unsigned int block;
+
+	if (tape->onstream_write_error == 1) {
+		printk(KERN_ERR "ide-tape: %s: detected physical bad block at %lu\n", tape->name, ntohl(tape->sense.information));
+		block = ntohl(tape->sense.information) + 80;
+		idetape_update_stats(drive);
+		printk(KERN_ERR "ide-tape: %s: relocating %d buffered logical blocks to physical block %u\n", tape->name, tape->cur_frames, block);
+		idetape_update_stats(drive);
+		if (tape->firmware_revision_num >= 106)
+			idetape_position_tape(drive, block, 0, 1);
+		else {
+			idetape_onstream_read_back_buffer(drive);
+			idetape_position_tape(drive, block, 0, 0);
+		}
+		idetape_read_position(drive);
+#if ONSTREAM_DEBUG
+		printk(KERN_ERR "ide-tape: %s: positioning complete, cur_frames %d, pos %d, tape pos %d\n", tape->name, tape->cur_frames, tape->first_frame_position, tape->last_frame_position);
+#endif
+	} else if (tape->onstream_write_error == 2) {
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: %s: skipping over config partition\n", tape->name);
+#endif
+		idetape_flush_tape_buffers(drive);
+		block = idetape_read_position(drive);
+		if (block != 0xba4) 
+			printk(KERN_ERR "ide-tape: warning, current position %d, expected %d\n", block, 0xba4);
+		idetape_position_tape(drive, 0xbb8, 0, 0);
+	}
+	tape->onstream_write_error = 0;
+}
+
+/*
+ *	idetape_insert_pipeline_into_queue is used to start servicing the
+ *	pipeline stages, starting from tape->next_stage.
+ */
+static void idetape_insert_pipeline_into_queue (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	if (tape->next_stage == NULL)
+		return;
+	if (!idetape_pipeline_active (tape)) {
+		if (tape->onstream_write_error)
+			idetape_onstream_write_error_recovery(drive);
+		set_bit(IDETAPE_PIPELINE_ACTIVE, &tape->flags);
+		idetape_active_next_stage (drive);
+		(void) ide_do_drive_cmd (drive, tape->active_data_request, ide_end);
+	}
+}
+
+static void idetape_create_inquiry_cmd(idetape_pc_t *pc)
+{
+	idetape_init_pc(pc);
+	pc->c[0] = IDETAPE_INQUIRY_CMD;
+	pc->c[4] = pc->request_transfer = 254;
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_rewind_cmd (ide_drive_t *drive, idetape_pc_t *pc)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_REWIND_CMD;
+	if (tape->onstream)
+		pc->c[1] = 1;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_mode_select_cmd (idetape_pc_t *pc, int length)
+{
+	idetape_init_pc (pc);
+	set_bit (PC_WRITING, &pc->flags);
+	pc->c[0] = IDETAPE_MODE_SELECT_CMD;
+	pc->c[1] = 0x10;
+	put_unaligned (htons(length), (unsigned short *) &pc->c[3]);
+	pc->request_transfer = 255;
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_erase_cmd (idetape_pc_t *pc)
+{
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_ERASE_CMD;
+	pc->c[1] = 1;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
+}
+
+static void idetape_create_space_cmd (idetape_pc_t *pc,int count,byte cmd)
+{
+	idetape_init_pc (pc);
+	pc->c[0] = IDETAPE_SPACE_CMD;
+	put_unaligned (htonl (count), (unsigned int *) &pc->c[1]);
+	pc->c[1] = cmd;
+	set_bit (PC_WAIT_FOR_DSC, &pc->flags);
+	pc->callback = &idetape_pc_callback;
 }
 
 /*
- *	idetape_add_chrdev_read_request is called from idetape_chrdev_read
- *	to service a character device read request and add read-ahead
- *	requests to our pipeline.
+ * Verify that we have the correct tape frame
  */
-static int idetape_add_chrdev_read_request (ide_drive_t *drive,int blocks)
+static int idetape_verify_stage(ide_drive_t *drive, idetape_stage_t *stage, int logical_blk_num, int quiet)
 {
 	idetape_tape_t *tape = drive->driver_data;
-	idetape_stage_t *new_stage;
-	unsigned long flags;
-	struct request rq,*rq_ptr;
-	int bytes_read;
-	
-#if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_add_chrdev_read_request\n");
-#endif /* IDETAPE_DEBUG_LOG */
-
-	ide_init_drive_cmd (&rq);
-	rq.cmd = IDETAPE_READ_RQ;
-	rq.sector = tape->block_address;
-	rq.nr_sectors = rq.current_nr_sectors = blocks;
+	os_aux_t *aux = stage->aux;
+	os_partition_t *par = &aux->partition;
+	struct request *rq = &stage->rq;
+	struct buffer_head *bh;
 
-	if (idetape_pipeline_active (tape) || tape->nr_stages <= tape->max_stages / 4) {
-		new_stage=idetape_kmalloc_stage (tape);
-		while (new_stage != NULL) {
-			new_stage->rq=rq;
-			idetape_add_stage_tail (drive,new_stage);
-			new_stage=idetape_kmalloc_stage (tape);
+	if (!tape->onstream)
+		return 1;
+	if (tape->raw) {
+		if (rq->errors) {
+			bh = stage->bh;
+			while (bh) {
+				memset(bh->b_data, 0, bh->b_size);
+				bh = bh->b_reqnext;
+			}
+			strcpy(stage->bh->b_data, "READ ERROR ON FRAME");
 		}
-		if (!idetape_pipeline_active (tape))
-			idetape_insert_pipeline_into_queue (drive);
+		return 1;
 	}
-	if (tape->first_stage == NULL) {
-		/*
-		 *	Linux is short on memory. Revert to non-pipelined
-		 *	operation mode for this request.
-		 */
-		return (idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, blocks, tape->merge_stage->bh));
+	if (rq->errors == IDETAPE_ERROR_GENERAL) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, read error\n", tape->name);
+		return 0;
+	}
+	if (rq->errors == IDETAPE_ERROR_EOD) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, eod\n", tape->name);
+		return 0;
+	}
+	if (ntohl(aux->format_id) != 0) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, format_id %lu\n", tape->name, ntohl(aux->format_id));
+		return 0;
+	}
+	if (memcmp(aux->application_sig, tape->application_sig, 4) != 0) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, incorrect application signature\n", tape->name);
+		return 0;
+	}
+	if (aux->frame_type != OS_FRAME_TYPE_DATA &&
+	    aux->frame_type != OS_FRAME_TYPE_EOD &&
+	    aux->frame_type != OS_FRAME_TYPE_MARKER) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, frame type %x\n", tape->name, aux->frame_type);
+		return 0;
+	}
+	if (par->partition_num != OS_DATA_PARTITION) {
+		if (!tape->linux_media || tape->linux_media_version != 2) {
+			printk(KERN_INFO "ide-tape: %s: skipping frame, partition num %d\n", tape->name, par->partition_num);
+			return 0;
+		}
+	}
+	if (par->par_desc_ver != OS_PARTITION_VERSION) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, partition version %d\n", tape->name, par->par_desc_ver);
+		return 0;
+	}
+	if (ntohs(par->wrt_pass_cntr) != tape->wrt_pass_cntr) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, wrt_pass_cntr %d (expected %d)\n", tape->name, ntohs(par->wrt_pass_cntr), tape->wrt_pass_cntr);
+		return 0;
+	}
+	if (aux->frame_seq_num != aux->logical_blk_num) {
+		printk(KERN_INFO "ide-tape: %s: skipping frame, seq != logical\n", tape->name);
+		return 0;
+	}
+	if (logical_blk_num != -1 && ntohl(aux->logical_blk_num) != logical_blk_num) {
+		if (!quiet)
+			printk(KERN_INFO "ide-tape: %s: skipping frame, logical_blk_num %lu (expected %d)\n", tape->name, ntohl(aux->logical_blk_num), logical_blk_num);
+		return 0;
+	}
+	if (aux->frame_type == OS_FRAME_TYPE_MARKER) {
+		rq->errors = IDETAPE_ERROR_FILEMARK;
+		rq->current_nr_sectors = rq->nr_sectors;
 	}
+	return 1;
+}
+
+static void idetape_wait_first_stage(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	unsigned long flags;
+
+	if (tape->first_stage == NULL)
+		return;
 	spin_lock_irqsave(&tape->spinlock, flags);
 	if (tape->active_stage == tape->first_stage)
 		idetape_wait_for_request(drive, tape->active_data_request);
 	spin_unlock_irqrestore(&tape->spinlock, flags);
-
-	rq_ptr = &tape->first_stage->rq;
-	bytes_read = tape->tape_block_size * (rq_ptr->nr_sectors - rq_ptr->current_nr_sectors);
-	rq_ptr->nr_sectors = rq_ptr->current_nr_sectors = 0;
-
-	idetape_switch_buffers (tape, tape->first_stage);
-
-	if (rq_ptr->errors != IDETAPE_ERROR_FILEMARK) {
-		clear_bit (IDETAPE_FILEMARK, &tape->flags);
-		idetape_remove_stage_head (drive);
-	} else
-		set_bit (IDETAPE_FILEMARK, &tape->flags);
-#if IDETAPE_DEBUG_BUGS
-	if (bytes_read > blocks*tape->tape_block_size) {
-		printk (KERN_ERR "ide-tape: bug: trying to return more bytes than requested\n");
-		bytes_read=blocks*tape->tape_block_size;
-	}
-#endif /* IDETAPE_DEBUG_BUGS */
-	return (bytes_read);
 }
 
 /*
@@ -2506,84 +3482,341 @@
 	rq = &new_stage->rq;
 	ide_init_drive_cmd (rq);
 	rq->cmd = IDETAPE_WRITE_RQ;
-	rq->sector = tape->block_address;	/* Doesn't actually matter - We always assume sequential access */
+	rq->sector = tape->first_frame_position;	/* Doesn't actually matter - We always assume sequential access */
 	rq->nr_sectors = rq->current_nr_sectors = blocks;
 
 	idetape_switch_buffers (tape, new_stage);
+	idetape_init_stage(drive, new_stage, OS_FRAME_TYPE_DATA, tape->logical_blk_num);
+	tape->logical_blk_num++;
 	idetape_add_stage_tail (drive,new_stage);
+	tape->pipeline_head++;
+#if USE_IOTRACE
+	IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+#endif
+	calculate_speeds(drive);
 
 	/*
-	 *	Check if we are currently servicing requests in the bottom
-	 *	part of the driver.
+	 *	Estimate whether the tape has stopped writing by checking
+	 *	if our write pipeline is currently empty. If we are not
+	 *	writing anymore, wait for the pipeline to be full enough
+	 *	(90%) before starting to service requests, so that we will
+	 *	be able to keep up with the higher speeds of the tape.
 	 *
-	 *	If not, wait for the pipeline to be full enough (75%) before
-	 *	starting to service requests, so that we will be able to
-	 *	keep up with the higher speeds of the tape.
+	 *	For the OnStream drive, we can query the number of pending
+	 *	frames in the drive's internal buffer. As long as the tape
+	 *	is still writing, it is better to write frames immediately
+	 *	rather than gather them in the pipeline. This will give the
+	 *	tape's firmware the ability to sense the current incoming
+	 *	data rate more accurately, and since the OnStream tape
+	 *	supports variable speeds, it can try to adjust itself to the
+	 *	incoming data rate.
 	 */
-	if (!idetape_pipeline_active (tape) && tape->nr_stages >= (3 * tape->max_stages) / 4)
-		idetape_insert_pipeline_into_queue (drive);
-
+	if (!idetape_pipeline_active(tape)) {
+		if (tape->nr_stages >= tape->max_stages * 9 / 10 ||
+		    tape->nr_stages >= tape->max_stages - tape->uncontrolled_pipeline_head_speed * 3 * 1024 / tape->tape_block_size) {
+			tape->measure_insert_time = 1;
+			tape->insert_time = jiffies;
+			tape->insert_size = 0;
+			tape->insert_speed = 0;
+			idetape_insert_pipeline_into_queue (drive);
+		} else if (tape->onstream) {
+			idetape_update_stats(drive);
+			if (tape->cur_frames > 5)
+				idetape_insert_pipeline_into_queue (drive);
+		}
+	}
 	if (test_and_clear_bit (IDETAPE_PIPELINE_ERROR, &tape->flags))		/* Return a deferred error */
 		return -EIO;
 	return blocks;
 }
 
-static void idetape_discard_read_pipeline (ide_drive_t *drive)
+/*
+ *	idetape_wait_for_pipeline will wait until all pending pipeline
+ *	requests are serviced. Typically called on device close.
+ */
+static void idetape_wait_for_pipeline (ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
 	unsigned long flags;
 
+	while (tape->next_stage || idetape_pipeline_active(tape)) {
+		idetape_insert_pipeline_into_queue (drive);
+		spin_lock_irqsave(&tape->spinlock, flags);
+		if (idetape_pipeline_active(tape))
+			idetape_wait_for_request(drive, tape->active_data_request);
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+}
+
+static void idetape_empty_write_pipeline (ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int blocks, i, min;
+	struct buffer_head *bh;
+	
 #if IDETAPE_DEBUG_BUGS
-	if (tape->chrdev_direction != idetape_direction_read) {
-		printk (KERN_ERR "ide-tape: bug: Trying to discard read pipeline, but we are not reading.\n");
+	if (tape->chrdev_direction != idetape_direction_write) {
+		printk (KERN_ERR "ide-tape: bug: Trying to empty write pipeline, but we are not writing.\n");
 		return;
 	}
+	if (tape->merge_stage_size > tape->stage_size) {
+		printk (KERN_ERR "ide-tape: bug: merge_buffer too big\n");
+		tape->merge_stage_size = tape->stage_size;
+	}
 #endif /* IDETAPE_DEBUG_BUGS */
-	tape->merge_stage_size = 0;
+	if (tape->merge_stage_size) {
+		blocks=tape->merge_stage_size/tape->tape_block_size;
+		if (tape->merge_stage_size % tape->tape_block_size) {
+			blocks++;
+			i = tape->tape_block_size - tape->merge_stage_size % tape->tape_block_size;
+			bh = tape->bh->b_reqnext;
+			while (bh) {
+				atomic_set(&bh->b_count, 0);
+				bh = bh->b_reqnext;
+			}
+			bh = tape->bh;
+			while (i) {
+				if (bh == NULL) {
+					printk(KERN_INFO "bug, bh NULL\n");
+					break;
+				}
+				min = IDE_MIN(i, bh->b_size - atomic_read(&bh->b_count));
+				memset(bh->b_data + atomic_read(&bh->b_count), 0, min);
+				atomic_add(min, &bh->b_count);
+				i -= min;
+				bh = bh->b_reqnext;
+			}
+		}
+		(void) idetape_add_chrdev_write_request (drive, blocks);
+		tape->merge_stage_size = 0;
+	}
+	idetape_wait_for_pipeline (drive);
 	if (tape->merge_stage != NULL) {
 		__idetape_kfree_stage (tape->merge_stage);
 		tape->merge_stage = NULL;
 	}
-	tape->chrdev_direction = idetape_direction_none;
-	
-	if (tape->first_stage == NULL)
-		return;
-
-	spin_lock_irqsave(&tape->spinlock, flags);
-	tape->next_stage = NULL;
-	if (idetape_pipeline_active (tape))
-		idetape_wait_for_request(drive, tape->active_data_request);
-	spin_unlock_irqrestore(&tape->spinlock, flags);
+	clear_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
+	tape->chrdev_direction=idetape_direction_none;
 
-	while (tape->first_stage != NULL)
-		idetape_remove_stage_head (drive);
-	tape->nr_pending_stages = 0;
+	/*
+	 *	On the next backup, perform the feedback loop again.
+	 *	(I don't want to keep sense information between backups,
+	 *	 as some systems are constantly on, and the system load
+	 *	 can be totally different on the next backup).
+	 */
 	tape->max_stages = tape->min_pipeline;
+#if IDETAPE_DEBUG_BUGS
+	if (tape->first_stage != NULL || tape->next_stage != NULL || tape->last_stage != NULL || tape->nr_stages != 0) {
+		printk (KERN_ERR "ide-tape: ide-tape pipeline bug, "
+		"first_stage %p, next_stage %p, last_stage %p, nr_stages %d\n",
+		tape->first_stage, tape->next_stage, tape->last_stage, tape->nr_stages);
+	}
+#endif /* IDETAPE_DEBUG_BUGS */
+}
+
+static void idetape_restart_speed_control(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	tape->restart_speed_control_req = 0;
+	tape->pipeline_head = 0;
+	tape->buffer_head = tape->tape_head = tape->cur_frames;
+	tape->controlled_last_pipeline_head = tape->uncontrolled_last_pipeline_head = 0;
+	tape->controlled_previous_pipeline_head = tape->uncontrolled_previous_pipeline_head = 0;
+	tape->pipeline_head_speed = tape->controlled_pipeline_head_speed = 5000;
+	tape->uncontrolled_pipeline_head_speed = 0;
+	tape->controlled_pipeline_head_time = tape->uncontrolled_pipeline_head_time = jiffies;
+	tape->controlled_previous_head_time = tape->uncontrolled_previous_head_time = jiffies;
+}
+
+static int idetape_initiate_read(ide_drive_t *drive, int max_stages)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *new_stage;
+	struct request rq;
+	int bytes_read;
+	int blocks = tape->capabilities.ctl;
+
+	if (tape->chrdev_direction != idetape_direction_read) {		/* Initialize read operation */
+		if (tape->chrdev_direction == idetape_direction_write) {
+			idetape_empty_write_pipeline (drive);
+			idetape_flush_tape_buffers (drive);
+		}
+#if IDETAPE_DEBUG_BUGS
+		if (tape->merge_stage || tape->merge_stage_size) {
+			printk (KERN_ERR "ide-tape: merge_stage_size should be 0 now\n");
+			tape->merge_stage_size = 0;
+		}
+#endif /* IDETAPE_DEBUG_BUGS */
+		if ((tape->merge_stage = __idetape_kmalloc_stage (tape, 0, 0)) == NULL)
+			return -ENOMEM;
+		tape->chrdev_direction = idetape_direction_read;
+		tape->logical_blk_num = 0;
+
+		/*
+		 *	Issue a read 0 command to ensure that DSC handshake
+		 *	is switched from completion mode to buffer available
+		 *	mode.
+		 */
+		bytes_read = idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, 0, tape->merge_stage->bh);
+		if (bytes_read < 0) {
+			kfree (tape->merge_stage);
+			tape->merge_stage = NULL;
+			tape->chrdev_direction = idetape_direction_none;
+			return bytes_read;
+		}
+	}
+	if (tape->restart_speed_control_req)
+		idetape_restart_speed_control(drive);
+	ide_init_drive_cmd (&rq);
+	rq.cmd = IDETAPE_READ_RQ;
+	rq.sector = tape->first_frame_position;
+	rq.nr_sectors = rq.current_nr_sectors = blocks;
+	if (!test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags) && tape->nr_stages <= max_stages) {
+		new_stage=idetape_kmalloc_stage (tape);
+		while (new_stage != NULL) {
+			new_stage->rq=rq;
+			idetape_add_stage_tail (drive,new_stage);
+			if (tape->nr_stages >= max_stages)
+				break;
+			new_stage=idetape_kmalloc_stage (tape);
+		}
+	}
+	if (!idetape_pipeline_active(tape)) {
+		if (tape->nr_pending_stages >= 3 * max_stages / 4) {
+			tape->measure_insert_time = 1;
+			tape->insert_time = jiffies;
+			tape->insert_size = 0;
+			tape->insert_speed = 0;
+			idetape_insert_pipeline_into_queue (drive);
+		} else if (tape->onstream) {
+			idetape_update_stats(drive);
+			if (tape->cur_frames < tape->max_frames - 5)
+				idetape_insert_pipeline_into_queue (drive);
+		}
+	}
+	return 0;
+}
+
+static int idetape_get_logical_blk(ide_drive_t *drive, int logical_blk_num, int max_stages, int quiet)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	unsigned long flags;
+	int cnt = 0, x, position;
+
+	/*
+	 * Search and wait for the next logical tape block
+	 */
+	while (1) {
+		if (cnt++ > 100) {
+			printk(KERN_INFO "ide-tape: %s: couldn't find logical block %d, aborting\n", tape->name, logical_blk_num);
+			return 0;
+		}
+		idetape_initiate_read(drive, max_stages);
+		if (tape->first_stage == NULL) {
+			if (tape->onstream) {
+#if ONSTREAM_DEBUG
+				printk(KERN_INFO "ide-tape: %s: first_stage == NULL, pipeline error %d\n", tape->name, test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags));
+#endif
+				clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags);
+				position = idetape_read_position(drive);
+				printk(KERN_INFO "ide-tape: %s: blank block detected, positioning tape to block %d\n", tape->name, position + 60);
+				idetape_position_tape(drive, position + 60, 0, 1);
+				cnt += 40;
+				continue;
+			} else
+				return 0;
+		}
+		idetape_wait_first_stage(drive);
+		if (idetape_verify_stage(drive, tape->first_stage, logical_blk_num, quiet))
+			break;
+		if (tape->first_stage->rq.errors == IDETAPE_ERROR_EOD)
+			cnt--;
+		if (idetape_verify_stage(drive, tape->first_stage, -1, quiet)) {
+			x = ntohl(tape->first_stage->aux->logical_blk_num);
+			if (x > logical_blk_num) {
+				printk(KERN_ERR "ide-tape: %s: couldn't find logical block %d, aborting (block %d found)\n", tape->name, logical_blk_num, x);
+				return 0;
+			}
+		}
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head(drive);
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	if (tape->onstream)
+		tape->logical_blk_num = ntohl(tape->first_stage->aux->logical_blk_num);
+	return 1;
 }
 
 /*
- *	idetape_wait_for_pipeline will wait until all pending pipeline
- *	requests are serviced. Typically called on device close.
+ *	idetape_add_chrdev_read_request is called from idetape_chrdev_read
+ *	to service a character device read request and add read-ahead
+ *	requests to our pipeline.
  */
-static void idetape_wait_for_pipeline (ide_drive_t *drive)
+static int idetape_add_chrdev_read_request (ide_drive_t *drive,int blocks)
 {
 	idetape_tape_t *tape = drive->driver_data;
 	unsigned long flags;
+	struct request *rq_ptr;
+	int bytes_read;
+
+#if IDETAPE_DEBUG_LOG
+	printk (KERN_INFO "Reached idetape_add_chrdev_read_request, %d blocks\n", blocks);
+#endif /* IDETAPE_DEBUG_LOG */
+
+	/*
+	 * Wait for the next logical block to be available at the head
+	 * of the pipeline
+	 */
+	if (!idetape_get_logical_blk(drive, tape->logical_blk_num, tape->max_stages, 0)) {
+		if (tape->onstream) {
+			set_bit(IDETAPE_READ_ERROR, &tape->flags);
+			return 0;
+		}
+		if (test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags))
+		 	return 0;
+		return idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, blocks, tape->merge_stage->bh);
+	}
+	rq_ptr = &tape->first_stage->rq;
+	bytes_read = tape->tape_block_size * (rq_ptr->nr_sectors - rq_ptr->current_nr_sectors);
+	rq_ptr->nr_sectors = rq_ptr->current_nr_sectors = 0;
 
-	if (!idetape_pipeline_active (tape))
-		idetape_insert_pipeline_into_queue (drive);
 
-	spin_lock_irqsave(&tape->spinlock, flags);
-	if (!idetape_pipeline_active (tape))
-		goto abort;
+	if (tape->onstream && !tape->raw && tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) {
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: %s: EOD reached\n", tape->name);
+#endif
+		return 0;
+	}
+	if (rq_ptr->errors == IDETAPE_ERROR_EOD)
+		return 0;
+	else if (rq_ptr->errors == IDETAPE_ERROR_FILEMARK)
+		set_bit (IDETAPE_FILEMARK, &tape->flags);
+	else {
+		idetape_switch_buffers (tape, tape->first_stage);
+		if (rq_ptr->errors == IDETAPE_ERROR_GENERAL) {
+#if ONSTREAM_DEBUG
+			printk(KERN_INFO "error detected, bytes_read %d\n", bytes_read);
+#endif
+		}
+		clear_bit (IDETAPE_FILEMARK, &tape->flags);
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head (drive);
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+		tape->logical_blk_num++;
+		tape->pipeline_head++;
+#if USE_IOTRACE
+		IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+#endif
+		calculate_speeds(drive);
+	}
 #if IDETAPE_DEBUG_BUGS
-	if (tape->last_stage == NULL)
-		printk ("ide-tape: tape->last_stage == NULL\n");
-	else
+	if (bytes_read > blocks*tape->tape_block_size) {
+		printk (KERN_ERR "ide-tape: bug: trying to return more bytes than requested\n");
+		bytes_read=blocks*tape->tape_block_size;
+	}
 #endif /* IDETAPE_DEBUG_BUGS */
-	idetape_wait_for_request(drive, &tape->last_stage->rq);
-abort:
-	spin_unlock_irqrestore(&tape->spinlock, flags);
+	return (bytes_read);
 }
 
 static void idetape_pad_zeros (ide_drive_t *drive, int bcount)
@@ -2607,54 +3840,6 @@
 	}
 }
 
-static void idetape_empty_write_pipeline (ide_drive_t *drive)
-{
-	idetape_tape_t *tape = drive->driver_data;
-	int blocks, i;
-	
-#if IDETAPE_DEBUG_BUGS
-	if (tape->chrdev_direction != idetape_direction_write) {
-		printk (KERN_ERR "ide-tape: bug: Trying to empty write pipeline, but we are not writing.\n");
-		return;
-	}
-	if (tape->merge_stage_size > tape->stage_size) {
-		printk (KERN_ERR "ide-tape: bug: merge_buffer too big\n");
-		tape->merge_stage_size = tape->stage_size;
-	}
-#endif /* IDETAPE_DEBUG_BUGS */
-	if (tape->merge_stage_size) {
-		blocks=tape->merge_stage_size/tape->tape_block_size;
-		if (tape->merge_stage_size % tape->tape_block_size) {
-			blocks++;
-			i = tape->tape_block_size - tape->merge_stage_size % tape->tape_block_size;
-			memset (tape->bh->b_data + atomic_read(&tape->bh->b_count), 0, i);
-			atomic_add(i, &tape->bh->b_count);
-		}
-		(void) idetape_add_chrdev_write_request (drive, blocks);
-		tape->merge_stage_size = 0;
-	}
-	idetape_wait_for_pipeline (drive);
-	if (tape->merge_stage != NULL) {
-		__idetape_kfree_stage (tape->merge_stage);
-		tape->merge_stage = NULL;
-	}
-	clear_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
-	tape->chrdev_direction=idetape_direction_none;
-
-	/*
-	 *	On the next backup, perform the feedback loop again.
-	 *	(I don't want to keep sense information between backups,
-	 *	 as some systems are constantly on, and the system load
-	 *	 can be totally different on the next backup).
-	 */
-	tape->max_stages = tape->min_pipeline;
-#if IDETAPE_DEBUG_BUGS
-	if (tape->first_stage != NULL || tape->next_stage != NULL || tape->last_stage != NULL || tape->nr_stages != 0) {
-		printk (KERN_ERR "ide-tape: ide-tape pipeline bug\n");		
-	}
-#endif /* IDETAPE_DEBUG_BUGS */
-}
-
 static int idetape_pipeline_size (ide_drive_t *drive)
 {
 	idetape_tape_t *tape = drive->driver_data;
@@ -2676,28 +3861,6 @@
 }
 
 /*
- *	idetape_position_tape positions the tape to the requested block
- *	using the LOCATE packet command. A READ POSITION command is then
- *	issued to check where we are positioned.
- *
- *	Like all higher level operations, we queue the commands at the tail
- *	of the request queue and wait for their completion.
- *	
- */
-static int idetape_position_tape (ide_drive_t *drive, unsigned int block, byte partition)
-{
-	int retval;
-	idetape_pc_t pc;
-
-	idetape_create_locate_cmd (&pc, block, partition);
-	retval=idetape_queue_pc_tail (drive,&pc);
-	if (retval) return (retval);
-
-	idetape_create_read_position_cmd (&pc);
-	return (idetape_queue_pc_tail (drive,&pc));
-}
-
-/*
  *	Rewinds the tape to the Beginning Of the current Partition (BOP).
  *
  *	We currently support only one partition.
@@ -2706,24 +3869,20 @@
 {
 	int retval;
 	idetape_pc_t pc;
+	idetape_tape_t *tape = drive->driver_data;
 #if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Reached idetape_rewind_tape\n");
 #endif /* IDETAPE_DEBUG_LOG */	
 	
-	idetape_create_rewind_cmd (&pc);
+	idetape_create_rewind_cmd (drive, &pc);
 	retval=idetape_queue_pc_tail (drive,&pc);
-	if (retval) return (retval);
+	if (retval) return retval;
 
 	idetape_create_read_position_cmd (&pc);
-	return (idetape_queue_pc_tail (drive,&pc));
-}
-
-static int idetape_flush_tape_buffers (ide_drive_t *drive)
-{
-	idetape_pc_t pc;
-
-	idetape_create_write_filemark_cmd (&pc,0);
-	return (idetape_queue_pc_tail (drive,&pc));
+	retval = idetape_queue_pc_tail (drive,&pc);
+	if (retval) return retval;
+	tape->logical_blk_num = 0;
+	return 0;
 }
 
 /*
@@ -2792,13 +3951,171 @@
  */
 static ide_drive_t *get_drive_ptr (kdev_t i_rdev)
 {
-	unsigned int i = MINOR(i_rdev) & ~0x80;
+	unsigned int i = MINOR(i_rdev) & ~0xc0;
 
 	if (i >= MAX_HWIFS * MAX_DRIVES)
 		return NULL;
 	return (idetape_chrdevs[i].drive);
 }
 
+static int idetape_onstream_space_over_filemarks_backward (ide_drive_t *drive,short mt_op,int mt_count)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int cnt = 0;
+	int last_mark_addr;
+	unsigned long flags;
+
+	if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_bwd\n", tape->name);
+		return -EIO;
+	}
+	while (cnt != mt_count) {
+		last_mark_addr = ntohl(tape->first_stage->aux->last_mark_addr);
+		if (last_mark_addr == -1)
+			return -EIO;
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: positioning to last mark at %d\n", last_mark_addr);
+#endif
+		idetape_position_tape(drive, last_mark_addr, 0, 0);
+		cnt++;
+		if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+			printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name);
+			return -EIO;
+		}
+		if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) {
+			printk(KERN_INFO "ide-tape: %s: expected to find marker at block %d, not found\n", tape->name, last_mark_addr);
+			return -EIO;
+		}
+	}
+	if (mt_op == MTBSFM) {
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head (drive);
+		tape->logical_blk_num++;
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	return 0;
+}
+
+/*
+ * ADRL 1.1 compatible "slow" space filemarks fwd version
+ *
+ * Just scans for the filemark sequentially.
+ */
+static int idetape_onstream_space_over_filemarks_forward_slow(ide_drive_t *drive,short mt_op,int mt_count)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int cnt = 0;
+	unsigned long flags;
+
+	if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd\n", tape->name);
+		return -EIO;
+	}
+	while (1) {
+		if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+			printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name);
+			return -EIO;
+		}
+		if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_MARKER)
+			cnt++;
+		if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) {
+#if ONSTREAM_DEBUG
+			printk(KERN_INFO "ide-tape: %s: space_fwd: EOD reached\n", tape->name);
+#endif
+			return -EIO;
+		}
+		if (cnt == mt_count)
+			break;
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head (drive);
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	if (mt_op == MTFSF) {
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head (drive);
+		tape->logical_blk_num++;
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	return 0;
+}
+
+
+/*
+ * Fast linux specific version of OnStream FSF
+ */
+static int idetape_onstream_space_over_filemarks_forward_fast(ide_drive_t *drive,short mt_op,int mt_count)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int cnt = 0, next_mark_addr;
+	unsigned long flags;
+
+	if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd\n", tape->name);
+		return -EIO;
+	}
+
+	/*
+	 * Find nearest (usually previous) marker
+	 */
+	while (1) {
+		if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_MARKER)
+			break;
+		if (tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD) {
+#if ONSTREAM_DEBUG
+			printk(KERN_INFO "ide-tape: %s: space_fwd: EOD reached\n", tape->name);
+#endif
+			return -EIO;
+		}
+		if (ntohl(tape->first_stage->aux->filemark_cnt) == 0) {
+			if (tape->first_mark_addr == -1) {
+				printk(KERN_INFO "ide-tape: %s: reverting to slow filemark space\n", tape->name);
+				return idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count);
+			}
+			idetape_position_tape(drive, tape->first_mark_addr, 0, 0);
+			if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+				printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks_fwd_fast\n", tape->name);
+				return -EIO;
+			}
+			if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) {
+				printk(KERN_INFO "ide-tape: %s: expected to find filemark at %d\n", tape->name, tape->first_mark_addr);
+				return -EIO;
+			}
+		} else {
+			if (idetape_onstream_space_over_filemarks_backward(drive, MTBSF, 1) < 0)
+				return -EIO;
+			mt_count++;
+		}
+	}
+	cnt++;
+	while (cnt != mt_count) {
+		next_mark_addr = ntohl(tape->first_stage->aux->next_mark_addr);
+		if (!next_mark_addr || next_mark_addr > tape->eod_frame_addr) {
+			printk(KERN_INFO "ide-tape: %s: reverting to slow filemark space\n", tape->name);
+			return idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count - cnt);
+		}
+#if ONSTREAM_DEBUG
+		else printk(KERN_INFO "ide-tape: positioning to next mark at %d\n", next_mark_addr);
+#endif
+		idetape_position_tape(drive, next_mark_addr, 0, 0);
+		cnt++;
+		if (!idetape_get_logical_blk(drive, -1, 10, 0)) {
+			printk(KERN_INFO "ide-tape: %s: couldn't get logical blk num in space_filemarks\n", tape->name);
+			return -EIO;
+		}
+		if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_MARKER) {
+			printk(KERN_INFO "ide-tape: %s: expected to find marker at block %d, not found\n", tape->name, next_mark_addr);
+			return -EIO;
+		}
+	}
+	if (mt_op == MTFSF) {
+		spin_lock_irqsave(&tape->spinlock, flags);
+		idetape_remove_stage_head (drive);
+		tape->logical_blk_num++;
+		spin_unlock_irqrestore(&tape->spinlock, flags);
+	}
+	return 0;
+}
+
 /*
  *	idetape_space_over_filemarks is now a bit more complicated than just
  *	passing the command to the tape since we may have crossed some
@@ -2814,9 +4131,26 @@
 	idetape_pc_t pc;
 	unsigned long flags;
 	int retval,count=0;
+	int speed_control;
 
-	if (tape->chrdev_direction == idetape_direction_read) {
+	if (tape->onstream) {
+		if (tape->raw)
+			return -EIO;
+		speed_control = tape->speed_control;
+		tape->speed_control = 0;
+		if (mt_op == MTFSF || mt_op == MTFSFM) {
+			if (tape->linux_media)
+				retval = idetape_onstream_space_over_filemarks_forward_fast(drive, mt_op, mt_count);
+			else
+				retval = idetape_onstream_space_over_filemarks_forward_slow(drive, mt_op, mt_count);
+		} else
+			retval = idetape_onstream_space_over_filemarks_backward(drive, mt_op, mt_count);
+		tape->speed_control = speed_control;
+		tape->restart_speed_control_req = 1;
+		return retval;
+	}
 
+	if (tape->chrdev_direction == idetape_direction_read) {
 		/*
 		 *	We have a read-ahead buffer. Scan it for crossed
 		 *	filemarks.
@@ -2824,30 +4158,26 @@
 		tape->merge_stage_size = 0;
 		clear_bit (IDETAPE_FILEMARK, &tape->flags);
 		while (tape->first_stage != NULL) {
-			/*
-			 *	Wait until the first read-ahead request
-			 *	is serviced.
-			 */
-			spin_lock_irqsave(&tape->spinlock, flags);
-			if (tape->active_stage == tape->first_stage)
-				idetape_wait_for_request(drive, tape->active_data_request);
-			spin_unlock_irqrestore(&tape->spinlock, flags);
-
+			idetape_wait_first_stage(drive);
 			if (tape->first_stage->rq.errors == IDETAPE_ERROR_FILEMARK)
 				count++;
 			if (count == mt_count) {
 				switch (mt_op) {
 					case MTFSF:
+						spin_lock_irqsave(&tape->spinlock, flags);
 						idetape_remove_stage_head (drive);
+						spin_unlock_irqrestore(&tape->spinlock, flags);
 					case MTFSFM:
 						return (0);
 					default:
 						break;
 				}
 			}
+			spin_lock_irqsave(&tape->spinlock, flags);
 			idetape_remove_stage_head (drive);
+			spin_unlock_irqrestore(&tape->spinlock, flags);
 		}
-		idetape_discard_read_pipeline (drive);
+		idetape_discard_read_pipeline (drive, 1);
 	}
 
 	/*
@@ -2903,48 +4233,27 @@
 	struct inode *inode = file->f_dentry->d_inode;
 	ide_drive_t *drive = get_drive_ptr (inode->i_rdev);
 	idetape_tape_t *tape = drive->driver_data;
-	ssize_t bytes_read,temp,actually_read=0;
+	ssize_t bytes_read,temp,actually_read=0, rc;
 
 	if (ppos != &file->f_pos) {
 		/* "A request was outside the capabilities of the device." */
 		return -ENXIO;
 	}
-
+	if (tape->onstream && (count != tape->tape_block_size)) {
+		printk(KERN_ERR "ide-tape: %s: use %d bytes as block size (%d used)\n", tape->name, tape->tape_block_size, count);
+		return -EINVAL;
+	}
 #if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_chrdev_read\n");
+	printk (KERN_INFO "Reached idetape_chrdev_read, count %d\n", count);
 #endif /* IDETAPE_DEBUG_LOG */
-	
-	if (tape->chrdev_direction != idetape_direction_read) {		/* Initialize read operation */
-		if (tape->chrdev_direction == idetape_direction_write) {
-			idetape_empty_write_pipeline (drive);
-			idetape_flush_tape_buffers (drive);
-		}
-#if IDETAPE_DEBUG_BUGS
-		if (tape->merge_stage || tape->merge_stage_size) {
-			printk (KERN_ERR "ide-tape: merge_stage_size should be 0 now\n");
-			tape->merge_stage_size = 0;
-		}
-#endif /* IDETAPE_DEBUG_BUGS */
-		if ((tape->merge_stage = __idetape_kmalloc_stage (tape)) == NULL)
-			return -ENOMEM;
-		tape->chrdev_direction = idetape_direction_read;
 
-		/*
-		 *	Issue a read 0 command to ensure that DSC handshake
-		 *	is switched from completion mode to buffer available
-		 *	mode.
-		 */
-		bytes_read = idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, 0, tape->merge_stage->bh);
-		if (bytes_read < 0) {
-			kfree (tape->merge_stage);
-			tape->merge_stage = NULL;
-			tape->chrdev_direction = idetape_direction_none;
-			return bytes_read;
-		}
+	if (tape->chrdev_direction != idetape_direction_read) {
 		if (test_bit (IDETAPE_DETECT_BS, &tape->flags))
 			if (count > tape->tape_block_size && (count % tape->tape_block_size) == 0)
 				tape->user_bs_factor = count / tape->tape_block_size;
 	}
+	if ((rc = idetape_initiate_read(drive, tape->max_stages)) < 0)
+		return rc;
 	if (count==0)
 		return (0);
 	if (tape->merge_stage_size) {
@@ -2952,28 +4261,143 @@
 		idetape_copy_stage_to_user (tape, buf, tape->merge_stage, actually_read);
 		buf += actually_read; tape->merge_stage_size -= actually_read; count-=actually_read;
 	}
-	while (count >= tape->stage_size) {
-		bytes_read=idetape_add_chrdev_read_request (drive, tape->capabilities.ctl);
-		if (bytes_read <= 0)
-			goto finish;
-		idetape_copy_stage_to_user (tape, buf, tape->merge_stage, bytes_read);
-		buf += bytes_read; count -= bytes_read; actually_read += bytes_read;
+	while (count >= tape->stage_size) {
+		bytes_read=idetape_add_chrdev_read_request (drive, tape->capabilities.ctl);
+		if (bytes_read <= 0)
+			goto finish;
+		idetape_copy_stage_to_user (tape, buf, tape->merge_stage, bytes_read);
+		buf += bytes_read; count -= bytes_read; actually_read += bytes_read;
+	}
+	if (count) {
+		bytes_read=idetape_add_chrdev_read_request (drive, tape->capabilities.ctl);
+		if (bytes_read <= 0)
+			goto finish;
+		temp=IDE_MIN (count,bytes_read);
+		idetape_copy_stage_to_user (tape, buf, tape->merge_stage, temp);
+		actually_read+=temp;
+		tape->merge_stage_size=bytes_read-temp;
+	}
+finish:
+	if (!actually_read && test_bit (IDETAPE_FILEMARK, &tape->flags)) {
+#if IDETAPE_DEBUG_LOG
+		printk(KERN_INFO "ide-tape: %s: spacing over filemark\n", tape->name);
+#endif
+		idetape_space_over_filemarks (drive, MTFSF, 1);
+		return 0;
+	}
+	if (tape->onstream && !actually_read && test_and_clear_bit(IDETAPE_READ_ERROR, &tape->flags)) {
+		printk(KERN_ERR "ide-tape: %s: unrecovered read error on logical block number %d, skipping\n", tape->name, tape->logical_blk_num);
+		tape->logical_blk_num++;
+		return -EIO;
+	}
+	return actually_read;
+}
+
+static void idetape_update_last_marker(ide_drive_t *drive, int last_mark_addr, int next_mark_addr)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage;
+	os_aux_t *aux;
+	int position;
+
+	if (!tape->onstream || tape->raw)
+		return;
+	if (last_mark_addr == -1)
+		return;
+	stage = __idetape_kmalloc_stage(tape, 0, 0);
+	if (stage == NULL)
+		return;
+	idetape_flush_tape_buffers(drive);
+	position = idetape_read_position(drive);
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "current position (2) %d, lblk %d\n", position, tape->logical_blk_num);
+	printk(KERN_INFO "current position (2) tape block %d\n", tape->last_frame_position);
+#endif
+	idetape_position_tape(drive, last_mark_addr, 0, 0);
+	if (!idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, 1, stage->bh)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't read last marker\n", tape->name);
+		__idetape_kfree_stage (stage);
+		idetape_position_tape(drive, position, 0, 0);
+		return;
+	}
+	aux = stage->aux;
+	if (aux->frame_type != OS_FRAME_TYPE_MARKER) {
+		printk(KERN_INFO "ide-tape: %s: expected to find marker at addr %d\n", tape->name, last_mark_addr);
+		__idetape_kfree_stage (stage);
+		idetape_position_tape(drive, position, 0, 0);
+		return;
+	}
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "writing back marker\n");
+#endif
+	aux->next_mark_addr = htonl(next_mark_addr);
+	idetape_position_tape(drive, last_mark_addr, 0, 0);
+	if (!idetape_queue_rw_tail (drive, IDETAPE_WRITE_RQ, 1, stage->bh)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't write back marker frame at %d\n", tape->name, last_mark_addr);
+		__idetape_kfree_stage (stage);
+		idetape_position_tape(drive, position, 0, 0);
+		return;
 	}
-	if (count) {
-		bytes_read=idetape_add_chrdev_read_request (drive, tape->capabilities.ctl);
-		if (bytes_read <= 0)
-			goto finish;
-		temp=IDE_MIN (count,bytes_read);
-		idetape_copy_stage_to_user (tape, buf, tape->merge_stage, temp);
-		actually_read+=temp;
-		tape->merge_stage_size=bytes_read-temp;
+	__idetape_kfree_stage (stage);
+	idetape_flush_tape_buffers (drive);
+	idetape_position_tape(drive, position, 0, 0);
+	return;
+}
+
+static void __idetape_write_header(ide_drive_t *drive, int block, int cnt)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage;
+	os_header_t header;
+
+	stage = __idetape_kmalloc_stage(tape, 1, 1);
+	if (stage == NULL)
+		return;
+	idetape_init_stage(drive, stage, OS_FRAME_TYPE_HEADER, tape->logical_blk_num);
+	idetape_wait_ready(drive, 60 * 5 * HZ);
+	idetape_position_tape(drive, block, 0, 0);
+	memset(&header, 0, sizeof(header));
+	strcpy(header.ident_str, "ADR_SEQ");
+	header.major_rev = header.minor_rev = 1;
+	header.par_num = 1;
+	header.partition.partition_num = OS_DATA_PARTITION;
+	header.partition.par_desc_ver = OS_PARTITION_VERSION;
+	header.partition.first_frame_addr = htonl(0x14);
+	header.partition.last_frame_addr = htonl(19239 * 24);
+	header.partition.wrt_pass_cntr = htons(tape->wrt_pass_cntr);
+	header.partition.eod_frame_addr = htonl(tape->eod_frame_addr);
+	memcpy(stage->bh->b_data, &header, sizeof(header));
+	while (cnt--) {
+		if (!idetape_queue_rw_tail (drive, IDETAPE_WRITE_RQ, 1, stage->bh)) {
+			printk(KERN_INFO "ide-tape: %s: couldn't write header frame\n", tape->name);
+			__idetape_kfree_stage (stage);
+			return;
+		}
 	}
-finish:
-	if (!actually_read && test_bit (IDETAPE_FILEMARK, &tape->flags))
-		idetape_space_over_filemarks (drive, MTFSF, 1);
-	return (actually_read);
+	__idetape_kfree_stage (stage);
+	idetape_flush_tape_buffers (drive);
 }
- 
+
+static void idetape_write_header(ide_drive_t *drive, int locate_eod)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "ide-tape: %s: writing tape header\n", tape->name);
+#endif
+	if (!tape->onstream || tape->raw)
+		return;
+	tape->update_frame_cntr++;
+	__idetape_write_header(drive, 5, 5);
+	__idetape_write_header(drive, 0xbb2, 6);
+	if (locate_eod) {
+#if ONSTREAM_DEBUG
+		printk(KERN_INFO "ide-tape: %s: locating back to eod frame addr %d\n", tape->name, tape->eod_frame_addr);
+#endif
+		idetape_position_tape(drive, tape->eod_frame_addr, 0, 0);
+	}
+}
+
 static ssize_t idetape_chrdev_write (struct file *file, const char *buf,
 				     size_t count, loff_t *ppos)
 {
@@ -2981,30 +4405,59 @@
 	ide_drive_t *drive = get_drive_ptr (inode->i_rdev);
 	idetape_tape_t *tape = drive->driver_data;
 	ssize_t retval,actually_written=0;
+	int position;
 
 	if (ppos != &file->f_pos) {
 		/* "A request was outside the capabilities of the device." */
 		return -ENXIO;
 	}
-
+	if (tape->onstream && (count != tape->tape_block_size)) {
+		printk(KERN_ERR "ide-tape: %s: use %d bytes as block size (%d used)\n", tape->name, tape->tape_block_size, count);
+		return -EINVAL;
+	}
 #if IDETAPE_DEBUG_LOG
-	printk (KERN_INFO "Reached idetape_chrdev_write\n");
+	printk (KERN_INFO "Reached idetape_chrdev_write, count %d\n", count);
 #endif /* IDETAPE_DEBUG_LOG */
 
 	if (tape->chrdev_direction != idetape_direction_write) {	/* Initialize write operation */
 		if (tape->chrdev_direction == idetape_direction_read)
-			idetape_discard_read_pipeline (drive);
+			idetape_discard_read_pipeline (drive, 1);
 #if IDETAPE_DEBUG_BUGS
 		if (tape->merge_stage || tape->merge_stage_size) {
 			printk (KERN_ERR "ide-tape: merge_stage_size should be 0 now\n");
 			tape->merge_stage_size = 0;
 		}
 #endif /* IDETAPE_DEBUG_BUGS */
-		if ((tape->merge_stage = __idetape_kmalloc_stage (tape)) == NULL)
+		if ((tape->merge_stage = __idetape_kmalloc_stage (tape, 0, 0)) == NULL)
 			return -ENOMEM;
 		tape->chrdev_direction = idetape_direction_write;
 		idetape_init_merge_stage (tape);
 
+		if (tape->onstream) {
+			position = idetape_read_position(drive);
+			if (position <= 20) {
+				tape->logical_blk_num = 0;
+				tape->wrt_pass_cntr++;
+#if ONSTREAM_DEBUG
+				printk(KERN_INFO "ide-tape: %s: logical block num 0, setting eod to 20\n", tape->name);
+				printk(KERN_INFO "ide-tape: %s: allocating new write pass counter %d\n", tape->name, tape->wrt_pass_cntr);
+#endif
+				tape->filemark_cnt = 0;
+				tape->eod_frame_addr = 20;
+				tape->first_mark_addr = tape->last_mark_addr = -1;
+				idetape_write_header(drive, 1);
+			}
+#if ONSTREAM_DEBUG
+			printk(KERN_INFO "ide-tape: %s: positioning tape to eod at %d\n", tape->name, tape->eod_frame_addr);
+#endif
+			position = idetape_read_position(drive);
+			if (position != tape->eod_frame_addr)
+				idetape_position_tape(drive, tape->eod_frame_addr, 0, 0);
+#if ONSTREAM_DEBUG
+			printk(KERN_INFO "ide-tape: %s: first_frame_position %d\n", tape->name, tape->first_frame_position);
+#endif
+		}
+
 		/*
 		 *	Issue a write 0 command to ensure that DSC handshake
 		 *	is switched from completion mode to buffer available
@@ -3017,12 +4470,14 @@
 			tape->chrdev_direction = idetape_direction_none;
 			return retval;
 		}
-		if (test_bit (IDETAPE_DETECT_BS, &tape->flags))
-			if (count > tape->tape_block_size && (count % tape->tape_block_size) == 0)
-				tape->user_bs_factor = count / tape->tape_block_size;
+#if ONSTREAM_DEBUG
+		printk("ide-tape: first_frame_position %d\n", tape->first_frame_position);
+#endif
 	}
 	if (count==0)
 		return (0);
+	if (tape->restart_speed_control_req)
+		idetape_restart_speed_control(drive);
 	if (tape->merge_stage_size) {
 #if IDETAPE_DEBUG_BUGS
 		if (tape->merge_stage_size >= tape->stage_size) {
@@ -3057,6 +4512,90 @@
 	return (actually_written);
 }
 
+static int idetape_write_filemark(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int last_mark_addr;
+	idetape_pc_t pc;
+
+	if (!tape->onstream) {
+		idetape_create_write_filemark_cmd(drive, &pc,1);	/* Write a filemark */
+		if (idetape_queue_pc_tail (drive,&pc)) {
+			printk (KERN_ERR "ide-tape: Couldn't write a filemark\n");
+			return -EIO;
+		}
+	} else if (!tape->raw) {
+		last_mark_addr = idetape_read_position(drive);
+		tape->merge_stage = __idetape_kmalloc_stage (tape, 1, 0);
+		if (tape->merge_stage != NULL) {
+			idetape_init_stage(drive, tape->merge_stage, OS_FRAME_TYPE_MARKER, tape->logical_blk_num);
+			idetape_pad_zeros (drive, tape->stage_size);
+			tape->logical_blk_num++;
+			__idetape_kfree_stage (tape->merge_stage);
+			tape->merge_stage = NULL;
+		}
+		if (tape->filemark_cnt)
+			idetape_update_last_marker(drive, tape->last_mark_addr, last_mark_addr);
+		tape->last_mark_addr = last_mark_addr;
+		if (tape->filemark_cnt++ == 0)
+			tape->first_mark_addr = last_mark_addr;
+	}
+	return 0;
+}
+
+static void idetape_write_eod(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	if (!tape->onstream || tape->raw)
+		return;
+	tape->merge_stage = __idetape_kmalloc_stage (tape, 1, 0);
+	if (tape->merge_stage != NULL) {
+		tape->eod_frame_addr = idetape_read_position(drive);
+		idetape_init_stage(drive, tape->merge_stage, OS_FRAME_TYPE_EOD, tape->logical_blk_num);
+		idetape_pad_zeros (drive, tape->stage_size);
+		__idetape_kfree_stage (tape->merge_stage);
+		tape->merge_stage = NULL;
+	}
+	return;
+}
+
+int idetape_seek_logical_blk(ide_drive_t *drive, int logical_blk_num)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int estimated_address = logical_blk_num + 20;
+	int retries = 0;
+	int speed_control;
+
+	speed_control = tape->speed_control;
+	tape->speed_control = 0;
+	if (logical_blk_num < 0)
+		logical_blk_num = 0;
+	if (idetape_get_logical_blk(drive, logical_blk_num, 10, 1))
+		goto ok;
+	while (++retries < 10) {
+		idetape_discard_read_pipeline(drive, 0);
+		idetape_position_tape(drive, estimated_address, 0, 0);
+		if (idetape_get_logical_blk(drive, logical_blk_num, 10, 1))
+			goto ok;
+		if (!idetape_get_logical_blk(drive, -1, 10, 1))
+			goto error;
+		if (tape->logical_blk_num < logical_blk_num)
+			estimated_address += logical_blk_num - tape->logical_blk_num;
+		else
+			break;
+	}
+error:
+	tape->speed_control = speed_control;
+	tape->restart_speed_control_req = 1;
+	printk(KERN_INFO "ide-tape: %s: couldn't seek to logical block %d (at %d), %d retries\n", tape->name, logical_blk_num, tape->logical_blk_num, retries);
+	return -EIO;
+ok:
+	tape->speed_control = speed_control;
+	tape->restart_speed_control_req = 1;
+	return 0;
+}
+
 /*
  *	idetape_mtioctop is called from idetape_chrdev_ioctl when
  *	the general mtio MTIOCTOP ioctl is requested.
@@ -3111,9 +4650,13 @@
  *
  *	MTSETPART - 	Switches to another tape partition.
  *
+ *	MTLOCK - 	Locks the tape door.
+ *
+ *	MTUNLOCK - 	Unlocks the tape door.
+ *
  *	The following commands are currently not supported:
  *
- *	MTFSR, MTBSR, MTFSS, MTBSS, MTWSM, MTSETDENSITY,
+ *	MTFSS, MTBSS, MTWSM, MTSETDENSITY,
  *	MTSETDRVBUFFER, MT_ST_BOOLEANS, MT_ST_WRITE_THRESHOLD.
  */
 static int idetape_mtioctop (ide_drive_t *drive,short mt_op,int mt_count)
@@ -3139,43 +4682,75 @@
 		default:
 			break;
 	}
-
-	/*
-	 *	Empty the pipeline.
-	 */
-	if (tape->chrdev_direction == idetape_direction_read)
-		idetape_discard_read_pipeline (drive);
-
 	switch (mt_op) {
 		case MTWEOF:
-			for (i=0;i<mt_count;i++) {
-				idetape_create_write_filemark_cmd (&pc,1);
-				retval=idetape_queue_pc_tail (drive,&pc);
-				if (retval) return (retval);
+			idetape_discard_read_pipeline (drive, 1);
+			for (i = 0; i < mt_count; i++) {
+				retval = idetape_write_filemark(drive);
+				if (retval) return retval;
 			}
 			return (0);
 		case MTREW:
-			return (idetape_rewind_tape (drive));
+			idetape_discard_read_pipeline (drive, 0);
+			if (idetape_rewind_tape(drive))
+				return -EIO;
+			if (tape->onstream && !tape->raw)
+				return idetape_position_tape(drive, 20, 0, 0);
+			return 0;
 		case MTLOAD:
-			idetape_create_load_unload_cmd (&pc, IDETAPE_LU_LOAD_MASK);
+			idetape_discard_read_pipeline (drive, 0);
+			idetape_create_load_unload_cmd (drive, &pc, IDETAPE_LU_LOAD_MASK);
 			return (idetape_queue_pc_tail (drive,&pc));
 		case MTUNLOAD:
 		case MTOFFL:
-			idetape_create_load_unload_cmd (&pc,!IDETAPE_LU_LOAD_MASK);
+			idetape_discard_read_pipeline (drive, 0);
+			idetape_create_load_unload_cmd (drive, &pc,!IDETAPE_LU_LOAD_MASK);
 			return (idetape_queue_pc_tail (drive,&pc));
 		case MTNOP:
+			idetape_discard_read_pipeline (drive, 0);
 			return (idetape_flush_tape_buffers (drive));
 		case MTRETEN:
-			idetape_create_load_unload_cmd (&pc,IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);
+			idetape_discard_read_pipeline (drive, 0);
+			idetape_create_load_unload_cmd (drive, &pc,IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);
 			return (idetape_queue_pc_tail (drive,&pc));
 		case MTEOM:
+			if (tape->onstream) {
+#if ONSTREAM_DEBUG
+				printk(KERN_INFO "ide-tape: %s: positioning tape to eod at %d\n", tape->name, tape->eod_frame_addr);
+#endif
+				idetape_position_tape(drive, tape->eod_frame_addr, 0, 0);
+				if (!idetape_get_logical_blk(drive, -1, 10, 0))
+					return -EIO;
+				if (tape->first_stage->aux->frame_type != OS_FRAME_TYPE_EOD)
+					return -EIO;
+				return 0;
+			}
 			idetape_create_space_cmd (&pc,0,IDETAPE_SPACE_TO_EOD);
 			return (idetape_queue_pc_tail (drive,&pc));
 		case MTERASE:
+			if (tape->onstream) {
+				tape->eod_frame_addr = 20;
+				tape->logical_blk_num = 0;
+				tape->first_mark_addr = tape->last_mark_addr = -1;
+				idetape_position_tape(drive, tape->eod_frame_addr, 0, 0);
+				idetape_write_eod(drive);
+				idetape_flush_tape_buffers (drive);
+				idetape_write_header(drive, 0);
+				idetape_flush_tape_buffers (drive);
+				(void) idetape_rewind_tape (drive);
+				return 0;
+			}
 			(void) idetape_rewind_tape (drive);
 			idetape_create_erase_cmd (&pc);
 			return (idetape_queue_pc_tail (drive,&pc));
 		case MTSETBLK:
+			if (tape->onstream) {
+				if (mt_count != tape->tape_block_size) {
+					printk(KERN_INFO "ide-tape: %s: MTSETBLK %d -- only %d bytes block size supported\n", tape->name, mt_count, tape->tape_block_size);
+					return -EINVAL;
+				}
+				return 0;
+			}
 			if (mt_count) {
 				if (mt_count < tape->tape_block_size || mt_count % tape->tape_block_size)
 					return -EIO;
@@ -3185,9 +4760,40 @@
 				set_bit (IDETAPE_DETECT_BS, &tape->flags);
 			return 0;
 		case MTSEEK:
-			return (idetape_position_tape (drive, mt_count * tape->user_bs_factor, tape->partition));
+			if (!tape->onstream || tape->raw) {
+				idetape_discard_read_pipeline (drive, 0);
+				return idetape_position_tape (drive, mt_count * tape->user_bs_factor, tape->partition, 0);
+			}
+			return idetape_seek_logical_blk(drive, mt_count);
 		case MTSETPART:
-			return (idetape_position_tape (drive, 0, mt_count));
+			idetape_discard_read_pipeline (drive, 0);
+			if (tape->onstream)
+				return -EIO;
+			return (idetape_position_tape (drive, 0, mt_count, 0));
+		case MTFSR:
+		case MTBSR:
+			if (tape->onstream) {
+				if (!idetape_get_logical_blk(drive, -1, 10, 0))
+					return -EIO;
+				if (mt_op == MTFSR)
+					return idetape_seek_logical_blk(drive, tape->logical_blk_num + mt_count);
+				else {
+					idetape_discard_read_pipeline (drive, 0);
+					return idetape_seek_logical_blk(drive, tape->logical_blk_num - mt_count);
+				}
+			}
+		case MTLOCK:
+			idetape_create_prevent_cmd(drive, &pc, 1);
+			retval = idetape_queue_pc_tail (drive,&pc);
+			if (retval) return retval;
+			tape->door_locked = DOOR_EXPLICITLY_LOCKED;
+			return 0;
+		case MTUNLOCK:
+			idetape_create_prevent_cmd(drive, &pc, 0);
+			retval = idetape_queue_pc_tail (drive,&pc);
+			if (retval) return retval;
+			tape->door_locked = DOOR_UNLOCKED;
+			return 0;
 		default:
 			printk (KERN_ERR "ide-tape: MTIO operation %d not supported\n",mt_op);
 			return (-EIO);
@@ -3221,25 +4827,24 @@
 {
 	ide_drive_t *drive = get_drive_ptr (inode->i_rdev);
 	idetape_tape_t *tape = drive->driver_data;
-	idetape_pc_t pc;
 	struct mtop mtop;
 	struct mtget mtget;
 	struct mtpos mtpos;
-	int retval, block_offset = 0;
+	int block_offset = 0, position = tape->first_frame_position;
 
 #if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Reached idetape_chrdev_ioctl, cmd=%u\n",cmd);
 #endif /* IDETAPE_DEBUG_LOG */
 
+	tape->restart_speed_control_req = 1;
 	if (tape->chrdev_direction == idetape_direction_write) {
 		idetape_empty_write_pipeline (drive);
 		idetape_flush_tape_buffers (drive);
 	}
 	if (cmd == MTIOCGET || cmd == MTIOCPOS) {
 		block_offset = idetape_pipeline_size (drive) / (tape->tape_block_size * tape->user_bs_factor);
-		idetape_create_read_position_cmd (&pc);
-		retval=idetape_queue_pc_tail (drive,&pc);
-		if (retval) return (retval);
+		if ((position = idetape_read_position(drive)) < 0)
+			return -EIO;
 	}
 	switch (cmd) {
 		case MTIOCTOP:
@@ -3248,23 +4853,132 @@
 			return (idetape_mtioctop (drive,mtop.mt_op,mtop.mt_count));
 		case MTIOCGET:
 			memset (&mtget, 0, sizeof (struct mtget));
-			mtget.mt_blkno = tape->block_address / tape->user_bs_factor - block_offset;
+			mtget.mt_type = MT_ISSCSI2;
+			if (!tape->onstream || tape->raw)
+				mtget.mt_blkno = position / tape->user_bs_factor - block_offset;
+			else {
+				if (!idetape_get_logical_blk(drive, -1, 10, 0))
+					mtget.mt_blkno = -1;
+				else
+					mtget.mt_blkno = tape->logical_blk_num;
+			}
 			mtget.mt_dsreg = ((tape->tape_block_size * tape->user_bs_factor) << MT_ST_BLKSIZE_SHIFT) & MT_ST_BLKSIZE_MASK;
+			if (tape->onstream) {
+				mtget.mt_gstat |= GMT_ONLINE(0xffffffff);
+				if (tape->first_stage && tape->first_stage->aux->frame_type == OS_FRAME_TYPE_EOD)
+					mtget.mt_gstat |= GMT_EOD(0xffffffff);
+				if (position <= 20)
+					mtget.mt_gstat |= GMT_BOT(0xffffffff);
+			}
 			if (copy_to_user ((char *) arg,(char *) &mtget, sizeof (struct mtget)))
 				return -EFAULT;
 			return 0;
 		case MTIOCPOS:
-			mtpos.mt_blkno = tape->block_address / tape->user_bs_factor - block_offset;
+			if (tape->onstream && !tape->raw) {
+				if (!idetape_get_logical_blk(drive, -1, 10, 0))
+					return -EIO;
+				mtpos.mt_blkno = tape->logical_blk_num;
+			} else
+				mtpos.mt_blkno = position / tape->user_bs_factor - block_offset;
 			if (copy_to_user ((char *) arg,(char *) &mtpos, sizeof (struct mtpos)))
 				return -EFAULT;
 			return 0;
 		default:
 			if (tape->chrdev_direction == idetape_direction_read)
-				idetape_discard_read_pipeline (drive);
+				idetape_discard_read_pipeline (drive, 1);
 			return (idetape_blkdev_ioctl (drive,inode,file,cmd,arg));
 	}
 }
 
+static int __idetape_analyze_headers(ide_drive_t *drive, int block)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_stage_t *stage;
+	os_header_t *header;
+	os_aux_t *aux;
+
+	if (!tape->onstream || tape->raw) {
+		tape->header_ok = tape->linux_media = 1;
+		return 1;
+	}
+	tape->header_ok = tape->linux_media = 0;
+	tape->update_frame_cntr = 0;
+	tape->wrt_pass_cntr = 0;
+	tape->eod_frame_addr = 20;
+	tape->first_mark_addr = tape->last_mark_addr = -1;
+	stage = __idetape_kmalloc_stage (tape, 0, 0);
+	if (stage == NULL)
+		return 0;
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "ide-tape: %s: reading header\n", tape->name);
+#endif
+	idetape_position_tape(drive, block, 0, 0);
+	if (!idetape_queue_rw_tail (drive, IDETAPE_READ_RQ, 1, stage->bh)) {
+		printk(KERN_INFO "ide-tape: %s: couldn't read header frame\n", tape->name);
+		__idetape_kfree_stage (stage);
+		return 0;
+	}
+	header = (os_header_t *) stage->bh->b_data;
+	aux = stage->aux;
+	if (strncmp(header->ident_str, "ADR_SEQ", 7) != 0) {
+		printk(KERN_INFO "ide-tape: %s: invalid header identification string\n", tape->name);
+		__idetape_kfree_stage (stage);
+		return 0;
+	}
+	if (header->major_rev != 1 || header->minor_rev != 1)
+		printk(KERN_INFO "ide-tape: warning: revision %d.%d detected (1.1 supported)\n", header->major_rev, header->minor_rev);
+	if (header->par_num != 1)
+		printk(KERN_INFO "ide-tape: warning: %d partitions defined, only one supported\n", header->par_num);
+	tape->wrt_pass_cntr = ntohs(header->partition.wrt_pass_cntr);
+	tape->eod_frame_addr = ntohl(header->partition.eod_frame_addr);
+	tape->filemark_cnt = ntohl(aux->filemark_cnt);
+	tape->first_mark_addr = ntohl(aux->next_mark_addr);
+	tape->last_mark_addr = ntohl(aux->last_mark_addr);
+	tape->update_frame_cntr = ntohl(aux->update_frame_cntr);
+	memcpy(tape->application_sig, aux->application_sig, 4); tape->application_sig[4] = 0;
+	if (memcmp(tape->application_sig, "LIN", 3) == 0) {
+		tape->linux_media = 1;
+		tape->linux_media_version = tape->application_sig[3] - '0';
+		if (tape->linux_media_version != 3)
+			printk(KERN_INFO "ide-tape: %s: Linux media version %d detected (current 3)\n", tape->name, tape->linux_media_version);
+	} else {
+		printk(KERN_INFO "ide-tape: %s: non Linux media detected (%s)\n", tape->name, tape->application_sig);
+		tape->linux_media = 0;
+	}
+#if ONSTREAM_DEBUG
+	printk(KERN_INFO "ide-tape: %s: detected write pass counter %d, eod frame addr %d\n", tape->name, tape->wrt_pass_cntr, tape->eod_frame_addr);
+#endif
+	__idetape_kfree_stage (stage);
+	return 1;
+}
+
+static int idetape_analyze_headers(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+	int position, block;
+
+	if (!tape->onstream || tape->raw) {
+		tape->header_ok = tape->linux_media = 1;
+		return 1;
+	}
+	tape->header_ok = tape->linux_media = 0;
+	position = idetape_read_position(drive);
+	for (block = 5; block < 10; block++)
+		if (__idetape_analyze_headers(drive, block))
+			goto ok;
+	for (block = 0xbb2; block < 0xbb8; block++)
+		if (__idetape_analyze_headers(drive, block))
+			goto ok;
+	printk(KERN_ERR "ide-tape: %s: failed to find valid ADRL header\n", tape->name);
+	return 0;
+ok:
+	if (position < 20)
+		position = 20;
+	idetape_position_tape(drive, position, 0, 0);
+	tape->header_ok = 1;
+	return 1;
+}
+
 /*
  *	Our character device open function.
  */
@@ -3273,6 +4987,7 @@
 	ide_drive_t *drive;
 	idetape_tape_t *tape;
 	idetape_pc_t pc;
+	unsigned int minor=MINOR (inode->i_rdev);
 			
 #if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Reached idetape_chrdev_open\n");
@@ -3285,14 +5000,41 @@
 	if (test_and_set_bit (IDETAPE_BUSY, &tape->flags))
 		return -EBUSY;
 	MOD_INC_USE_COUNT;
-	idetape_create_read_position_cmd (&pc);
-	(void) idetape_queue_pc_tail (drive,&pc);
-	if (!test_bit (IDETAPE_ADDRESS_VALID, &tape->flags))
-		(void) idetape_rewind_tape (drive);
+	if (!tape->onstream) {
+		idetape_read_position(drive);
+		if (!test_bit (IDETAPE_ADDRESS_VALID, &tape->flags))
+			(void) idetape_rewind_tape (drive);
+	} else {
+		if (minor & 64) {
+			tape->tape_block_size = tape->stage_size = 32768 + 512;
+			tape->raw = 1;
+		} else {
+			tape->tape_block_size = tape->stage_size = 32768;
+			tape->raw = 0;
+		}
+	}
+	if (idetape_wait_ready(drive, 60 * HZ)) {
+		clear_bit(IDETAPE_BUSY, &tape->flags);
+		MOD_DEC_USE_COUNT;
+		printk(KERN_ERR "ide-tape: %s: drive not ready\n", tape->name);
+		return -EBUSY;
+	}
+	idetape_read_position(drive);
 	MOD_DEC_USE_COUNT;
+	clear_bit (IDETAPE_PIPELINE_ERROR, &tape->flags);
 
-	if (tape->chrdev_direction == idetape_direction_none)
+	if (tape->chrdev_direction == idetape_direction_none) {
 		MOD_INC_USE_COUNT;
+		idetape_create_prevent_cmd(drive, &pc, 1);
+		if (!idetape_queue_pc_tail (drive,&pc)) {
+			if (tape->door_locked != DOOR_EXPLICITLY_LOCKED)
+				tape->door_locked = DOOR_LOCKED;
+		}
+		idetape_analyze_headers(drive);
+	}
+	tape->max_frames = tape->cur_frames = tape->req_buffer_fill = 0;
+	idetape_restart_speed_control(drive);
+	tape->restart_speed_control_req = 0;
 	return 0;
 }
 
@@ -3303,8 +5045,8 @@
 {
 	ide_drive_t *drive = get_drive_ptr (inode->i_rdev);
 	idetape_tape_t *tape = drive->driver_data;
-	unsigned int minor=MINOR (inode->i_rdev);
 	idetape_pc_t pc;
+	unsigned int minor=MINOR (inode->i_rdev);
 			
 #if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Reached idetape_chrdev_release\n");
@@ -3312,19 +5054,21 @@
 
 	if (tape->chrdev_direction == idetape_direction_write) {
 		idetape_empty_write_pipeline (drive);
-		tape->merge_stage = __idetape_kmalloc_stage (tape);
+		tape->merge_stage = __idetape_kmalloc_stage (tape, 1, 0);
 		if (tape->merge_stage != NULL) {
 			idetape_pad_zeros (drive, tape->tape_block_size * (tape->user_bs_factor - 1));
 			__idetape_kfree_stage (tape->merge_stage);
 			tape->merge_stage = NULL;
 		}
-		idetape_create_write_filemark_cmd (&pc,1);	/* Write a filemark */
-		if (idetape_queue_pc_tail (drive,&pc))
-			printk (KERN_ERR "ide-tape: Couldn't write a filemark\n");
+		idetape_write_filemark(drive);
+		idetape_write_eod(drive);
+		idetape_flush_tape_buffers (drive);
+		idetape_write_header(drive, minor >= 128);
+		idetape_flush_tape_buffers (drive);
 	}
 	if (tape->chrdev_direction == idetape_direction_read) {
 		if (minor < 128)
-			idetape_discard_read_pipeline (drive);
+			idetape_discard_read_pipeline (drive, 1);
 		else
 			idetape_wait_for_pipeline (drive);
 	}
@@ -3334,10 +5078,15 @@
 	}
 	if (minor < 128)
 		(void) idetape_rewind_tape (drive);
-
-	clear_bit (IDETAPE_BUSY, &tape->flags);
-	if (tape->chrdev_direction == idetape_direction_none)
+	if (tape->chrdev_direction == idetape_direction_none) {
+		if (tape->door_locked != DOOR_EXPLICITLY_LOCKED) {
+			idetape_create_prevent_cmd(drive, &pc, 0);
+			if (!idetape_queue_pc_tail (drive,&pc))
+				tape->door_locked = DOOR_UNLOCKED;
+		}
 		MOD_DEC_USE_COUNT;
+	}
+	clear_bit (IDETAPE_BUSY, &tape->flags);
 	return 0;
 }
 
@@ -3353,16 +5102,16 @@
 static int idetape_identify_device (ide_drive_t *drive,struct hd_driveid *id)
 {
 	struct idetape_id_gcw gcw;
-#if IDETAPE_INFO_LOG
+#if IDETAPE_DEBUG_LOG
 	unsigned short mask,i;
-#endif /* IDETAPE_INFO_LOG */
+#endif /* IDETAPE_DEBUG_LOG */
 
 	if (!id)
 		return 0;
 
 	*((unsigned short *) &gcw) = id->config;
 
-#if IDETAPE_INFO_LOG
+#if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Dumping ATAPI Identify Device tape parameters\n");
 	printk (KERN_INFO "Protocol Type: ");
 	switch (gcw.protocol) {
@@ -3450,7 +5199,7 @@
 		
 	} else
 		printk (KERN_INFO "According to the device, fields 64-70 are not valid.\n");
-#endif /* IDETAPE_INFO_LOG */
+#endif /* IDETAPE_DEBUG_LOG */
 
 	/* Check that we can support this device */
 
@@ -3470,6 +5219,153 @@
 }
 
 /*
+ * Notify vendor ID to the OnStream tape drive
+ */
+static void idetape_onstream_set_vendor(ide_drive_t *drive, char *vendor)
+{
+	idetape_pc_t pc;
+	idetape_mode_parameter_header_t *header;
+
+	idetape_create_mode_select_cmd(&pc, sizeof(*header) + 8);
+	pc.buffer[0] = 3 + 8;	/* Mode Data Length */
+	pc.buffer[1] = 0;	/* Medium Type - ignoring */
+	pc.buffer[2] = 0;	/* Reserved */
+	pc.buffer[3] = 0;	/* Block Descriptor Length */
+	pc.buffer[4 + 0] = 0x36 | (1 << 7);
+	pc.buffer[4 + 1] = 6;
+	pc.buffer[4 + 2] = vendor[0];
+	pc.buffer[4 + 3] = vendor[1];
+	pc.buffer[4 + 4] = vendor[2];
+	pc.buffer[4 + 5] = vendor[3];
+	pc.buffer[4 + 6] = 0;
+	pc.buffer[4 + 7] = 0;
+	if (idetape_queue_pc_tail (drive,&pc))
+		printk (KERN_ERR "ide-tape: Couldn't set vendor name to %s\n", vendor);
+
+}
+
+/*
+ * Various unused OnStream commands
+ */
+#if ONSTREAM_DEBUG
+static void idetape_onstream_set_retries(ide_drive_t *drive, int retries)
+{
+	idetape_pc_t pc;
+
+	idetape_create_mode_select_cmd(&pc, sizeof(idetape_mode_parameter_header_t) + 4);
+	pc.buffer[0] = 3 + 4;
+	pc.buffer[1] = 0;	/* Medium Type - ignoring */
+	pc.buffer[2] = 0;	/* Reserved */
+	pc.buffer[3] = 0;	/* Block Descriptor Length */
+	pc.buffer[4 + 0] = 0x2f | (1 << 7);
+	pc.buffer[4 + 1] = 2;
+	pc.buffer[4 + 2] = 4;
+	pc.buffer[4 + 3] = retries;
+	if (idetape_queue_pc_tail (drive,&pc))
+		printk (KERN_ERR "ide-tape: Couldn't set retries to %d\n", retries);
+}
+#endif
+
+/*
+ * Configure 32.5KB block size.
+ */
+static void idetape_onstream_configure_block_size(ide_drive_t *drive)
+{
+	idetape_pc_t pc;
+	idetape_mode_parameter_header_t *header;
+	idetape_block_size_page_t *bs;
+
+	/*
+	 * Get the current block size from the block size mode page
+	 */
+	idetape_create_mode_sense_cmd (&pc,IDETAPE_BLOCK_SIZE_PAGE);
+	if (idetape_queue_pc_tail (drive,&pc))
+		printk (KERN_ERR "ide-tape: can't get tape block size mode page\n");
+	header = (idetape_mode_parameter_header_t *) pc.buffer;
+	bs = (idetape_block_size_page_t *) (pc.buffer + sizeof(idetape_mode_parameter_header_t) + header->bdl);
+
+#if IDETAPE_DEBUG_LOG
+	printk(KERN_INFO "32KB play back: %s\n", bs->play32 ? "Yes" : "No");
+	printk(KERN_INFO "32.5KB play back: %s\n", bs->play32_5 ? "Yes" : "No");
+	printk(KERN_INFO "32KB record: %s\n", bs->record32 ? "Yes" : "No");
+	printk(KERN_INFO "32.5KB record: %s\n", bs->record32_5 ? "Yes" : "No");
+#endif
+
+	/*
+	 * Configure default auto columns mode, 32.5KB block size
+	 */ 
+	bs->one = 1;
+	bs->play32 = 0;
+	bs->play32_5 = 1;
+	bs->record32 = 0;
+	bs->record32_5 = 1;
+	idetape_create_mode_select_cmd(&pc, sizeof(*header) + sizeof(*bs));
+	if (idetape_queue_pc_tail (drive,&pc))
+		printk (KERN_ERR "ide-tape: Couldn't set tape block size mode page\n");
+
+#if ONSTREAM_DEBUG
+	/*
+	 * In debug mode, we want to see as many errors as possible
+	 * to test the error recovery mechanism.
+	 */
+	idetape_onstream_set_retries(drive, 0);
+#endif
+}
+
+/*
+ * Use INQUIRY to get the firmware revision
+ */
+static void idetape_get_inquiry_results(ide_drive_t *drive)
+{
+	char *r;
+	idetape_tape_t *tape = drive->driver_data;
+	idetape_pc_t pc;
+	idetape_inquiry_result_t *inquiry;
+	
+	idetape_create_inquiry_cmd(&pc);
+	if (idetape_queue_pc_tail (drive,&pc)) {
+		printk (KERN_ERR "ide-tape: %s: can't get INQUIRY results\n", tape->name);
+		return;
+	}
+	inquiry = (idetape_inquiry_result_t *) pc.buffer;
+	memcpy(tape->vendor_id, inquiry->vendor_id, 8);
+	memcpy(tape->product_id, inquiry->product_id, 16);
+	memcpy(tape->firmware_revision, inquiry->revision_level, 4);
+	ide_fixstring(tape->vendor_id, 10, 0);
+	ide_fixstring(tape->product_id, 18, 0);
+	ide_fixstring(tape->firmware_revision, 6, 0);
+	r = tape->firmware_revision;
+	if (*(r + 1) == '.')
+		tape->firmware_revision_num = (*r - '0') * 100 + (*(r + 2) - '0') * 10 + *(r + 3) - '0';
+	else if (tape->onstream)
+		tape->firmware_revision_num = (*r - '0') * 100 + (*(r + 1) - '0') * 10 + *(r + 2) - '0';
+	printk(KERN_INFO "ide-tape: %s <-> %s: %s %s rev %s\n", drive->name, tape->name, tape->vendor_id, tape->product_id, tape->firmware_revision);
+}
+
+/*
+ * Configure the OnStream ATAPI tape drive for default operation
+ */
+static void idetape_configure_onstream(ide_drive_t *drive)
+{
+	idetape_tape_t *tape = drive->driver_data;
+
+	if (tape->firmware_revision_num < 105) {
+		printk("ide-tape: %s: Old OnStream firmware revision detected (%s)\n", tape->name, tape->firmware_revision);
+		printk("ide-tape: %s: An upgrade to version 1.05 or above is recommended\n", tape->name);
+	}
+
+	/*
+	 * Configure 32.5KB (data+aux) block size.
+	 */
+	idetape_onstream_configure_block_size(drive);
+
+	/*
+	 * Set vendor name to 'LIN3' for "Linux support version 3".
+	 */
+	idetape_onstream_set_vendor(drive, "LIN3");
+}
+
+/*
  *	idetape_get_mode_sense_results asks the tape about its various
  *	parameters. In particular, we will adjust our data transfer buffer
  *	size to the recommended value as returned by the tape.
@@ -3497,17 +5393,23 @@
 	capabilities->buffer_size = ntohs (capabilities->buffer_size);
 
 	if (!capabilities->speed) {
-		printk("ide-tape: %s: overriding capabilities->speed (assuming 650KB/sec)\n", drive->name);
+		printk(KERN_INFO "ide-tape: %s: overriding capabilities->speed (assuming 650KB/sec)\n", drive->name);
 		capabilities->speed = 650;
 	}
 	if (!capabilities->max_speed) {
-		printk("ide-tape: %s: overriding capabilities->max_speed (assuming 650KB/sec)\n", drive->name);
+		printk(KERN_INFO "ide-tape: %s: overriding capabilities->max_speed (assuming 650KB/sec)\n", drive->name);
 		capabilities->max_speed = 650;
 	}
 
 	tape->capabilities = *capabilities;		/* Save us a copy */
-	tape->tape_block_size = capabilities->blk512 ? 512:1024;
-#if IDETAPE_INFO_LOG
+	if (capabilities->blk512)
+		tape->tape_block_size = 512;
+	else if (capabilities->blk1024)
+		tape->tape_block_size = 1024;
+	else if (tape->onstream && capabilities->blk32768)
+		tape->tape_block_size = 32768;
+
+#if IDETAPE_DEBUG_LOG
 	printk (KERN_INFO "Dumping the results of the MODE SENSE packet command\n");
 	printk (KERN_INFO "Mode Parameter Header:\n");
 	printk (KERN_INFO "Mode Data Length - %d\n",header->mode_data_length);
@@ -3530,12 +5432,12 @@
 	printk (KERN_INFO "Supports data compression - %s\n",capabilities->cmprs ? "Yes":"No");
 	printk (KERN_INFO "Supports 512 bytes block size - %s\n",capabilities->blk512 ? "Yes":"No");
 	printk (KERN_INFO "Supports 1024 bytes block size - %s\n",capabilities->blk1024 ? "Yes":"No");
-	printk (KERN_INFO "Restricted byte count for PIO transfers - %s\n",capabilities->slowb ? "Yes":"No");
+	printk (KERN_INFO "Supports 32768 bytes block size / Restricted byte count for PIO transfers - %s\n",capabilities->blk32768 ? "Yes":"No");
 	printk (KERN_INFO "Maximum supported speed in KBps - %d\n",capabilities->max_speed);
 	printk (KERN_INFO "Continuous transfer limits in blocks - %d\n",capabilities->ctl);
 	printk (KERN_INFO "Current speed in KBps - %d\n",capabilities->speed);	
 	printk (KERN_INFO "Buffer size - %d\n",capabilities->buffer_size*512);
-#endif /* IDETAPE_INFO_LOG */
+#endif /* IDETAPE_DEBUG_LOG */
 }
 
 static void idetape_add_settings(ide_drive_t *drive)
@@ -3546,14 +5448,27 @@
  *			drive	setting name	read/write	ioctl	ioctl		data type	min			max			mul_factor			div_factor			data pointer				set function
  */
 	ide_add_setting(drive,	"buffer",	SETTING_READ,	-1,	-1,		TYPE_SHORT,	0,			0xffff,			1,				2,				&tape->capabilities.buffer_size,	NULL);
-	ide_add_setting(drive,	"pipeline_min",	SETTING_RW,	-1,	-1,		TYPE_INT,	0,			0xffff,			tape->stage_size / 1024,	1,				&tape->min_pipeline,			NULL);
-	ide_add_setting(drive,	"pipeline",	SETTING_RW,	-1,	-1,		TYPE_INT,	0,			0xffff,			tape->stage_size / 1024,	1,				&tape->max_stages,			NULL);
-	ide_add_setting(drive,	"pipeline_max",	SETTING_RW,	-1,	-1,		TYPE_INT,	0,			0xffff,			tape->stage_size / 1024,	1,				&tape->max_pipeline,			NULL);
+	ide_add_setting(drive,	"pipeline_min",	SETTING_RW,	-1,	-1,		TYPE_INT,	2,			0xffff,			tape->stage_size / 1024,	1,				&tape->min_pipeline,			NULL);
+	ide_add_setting(drive,	"pipeline",	SETTING_RW,	-1,	-1,		TYPE_INT,	2,			0xffff,			tape->stage_size / 1024,	1,				&tape->max_stages,			NULL);
+	ide_add_setting(drive,	"pipeline_max",	SETTING_RW,	-1,	-1,		TYPE_INT,	2,			0xffff,			tape->stage_size / 1024,	1,				&tape->max_pipeline,			NULL);
 	ide_add_setting(drive,	"pipeline_used",SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			tape->stage_size / 1024,	1,				&tape->nr_stages,			NULL);
+	ide_add_setting(drive,	"pipeline_pending",SETTING_READ,-1,	-1,		TYPE_INT,	0,			0xffff,			tape->stage_size / 1024,	1,				&tape->nr_pending_stages,		NULL);
 	ide_add_setting(drive,	"speed",	SETTING_READ,	-1,	-1,		TYPE_SHORT,	0,			0xffff,			1,				1,				&tape->capabilities.speed,		NULL);
 	ide_add_setting(drive,	"stage",	SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1024,				&tape->stage_size,			NULL);
 	ide_add_setting(drive,	"tdsc",		SETTING_RW,	-1,	-1,		TYPE_INT,	IDETAPE_DSC_RW_MIN,	IDETAPE_DSC_RW_MAX,	1000,				HZ,				&tape->best_dsc_rw_frequency,		NULL);
 	ide_add_setting(drive,	"dsc_overlap",	SETTING_RW,	-1,	-1,		TYPE_BYTE,	0,			1,			1,				1,				&drive->dsc_overlap,			NULL);
+	ide_add_setting(drive,	"pipeline_head_speed_c",SETTING_READ,	-1,	-1,	TYPE_INT,	0,			0xffff,			1,				1,				&tape->controlled_pipeline_head_speed,	NULL);
+	ide_add_setting(drive,	"pipeline_head_speed_u",SETTING_READ,	-1,	-1,	TYPE_INT,	0,			0xffff,			1,				1,				&tape->uncontrolled_pipeline_head_speed,	NULL);
+	ide_add_setting(drive,	"avg_speed",	SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->avg_speed,		NULL);
+	if (tape->onstream) {
+		ide_add_setting(drive,	"cur_frames",	SETTING_READ,	-1,	-1,		TYPE_SHORT,	0,			0xffff,			1,				1,				&tape->cur_frames,		NULL);
+		ide_add_setting(drive,	"max_frames",	SETTING_READ,	-1,	-1,		TYPE_SHORT,	0,			0xffff,			1,				1,				&tape->max_frames,		NULL);
+		ide_add_setting(drive,	"insert_speed",	SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->insert_speed,		NULL);
+		ide_add_setting(drive,	"speed_control",SETTING_RW,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->speed_control,		NULL);
+		ide_add_setting(drive,	"tape_still_time",SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->tape_still_time,		NULL);
+		ide_add_setting(drive,	"max_insert_speed",SETTING_RW,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->max_insert_speed,	NULL);
+		ide_add_setting(drive,	"insert_size",	SETTING_READ,	-1,	-1,		TYPE_INT,	0,			0xffff,			1,				1,				&tape->insert_size,		NULL);
+	}
 }
 
 /*
@@ -3570,42 +5485,48 @@
  */
 static void idetape_setup (ide_drive_t *drive, idetape_tape_t *tape, int minor)
 {
-	ide_hwif_t *hwif = HWIF(drive);
 	unsigned long t1, tmid, tn, t;
-	u16 speed;
+	int speed;
 	struct idetape_id_gcw gcw;
+	int stage_size;
 
 	memset (tape, 0, sizeof (idetape_tape_t));
 	spin_lock_init(&tape->spinlock);
 	drive->driver_data = tape;
 	drive->ready_stat = 0;			/* An ATAPI device ignores DRDY */
+	if (strstr(drive->id->model, "OnStream DI-30"))
+		tape->onstream = 1;
+	drive->dsc_overlap = 1;
 #ifdef CONFIG_BLK_DEV_IDEPCI
-	/*
-	 *  These two ide-pci host adapters appear to need this disabled.
-	 */
-	if (HWIF(drive)->pci_dev != NULL && (
-	    (HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) ||
-	    (HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_TTI_HPT343))) {
-		drive->dsc_overlap = 0;
-	} else
-#endif  /* CONFIG_BLK_DEV_IDEPCI */
-	{
-		drive->dsc_overlap = 1;
+	if (!tape->onstream && HWIF(drive)->pci_dev != NULL) {
+		/*
+		 * These two ide-pci host adapters appear to need DSC overlap disabled.
+		 * This probably needs further analysis.
+		 */
+		if ((HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) ||
+		    (HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_TTI_HPT343)) {
+			printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n", tape->name);
+		    	drive->dsc_overlap = 0;
+		}
 	}
-	memset (tape, 0, sizeof (idetape_tape_t));
+#endif /* CONFIG_BLK_DEV_IDEPCI */
 	tape->drive = drive;
 	tape->minor = minor;
 	tape->name[0] = 'h'; tape->name[1] = 't'; tape->name[2] = '0' + minor;
 	tape->chrdev_direction = idetape_direction_none;
 	tape->pc = tape->pc_stack;
-	tape->min_pipeline = IDETAPE_MIN_PIPELINE_STAGES;
-	tape->max_pipeline = IDETAPE_MAX_PIPELINE_STAGES;
-	tape->max_stages = tape->min_pipeline;
+	tape->max_insert_speed = 10000;
+	tape->speed_control = 1;
 	*((unsigned short *) &gcw) = drive->id->config;
 	if (gcw.drq_type == 1)
 		set_bit(IDETAPE_DRQ_INTERRUPT, &tape->flags);
 
-	idetape_get_mode_sense_results (drive);
+	tape->min_pipeline = tape->max_pipeline = tape->max_stages = 10;
+	
+	idetape_get_inquiry_results(drive);
+	idetape_get_mode_sense_results(drive);
+	if (tape->onstream)
+		idetape_configure_onstream(drive);
 
 	tape->user_bs_factor = 1;
 	tape->stage_size = tape->capabilities.ctl * tape->tape_block_size;
@@ -3614,45 +5535,40 @@
 		tape->capabilities.ctl /= 2;
 		tape->stage_size = tape->capabilities.ctl * tape->tape_block_size;
 	}
-	tape->pages_per_stage = tape->stage_size / PAGE_SIZE;
-	if (tape->stage_size % PAGE_SIZE) {
+	stage_size = tape->stage_size;
+	if (tape->onstream)
+		stage_size = 32768 + 512;
+	tape->pages_per_stage = stage_size / PAGE_SIZE;
+	if (stage_size % PAGE_SIZE) {
 		tape->pages_per_stage++;
-		tape->excess_bh_size = PAGE_SIZE - tape->stage_size % PAGE_SIZE;
+		tape->excess_bh_size = PAGE_SIZE - stage_size % PAGE_SIZE;
 	}
 
 	/*
-	 *	Select the "best" DSC read/write polling frequency.
-	 *	The following algorithm attempts to find a balance between
-	 *	good latency and good system throughput. It will be nice to
-	 *	have all this configurable in run time at some point.
+	 *	Select the "best" DSC read/write polling frequency
+	 *	and pipeline size.
 	 */
 	speed = IDE_MAX (tape->capabilities.speed, tape->capabilities.max_speed);
+
+	tape->max_stages = speed * 1000 * 10 / tape->stage_size;
+	tape->min_pipeline = tape->max_stages;
+	tape->max_pipeline = tape->max_stages * 2;
+
 	t1 = (tape->stage_size * HZ) / (speed * 1000);
 	tmid = (tape->capabilities.buffer_size * 32 * HZ) / (speed * 125);
 	tn = (IDETAPE_FIFO_THRESHOLD * tape->stage_size * HZ) / (speed * 1000);
 
-	if (tape->max_stages) {
-		if (drive->using_dma)
-			t = tmid;
-		else {
-			if (hwif->drives[drive->select.b.unit ^ 1].present || hwif->next != hwif)
-				t = (tn + tmid) / 2;
-			else
-				t = tn;
-		}
-	} else
+	if (tape->max_stages)
+		t = tn;
+	else
 		t = t1;
-	t = IDE_MIN (t, tmid);
 
 	/*
-	 *	Ensure that the number we got makes sense.
+	 *	Ensure that the number we got makes sense; limit
+	 *	it within IDETAPE_DSC_RW_MIN and IDETAPE_DSC_RW_MAX.
 	 */
 	tape->best_dsc_rw_frequency = IDE_MAX (IDE_MIN (t, IDETAPE_DSC_RW_MAX), IDETAPE_DSC_RW_MIN);
-	if (tape->best_dsc_rw_frequency != t) {
-		printk (KERN_NOTICE "ide-tape: Although the recommended polling period is %lu jiffies\n", t);
-		printk (KERN_NOTICE "ide-tape: we will use %lu jiffies\n", tape->best_dsc_rw_frequency);
-	}
-	printk (KERN_INFO "ide-tape: %s <-> %s, %dKBps, %d*%dkB buffer, %dkB pipeline, %lums tDSC%s\n",
+	printk (KERN_INFO "ide-tape: %s <-> %s: %dKBps, %d*%dkB buffer, %dkB pipeline, %lums tDSC%s\n",
 		drive->name, tape->name, tape->capabilities.speed, (tape->capabilities.buffer_size * 512) / tape->stage_size,
 		tape->stage_size / 1024, tape->max_stages * tape->stage_size / 1024,
 		tape->best_dsc_rw_frequency * 1000 / HZ, drive->using_dma ? ", DMA":"");
@@ -3791,6 +5707,14 @@
 			printk (KERN_ERR "ide-tape: %s: not supported by this version of ide-tape\n", drive->name);
 			continue;
 		}
+		if (drive->scsi) {
+			if (strstr(drive->id->model, "OnStream DI-30")) {
+				printk("ide-tape: ide-scsi emulation is not supported for %s.\n", drive->id->model);
+			} else {
+				printk("ide-tape: passing drive %s to ide-scsi emulation.\n", drive->name);
+				continue;
+			}
+		}
 		tape = (idetape_tape_t *) kmalloc (sizeof (idetape_tape_t), GFP_KERNEL);
 		if (tape == NULL) {
 			printk (KERN_ERR "ide-tape: %s: Can't allocate a tape structure\n", drive->name);
@@ -3828,14 +5752,8 @@
 
 	for (minor = 0; minor < MAX_HWIFS * MAX_DRIVES; minor++) {
 		drive = idetape_chrdevs[minor].drive;
-		if (drive) {
-			if (idetape_cleanup (drive))
-				printk (KERN_ERR "ide-tape: %s: cleanup_module() called while still busy\n", drive->name);
-			/* We must remove proc entries defined in this module.
-			   Otherwise we oops while accessing these entries */
-			if (drive->proc)
-				ide_remove_proc_entries(drive->proc, idetape_proc);
-		}
+		if (drive != NULL && idetape_cleanup (drive))
+			printk (KERN_ERR "ide-tape: %s: cleanup_module() called while still busy\n", drive->name);
 	}
 	ide_unregister_module(&idetape_module);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)