Revert "sd: Fix rw_max for devices that report an optimal xfer size"
This reverts 'commit 9814eb75495b ("sd: Fix rw_max for devices
that report an optimal xfer size")'.
Max sectors limit for request queue(q->limits.max_sectors) is reduced
from 1024 to 16 sectors by above commit and causing performance impact
(reduced by upto 50%). Hence revert the change to fix the performance
issue observed on 8998.
Change-Id: I9abd2be6c90922ea9de818912f405e0d292a62b8
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c2ac982..967bb0d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2792,10 +2792,10 @@
if (sdkp->opt_xfer_blocks &&
sdkp->opt_xfer_blocks <= dev_max &&
sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
- logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_SIZE) {
- q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks);
- rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
- } else
+ sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE)
+ rw_max = q->limits.io_opt =
+ sdkp->opt_xfer_blocks * sdp->sector_size;
+ else
rw_max = min_not_zero(logical_to_sectors(sdp, dev_max),
(sector_t)BLK_DEF_MAX_SECTORS);