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

Commit 0d5644b7 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Martin K. Petersen
Browse files

scsi: configure runtime pm before calling device_add in scsi_add_host_with_dma 

Runtime PM should be configured already once we call device_add. See
also the description in this mail thread
https://lists.linuxfoundation.org/pipermail/linux-pm/2009-November/023198.html


or the order of calls e.g. in usb_new_device.

The changed order also helps to avoid scenarios where runtime pm for
&shost->shost_gendev is activated whilst the parent is suspended,
resulting in error message "runtime PM trying to activate child device
hostx but parent yyy is not active".

In addition properly reverse the runtime pm calls in the error path.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent afc3f83c

drivers/scsi/hosts.c

+8 −4
Original line number Diff line number Diff line
@@ -246,10 +246,6 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 


	shost->dma_dev = dma_dev;



	error = device_add(&shost->shost_gendev);

	if (error)

		goto out_destroy_freelist;



	/*

	 * Increase usage count temporarily here so that calling

	 * scsi_autopm_put_host() will trigger runtime idle if there is
@@ -260,6 +256,10 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 
	pm_runtime_enable(&shost->shost_gendev);

	device_enable_async_suspend(&shost->shost_gendev);



	error = device_add(&shost->shost_gendev);

	if (error)

		goto out_destroy_freelist;



	scsi_host_set_state(shost, SHOST_RUNNING);

	get_device(shost->shost_gendev.parent);
@@ -309,6 +309,10 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, 
 out_del_gendev:

	device_del(&shost->shost_gendev);

 out_destroy_freelist:

	device_disable_async_suspend(&shost->shost_gendev);

	pm_runtime_disable(&shost->shost_gendev);

	pm_runtime_set_suspended(&shost->shost_gendev);

	pm_runtime_put_noidle(&shost->shost_gendev);

	scsi_destroy_command_freelist(shost);

 out_destroy_tags:

	if (shost_use_blk_mq(shost))