diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-30 11:56:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-30 11:56:07 +0000 |
| commit | d03e884e4ece4b528ed87d4133867fcf87aa76e5 (patch) | |
| tree | 7fb71104813bdf13a1505bc56c0950e0c484a279 | |
| parent | a19d4bc452532a9402f90b77d2aaaed9fe1df046 (diff) | |
| parent | 1a9925e3390b6adf1125e3abaa17c80ca012bede (diff) | |
| download | qemu-d03e884e4ece4b528ed87d4133867fcf87aa76e5.zip qemu-d03e884e4ece4b528ed87d4133867fcf87aa76e5.tar.gz qemu-d03e884e4ece4b528ed87d4133867fcf87aa76e5.tar.bz2 | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/ide-pull-request' into staging
IDE Pull request
# gpg: Signature made Tue 27 Oct 2020 14:41:59 GMT
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jsnow-gitlab/tags/ide-pull-request:
ide: clear SRST after SRST finishes
ide: perform SRST as early as possible
ide: run diagnostic after SRST
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/ide/core.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 693b352..e858216 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2254,10 +2254,8 @@ static void ide_perform_srst(IDEState *s) /* Cancel PIO callback, reset registers/signature, etc */ ide_reset(s); - if (s->drive_kind == IDE_CD) { - /* ATAPI drives do not set READY or SEEK */ - s->status = 0x00; - } + /* perform diagnostic */ + cmd_exec_dev_diagnostic(s, WIN_DIAGNOSE); } static void ide_bus_perform_srst(void *opaque) @@ -2270,6 +2268,8 @@ static void ide_bus_perform_srst(void *opaque) s = &bus->ifs[i]; ide_perform_srst(s); } + + bus->cmd &= ~IDE_CTRL_RESET; } void ide_ctrl_write(void *opaque, uint32_t addr, uint32_t val) @@ -2282,9 +2282,7 @@ void ide_ctrl_write(void *opaque, uint32_t addr, uint32_t val) /* Device0 and Device1 each have their own control register, * but QEMU models it as just one register in the controller. */ - if ((bus->cmd & IDE_CTRL_RESET) && - !(val & IDE_CTRL_RESET)) { - /* SRST triggers on falling edge */ + if (!(bus->cmd & IDE_CTRL_RESET) && (val & IDE_CTRL_RESET)) { for (i = 0; i < 2; i++) { s = &bus->ifs[i]; s->status |= BUSY_STAT; |