diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:17:24 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 11:17:24 -0300 |
| commit | 143ca87ada4aeca55c5418be921d07d12763878a (patch) | |
| tree | 8e132896e25ce365974fa59a3dfb3eb28ccefed5 /drivers/scsi | |
| parent | a34846a378087b15e661c9b4c1a3eb42f4042f82 (diff) | |
| parent | 760adb59f6211e157dd587927ac26c42abc81550 (diff) | |
Merge tag 'v5.15.56' into 5.15-2.1.x-imx
This is the 5.15.56 stable release
Conflicts:
arch/arm/mm/mmu.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 1f5e0688c0c8..15c7451fb30f 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -2758,6 +2758,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; @@ -2775,6 +2776,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; } |