Commit 36c6b761 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Initialise devices in .slave_alloc callback 

Perform driver-specific SCSI device initialization in the designated SCSI
midlayer callback instead of relying on the libsas "device found" callback.

The SCSI midlayer .slave_alloc interface is called prior to sending any I/O
to the device.

Link: https://lore.kernel.org/r/1634041588-74824-2-git-send-email-john.garry@huawei.com


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 d489f18a

drivers/scsi/hisi_sas/hisi_sas.h

+1 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ extern int hisi_sas_probe(struct platform_device *pdev, 
extern int hisi_sas_remove(struct platform_device *pdev);



extern int hisi_sas_slave_configure(struct scsi_device *sdev);

extern int hisi_sas_slave_alloc(struct scsi_device *sdev);

extern int hisi_sas_scan_finished(struct Scsi_Host *shost, unsigned long time);

extern void hisi_sas_scan_start(struct Scsi_Host *shost);

extern int hisi_sas_host_reset(struct Scsi_Host *shost, int reset_type);

drivers/scsi/hisi_sas/hisi_sas_main.c

+14 −3
Original line number Diff line number Diff line
@@ -756,6 +756,20 @@ static int hisi_sas_init_device(struct domain_device *device) 
	return rc;

}



int hisi_sas_slave_alloc(struct scsi_device *sdev)

{

	struct domain_device *ddev;

	int rc;



	rc = sas_slave_alloc(sdev);

	if (rc)

		return rc;

	ddev = sdev_to_domain_dev(sdev);



	return hisi_sas_init_device(ddev);

}

EXPORT_SYMBOL_GPL(hisi_sas_slave_alloc);



static int hisi_sas_dev_found(struct domain_device *device)

{

	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
@@ -802,9 +816,6 @@ static int hisi_sas_dev_found(struct domain_device *device) 
	dev_info(dev, "dev[%d:%x] found\n",

		sas_dev->device_id, sas_dev->dev_type);



	rc = hisi_sas_init_device(device);

	if (rc)

		goto err_out;

	sas_dev->dev_status = HISI_SAS_DEV_NORMAL;

	return 0;

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,7 @@ static struct scsi_host_template sht_v1_hw = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.slave_alloc		= sas_slave_alloc,

	.slave_alloc		= hisi_sas_slave_alloc,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

#ifdef CONFIG_COMPAT

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3584,7 +3584,7 @@ static struct scsi_host_template sht_v2_hw = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.slave_alloc		= sas_slave_alloc,

	.slave_alloc		= hisi_sas_slave_alloc,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

#ifdef CONFIG_COMPAT

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3157,7 +3157,7 @@ static struct scsi_host_template sht_v3_hw = { 
	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

	.eh_device_reset_handler = sas_eh_device_reset_handler,

	.eh_target_reset_handler = sas_eh_target_reset_handler,

	.slave_alloc		= sas_slave_alloc,

	.slave_alloc		= hisi_sas_slave_alloc,

	.target_destroy		= sas_target_destroy,

	.ioctl			= sas_ioctl,

#ifdef CONFIG_COMPAT