3 files changed, 22 insertions, 1 deletions

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 5e57048e2c1d..8d6bb1821834 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -16,6 +16,7 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/acpi.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -299,6 +300,19 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card)
         return func;
 }
 
+#ifdef CONFIG_ACPI
+static void sdio_acpi_set_handle(struct sdio_func *func)
+{
+        struct mmc_host *host = func->card->host;
+        u64 addr = (host->slotno << 16) | func->num;
+
+        ACPI_HANDLE_SET(&func->dev,
+                        acpi_get_child(ACPI_HANDLE(host->parent), addr));
+}
+#else
+static inline void sdio_acpi_set_handle(struct sdio_func *func) {}
+#endif
+
 /*
  * Register a new SDIO function with the driver model.
  */
@@ -308,9 +322,12 @@ int sdio_add_func(struct sdio_func *func)
 
         dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
 
+        sdio_acpi_set_handle(func);
         ret = device_add(&func->dev);
-        if (ret == 0)
+        if (ret == 0) {
                 sdio_func_set_present(func);
+                acpi_dev_pm_attach(&func->dev, false);
+        }
 
         return ret;
 }
@@ -326,6 +343,7 @@ void sdio_remove_func(struct sdio_func *func)
         if (!sdio_func_present(func))
                 return;
 
+        acpi_dev_pm_detach(&func->dev, false);
         device_del(&func->dev);
         put_device(&func->dev);
 }
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index c7ccf3034dad..3dee22d098e9 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -1279,6 +1279,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot(
         }
 
         host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;
+        host->mmc->slotno = slotno;
 
         ret = sdhci_add_host(host);
         if (ret)
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index d6f20cc6415e..17d714801e94 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -361,6 +361,8 @@ struct mmc_host {
 
         unsigned int            actual_clock;   /* Actual HC clock rate */
 
+        unsigned int            slotno; /* used for sdio acpi binding */
+
         unsigned long           private[0] ____cacheline_aligned;
 };