From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>,
David Woodhouse <David.Woodhouse@intel.com>,
Aaron Lu <aaron.lu@amd.com>, Holger Macht <holger@homac.de>,
Matthew Garrett <mjg@redhat.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [PATCH v4 02/13] libata: bind the Linux device tree to the ACPI device tree
Date: Mon, 28 May 2012 13:08:29 +0800 [thread overview]
Message-ID: <1338181720-4149-3-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1338181720-4149-1-git-send-email-ming.m.lin@intel.com>
From: Matthew Garrett <mjg@redhat.com>
Associate the ACPI device tree and libata devices.
This patch uses the generic ACPI glue framework to do so.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Holger Macht <holger@homac.de>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/acpi/glue.c | 2 +
drivers/ata/libata-acpi.c | 114 +++++++++++++++++++++++++++++++++++++++++++++
drivers/ata/libata-core.c | 3 +
drivers/ata/libata.h | 4 ++
4 files changed, 123 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 29a4a5c..18d6812 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -39,6 +39,7 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
}
return -ENODEV;
}
+EXPORT_SYMBOL(register_acpi_bus_type);
int unregister_acpi_bus_type(struct acpi_bus_type *type)
{
@@ -54,6 +55,7 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type)
}
return -ENODEV;
}
+EXPORT_SYMBOL(unregister_acpi_bus_type);
static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)
{
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index bb7c5f1..96a5775 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -47,6 +47,28 @@ static void ata_acpi_clear_gtf(struct ata_device *dev)
dev->gtf_cache = NULL;
}
+static acpi_handle ap_acpi_handle(struct ata_port *ap)
+{
+ if (ap->flags & ATA_FLAG_ACPI_SATA)
+ return NULL;
+ return DEVICE_ACPI_HANDLE(&ap->scsi_host->shost_gendev);
+}
+
+static acpi_handle dev_acpi_handle(struct ata_device *dev)
+{
+ acpi_integer adr;
+ struct ata_port *ap = dev->link->ap;
+
+ if (ap->flags & ATA_FLAG_ACPI_SATA) {
+ if (!sata_pmp_attached(ap))
+ adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
+ else
+ adr = SATA_ADR(ap->port_no, dev->link->pmp);
+ return acpi_get_child(DEVICE_ACPI_HANDLE(ap->host->dev), adr);
+ } else
+ return acpi_get_child(ap_acpi_handle(ap), dev->devno);
+}
+
/**
* ata_acpi_associate_sata_port - associate SATA port with ACPI objects
* @ap: target SATA port
@@ -1018,3 +1040,95 @@ void ata_acpi_on_disable(struct ata_device *dev)
{
ata_acpi_clear_gtf(dev);
}
+
+static int is_pci_ata(struct device *dev)
+{
+ struct pci_dev *pdev;
+
+ if (!is_pci_dev(dev))
+ return 0;
+
+ pdev = to_pci_dev(dev);
+
+ if ((pdev->class >> 8) != PCI_CLASS_STORAGE_SATA &&
+ (pdev->class >> 8) != PCI_CLASS_STORAGE_IDE)
+ return 0;
+
+ return 1;
+}
+
+static int ata_acpi_bind_host(struct device *dev, int host, acpi_handle *handle)
+{
+ struct Scsi_Host *shost = dev_to_shost(dev);
+ struct ata_port *ap = ata_shost_to_port(shost);
+
+ if (ap->flags & ATA_FLAG_ACPI_SATA)
+ return -ENODEV;
+
+ *handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent), ap->port_no);
+
+ if (!*handle)
+ return -ENODEV;
+
+ return 0;
+}
+
+static int ata_acpi_bind_device(struct device *dev, int channel, int id,
+ acpi_handle *handle)
+{
+ struct device *host = dev->parent->parent;
+ struct Scsi_Host *shost = dev_to_shost(host);
+ struct ata_port *ap = ata_shost_to_port(shost);
+ struct ata_device *ata_dev;
+
+ if (ap->flags & ATA_FLAG_ACPI_SATA)
+ ata_dev = &ap->link.device[channel];
+ else
+ ata_dev = &ap->link.device[id];
+
+ *handle = dev_acpi_handle(ata_dev);
+
+ if (!*handle)
+ return -ENODEV;
+
+ return 0;
+}
+
+static int ata_acpi_find_device(struct device *dev, acpi_handle *handle)
+{
+ unsigned int host, channel, id, lun;
+
+ if (sscanf(dev_name(dev), "host%u", &host) == 1) {
+ if (!is_pci_ata(dev->parent))
+ return -ENODEV;
+
+ return ata_acpi_bind_host(dev, host, handle);
+ } else if (sscanf(dev_name(dev), "%d:%d:%d:%d",
+ &host, &channel, &id, &lun) == 4) {
+ if (!is_pci_ata(dev->parent->parent->parent))
+ return -ENODEV;
+
+ return ata_acpi_bind_device(dev, channel, id, handle);
+ } else
+ return -ENODEV;
+}
+
+static int ata_acpi_find_dummy(struct device *dev, acpi_handle *handle)
+{
+ return -ENODEV;
+}
+
+static struct acpi_bus_type ata_acpi_bus = {
+ .find_bridge = ata_acpi_find_dummy,
+ .find_device = ata_acpi_find_device,
+};
+
+int ata_acpi_register(void)
+{
+ return scsi_register_acpi_bus_type(&ata_acpi_bus);
+}
+
+void ata_acpi_unregister(void)
+{
+ scsi_unregister_acpi_bus_type(&ata_acpi_bus);
+}
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 23763a1..8908f9f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6506,6 +6506,8 @@ static int __init ata_init(void)
ata_parse_force_param();
+ ata_acpi_register();
+
rc = ata_sff_init();
if (rc) {
kfree(ata_force_tbl);
@@ -6532,6 +6534,7 @@ static void __exit ata_exit(void)
ata_release_transport(ata_scsi_transport_template);
libata_transport_exit();
ata_sff_exit();
+ ata_acpi_unregister();
kfree(ata_force_tbl);
}
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 9d0fd0b..3df3362 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -119,6 +119,8 @@ extern void ata_acpi_on_resume(struct ata_port *ap);
extern int ata_acpi_on_devcfg(struct ata_device *dev);
extern void ata_acpi_on_disable(struct ata_device *dev);
extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state);
+extern int ata_acpi_register(void);
+extern void ata_acpi_unregister(void);
#else
static inline void ata_acpi_associate_sata_port(struct ata_port *ap) { }
static inline void ata_acpi_associate(struct ata_host *host) { }
@@ -129,6 +131,8 @@ static inline int ata_acpi_on_devcfg(struct ata_device *dev) { return 0; }
static inline void ata_acpi_on_disable(struct ata_device *dev) { }
static inline void ata_acpi_set_state(struct ata_port *ap,
pm_message_t state) { }
+static inline int ata_acpi_register(void) { return 0; }
+static void ata_acpi_unregister(void) { }
#endif
/* libata-scsi.c */
--
1.7.2.5
next prev parent reply other threads:[~2012-05-28 5:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-28 5:08 [PATCH v4 0/13] SATA ZPODD support Lin Ming
2012-05-28 5:08 ` [PATCH v4 01/13] [SCSI]: add wrapper to access and set scsi_bus_type in struct acpi_bus_type Lin Ming
2012-05-29 12:26 ` Sergei Shtylyov
2012-05-28 5:08 ` Lin Ming [this message]
2012-05-28 9:51 ` [PATCH v4 02/13] libata: bind the Linux device tree to the ACPI device tree Alan Cox
2012-06-13 8:03 ` Lin Ming
2012-06-13 11:00 ` Alan Cox
2012-06-14 7:43 ` Lin Ming
2012-05-28 5:08 ` [PATCH v4 03/13] libata: migrate ACPI code over to new bindings Lin Ming
2012-05-28 5:08 ` [PATCH v4 04/13] libata: use correct PCI devices Lin Ming
2012-05-29 12:22 ` Sergei Shtylyov
2012-05-28 5:08 ` [PATCH v4 05/13] libata-acpi: set acpi state for SATA port Lin Ming
2012-05-28 5:08 ` [PATCH v4 06/13] libata-acpi: add ata port runtime D3Cold support Lin Ming
2012-05-28 5:08 ` [PATCH v4 07/13] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-05-28 5:08 ` [PATCH v4 08/13] libata: detect Device Attention support Lin Ming
2012-05-28 5:08 ` [PATCH v4 09/13] libata: tell scsi layer device supports runtime power off Lin Ming
2012-05-28 5:08 ` [PATCH v4 10/13] [SCSI] pm: resume device if suspend failed Lin Ming
2012-05-28 5:08 ` [PATCH v4 11/13] [SCSI] sr: check support for device busy class events Lin Ming
2012-05-28 5:08 ` [PATCH v4 12/13] [SCSI] sr: support zero power ODD Lin Ming
2012-05-28 5:08 ` [PATCH v4 13/13] [SCSI] sr: make sure ODD is in resumed state in block ioctl Lin Ming
2012-05-28 9:44 ` [PATCH v4 0/13] SATA ZPODD support Alan Cox
2012-05-28 9:54 ` Alan Cox
2012-05-29 12:32 ` Lin Ming
2012-05-30 5:43 ` Aaron Lu
2012-05-30 9:06 ` Fuzhou Chen
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=1338181720-4149-3-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=David.Woodhouse@intel.com \
--cc=aaron.lu@amd.com \
--cc=holger@homac.de \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--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=mjg@redhat.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).