From patchwork Fri Jul 27 09:00:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aaron lu X-Patchwork-Id: 1247481 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 030BADFFC0 for ; Fri, 27 Jul 2012 09:02:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752128Ab2G0JCM (ORCPT ); Fri, 27 Jul 2012 05:02:12 -0400 Received: from ch1ehsobe004.messaging.microsoft.com ([216.32.181.184]:21911 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113Ab2G0JCK (ORCPT ); Fri, 27 Jul 2012 05:02:10 -0400 Received: from mail36-ch1-R.bigfish.com (10.43.68.252) by CH1EHSOBE003.bigfish.com (10.43.70.53) with Microsoft SMTP Server id 14.1.225.23; Fri, 27 Jul 2012 09:02:08 +0000 Received: from mail36-ch1 (localhost [127.0.0.1]) by mail36-ch1-R.bigfish.com (Postfix) with ESMTP id C31B9320192; Fri, 27 Jul 2012 09:02:08 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.108; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zzzz1202hzz8275bhz2dh668h839hd24he5bhf0ah107ah) Received: from mail36-ch1 (localhost.localdomain [127.0.0.1]) by mail36-ch1 (MessageSwitch) id 1343379726946201_29461; Fri, 27 Jul 2012 09:02:06 +0000 (UTC) Received: from CH1EHSMHS010.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.236]) by mail36-ch1.bigfish.com (Postfix) with ESMTP id DA26E2A0045; Fri, 27 Jul 2012 09:02:06 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by CH1EHSMHS010.bigfish.com (10.43.70.10) with Microsoft SMTP Server id 14.1.225.23; Fri, 27 Jul 2012 09:02:07 +0000 X-WSS-ID: 0M7TAFG-01-16J-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1) with ESMTP id 2275910280A6; Fri, 27 Jul 2012 04:02:03 -0500 (CDT) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.192.1; Fri, 27 Jul 2012 04:02:23 -0500 Received: from sausexmb1.amd.com (163.181.3.156) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server id 8.3.213.0; Fri, 27 Jul 2012 04:02:03 -0500 Received: from storexbh1.amd.com ([10.1.1.17]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Jul 2012 04:02:03 -0500 Received: from sshaexmb1.amd.com ([10.237.2.11]) by storexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Jul 2012 05:02:02 -0400 Received: from aarontestpc.amd.com ([10.237.73.134]) by sshaexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Jul 2012 17:01:59 +0800 From: Aaron Lu To: James Bottomley , Jeff Garzik , Alan Stern , Sergei Shtylyov , Oliver Neukum CC: Jeff Wu , Lin Ming , , , , , Aaron Lu , Aaron Lu Subject: [PATCH v4 4/7] scsi: sr: block events when runtime suspended Date: Fri, 27 Jul 2012 17:00:47 +0800 Message-ID: <1343379650-2867-5-git-send-email-aaron.lu@amd.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1343379650-2867-1-git-send-email-aaron.lu@amd.com> References: <1343379650-2867-1-git-send-email-aaron.lu@amd.com> X-OriginalArrivalTime: 27 Jul 2012 09:01:59.0330 (UTC) FILETIME=[7AEF7820:01CD6BD6] MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 --- 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;