Messages in this thread | | | Date | Mon, 07 Feb 2005 14:02:49 +0900 | From | Tejun Heo <> | Subject | Re: [PATCH 2.6.11-rc2 08/09] ide: map ide_cmd_ioctl() to ide_taskfile_ioctl() |
| |
Bartlomiej Zolnierkiewicz wrote: > 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(). >
Sorry, it was for the previous map to ide_taskfile_ioctl() implementation, where ide_cmd_ioctl() didn't have ide_task_t. I'll restore it. Also, I've forgot to update the description of this patch. I'll fix that too.
> >>@@ -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 >
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.
Fixing the race condition in taskfile ioctl was on my to-do list, so I was thinking unifying the problem wouldn't be bad such that it can be fixed together later (soon). I think I can make a patch to fix taskfile ioctl first and then submit this patch again without the race.
Thanks.
-- tejun
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |