ahci: factor ncq_finish out of ncq_cb
When we add werror=stop or rerror=stop support to NCQ, we'll want to take a codepath where we don't actually complete the command, so factor that out into a new routine. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1435767578-32743-6-git-send-email-jsnow@redhat.com
This commit is contained in:
parent
631ddc22cb
commit
54f3223730
|
@ -933,23 +933,11 @@ static void ncq_err(NCQTransferState *ncq_tfs)
|
||||||
ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
|
ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ncq_cb(void *opaque, int ret)
|
static void ncq_finish(NCQTransferState *ncq_tfs)
|
||||||
{
|
{
|
||||||
NCQTransferState *ncq_tfs = (NCQTransferState *)opaque;
|
|
||||||
IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];
|
|
||||||
|
|
||||||
if (ret == -ECANCELED) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
/* Clear bit for this tag in SActive */
|
/* Clear bit for this tag in SActive */
|
||||||
ncq_tfs->drive->port_regs.scr_act &= ~(1 << ncq_tfs->tag);
|
ncq_tfs->drive->port_regs.scr_act &= ~(1 << ncq_tfs->tag);
|
||||||
|
|
||||||
if (ret < 0) {
|
|
||||||
ncq_err(ncq_tfs);
|
|
||||||
} else {
|
|
||||||
ide_state->status = READY_STAT | SEEK_STAT;
|
|
||||||
}
|
|
||||||
|
|
||||||
ahci_write_fis_sdb(ncq_tfs->drive->hba, ncq_tfs->drive->port_no,
|
ahci_write_fis_sdb(ncq_tfs->drive->hba, ncq_tfs->drive->port_no,
|
||||||
(1 << ncq_tfs->tag));
|
(1 << ncq_tfs->tag));
|
||||||
|
|
||||||
|
@ -962,6 +950,24 @@ static void ncq_cb(void *opaque, int ret)
|
||||||
ncq_tfs->used = 0;
|
ncq_tfs->used = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ncq_cb(void *opaque, int ret)
|
||||||
|
{
|
||||||
|
NCQTransferState *ncq_tfs = (NCQTransferState *)opaque;
|
||||||
|
IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];
|
||||||
|
|
||||||
|
if (ret == -ECANCELED) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret < 0) {
|
||||||
|
ncq_err(ncq_tfs);
|
||||||
|
} else {
|
||||||
|
ide_state->status = READY_STAT | SEEK_STAT;
|
||||||
|
}
|
||||||
|
|
||||||
|
ncq_finish(ncq_tfs);
|
||||||
|
}
|
||||||
|
|
||||||
static int is_ncq(uint8_t ata_cmd)
|
static int is_ncq(uint8_t ata_cmd)
|
||||||
{
|
{
|
||||||
/* Based on SATA 3.2 section 13.6.3.2 */
|
/* Based on SATA 3.2 section 13.6.3.2 */
|
||||||
|
|
Loading…
Reference in a new issue