scsi: hisi_sas: Set protection parameters prior to adding SCSI host (7bb25a89) · Commits · 戴 / test

Currently we set the protection parameters after calling scsi_add_host() for v3 hw. They should be set beforehand, so make this change. Appearantly this fixes our DIX issue (not mainline yet) also, but more testing required. Fixes: ("scsi: hisi_sas: Add support for DIF feature for v2 hw") Signed-off-by:

John Garry <john.garry@huawei.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2507,6 +2507,12 @@ hisi_sas_v3_probe(struct pci_dev pdev, const struct pci_device_id id)
		sha->sas_port[i] = &hisi_hba->port[i].sas_port;
		}

		if (hisi_hba->prot_mask) {
		dev_info(dev, "Registering for DIF/DIX prot_mask=0x%x\n",
		prot_mask);
		scsi_host_set_prot(hisi_hba->shost, prot_mask);
		}

		rc = scsi_add_host(shost, dev);
		if (rc)
		goto err_out_ha;
		@@ -2519,12 +2525,6 @@ hisi_sas_v3_probe(struct pci_dev pdev, const struct pci_device_id id)
		if (rc)
		goto err_out_register_ha;

		if (hisi_hba->prot_mask) {
		dev_info(dev, "Registering for DIF/DIX prot_mask=0x%x\n",
		prot_mask);
		scsi_host_set_prot(hisi_hba->shost, prot_mask);
		}

		scsi_scan_host(shost);

		return 0;

Admin message