[qemu-xen stable-4.18] hw/nvme: fix CRC64 for guard tag

[patchbot@xxxxxxx]

commit f47369c3d114ddd2021d9ca2cdde9fe138675bcb
Author:     Ankit Kumar <ankit.kumar@xxxxxxxxxxx>
AuthorDate: Tue Aug 8 02:57:43 2023 +0530
Commit:     Michael Tokarev <mjt@xxxxxxxxxx>
CommitDate: Sun Sep 10 19:39:41 2023 +0300

    hw/nvme: fix CRC64 for guard tag
    
    The nvme CRC64 generator expects the caller to pass inverted seed value.
    Pass inverted crc value for metadata buffer.
    
    Cc: qemu-stable@xxxxxxxxxx
    Fixes: 44219b6029fc ("hw/nvme: 64-bit pi support")
    Signed-off-by: Ankit Kumar <ankit.kumar@xxxxxxxxxxx>
    Signed-off-by: Klaus Jensen <k.jensen@xxxxxxxxxxx>
    (cherry picked from commit dbdb13f931d7cf2d3c3ca662e751bb1551e9eab6)
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
---
 hw/nvme/dif.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/nvme/dif.c b/hw/nvme/dif.c
index 63c44c86ab..01b19c3373 100644
--- a/hw/nvme/dif.c
+++ b/hw/nvme/dif.c
@@ -115,7 +115,7 @@ static void nvme_dif_pract_generate_dif_crc64(NvmeNamespace 
*ns, uint8_t *buf,
         uint64_t crc = crc64_nvme(~0ULL, buf, ns->lbasz);
 
         if (pil) {
-            crc = crc64_nvme(crc, mbuf, pil);
+            crc = crc64_nvme(~crc, mbuf, pil);
         }
 
         dif->g64.guard = cpu_to_be64(crc);
@@ -246,7 +246,7 @@ static uint16_t nvme_dif_prchk_crc64(NvmeNamespace *ns, 
NvmeDifTuple *dif,
         uint64_t crc = crc64_nvme(~0ULL, buf, ns->lbasz);
 
         if (pil) {
-            crc = crc64_nvme(crc, mbuf, pil);
+            crc = crc64_nvme(~crc, mbuf, pil);
         }
 
         trace_pci_nvme_dif_prchk_guard_crc64(be64_to_cpu(dif->g64.guard), crc);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.18