scsi: hpsa: remove coalescing settings for ioaccel2

- Setting coalescing has a significant negative impact on low
  queue-depth performance.
- Does not help high queue-depth performance.

Signed-off-by: Don Brace <don.brace@microsemi.com>
Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Orabug: 25605941
(cherry picked from commit 96b6ce4e8b66b009396799843d6191fefcc36c33)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 35931d754e3877ba3cbca4c56f5c741b926736be..a6189f9d3feb9f950fae9f474adf94206836f9de 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -9347,13 +9347,9 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
                access = SA5_ioaccel_mode1_access;
                writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
                writel(4, &h->cfgtable->HostWrite.CoalIntCount);
-       } else {
-               if (trans_support & CFGTBL_Trans_io_accel2) {
+       } else
+               if (trans_support & CFGTBL_Trans_io_accel2)
                        access = SA5_ioaccel_mode2_access;
-                       writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
-                       writel(4, &h->cfgtable->HostWrite.CoalIntCount);
-               }
-       }
        writel(CFGTBL_ChangeReq, h->vaddr + SA5_DOORBELL);
        if (hpsa_wait_for_mode_change_ack(h)) {
                dev_err(&h->pdev->dev,