From: John Snow <jsnow@redhat.com>
Date: Tue, 20 Oct 2020 20:02:42 +0000 (-0400)
Subject: ide: clear SRST after SRST finishes
X-Git-Tag: v5.2.0-rc0~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a9925e3390b6adf1125e3abaa17c80ca012bede;p=thirdparty%2Fqemu.git

ide: clear SRST after SRST finishes

The SRST protocol states that after diagnostics are complete and the
status is posted, we should clear the SRST bit if it should so happen to
be set.

The reset method itself should handle this, but just in case -- make our
intention explicit here.

Signed-off-by: John Snow <jsnow@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 20201020200242.1497705-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 98cea7ad450..e85821637c9 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2268,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)