[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-6.2 1/7] hw/ide/core: set ERR_STAT in unsupported command comp
From: |
John Snow |
Subject: |
[PULL for-6.2 1/7] hw/ide/core: set ERR_STAT in unsupported command completion |
Date: |
Wed, 6 Sep 2023 23:42:22 -0400 |
From: Niklas Cassel <niklas.cassel@wdc.com>
Currently, the first time sending an unsupported command
(e.g. READ LOG DMA EXT) will not have ERR_STAT set in the completion.
Sending the unsupported command again, will correctly have ERR_STAT set.
When ide_cmd_permitted() returns false, it calls ide_abort_command().
ide_abort_command() first calls ide_transfer_stop(), which will call
ide_transfer_halt() and ide_cmd_done(), after that ide_abort_command()
sets ERR_STAT in status.
ide_cmd_done() for AHCI will call ahci_write_fis_d2h() which writes the
current status in the FIS, and raises an IRQ. (The status here will not
have ERR_STAT set!).
Thus, we cannot call ide_transfer_stop() before setting ERR_STAT, as
ide_transfer_stop() will result in the FIS being written and an IRQ
being raised.
The reason why it works the second time, is that ERR_STAT will still
be set from the previous command, so when writing the FIS, the
completion will correctly have ERR_STAT set.
Set ERR_STAT before writing the FIS (calling cmd_done), so that we will
raise an error IRQ correctly when receiving an unsupported command.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230609140844.202795-3-nks@flawful.org
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/ide/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index ee116891ed..b5e0dcd29b 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -533,9 +533,9 @@ BlockAIOCB *ide_issue_trim(
void ide_abort_command(IDEState *s)
{
- ide_transfer_stop(s);
s->status = READY_STAT | ERR_STAT;
s->error = ABRT_ERR;
+ ide_transfer_stop(s);
}
static void ide_set_retry(IDEState *s)
--
2.41.0
- [PULL for-6.2 0/7] Ide patches, John Snow, 2023/09/06
- [PULL for-6.2 2/7] hw/ide/ahci: write D2H FIS when processing NCQ command, John Snow, 2023/09/06
- [PULL for-6.2 4/7] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared, John Snow, 2023/09/06
- [PULL for-6.2 6/7] hw/ide/ahci: fix ahci_write_fis_sdb(), John Snow, 2023/09/06
- [PULL for-6.2 1/7] hw/ide/core: set ERR_STAT in unsupported command completion,
John Snow <=
- [PULL for-6.2 5/7] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set, John Snow, 2023/09/06
- [PULL for-6.2 7/7] hw/ide/ahci: fix broken SError handling, John Snow, 2023/09/06
- [PULL for-6.2 3/7] hw/ide/ahci: simplify and document PxCI handling, John Snow, 2023/09/06
- Re: [PULL for-6.2 0/7] Ide patches, John Snow, 2023/09/06
- Re: [PULL for-6.2 0/7] Ide patches, Stefan Hajnoczi, 2023/09/07
- Re: [PULL for-6.2 0/7] Ide patches, Michael Tokarev, 2023/09/07