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

Commit 4ab3d502 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: set IDE_AFLAG_DRQ_INTERRUPT in do_identify() 



Set IDE_AFLAG_DRQ_INTERRUPT in do_identify() instead of ATAPI
device drivers *_setup() methods.

While at it:
- use ata_id_cdb_intr()

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 a36223b0

drivers/ide/ide-cd.c

+0 −3
Original line number Diff line number Diff line
@@ -1891,9 +1891,6 @@ static int ide_cdrom_setup(ide_drive_t *drive) 
	drive->atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT |

		       ide_cd_flags(id);



	if ((id[ATA_ID_CONFIG] & 0x0060) == 0x20)

		drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;



	if ((drive->atapi_flags & IDE_AFLAG_VERTOS_300_SSD) &&

	    fw_rev[4] == '1' && fw_rev[6] <= '2')

		drive->atapi_flags |= (IDE_AFLAG_TOCTRACKS_AS_BCD |

drivers/ide/ide-floppy.c

+0 −5
Original line number Diff line number Diff line
@@ -578,16 +578,11 @@ static const struct ide_proc_devset idefloppy_settings[] = { 
static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)

{

	u16 *id = drive->id;

	u8 gcw[2];



	*((u16 *)&gcw) = id[ATA_ID_CONFIG];



	drive->pc_callback	 = ide_floppy_callback;

	drive->pc_update_buffers = idefloppy_update_buffers;

	drive->pc_io_buffers	 = ide_io_buffers;



	if (((gcw[0] & 0x60) >> 5) == 1)

		drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;

	/*

	 * We used to check revisions here. At this point however I'm giving up.

	 * Just assume they are all broken, its easier.

drivers/ide/ide-probe.c

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd) 
		drive->media = type;

		/* an ATAPI device ignores DRDY */

		drive->ready_stat = 0;

		if (ata_id_cdb_intr(id))

			drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;

		return;

	}

drivers/ide/ide-tape.c

+0 −7
Original line number Diff line number Diff line
@@ -2185,7 +2185,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
	unsigned long t;

	int speed;

	int buffer_size;

	u8 gcw[2];

	u16 *ctl = (u16 *)&tape->caps[12];



	drive->pc_callback	 = ide_tape_callback;
@@ -2212,12 +2211,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) 
	tape->name[2] = '0' + minor;

	tape->chrdev_dir = IDETAPE_DIR_NONE;



	*((u16 *)&gcw) = drive->id[ATA_ID_CONFIG];



	/* Command packet DRQ type */

	if (((gcw[0] & 0x60) >> 5) == 1)

		set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);



	idetape_get_inquiry_results(drive);

	idetape_get_mode_sense_results(drive);

	ide_tape_get_bsize_from_bdesc(drive);

drivers/scsi/ide-scsi.c

+0 −2
Original line number Diff line number Diff line
@@ -385,8 +385,6 @@ static const struct ide_proc_devset idescsi_settings[] = { 
 */

static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)

{

	if ((drive->id[ATA_ID_CONFIG] & 0x0060) == 0x20)

		set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);

	clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);

#if IDESCSI_DEBUG_LOG

	set_bit(IDESCSI_LOG_CMD, &scsi->log);