Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6db831f4 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Make sg_tablesize consistent value 



Sht->sg_tablesize is set in the driver, and it will be assigned to
shost->sg_tablesize in SCSI mid-layer. So it is not necessary to assign
shost->sg_table one more time in the driver.

In addition to the change, change each scsi_host_template.sg_tablesize
to HISI_SAS_SGE_PAGE_CNT instead of SG_ALL.

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6e1b731b

drivers/scsi/hisi_sas/hisi_sas_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2410,7 +2410,6 @@ int hisi_sas_probe(struct platform_device *pdev, 
	shost->max_lun = ~0;

	shost->max_channel = 1;

	shost->max_cmd_len = 16;

	shost->sg_tablesize = min_t(u16, SG_ALL, HISI_SAS_SGE_PAGE_CNT);

	if (hisi_hba->hw->slot_index_alloc) {

		shost->can_queue = hisi_hba->hw->max_command_entries;

		shost->cmd_per_lun = hisi_hba->hw->max_command_entries;

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ static struct scsi_host_template sht_v1_hw = { 
	.change_queue_depth	= sas_change_queue_depth,

	.bios_param		= sas_bios_param,

	.this_id		= -1,

	.sg_tablesize		= SG_ALL,

	.sg_tablesize		= HISI_SAS_SGE_PAGE_CNT,

	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3578,7 +3578,7 @@ static struct scsi_host_template sht_v2_hw = { 
	.change_queue_depth	= sas_change_queue_depth,

	.bios_param		= sas_bios_param,

	.this_id		= -1,

	.sg_tablesize		= SG_ALL,

	.sg_tablesize		= HISI_SAS_SGE_PAGE_CNT,

	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -2231,7 +2231,7 @@ static struct scsi_host_template sht_v3_hw = { 
	.change_queue_depth	= sas_change_queue_depth,

	.bios_param		= sas_bios_param,

	.this_id		= -1,

	.sg_tablesize		= SG_ALL,

	.sg_tablesize		= HISI_SAS_SGE_PAGE_CNT,

	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering		= ENABLE_CLUSTERING,

	.eh_device_reset_handler = sas_eh_device_reset_handler,
@@ -2373,7 +2373,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	shost->max_lun = ~0;

	shost->max_channel = 1;

	shost->max_cmd_len = 16;

	shost->sg_tablesize = min_t(u16, SG_ALL, HISI_SAS_SGE_PAGE_CNT);

	shost->can_queue = hisi_hba->hw->max_command_entries -

		HISI_SAS_RESERVED_IPTT_CNT;

	shost->cmd_per_lun = hisi_hba->hw->max_command_entries -