From patchwork Tue Sep 18 07:00:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 184630 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 54EFA2C007E for ; Tue, 18 Sep 2012 17:01:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757064Ab2IRHBD (ORCPT ); Tue, 18 Sep 2012 03:01:03 -0400 Received: from mga14.intel.com ([143.182.124.37]:32964 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757048Ab2IRHBA (ORCPT ); Tue, 18 Sep 2012 03:01:00 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 18 Sep 2012 00:01:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,441,1344236400"; d="scan'208";a="193966070" Received: from mint-spring.sh.intel.com ([10.239.36.120]) by azsmga001.ch.intel.com with ESMTP; 18 Sep 2012 00:00:57 -0700 From: Aaron Lu To: Alan Stern , Jeff Garzik , James Bottomley , Oliver Neukum Cc: Aaron Lu , Jack Wang , Shane Huang , linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, linux-pm@vger.kernel.org, Aaron Lu Subject: [PATCH v2 2/4] scsi: sd: enter stop power condition on runtime suspend Date: Tue, 18 Sep 2012 15:00:29 +0800 Message-Id: <1347951631-1592-3-git-send-email-aaron.lu@intel.com> X-Mailer: git-send-email 1.7.12.21.g871e293 In-Reply-To: <1347951631-1592-1-git-send-email-aaron.lu@intel.com> References: <1347951631-1592-1-git-send-email-aaron.lu@intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On runtime suspend, put device into stop power condition. For standard scsi device, no need to synchronize cache. For ata devices, issue synchronize cache before enter standby state as reflected by the sync_before_stop flag. Signed-off-by: Aaron Lu --- drivers/ata/libata-scsi.c | 1 + drivers/scsi/sd.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 8ec81ca..9307f52 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1117,6 +1117,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev, } else { sdev->sector_size = ata_id_logical_sector_size(dev->id); sdev->manage_start_stop = 1; + sdev->sync_before_stop = 1; } /* diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 4df73e5..7b0f07a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2866,18 +2866,24 @@ static int sd_suspend(struct device *dev, pm_message_t mesg) { struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev); int ret = 0; + bool sync; if (!sdkp) return 0; /* this can happen */ - if (sdkp->WCE) { + if (!sdkp->device->manage_start_stop) + sync = !!sdkp->WCE; + else + sync = sdkp->device->sync_before_stop && !!sdkp->WCE; + + if (sync) { sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n"); ret = sd_sync_cache(sdkp); if (ret) goto done; } - if ((mesg.event & PM_EVENT_SLEEP) && sdkp->device->manage_start_stop) { + if (sdkp->device->manage_start_stop) { sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n"); ret = sd_start_stop_device(sdkp, 0); }