qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, Niklas Cassel <niklas.cassel@wdc.com>,
	John Snow <jsnow@redhat.com>, Michael Tokarev <mjt@tls.msk.ru>
Subject: [Stable-7.2.6 26/37] hw/ide/ahci: write D2H FIS when processing NCQ command
Date: Sat,  9 Sep 2023 16:04:56 +0300	[thread overview]
Message-ID: <20230909130511.354171-26-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>

The way that BUSY + PxCI is cleared for NCQ (FPDMA QUEUED) commands is
described in SATA 3.5a Gold:

11.15 FPDMA QUEUED command protocol
DFPDMAQ2: ClearInterfaceBsy
"Transmit Register Device to Host FIS with the BSY bit cleared to zero
and the DRQ bit cleared to zero and Interrupt bit cleared to zero to
mark interface ready for the next command."

PxCI is currently cleared by handle_cmd(), but we don't write the D2H
FIS to the FIS Receive Area that actually caused PxCI to be cleared.

Similar to how ahci_pio_transfer() calls ahci_write_fis_pio() with an
additional parameter to write a PIO Setup FIS without raising an IRQ,
add a parameter to ahci_write_fis_d2h() so that ahci_write_fis_d2h()
also can write the FIS to the FIS Receive Area without raising an IRQ.

Change process_ncq_command() to call ahci_write_fis_d2h() without
raising an IRQ (similar to ahci_pio_transfer()), such that the FIS
Receive Area is in sync with the PxTFD shadow register.

E.g. Linux reads status and error fields from the FIS Receive Area
directly, so it is wise to keep the FIS Receive Area and the PxTFD
shadow register in sync.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Message-id: 20230609140844.202795-4-nks@flawful.org
Signed-off-by: John Snow <jsnow@redhat.com>
(cherry picked from commit 2967dc8209dd27b61a6ab7bad78cf7c6ec58ddb4)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 7ce001cacd..54b741c7b3 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -42,7 +42,7 @@
 static void check_cmd(AHCIState *s, int port);
 static int handle_cmd(AHCIState *s, int port, uint8_t slot);
 static void ahci_reset_port(AHCIState *s, int port);
-static bool ahci_write_fis_d2h(AHCIDevice *ad);
+static bool ahci_write_fis_d2h(AHCIDevice *ad, bool d2h_fis_i);
 static void ahci_init_d2h(AHCIDevice *ad);
 static int ahci_dma_prepare_buf(const IDEDMA *dma, int32_t limit);
 static bool ahci_map_clb_address(AHCIDevice *ad);
@@ -617,7 +617,7 @@ static void ahci_init_d2h(AHCIDevice *ad)
         return;
     }
 
-    if (ahci_write_fis_d2h(ad)) {
+    if (ahci_write_fis_d2h(ad, true)) {
         ad->init_d2h_sent = true;
         /* We're emulating receiving the first Reg H2D Fis from the device;
          * Update the SIG register, but otherwise proceed as normal. */
@@ -849,7 +849,7 @@ static void ahci_write_fis_pio(AHCIDevice *ad, uint16_t len, bool pio_fis_i)
     }
 }
 
-static bool ahci_write_fis_d2h(AHCIDevice *ad)
+static bool ahci_write_fis_d2h(AHCIDevice *ad, bool d2h_fis_i)
 {
     AHCIPortRegs *pr = &ad->port_regs;
     uint8_t *d2h_fis;
@@ -863,7 +863,7 @@ static bool ahci_write_fis_d2h(AHCIDevice *ad)
     d2h_fis = &ad->res_fis[RES_FIS_RFIS];
 
     d2h_fis[0] = SATA_FIS_TYPE_REGISTER_D2H;
-    d2h_fis[1] = (1 << 6); /* interrupt bit */
+    d2h_fis[1] = d2h_fis_i ? (1 << 6) : 0; /* interrupt bit */
     d2h_fis[2] = s->status;
     d2h_fis[3] = s->error;
 
@@ -889,7 +889,10 @@ static bool ahci_write_fis_d2h(AHCIDevice *ad)
         ahci_trigger_irq(ad->hba, ad, AHCI_PORT_IRQ_BIT_TFES);
     }
 
-    ahci_trigger_irq(ad->hba, ad, AHCI_PORT_IRQ_BIT_DHRS);
+    if (d2h_fis_i) {
+        ahci_trigger_irq(ad->hba, ad, AHCI_PORT_IRQ_BIT_DHRS);
+    }
+
     return true;
 }
 
@@ -1119,6 +1122,8 @@ static void process_ncq_command(AHCIState *s, int port, const uint8_t *cmd_fis,
         return;
     }
 
+    ahci_write_fis_d2h(ad, false);
+
     ncq_tfs->used = 1;
     ncq_tfs->drive = ad;
     ncq_tfs->slot = slot;
@@ -1505,7 +1510,7 @@ static void ahci_cmd_done(const IDEDMA *dma)
     }
 
     /* update d2h status */
-    ahci_write_fis_d2h(ad);
+    ahci_write_fis_d2h(ad, true);
 
     if (ad->port_regs.cmd_issue && !ad->check_bh) {
         ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);
-- 
2.39.2



  parent reply	other threads:[~2023-09-09 13:15 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 ` [Stable-7.2.6 25/37] hw/ide/core: set ERR_STAT in unsupported command completion Michael Tokarev
2023-09-09 13:04 ` Michael Tokarev [this message]
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-26-mjt@tls.msk.ru \
    --to=mjt@tls.msk.ru \
    --cc=jsnow@redhat.com \
    --cc=niklas.cassel@wdc.com \
    --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).