Unverified Commit ec076798 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1639 nvme-pci: set min_align_mask before calculating max_hw_sectors 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yong Hu <yong.hu@windriver.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BYQKULLDBICIPTVMVEPZUOLO6E6W33GS/ 
 
https://gitee.com/openeuler/kernel/issues/I6D0XA 
 
Link:https://gitee.com/openeuler/kernel/pulls/1639

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents a384d9a1 7cd0ff82

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -2624,6 +2624,8 @@ static void nvme_reset_work(struct work_struct *work) 
	if (result)

		goto out_unlock;



	dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);



	/*

	 * Limit the max command size to prevent iod->sg allocations going

	 * over a single page.
@@ -2636,7 +2638,6 @@ static void nvme_reset_work(struct work_struct *work) 
	 * Don't limit the IOMMU merged segment size.

	 */

	dma_set_max_seg_size(dev->dev, 0xffffffff);

	dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);



	mutex_unlock(&dev->shutdown_lock);