Commit bcd80802 authored May 09, 2017 by Subhash Jadavani

Revert "scsi: Set request queue runtime PM status back to active on resume"



This reverts commit 356fd266 as we are
seeing following crash due to it, this commit isn't really needed as
commit <2b80aee4> ("scsi: pm: keep request queue and scsi device runtime
status in sync") already takes care of the issue fixed by the above
commit.

Log messages and call stack:
 scsi host0: runtime PM trying to activate child device host0 but parent (1d84000.ufshc_mem) is not active
 scsi target0:0:0: runtime PM trying to activate child device target0:0:0 but parent (host0) is not active
 Unable to handle kernel NULL pointer dereference at virtual address 000001f0
	blk_set_runtime_active+0x34/0x54
	scsi_bus_resume_common+0xc0/0x158
	scsi_bus_resume+0x28/0x34
	dpm_run_callback+0x6c/0x200
	device_resume+0xa0/0x278
	async_resume+0x30/0x60
	async_run_entry_fn+0x64/0x16c
	process_one_work+0x15c/0x440
	worker_thread+0x60/0x448
	kthread+0xec/0x100
	ret_from_fork+0x10/0x40

Change-Id: Ied1d0db7b70be02318b4ca9ad816c01b6c4aa6c2
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>

parent 56c0a94b

drivers/scsi/scsi_pm.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -154,16 +154,6 @@ static int scsi_bus_resume_common(struct device *dev,
		else
		fn = NULL;

		/*
		* Forcibly set runtime PM status of request queue to "active" to
		* make sure we can again get requests from the queue (see also
		* blk_pm_peek_request()).
		*
		* The resume hook will correct runtime PM status of the disk.
		*/
		if (scsi_is_sdev_device(dev) && pm_runtime_suspended(dev))
		blk_set_runtime_active(to_scsi_device(dev)->request_queue);

		if (fn) {
		async_schedule_domain(fn, dev, &scsi_sd_pm_domain);