From patchwork Mon Dec 5 01:20:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 129208 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 29EC41007D5 for ; Mon, 5 Dec 2011 12:21:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756267Ab1LEBVB (ORCPT ); Sun, 4 Dec 2011 20:21:01 -0500 Received: from mga02.intel.com ([134.134.136.20]:25501 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756142Ab1LEBU7 (ORCPT ); Sun, 4 Dec 2011 20:20:59 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 04 Dec 2011 17:20:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="83361857" Received: from minggr.sh.intel.com ([10.239.36.47]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2011 17:20:56 -0800 From: Lin Ming To: Jeff Garzik , James Bottomley , Alan Stern , Tejun Heo Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org, "Rafael J. Wysocki" , Huang Ying , Zhang Rui Subject: [PATCH v5 6/6] ata: add ata port runtime PM callbacks Date: Mon, 5 Dec 2011 09:20:28 +0800 Message-Id: <1323048028-10421-7-git-send-email-ming.m.lin@intel.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323048028-10421-1-git-send-email-ming.m.lin@intel.com> References: <1323048028-10421-1-git-send-email-ming.m.lin@intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Add ata port runtime suspend/resume/idle callbacks. Set ->eh_noresume to skip the runtime PM calls on scsi host in the error handler to avoid dead lock. Signed-off-by: Lin Ming --- drivers/ata/libata-core.c | 10 ++++++++++ drivers/ata/libata-scsi.c | 1 + drivers/ata/libata-transport.c | 4 ++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 04c208e..15a3d4d 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -66,6 +66,7 @@ #include #include #include +#include #include "libata.h" #include "libata-transport.h" @@ -5307,9 +5308,18 @@ static int ata_port_resume(struct device *dev) return rc; } +static int ata_port_runtime_idle(struct device *dev) +{ + return pm_runtime_suspend(dev); +} + static const struct dev_pm_ops ata_port_pm_ops = { .suspend = ata_port_suspend, .resume = ata_port_resume, + + .runtime_suspend = ata_port_suspend_common, + .runtime_resume = ata_port_resume, + .runtime_idle = ata_port_runtime_idle, }; /** diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 7ae1e77..508a60b 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3381,6 +3381,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht) if (!shost) goto err_alloc; + shost->eh_noresume = 1; *(struct ata_port **)&shost->hostdata[0] = ap; ap->scsi_host = shost; diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c index 3ceb3d9..9a7f0ea 100644 --- a/drivers/ata/libata-transport.c +++ b/drivers/ata/libata-transport.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "libata.h" #include "libata-transport.h" @@ -290,6 +291,9 @@ int ata_tport_add(struct device *parent, goto tport_err; } + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + transport_add_device(dev); transport_configure_device(dev);