3 files changed, 38 insertions, 4 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index dc9842ec6f06..a276c06dda95 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -40,12 +40,40 @@ static int is_pci_dev(struct device *dev)
         return (dev->bus == &pci_bus_type);
 }
 
-static void ata_acpi_associate_sata_port(struct ata_port *ap)
+/**
+ * ata_acpi_associate_sata_port - associate SATA port with ACPI objects
+ * @ap: target SATA port
+ *
+ * Look up ACPI objects associated with @ap and initialize acpi_handle
+ * fields of @ap, the port and devices accordingly.
+ *
+ * LOCKING:
+ * EH context.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
+ */
+void ata_acpi_associate_sata_port(struct ata_port *ap)
 {
-        acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
+        WARN_ON(!(ap->flags & ATA_FLAG_ACPI_SATA));
+
+        if (!ap->nr_pmp_links) {
+                acpi_integer adr = SATA_ADR(ap->port_no, NO_PORT_MULT);
+
+                ap->link.device->acpi_handle =
+                        acpi_get_child(ap->host->acpi_handle, adr);
+        } else {
+                struct ata_link *link;
+
+                ap->link.device->acpi_handle = NULL;
 
-        ap->link.device->acpi_handle =
-                acpi_get_child(ap->host->acpi_handle, adr);
+                ata_port_for_each_link(link, ap) {
+                        acpi_integer adr = SATA_ADR(ap->port_no, link->pmp);
+
+                        link->device->acpi_handle =
+                                acpi_get_child(ap->host->acpi_handle, adr);
+                }
+        }
 }
 
 static void ata_acpi_associate_ide_port(struct ata_port *ap)
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 671d171055a3..eeffce636d0c 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -607,6 +607,8 @@ int sata_pmp_attach(struct ata_device *dev)
         ata_port_for_each_link(tlink, ap)
                 sata_link_init_spd(tlink);
 
+        ata_acpi_associate_sata_port(ap);
+
         return 0;
 
  fail:
@@ -646,6 +648,8 @@ static void sata_pmp_detach(struct ata_device *dev)
         ap->nr_pmp_links = 0;
         link->pmp = 0;
         spin_unlock_irqrestore(ap->lock, flags);
+
+        ata_acpi_associate_sata_port(ap);
 }
 
 /**
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index a44172fd1f5c..f8bd955c5ba7 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -103,11 +103,13 @@ extern struct ata_port *ata_port_alloc(struct ata_host *host);
 
 /* libata-acpi.c */
 #ifdef CONFIG_ATA_ACPI
+extern void ata_acpi_associate_sata_port(struct ata_port *ap);
 extern void ata_acpi_associate(struct ata_host *host);
 extern int ata_acpi_on_suspend(struct ata_port *ap);
 extern void ata_acpi_on_resume(struct ata_port *ap);
 extern int ata_acpi_on_devcfg(struct ata_device *adev);
 #else
+static inline void ata_acpi_associate_sata_port(struct ata_port *ap) { }
 static inline void ata_acpi_associate(struct ata_host *host) { }
 static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; }
 static inline void ata_acpi_on_resume(struct ata_port *ap) { }