evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ide: set IDE_AFLAG_DRQ_INTERRUPT in do_identify()

Browse source 
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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-10-13 21:39:43 +02:00
parent a36223b0dc
commit 4ab3d50224
5 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/ide/ide-cd.c
View file

@ -1891,9 +1891,6 @@ static int ide_cdrom_setup(ide_drive_t *drive)
drive->atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT | drive->atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT |
ide_cd_flags(id); 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) && if ((drive->atapi_flags & IDE_AFLAG_VERTOS_300_SSD) &&
fw_rev[4] == '1' && fw_rev[6] <= '2') fw_rev[4] == '1' && fw_rev[6] <= '2')
drive->atapi_flags |= (IDE_AFLAG_TOCTRACKS_AS_BCD | drive->atapi_flags |= (IDE_AFLAG_TOCTRACKS_AS_BCD |

5
drivers/ide/ide-floppy.c
View file

@ -578,16 +578,11 @@ static const struct ide_proc_devset idefloppy_settings[] = {
static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy) static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
{ {
u16 *id = drive->id; u16 *id = drive->id;
u8 gcw[2];
*((u16 *)&gcw) = id[ATA_ID_CONFIG];
drive->pc_callback = ide_floppy_callback; drive->pc_callback = ide_floppy_callback;
drive->pc_update_buffers = idefloppy_update_buffers; drive->pc_update_buffers = idefloppy_update_buffers;
drive->pc_io_buffers = ide_io_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. * We used to check revisions here. At this point however I'm giving up.
* Just assume they are all broken, its easier. * Just assume they are all broken, its easier.

2
drivers/ide/ide-probe.c
View file

@ -206,6 +206,8 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
drive->media = type; drive->media = type;
/* an ATAPI device ignores DRDY */ /* an ATAPI device ignores DRDY */
drive->ready_stat = 0; drive->ready_stat = 0;
if (ata_id_cdb_intr(id))
drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
return; return;
} }

7
drivers/ide/ide-tape.c
View file

@ -2185,7 +2185,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
unsigned long t; unsigned long t;
int speed; int speed;
int buffer_size; int buffer_size;
u8 gcw[2];
u16 *ctl = (u16 *)&tape->caps[12]; u16 *ctl = (u16 *)&tape->caps[12];
drive->pc_callback = ide_tape_callback; 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->name[2] = '0' + minor;
tape->chrdev_dir = IDETAPE_DIR_NONE; 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_inquiry_results(drive);
idetape_get_mode_sense_results(drive); idetape_get_mode_sense_results(drive);
ide_tape_get_bsize_from_bdesc(drive); ide_tape_get_bsize_from_bdesc(drive);

2
drivers/scsi/ide-scsi.c
View file

@ -385,8 +385,6 @@ static const struct ide_proc_devset idescsi_settings[] = {
*/ */
static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi) 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); clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
#if IDESCSI_DEBUG_LOG #if IDESCSI_DEBUG_LOG
set_bit(IDESCSI_LOG_CMD, &scsi->log); set_bit(IDESCSI_LOG_CMD, &scsi->log);