mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-29 23:03:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ahci: explicitly reject bad engine states on post_load

Browse Source 
Currently, we let ahci_cond_start_engines reject weird configurations
where either the DMA (CLB) or FIS engines are said to be started, but
their matching on/off control bit is toggled off.

There should be no way to achieve this, since any time you toggle the
control bit off, the status bit should always follow synchronously.

Preparing for a refactor in cond_start_engines, move the rejection logic
straight up into post_load.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1454103689-13042-4-git-send-email-jsnow@redhat.com
This commit is contained in:
John Snow 2016-02-10 13:29:40 -05:00
parent f32a2f33c2
commit f8a6c5f318
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/ide/ahci.c
View File

@ -218,10 +218,6 @@ static int ahci_cond_start_engines(AHCIDevice *ad, bool allow_stop)
} else if (pr->cmd & PORT_CMD_LIST_ON) { } else if (pr->cmd & PORT_CMD_LIST_ON) {
if (allow_stop) { if (allow_stop) {
ahci_unmap_clb_address(ad); ahci_unmap_clb_address(ad);
} else {
error_report("AHCI: DMA engine should be off, "
"but appears to still be running");
return -1;
} }
} }
@ -234,10 +230,6 @@ static int ahci_cond_start_engines(AHCIDevice *ad, bool allow_stop)
} else if (pr->cmd & PORT_CMD_FIS_ON) { } else if (pr->cmd & PORT_CMD_FIS_ON) {
if (allow_stop) { if (allow_stop) {
ahci_unmap_fis_address(ad); ahci_unmap_fis_address(ad);
} else {
error_report("AHCI: FIS receive engine should be off, "
"but appears to still be running");
return -1;
} }
} }
@ -1568,10 +1560,23 @@ static int ahci_state_post_load(void *opaque, int version_id)
int i, j; int i, j;
struct AHCIDevice *ad; struct AHCIDevice *ad;
NCQTransferState *ncq_tfs; NCQTransferState *ncq_tfs;
AHCIPortRegs *pr;
AHCIState *s = opaque; AHCIState *s = opaque;
for (i = 0; i < s->ports; i++) { for (i = 0; i < s->ports; i++) {
ad = &s->dev[i]; ad = &s->dev[i];
pr = &ad->port_regs;
if (!(pr->cmd & PORT_CMD_START) && (pr->cmd & PORT_CMD_LIST_ON)) {
error_report("AHCI: DMA engine should be off, but status bit "
"indicates it is still running.");
return -1;
}
if (!(pr->cmd & PORT_CMD_FIS_RX) && (pr->cmd & PORT_CMD_FIS_ON)) {
error_report("AHCI: FIS RX engine should be off, but status bit "
"indicates it is still running.");
return -1;
}
/* Only remap the CLB address if appropriate, disallowing a state /* Only remap the CLB address if appropriate, disallowing a state
* transition from 'on' to 'off' it should be consistent here. */ * transition from 'on' to 'off' it should be consistent here. */