Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/scsi/hisi_sas/Kconfig b/drivers/scsi/hisi_sas/Kconfig
index 37a0c7156087..b67661836c9f 100644
--- a/drivers/scsi/hisi_sas/Kconfig
+++ b/drivers/scsi/hisi_sas/Kconfig
@@ -1,5 +1,7 @@
 config SCSI_HISI_SAS
         tristate "HiSilicon SAS"
+        depends on HAS_DMA
+        depends on ARM64 || COMPILE_TEST
         select SCSI_SAS_LIBSAS
         select BLK_DEV_INTEGRITY
         help
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 84fa4c46eaa6..bb669d32ccd0 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
             sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
             sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
                 rw_max = q->limits.io_opt =
-                        logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
+                        sdkp->opt_xfer_blocks * sdp->sector_size;
         else
                 rw_max = BLK_DEF_MAX_SECTORS;