On Sat, Mar 26, 2011 at 07:29, Jens Axboe <jaxboe@xxxxxxxxxxxx> wrote:
On 2011-03-25 22:35, Geert Uytterhoeven wrote:
On Thu, Mar 24, 2011 at 14:43, Jens Axboe <jaxboe@xxxxxxxxxxxx> wrote:
Jens Axboe (20):
  Âblock: remove per-queue plugging
This one (commit 7eaceaccab5f40bbfda044629a6298616aeaed50) breaks IDE
on Atari/m68k under ARAnyM. It hangs on:
| ide: Falcon IDE controller
| Probing IDE interface ide0...
| hda: Sarge m68k, ATA DISK drive
| ide0 at 0xfff00000 on irq 15 (serialized)
| ide-gd driver 1.18
| hda: max request size: 128KiB
| hda: 2118816 sectors (1084 MB) w/256KiB Cache, CHS=2102/16/63
The next expected line is the partition parsing:
| hda: AHDI hda1 hda2
Geert, does this work for you?
Yep.Thanks!
Tested-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index f407784..381017c 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -549,6 +549,9 @@ plug_device_2:
   Âif (rq)
       Âblk_requeue_request(q, rq);
+
+ Â Â Â /* Use 3ms as that was the old plug delay */
+ Â Â Â blk_delay_queue(q, msecs_to_jiffies(3));
Â}
Âvoid ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
@@ -561,6 +564,8 @@ void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
   Âif (rq)
       Âblk_requeue_request(q, rq);
+ Â Â Â /* Use 3ms as that was the old plug delay */
+ Â Â Â blk_delay_queue(q, msecs_to_jiffies(3));
   Âspin_unlock_irqrestore(q->queue_lock, flags);
Â}
Gr{oetje,eeting}s,
            Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
             Â Â -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
