2 files changed, 12 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index ee15f4f10fec..df7d74f93e50 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2989,6 +2989,8 @@ typedef struct scsi_qla_host {
 
 #define CMD_SP(Cmnd)            ((Cmnd)->SCp.ptr)
 
+#define QLA_SG_ALL      1024
+
 enum nexus_wait_type {
         WAIT_HOST = 0,
         WAIT_TARGET,
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index e1782f771400..2e10f2b2e017 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2136,8 +2136,16 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         else
                 base_vha->mgmt_svr_loop_id = MANAGEMENT_SERVER +
                                                 base_vha->vp_idx;
-        if (IS_QLA2100(ha))
-                host->sg_tablesize = 32;
+
+        /* Set the SG table size based on ISP type */
+        if (!IS_FWI2_CAPABLE(ha)) {
+                if (IS_QLA2100(ha))
+                        host->sg_tablesize = 32;
+        } else {
+                if (!IS_QLA82XX(ha))
+                        host->sg_tablesize = QLA_SG_ALL;
+        }
+
         host->max_id = max_id;
         host->this_id = 255;
         host->cmd_per_lun = 3;