You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tejun Heo dd8717da6d ide: clean up timed out request handling ... 8f6205cd57 introduced a bug where a timed out DMA request is never requeued and lost. 6072f7491f fixed this by making ide_dma_timeout_retry() requeue the request itself. While the fix is correct, it makes DMA and non-DMA paths asymmetric regarding how the in flight request is requeued. As long as hwif->rq is set, the IDE driver is assuming ownership of the request and the request should either be completed or requeued when clearing hwif->rq. In the timeout path, the ide driver holds onto the request as long as the recovery action (ie. reset) is in progress and clears it after the state machine is stopped (ide_stopped return), so the existing requeueing logic is correct. The bug occurred because ide_dma_timeout_retry() explicitly clears hwif->rq without requeueing it. ide_dma_timeout_retry() is called only by ide_timer_expiry() and returns ide_started only when ide_error() would return it - ie. after reset state machine has started in which case the state machine will eventually end up executing the ide_stopped path in ide_timer_expiry() after reset protocol is complete. So, there is no need to clear hwif->rq from ide_dma_timeout_retry(). ide_timer_expiry() will handle it the same way as PIO timeout path. Kill hwif->rq clearing and requeueing from ide_dma_timeout_retry() and let ide_timer_expiry() deal with it. The end result should remain the same. grepping shows ide_dma_timeout_retry() is the only site which clears hwif->rq without taking care of the request, so there shouldn't be similar fallouts. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>		14 years ago
..
Kconfig	ide: update Kconfig text to mark as deprecated	15 years ago
Makefile	…
aec62xx.c	ide: change ->set_dma_mode method parameters	15 years ago
ali14xx.c	ide: change ->set_pio_mode method parameters	15 years ago
alim15x3.c	alim15x3: fix handling of UDMA enable bit	15 years ago
amd74xx.c	amd74xx: use ->pio_mode value to determine pair device speed	15 years ago
at91_ide.c	ide: change ->set_pio_mode method parameters	15 years ago
atiixp.c	ide: change ->set_dma_mode method parameters	15 years ago
au1xxx-ide.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6	15 years ago
buddha.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	16 years ago
cmd64x.c	cmd64x: fix handling of address setup timings	15 years ago
cmd640.c	cmd640: fix kernel oops in test_irq() method	15 years ago
cs5520.c	ide: change ->set_dma_mode method parameters	15 years ago
cs5530.c	ide: change ->set_dma_mode method parameters	15 years ago
cs5535.c	cs5535: use ->pio_mode value to determine pair device speed	15 years ago
cs5536.c	cs5536: use ->pio_mode value to determine pair device speed	15 years ago
cy82c693.c	ide: change ->set_dma_mode method parameters	15 years ago
delkin_cb.c	ide: remove hw_regs_t typedef	16 years ago
dtc2278.c	ide: change ->set_pio_mode method parameters	15 years ago
falconide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	16 years ago
gayle.c	m68k: amiga - Amiga Gayle IDE platform device conversion	15 years ago
hpt366.c	hpt366: fix clock turnaround	14 years ago
ht6560b.c	Update broken web addresses in the kernel.	15 years ago
icside.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6	15 years ago
ide-4drives.c	ide: remove hw_regs_t typedef	16 years ago
ide-acpi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-atapi.c	block: fix some more cmd_type cleanup fallout	15 years ago
ide-cd.c	block: autoconvert trivial BKL users to private mutex	15 years ago
ide-cd.h	…
ide-cd_ioctl.c	block: unify flags for struct bio and struct request	15 years ago
ide-cd_verbose.c	…
ide-cs.c	pcmcia: remove obsolete and wrong comments	15 years ago
ide-devsets.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-disk.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	14 years ago
ide-disk.h	…
ide-disk_ioctl.c	block: autoconvert trivial BKL users to private mutex	15 years ago
ide-disk_proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-dma-sff.c	…
ide-dma.c	ide: clean up timed out request handling	14 years ago
ide-eh.c	block: remove wrappers for request type/flags	15 years ago
ide-floppy.c	block: unify flags for struct bio and struct request	15 years ago
ide-floppy.h	…
ide-floppy_ioctl.c	block: autoconvert trivial BKL users to private mutex	15 years ago
ide-floppy_proc.c	ide: convert to ->proc_fops	16 years ago
ide-gd.c	block: autoconvert trivial BKL users to private mutex	15 years ago
ide-gd.h	…
ide-generic.c	ide: remove hw_regs_t typedef	16 years ago
ide-h8300.c	ide: remove hw_regs_t typedef	16 years ago
ide-io-std.c	…
ide-io.c	ide: remove unnecessary blk_queue_flushing() test in do_ide_request()	15 years ago
ide-ioctls.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-iops.c	ide: add SATA cable detection support	15 years ago
ide-legacy.c	ide: remove hw_regs_t typedef	16 years ago
ide-lib.c	Merge branch 'master' into for-2.6.31	16 years ago
ide-park.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-pci-generic.c	pata_piccolo: Driver for old Toshiba chipsets	15 years ago
ide-pio-blacklist.c	…
ide-pm.c	block: remove wrappers for request type/flags	15 years ago
ide-pnp.c	ide: remove hw_regs_t typedef	16 years ago
ide-probe.c	ide: Fix ordering of procfs registry.	15 years ago
ide-proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ide-scan-pci.c	…
ide-sysfs.c	…
ide-tape.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	14 years ago
ide-taskfile.c	drivers/ide: Use memdup_user	15 years ago
ide-timings.c	ide: ide_timing_compute() fixup	15 years ago
ide-xfer-mode.c	ide: make ide_get_best_pio_mode() static	15 years ago
ide.c	ide: use module_param_named rather than module_param_call	15 years ago
ide_platform.c	IDE: pass IRQ flags to the IDE core	15 years ago
it821x.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
it8172.c	ide: change ->set_dma_mode method parameters	15 years ago
it8213.c	ide: change ->set_dma_mode method parameters	15 years ago
jmicron.c	ide: change ->set_dma_mode method parameters	15 years ago
macide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	16 years ago
ns87415.c	…
opti621.c	ide: change ->set_pio_mode method parameters	15 years ago
palm_bk3710.c	palm_bk3710: use ->pio_mode value to determine pair device speed	15 years ago
pdc202xx_new.c	ide: change ->set_dma_mode method parameters	15 years ago
pdc202xx_old.c	pdc202xx_old: ignore "FIFO empty" bit in test_irq() method	15 years ago
piix.c	ide: change ->set_dma_mode method parameters	15 years ago
pmac.c	powerpc/macio: Fix probing of macio devices by using the right of match table	15 years ago
q40ide.c	ide: move ack_intr() method into 'struct ide_port_ops' (take 2)	16 years ago
qd65xx.c	ide: change ->set_pio_mode method parameters	15 years ago
qd65xx.h	ide: do not access ide_drive_t 'drive_data' field directly	16 years ago
rapide.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
rz1000.c	…
sc1200.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
scc_pata.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6	15 years ago
serverworks.c	ide: change ->set_dma_mode method parameters	15 years ago
setup-pci.c	ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()	16 years ago
sgiioc4.c	ide: change ->set_dma_mode method parameters	15 years ago
siimage.c	siimage: use ->pio_mode value to determine pair device speed	15 years ago
sis5513.c	ide: change ->set_dma_mode method parameters	15 years ago
sl82c105.c	ide: change ->set_dma_mode method parameters	15 years ago
slc90e66.c	ide: change ->set_dma_mode method parameters	15 years ago
tc86c001.c	ide: change ->set_dma_mode method parameters	15 years ago
triflex.c	ide: change ->set_dma_mode method parameters	15 years ago
trm290.c	…
tx4938ide.c	tx493xide: use min_t() macro instead of min()	15 years ago
tx4939ide.c	tx493xide: use min_t() macro instead of min()	15 years ago
umc8672.c	ide: change ->set_pio_mode method parameters	15 years ago
via82cxxx.c	via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support.	15 years ago