Cc: Bartlomiej Zolnierkiewicz <bzolnier@...>, Rafael J. Wysocki <rjw@...>, Jens Axboe <jens.axboe@...>, Ingo Molnar <mingo@...>, Linux Kernel Mailing List <linux-kernel@...>
Ok, this is interesting. It's clearly a regression, so we need to undo it.
However, it's not trivial to revert, since lots of things have changed
around that area since.
In particular, commit 7267c3377443322588cddaf457cf106839a60463 ("ide:
remove REQ_TYPE_ATA_CMD") ended up removing the whole drive_cmd_intr()
function, because now all the commands are handled with the
REQ_TYPE_ATA_TASKFILE model instead, which uses a whole another path.
And quite frankly, I think the commit you bisected to really is very
broken. It starts doing error handling *before* it has handled the DRQ
bit, and that's bogus, since iirc a lot of controllers need to have their
DRQ issues satisfied before anything else.
So what probably happens is that yes, you get an error, but the IDE drive
still wants the code to flush the data it generated, and if we don't do
that, it will never do anything else ever again. Resulting in a hang.
So Anders, can you try these two silly things:
- there's a totally untested patch at the end here that tries to make the
error handling do that DRQ flush unconditionally. Does it make a
difference for you?
- did you already try if ata_piix fixes it?
but I do think that the commit you bisected is crap, crap, crap.
Bartlomiej?
Linus
---
drivers/ide/ide-io.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 7153796..9105c09 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -462,8 +462,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
}
}
- if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ &&
- (hwif->host_flags & IDE_HFLAG_ERROR_STOPS_FIFO) == 0)
+ if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ)
try_to_flush_leftover_data(drive);
if (rq->errors >= ERROR_MAX || blk_noretry_request(rq)) {
--
