I have not fully reviewed it yet but I've noticed two things...
> @@ -648,11 +648,11 @@ u8 eighty_ninty_three (ide_drive_t *driv
>
> EXPORT_SYMBOL(eighty_ninty_three);
>
> -int ide_ata66_check (ide_drive_t *drive, ide_task_t *args)
> +int ide_ata66_check(ide_drive_t *drive, task_ioreg_t *regs)
> {
> - if ((args->tfRegister[IDE_COMMAND_OFFSET] == WIN_SETFEATURES) &&
> - (args->tfRegister[IDE_SECTOR_OFFSET] > XFER_UDMA_2) &&
> - (args->tfRegister[IDE_FEATURE_OFFSET] == SETFEATURES_XFER)) {
> + if (regs[IDE_COMMAND_OFFSET] == WIN_SETFEATURES &&
> + regs[IDE_SECTOR_OFFSET] > XFER_UDMA_2 &&
> + regs[IDE_FEATURE_OFFSET] == SETFEATURES_XFER) {
> #ifndef CONFIG_IDEDMA_IVB
> if ((drive->id->hw_config & 0x6000) == 0) {
> #else /* !CONFIG_IDEDMA_IVB */
What is the rationale for this change?
ide_task_t is available in ide_cmd_ioctl().
> @@ -678,11 +678,11 @@ int ide_ata66_check (ide_drive_t *drive,
> * 1 : Safe to update drive->id DMA registers.
> * 0 : OOPs not allowed.
> */
> -int set_transfer (ide_drive_t *drive, ide_task_t *args)
> +int set_transfer(ide_drive_t *drive, task_ioreg_t *regs)
> {
> - if ((args->tfRegister[IDE_COMMAND_OFFSET] == WIN_SETFEATURES) &&
> - (args->tfRegister[IDE_SECTOR_OFFSET] >= XFER_SW_DMA_0) &&
> - (args->tfRegister[IDE_FEATURE_OFFSET] == SETFEATURES_XFER) &&
> + if (regs[IDE_COMMAND_OFFSET] == WIN_SETFEATURES &&
> + regs[IDE_SECTOR_OFFSET] >= XFER_SW_DMA_0 &&
> + regs[IDE_FEATURE_OFFSET] == SETFEATURES_XFER &&
> (drive->id->dma_ultra ||
> drive->id->dma_mword ||
> drive->id->dma_1word))
ditto
> + io_32bit = drive->io_32bit;
> + drive->io_32bit = 0; /* racy */
> + ret = ide_diag_taskfile(drive, &task, in_size, buf);
> + drive->io_32bit = io_32bit;
It wasn't racy before this patch. I know that it is like that
in ide_taskfile_ioctl() but it is not an excuse for propagating
the bug. It can be easily fixed if you use drive_cmd_intr()
instead of task_in_intr() as task->handler.
Thanks,
Bartlomiej
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
