lkml.org 
[lkml]   [2003]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: Testing IDE-TCQ and Taskfile - doesn't work nicely:)
On Mon, Jun 23 2003, Bartlomiej Zolnierkiewicz wrote:
> [ide] TCQ initialization fixes
>
> - do not enable TCQ in ide_init_drive(), its too early
> - enable TCQ in __ide_dma_on() only if CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y
>
> drivers/ide/ide-dma.c | 8 ++++----
> drivers/ide/ide-probe.c | 5 -----
> include/linux/ide.h | 1 -
> 3 files changed, 4 insertions(+), 10 deletions(-)
>
> diff -puN drivers/ide/ide-probe.c~ide-tcq-init-fixes drivers/ide/ide-probe.c
> --- linux-2.5.73/drivers/ide/ide-probe.c~ide-tcq-init-fixes Mon Jun 23 23:10:11 2003
> +++ linux-2.5.73-root/drivers/ide/ide-probe.c Mon Jun 23 23:10:11 2003
> @@ -983,7 +983,6 @@ static void ide_init_queue(ide_drive_t *
>
> blk_init_queue(q, do_ide_request, &ide_lock);
> q->queuedata = HWGROUP(drive);
> - drive->queue_setup = 1;
> blk_queue_segment_boundary(q, 0xffff);
>
> if (!hwif->rqsize)
> @@ -1005,10 +1004,6 @@ static void ide_init_queue(ide_drive_t *
> static void ide_init_drive(ide_drive_t *drive)
> {
> ide_toggle_bounce(drive, 1);
> -
> -#ifdef CONFIG_BLK_DEV_IDE_TCQ_DEFAULT
> - HWIF(drive)->ide_dma_queued_on(drive);
> -#endif
> }
>
> /*
> diff -puN drivers/ide/ide-dma.c~ide-tcq-init-fixes drivers/ide/ide-dma.c
> --- linux-2.5.73/drivers/ide/ide-dma.c~ide-tcq-init-fixes Mon Jun 23 23:10:11 2003
> +++ linux-2.5.73-root/drivers/ide/ide-dma.c Mon Jun 23 23:10:11 2003
> @@ -523,8 +523,7 @@ int __ide_dma_off_quietly (ide_drive_t *
> if (HWIF(drive)->ide_dma_host_off(drive))
> return 1;
>
> - if (drive->queue_setup)
> - HWIF(drive)->ide_dma_queued_off(drive);
> + HWIF(drive)->ide_dma_queued_off(drive);
>
> return 0;
> }
> @@ -585,8 +584,9 @@ int __ide_dma_on (ide_drive_t *drive)
> if (HWIF(drive)->ide_dma_host_on(drive))
> return 1;
>
> - if (drive->queue_setup)
> - HWIF(drive)->ide_dma_queued_on(drive);
> +#ifdef BLK_DEV_IDE_TCQ_DEFAULT
> + HWIF(drive)->ide_dma_queued_on(drive);
> +#endif
>
> return 0;
> }
> diff -puN include/linux/ide.h~ide-tcq-init-fixes include/linux/ide.h
> --- linux-2.5.73/include/linux/ide.h~ide-tcq-init-fixes Mon Jun 23 23:10:11 2003
> +++ linux-2.5.73-root/include/linux/ide.h Mon Jun 23 23:10:11 2003
> @@ -726,7 +726,6 @@ typedef struct ide_drive_s {
> unsigned ata_flash : 1; /* 1=present, 0=default */
> unsigned blocked : 1; /* 1=powermanagment told us not to do anything, so sleep nicely */
> unsigned vdma : 1; /* 1=doing PIO over DMA 0=doing normal DMA */
> - unsigned queue_setup : 1;
> unsigned addressing; /* : 3;
> * 0=28-bit
> * 1=48-bit
>
> _

Patch is nice and kills the ->queue_setup abomination, great.

--
Jens Axboe

-
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/

\
 
 \ /
  Last update: 2005-03-22 13:36    [from the cache]
©2003-2011 Jasper Spaans