Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

torvalds · torvalds · commit 067c227379c0 · 2022-07-01T10:38:17.000-07:00
Pull SCSI fix from James Bottomley:
 "One simple driver fix for a dma overrun"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: hisi_sas: Limit max hw sectors for v3 HW
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2782,6 +2782,7 @@ static int slave_configure_v3_hw(struct scsi_device *sdev)
 	struct hisi_hba *hisi_hba = shost_priv(shost);
 	struct device *dev = hisi_hba->dev;
 	int ret = sas_slave_configure(sdev);
+	unsigned int max_sectors;
 
 	if (ret)
 		return ret;
@@ -2799,6 +2800,12 @@ static int slave_configure_v3_hw(struct scsi_device *sdev)
 		}
 	}
 
+	/* Set according to IOMMU IOVA caching limit */
+	max_sectors = min_t(size_t, queue_max_hw_sectors(sdev->request_queue),
+			    (PAGE_SIZE * 32) >> SECTOR_SHIFT);
+
+	blk_queue_max_hw_sectors(sdev->request_queue, max_sectors);
+
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2782,6 +2782,7 @@ static int slave_configure_v3_hw(struct scsi_device *sdev)`
`2782`	`2782`	`struct hisi_hba *hisi_hba = shost_priv(shost);`
`2783`	`2783`	`struct device *dev = hisi_hba->dev;`
`2784`	`2784`	`int ret = sas_slave_configure(sdev);`
	`2785`	`+ unsigned int max_sectors;`
`2785`	`2786`
`2786`	`2787`	`if (ret)`
`2787`	`2788`	`return ret;`
`@@ -2799,6 +2800,12 @@ static int slave_configure_v3_hw(struct scsi_device *sdev)`
`2799`	`2800`	`}`
`2800`	`2801`	`}`
`2801`	`2802`
	`2803`	`+ /* Set according to IOMMU IOVA caching limit */`
	`2804`	`+ max_sectors = min_t(size_t, queue_max_hw_sectors(sdev->request_queue),`
	`2805`	`+ (PAGE_SIZE * 32) >> SECTOR_SHIFT);`
	`2806`	`+`
	`2807`	`+ blk_queue_max_hw_sectors(sdev->request_queue, max_sectors);`
	`2808`	`+`
`2802`	`2809`	`return 0;`
`2803`	`2810`	`}`
`2804`	`2811`