Commit 4501ea5f authored by Igor Pylypiv's avatar Igor Pylypiv Committed by Martin K. Petersen
Browse files

scsi: pm8001: Initialize devices in pm8001_alloc_dev() 



Devices can be allocated and freed at runtime. For example during a soft
reset all devices are freed and reallocated upon discovery.

Currently the driver fully initializes devices once in pm8001_alloc().
Allows initialization steps to happen during runtime, avoiding any
leftover states from the device being freed.

Signed-off-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Signed-off-by: default avatarTerrence Adams <tadamsjr@google.com>
Link: https://lore.kernel.org/r/20241021201828.1378858-1-tadamsjr@google.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c8d81a43

drivers/scsi/pm8001/pm8001_init.c

+0 −3
Original line number Diff line number Diff line
@@ -451,9 +451,6 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, 
	}

	for (i = 0; i < PM8001_MAX_DEVICES; i++) {

		pm8001_ha->devices[i].dev_type = SAS_PHY_UNUSED;

		pm8001_ha->devices[i].id = i;

		pm8001_ha->devices[i].device_id = PM8001_MAX_DEVICES;

		atomic_set(&pm8001_ha->devices[i].running_req, 0);

	}

	pm8001_ha->flags = PM8001F_INIT_TIME;

	return 0;

drivers/scsi/pm8001/pm8001_sas.c

+12 −5
Original line number Diff line number Diff line
@@ -572,6 +572,13 @@ void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha, 
	pm8001_ccb_free(pm8001_ha, ccb);

}



static void pm8001_init_dev(struct pm8001_device *pm8001_dev, int id)

{

	pm8001_dev->id = id;

	pm8001_dev->device_id = PM8001_MAX_DEVICES;

	atomic_set(&pm8001_dev->running_req, 0);

}



/**

 * pm8001_alloc_dev - find a empty pm8001_device

 * @pm8001_ha: our hba card information
@@ -580,9 +587,11 @@ static struct pm8001_device *pm8001_alloc_dev(struct pm8001_hba_info *pm8001_ha) 
{

	u32 dev;

	for (dev = 0; dev < PM8001_MAX_DEVICES; dev++) {

		if (pm8001_ha->devices[dev].dev_type == SAS_PHY_UNUSED) {

			pm8001_ha->devices[dev].id = dev;

			return &pm8001_ha->devices[dev];

		struct pm8001_device *pm8001_dev = &pm8001_ha->devices[dev];



		if (pm8001_dev->dev_type == SAS_PHY_UNUSED) {

			pm8001_init_dev(pm8001_dev, dev);

			return pm8001_dev;

		}

	}

	if (dev == PM8001_MAX_DEVICES) {
@@ -613,9 +622,7 @@ struct pm8001_device *pm8001_find_dev(struct pm8001_hba_info *pm8001_ha, 


void pm8001_free_dev(struct pm8001_device *pm8001_dev)

{

	u32 id = pm8001_dev->id;

	memset(pm8001_dev, 0, sizeof(*pm8001_dev));

	pm8001_dev->id = id;

	pm8001_dev->dev_type = SAS_PHY_UNUSED;

	pm8001_dev->device_id = PM8001_MAX_DEVICES;

	pm8001_dev->sas_device = NULL;