ide: fix SRST (again)
cover ide: fix SRST (again)
My last fix for SRST wasn't entirely correct and caused a regression; namely we need to mime execution of the diagnostic command. If we don't, Linux bins the IDE device as 'horked'.
For detailed reading on the SRST protocol, I recommend checking out the ATA8-APT specification.
John Snow (3):
ide: run diagnostic after SRST
ide: perform SRST as early as possible
ide: clear SRST after SRST finishes
hw/ide/core.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/3 ide: run diagnostic after SRST
Software reset (SRST) should cause the diagnostic command to be run. Make an explicit call to that routine.
--- hw/ide/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
hw/ide/core.c +2 -4
@@ -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)
Signature · 1 line
2.26.2
PATCH 2/3 ide: perform SRST as early as possible
In reply to John SnowWe don't need to wait for the falling edge. We can set BSY as soon as possible and begin immediately resetting the drive. Devices don't appear to need to take any specific action on the falling edge.
--- hw/ide/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/ide/core.c +1 -3
@@ -2280,9 +2280,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 ;
Signature · 1 line
2.26.2
PATCH 3/3 ide: clear SRST after SRST finishes
In reply to John SnowThe 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.
--- hw/ide/core.c | 2 ++ 1 file changed, 2 insertions(+)
hw/ide/core.c +2 -0
@@ -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)
Signature · 1 line
2.26.2
Quoted 7 lines · John Snow
My last fix for SRST wasn't entirely correct and caused a regression; namely we need to mime execution of the diagnostic command. If we don't, Linux bins the IDE device as 'horked'.
For detailed reading on the SRST protocol, I recommend checking out the ATA8-APT specification.
Quoted 7 lines
John Snow (3):
ide: run diagnostic after SRST
ide: perform SRST as early as possible
ide: clear SRST after SRST finisheshw/ide/core.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
I tried this in 3 combinations: HD only, HD + CD, and CD only and I didn't notice any error messages during my boot tests on qemu-system-sparc64 so:
ATB,
Mark.