Message ID | 20210921012836.25550-10-khalid.elmously@canonical.com |
---|---|
State | New |
Headers | show |
Series | Fix nvme errors w/ swiotlb in confidential VMs | expand |
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index af516c35afe6f..414df0e0786d0 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2631,6 +2631,15 @@ static void nvme_reset_work(struct work_struct *work) */ dma_set_max_seg_size(dev->dev, 0xffffffff); + /* + * LP #1943902 + * The following 2 defines are from 6c3c05b087ada8947cd31895f67e433070446234 + * in Linux 5.12 and not intended to be changed. + */ + #define NVME_CTRL_PAGE_SHIFT 12 + #define NVME_CTRL_PAGE_SIZE (1 << NVME_CTRL_PAGE_SHIFT) + dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); + mutex_unlock(&dev->shutdown_lock); /*