Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b0da28b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_retry_pc() helper 



* Add ide_create_request_sense_cmd() and ide_retry_pc() helpers
  and convert ide-{atapi,floppy,tape}.c to use them.

* Remove no longer used ide*_create_request_sense_cmd(),
  ide*_retry_pc() and 'retry_pc' argument from ide_pc_intr().

* Make ide_queue_pc_head() static.

There should be no functional changes caused by this patch.

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 67c56364

drivers/ide/ide-atapi.c

+34 −5
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ EXPORT_SYMBOL_GPL(ide_init_pc); 
 * the current request, so that it will be processed immediately, on the next

 * pass through the driver.

 */

void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,

static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk,

			      struct ide_atapi_pc *pc, struct request *rq)

{

	blk_rq_init(NULL, rq);
@@ -137,7 +137,6 @@ void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk, 
		rq->cmd[13] = REQ_IDETAPE_PC1;

	ide_do_drive_cmd(drive, rq);

}

EXPORT_SYMBOL_GPL(ide_queue_pc_head);



/*

 * Add a special packet command request to the tail of the request queue,
@@ -203,6 +202,37 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on) 
}

EXPORT_SYMBOL_GPL(ide_set_media_lock);



void ide_create_request_sense_cmd(ide_drive_t *drive, struct ide_atapi_pc *pc)

{

	ide_init_pc(pc);

	pc->c[0] = REQUEST_SENSE;

	if (drive->media == ide_floppy) {

		pc->c[4] = 255;

		pc->req_xfer = 18;

	} else {

		pc->c[4] = 20;

		pc->req_xfer = 20;

	}

}

EXPORT_SYMBOL_GPL(ide_create_request_sense_cmd);



/*

 * 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.

 */

void ide_retry_pc(ide_drive_t *drive, struct gendisk *disk)

{

	struct request *rq = &drive->request_sense_rq;

	struct ide_atapi_pc *pc = &drive->request_sense_pc;



	(void)ide_read_error(drive);

	ide_create_request_sense_cmd(drive, pc);

	if (drive->media == ide_tape)

		set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

	ide_queue_pc_head(drive, disk, pc, rq);

}

EXPORT_SYMBOL_GPL(ide_retry_pc);



int ide_scsi_expiry(ide_drive_t *drive)

{

	struct ide_atapi_pc *pc = drive->pc;
@@ -219,7 +249,6 @@ EXPORT_SYMBOL_GPL(ide_scsi_expiry); 
/* TODO: unify the code thus making some arguments go away */

ide_startstop_t ide_pc_intr(ide_drive_t *drive, ide_handler_t *handler,

	void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),

	void (*retry_pc)(ide_drive_t *),

	int (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned, int))

{

	struct ide_atapi_pc *pc = drive->pc;
@@ -299,7 +328,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, ide_handler_t *handler, 
			debug_log("[cmd %x]: check condition\n", rq->cmd[0]);



			/* Retry operation */

			retry_pc(drive);

			ide_retry_pc(drive, rq->rq_disk);



			/* queued, but not started */

			return ide_stopped;

drivers/ide/ide-floppy.c

+1 −24
Original line number Diff line number Diff line
@@ -193,34 +193,11 @@ static void ide_floppy_callback(ide_drive_t *drive, int dsc) 
	idefloppy_end_request(drive, uptodate, 0);

}



void ide_floppy_create_request_sense_cmd(struct ide_atapi_pc *pc)

{

	ide_init_pc(pc);

	pc->c[0] = GPCMD_REQUEST_SENSE;

	pc->c[4] = 255;

	pc->req_xfer = 18;

}



/*

 * 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.

 */

static void idefloppy_retry_pc(ide_drive_t *drive)

{

	struct ide_floppy_obj *floppy = drive->driver_data;

	struct request *rq = &drive->request_sense_rq;

	struct ide_atapi_pc *pc = &drive->request_sense_pc;



	(void)ide_read_error(drive);

	ide_floppy_create_request_sense_cmd(pc);

	ide_queue_pc_head(drive, floppy->disk, pc, rq);

}



/* The usual interrupt handler called during a packet command. */

static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)

{

	return ide_pc_intr(drive, idefloppy_pc_intr, idefloppy_update_buffers,

			   idefloppy_retry_pc, ide_io_buffers);

			   ide_io_buffers);

}



/*

drivers/ide/ide-floppy.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ typedef struct ide_floppy_obj { 
/* ide-floppy.c */

void ide_floppy_create_mode_sense_cmd(struct ide_atapi_pc *, u8);

void ide_floppy_create_read_capacity_cmd(struct ide_atapi_pc *);

void ide_floppy_create_request_sense_cmd(struct ide_atapi_pc *);



/* ide-floppy_ioctl.c */

int ide_floppy_format_ioctl(ide_drive_t *, struct file *, unsigned int,

drivers/ide/ide-floppy_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg) 
	int progress_indication = 0x10000;



	if (drive->atapi_flags & IDE_AFLAG_SRFP) {

		ide_floppy_create_request_sense_cmd(&pc);

		ide_create_request_sense_cmd(drive, &pc);

		if (ide_queue_pc_tail(drive, floppy->disk, &pc))

			return -EIO;

drivers/ide/ide-tape.c

+2 −27
Original line number Diff line number Diff line
@@ -581,31 +581,6 @@ static void ide_tape_callback(ide_drive_t *drive, int dsc) 
	idetape_end_request(drive, uptodate, 0);

}



static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc)

{

	ide_init_pc(pc);

	pc->c[0] = REQUEST_SENSE;

	pc->c[4] = 20;

	pc->req_xfer = 20;

}



/*

 *	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.

 */

static void idetape_retry_pc(ide_drive_t *drive)

{

	struct ide_tape_obj *tape = drive->driver_data;

	struct request *rq = &drive->request_sense_rq;

	struct ide_atapi_pc *pc = &drive->request_sense_pc;



	(void)ide_read_error(drive);

	idetape_create_request_sense_cmd(pc);

	set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

	ide_queue_pc_head(drive, tape->disk, pc, rq);

}



/*

 * Postpone 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.
@@ -653,7 +628,7 @@ static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc, 
static ide_startstop_t idetape_pc_intr(ide_drive_t *drive)

{

	return ide_pc_intr(drive, idetape_pc_intr, idetape_update_buffers,

			   idetape_retry_pc, ide_tape_io_buffers);

			   ide_tape_io_buffers);

}



/*
@@ -789,7 +764,7 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) 
				printk(KERN_ERR "ide-tape: %s: I/O error, ",

						tape->name);

			/* Retry operation */

			idetape_retry_pc(drive);

			ide_retry_pc(drive, tape->disk);

			return ide_stopped;

		}

		pc->error = 0;