Patchwork [v4,4/7] scsi: sr: block events when runtime suspended

login
register
mail settings
Submitter Aaron Lu
Date July 27, 2012, 9 a.m.
Message ID <1343379650-2867-5-git-send-email-aaron.lu@amd.com>
Download mbox | patch
Permalink /patch/173594/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Aaron Lu - July 27, 2012, 9 a.m.
When the ODD is runtime suspended, there is no need to poll it for
events, so block events poll for it and unblock when resumed.

Signed-off-by: Aaron Lu <aaron.lu@amd.com>
---
 block/genhd.c     | 2 ++
 drivers/scsi/sr.c | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
Aaron Lu - Aug. 3, 2012, 9:50 a.m.
Hello,

Not sure if I should use EXPORT_SYMBOL or EXPORT_SYMBOL_GPL, any
comments?

Thanks,
Aaron

On 07/27/2012 05:00 PM, Aaron Lu wrote:
> When the ODD is runtime suspended, there is no need to poll it for
> events, so block events poll for it and unblock when resumed.
>
> Signed-off-by: Aaron Lu <aaron.lu@amd.com>
> ---
>   block/genhd.c     | 2 ++
>   drivers/scsi/sr.c | 7 ++++---
>   2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/block/genhd.c b/block/genhd.c
> index 9cf5583..bdb3682 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -1458,6 +1458,7 @@ void disk_block_events(struct gendisk *disk)
>
>   	mutex_unlock(&ev->block_mutex);
>   }
> +EXPORT_SYMBOL(disk_block_events);
>
>   static void __disk_unblock_events(struct gendisk *disk, bool check_now)
>   {
> @@ -1502,6 +1503,7 @@ void disk_unblock_events(struct gendisk *disk)
>   	if (disk->ev)
>   		__disk_unblock_events(disk, false);
>   }
> +EXPORT_SYMBOL(disk_unblock_events);
>
>   /**
>    * disk_flush_events - schedule immediate event checking and flushing
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index acfd10a..cbc14ea 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -205,6 +205,8 @@ static int sr_suspend(struct device *dev, pm_message_t msg)
>   		return -EBUSY;
>   	}
>
> +	disk_block_events(cd->disk);
> +
>   	return 0;
>   }
>
> @@ -226,6 +228,8 @@ static int sr_resume(struct device *dev)
>   		atomic_set(&cd->suspend_count, 1);
>   	}
>
> +	disk_unblock_events(cd->disk);
> +
>   	return 0;
>   }
>
> @@ -314,9 +318,6 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi,
>   	if (CDSL_CURRENT != slot)
>   		return 0;
>
> -	if (pm_runtime_suspended(&cd->device->sdev_gendev))
> -		return 0;
> -
>   	/* if the logical unit just finished loading/unloading, do a TUR */
>   	if (cd->device->can_power_off && cd->dbml && sr_unit_load_done(cd)) {
>   		events = 0;
>


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - Aug. 3, 2012, 2:52 p.m.
On 08/03/2012 05:50 AM, Aaron Lu wrote:
> Hello,
>
> Not sure if I should use EXPORT_SYMBOL or EXPORT_SYMBOL_GPL, any
> comments?

Typically you follow the pattern of similar exports in the file (or in 
the API, if no others are in the file).

	Jeff





--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Aaron Lu - Aug. 7, 2012, 6:18 a.m.
On 08/03/2012 10:52 PM, Jeff Garzik wrote:
> On 08/03/2012 05:50 AM, Aaron Lu wrote:
>> Hello,
>>
>> Not sure if I should use EXPORT_SYMBOL or EXPORT_SYMBOL_GPL, any
>> comments?
>
> Typically you follow the pattern of similar exports in the file (or in
> the API, if no others are in the file).

Thanks Jeff for your suggestion, and I'll keep using EXPORT_SYMBOL.
If anyone thinks this is wrong, please kindly let me know, thanks.

-Aaron

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/block/genhd.c b/block/genhd.c
index 9cf5583..bdb3682 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1458,6 +1458,7 @@  void disk_block_events(struct gendisk *disk)
 
 	mutex_unlock(&ev->block_mutex);
 }
+EXPORT_SYMBOL(disk_block_events);
 
 static void __disk_unblock_events(struct gendisk *disk, bool check_now)
 {
@@ -1502,6 +1503,7 @@  void disk_unblock_events(struct gendisk *disk)
 	if (disk->ev)
 		__disk_unblock_events(disk, false);
 }
+EXPORT_SYMBOL(disk_unblock_events);
 
 /**
  * disk_flush_events - schedule immediate event checking and flushing
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index acfd10a..cbc14ea 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -205,6 +205,8 @@  static int sr_suspend(struct device *dev, pm_message_t msg)
 		return -EBUSY;
 	}
 
+	disk_block_events(cd->disk);
+
 	return 0;
 }
 
@@ -226,6 +228,8 @@  static int sr_resume(struct device *dev)
 		atomic_set(&cd->suspend_count, 1);
 	}
 
+	disk_unblock_events(cd->disk);
+
 	return 0;
 }
 
@@ -314,9 +318,6 @@  static unsigned int sr_check_events(struct cdrom_device_info *cdi,
 	if (CDSL_CURRENT != slot)
 		return 0;
 
-	if (pm_runtime_suspended(&cd->device->sdev_gendev))
-		return 0;
-
 	/* if the logical unit just finished loading/unloading, do a TUR */
 	if (cd->device->can_power_off && cd->dbml && sr_unit_load_done(cd)) {
 		events = 0;