]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
nvme-pci: clear the prp2 field when not used
authorLei Rao <lei.rao@intel.com>
Tue, 29 Nov 2022 09:48:11 +0000 (17:48 +0800)
committerChristoph Hellwig <hch@lst.de>
Wed, 30 Nov 2022 13:34:17 +0000 (14:34 +0100)
If the prp2 field is not filled in nvme_setup_prp_simple(), the prp2
field is garbage data. According to nvme spec, the prp2 is reserved if
the data transfer does not cross a memory page boundary, so clear it to
zero if it is not used.

Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/pci.c

index f4335519399d03b2d8cbc1d5e05b27235da357d6..488ad7dabeb8ef077ee46502b6ded629997a8f12 100644 (file)
@@ -797,6 +797,8 @@ static blk_status_t nvme_setup_prp_simple(struct nvme_dev *dev,
        cmnd->dptr.prp1 = cpu_to_le64(iod->first_dma);
        if (bv->bv_len > first_prp_len)
                cmnd->dptr.prp2 = cpu_to_le64(iod->first_dma + first_prp_len);
+       else
+               cmnd->dptr.prp2 = 0;
        return BLK_STS_OK;
 }