linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lin Ming <ming.m.lin@intel.com>
To: linux-kernel@vger.kernel.org
Cc: linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org,
	linux-pm@vger.kernel.org, Alan Stern <stern@rowland.harvard.edu>,
	Jeff Garzik <jgarzik@pobox.com>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	James Bottomley <JBottomley@parallels.com>,
	Tejun Heo <tj@kernel.org>, Huang Ying <ying.huang@intel.com>,
	Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH v3 1/6] ata: make ata port as parent device of scsi host
Date: Wed, 23 Nov 2011 15:01:21 +0800	[thread overview]
Message-ID: <1322031686-28233-2-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1322031686-28233-1-git-send-email-ming.m.lin@intel.com>

Currently, the device tree of ata port and scsi host looks as below,

        /sys/devices/pci0000:00/0000:00:1f.2    (ahci controller)
        |-- ata1                                (ata port)
        |-- host0                               (scsi host)
           |-- target0:0:0                      (scsi target)
               |-- 0:0:0:0                      (disk)

This patch makes ata port as parent device of scsi host, then it becomes

        /sys/devices/pci0000:00/0000:00:1f.2    (ahci controller)
        |-- ata1                                (ata port)
            |-- host0                           (scsi host)
                |-- target0:0:0                 (scsi target)
                    |-- 0:0:0:0                 (disk)

With this change, the ata port runtime PM is easier.
For example, the ata port runtime suspend will happen as,

disk suspend --> scsi target suspend --> scsi host suspend --> ata port
suspend.

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/ata/libata-scsi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 2a5412e..7ae1e77 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3398,7 +3398,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
 		 */
 		shost->max_host_blocked = 1;
 
-		rc = scsi_add_host(ap->scsi_host, ap->host->dev);
+		rc = scsi_add_host(ap->scsi_host, &ap->tdev);
 		if (rc)
 			goto err_add;
 	}
-- 
1.7.2.5


  reply	other threads:[~2011-11-23  7:01 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-23  7:01 [PATCH v3 0/6] ata port runtime power management support Lin Ming
2011-11-23  7:01 ` Lin Ming [this message]
2011-11-23  7:01 ` [PATCH v3 2/6] scsi: add flag to skip the runtime PM calls on the host Lin Ming
2011-11-23  7:01 ` [PATCH v3 3/6] [SCSI] runtime resume device before system suspend Lin Ming
2011-11-23 17:02   ` Alan Stern
2011-11-24 12:21     ` Lin Ming
2011-11-24 16:36       ` Alan Stern
2011-11-24 19:57         ` Tejun Heo
2011-11-24 22:54           ` Alan Stern
2011-11-24 23:01             ` Tejun Heo
2011-11-25  0:17               ` Alan Stern
2011-11-25 13:50                 ` Lin Ming
2011-11-25 15:19                   ` Alan Stern
2011-11-23  7:01 ` [PATCH v3 4/6] [SCSI] sd: check runtime status in sd_shutdown Lin Ming
2011-11-23  7:01 ` [PATCH v3 5/6] ata: add ata port system PM callbacks Lin Ming
2011-11-23  7:01 ` [PATCH v3 6/6] ata: add ata port runtime " Lin Ming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322031686-28233-2-git-send-email-ming.m.lin@intel.com \
    --to=ming.m.lin@intel.com \
    --cc=JBottomley@parallels.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=rui.zhang@intel.com \
    --cc=stern@rowland.harvard.edu \
    --cc=tj@kernel.org \
    --cc=ying.huang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).