From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, "Niklas Cassel" <niklas.cassel@wdc.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [Stable-7.2.6 25/37] hw/ide/core: set ERR_STAT in unsupported command completion
Date: Sat, 9 Sep 2023 16:04:55 +0300 [thread overview]
Message-ID: <20230909130511.354171-25-mjt@tls.msk.ru> (raw)
In-Reply-To: <qemu-stable-7.2.6-20230909160328@cover.tls.msk.ru>
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>
(cherry picked from commit c3461c6264a7c8ca15b117e91fe5da786924a784)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 39afdc0006..79c5529975 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -530,9 +530,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.39.2
next prev parent reply other threads:[~2023-09-09 13:21 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 13:04 [Stable-7.2.6 00/37] Patch Round-up for stable 7.2.6, freeze on 2023-09-19 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 01/37] machine: Add helpers to get cores/threads per socket Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 02/37] hw/smbios: Fix smbios_smp_sockets caculation Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 03/37] hw/smbios: Fix thread count in type4 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 04/37] hw/smbios: Fix core " Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 05/37] dump: kdump-zlib data pages not dumped with pvtime/aarch64 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 06/37] hw/nvme: fix CRC64 for guard tag Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 07/37] linux-user/elfload: Set V in ELF_HWCAP for RISC-V Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 08/37] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for microblaze Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 09/37] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for nios2 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 10/37] Fixed incorrect LLONG alignment for openrisc and cris Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 11/37] target/s390x: Fix the "ignored match" case in VSTRS Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 12/37] target/s390x: Use a 16-bit immediate in VREP Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 13/37] target/s390x: Fix VSTL with a large length Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 14/37] target/s390x: Check reserved bits of VFMIN/VFMAX's M5 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 15/37] include/hw/virtio/virtio-gpu: Fix virtio-gpu with blob on big endian hosts Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 16/37] kvm: Introduce kvm_arch_get_default_type hook Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 17/37] accel/kvm: Specify default IPA size for arm64 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 18/37] target/arm: Fix SME ST1Q Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 19/37] target/arm: Fix 64-bit SSRA Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 20/37] docs/about/license: Update LICENSE URL Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 21/37] block-migration: Ensure we don't crash during migration cleanup Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 22/37] hw/ppc/e500: fix broken snapshot replay Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 23/37] ppc/vof: Fix missed fields in VOF cleanup Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 24/37] target/ppc: Flush inputs to zero with NJ in ppc_store_vscr Michael Tokarev
2023-09-09 13:04 ` Michael Tokarev [this message]
2023-09-09 13:04 ` [Stable-7.2.6 26/37] hw/ide/ahci: write D2H FIS when processing NCQ command Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 27/37] hw/ide/ahci: simplify and document PxCI handling Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 28/37] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 29/37] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set Michael Tokarev
2023-09-10 21:07 ` Michael Tokarev
2023-09-11 13:34 ` Niklas Cassel
2023-09-09 13:05 ` [Stable-7.2.6 30/37] hw/ide/ahci: fix ahci_write_fis_sdb() Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 31/37] hw/ide/ahci: fix broken SError handling Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 32/37] hw/i2c/aspeed: Fix Tx count and Rx size error in buffer pool mode Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 33/37] hw/i2c/aspeed: Fix TXBUF transmission start position error Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 34/37] qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 35/37] docs tests: Fix use of migrate_set_parameter Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 36/37] hw/net/vmxnet3: Fix guest-triggerable assert() Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 37/37] qxl: don't assert() if device isn't yet initialized Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230909130511.354171-25-mjt@tls.msk.ru \
--to=mjt@tls.msk.ru \
--cc=jsnow@redhat.com \
--cc=niklas.cassel@wdc.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).