mmc: sdhci-pci: add UHS-II support framework

This patch prepares for adding UHS-II support at a specific UHS-II
capable sdhci-pci controller, GL9755 for now.

Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Message-ID: <20241018105333.4569-15-victorshihgli@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Victor Shih 2024-10-18 18:53:31 +08:00 committed by Ulf Hansson
parent 379e4dc5b6
commit 2daf64308d
3 changed files with 19 additions and 1 deletions

View File

@ -111,6 +111,7 @@ config MMC_SDHCI_PCI
tristate "SDHCI support on PCI bus" tristate "SDHCI support on PCI bus"
depends on MMC_SDHCI && PCI depends on MMC_SDHCI && PCI
select MMC_CQHCI select MMC_CQHCI
select MMC_SDHCI_UHS2
select IOSF_MBI if X86 select IOSF_MBI if X86
select MMC_SDHCI_IO_ACCESSORS select MMC_SDHCI_IO_ACCESSORS
help help

View File

@ -40,6 +40,7 @@
#include "sdhci.h" #include "sdhci.h"
#include "sdhci-cqhci.h" #include "sdhci-cqhci.h"
#include "sdhci-pci.h" #include "sdhci-pci.h"
#include "sdhci-uhs2.h"
static void sdhci_pci_hw_reset(struct sdhci_host *host); static void sdhci_pci_hw_reset(struct sdhci_host *host);
@ -2181,7 +2182,10 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
if (scratch == (u32)-1) if (scratch == (u32)-1)
dead = 1; dead = 1;
sdhci_remove_host(slot->host, dead); if (slot->chip->fixes && slot->chip->fixes->remove_host)
slot->chip->fixes->remove_host(slot, dead);
else
sdhci_remove_host(slot->host, dead);
if (slot->chip->fixes && slot->chip->fixes->remove_slot) if (slot->chip->fixes && slot->chip->fixes->remove_slot)
slot->chip->fixes->remove_slot(slot, dead); slot->chip->fixes->remove_slot(slot, dead);
@ -2189,6 +2193,16 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
sdhci_free_host(slot->host); sdhci_free_host(slot->host);
} }
int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot)
{
return sdhci_uhs2_add_host(slot->host);
}
void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead)
{
sdhci_uhs2_remove_host(slot->host, dead);
}
static void sdhci_pci_runtime_pm_allow(struct device *dev) static void sdhci_pci_runtime_pm_allow(struct device *dev)
{ {
pm_suspend_ignore_children(dev, 1); pm_suspend_ignore_children(dev, 1);

View File

@ -145,6 +145,7 @@ struct sdhci_pci_fixes {
int (*probe_slot) (struct sdhci_pci_slot *); int (*probe_slot) (struct sdhci_pci_slot *);
int (*add_host) (struct sdhci_pci_slot *); int (*add_host) (struct sdhci_pci_slot *);
void (*remove_slot) (struct sdhci_pci_slot *, int); void (*remove_slot) (struct sdhci_pci_slot *, int);
void (*remove_host) (struct sdhci_pci_slot *, int);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
int (*suspend) (struct sdhci_pci_chip *); int (*suspend) (struct sdhci_pci_chip *);
@ -189,6 +190,8 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot)
return (void *)slot->private; return (void *)slot->private;
} }
int sdhci_pci_uhs2_add_host(struct sdhci_pci_slot *slot);
void sdhci_pci_uhs2_remove_host(struct sdhci_pci_slot *slot, int dead);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
int sdhci_pci_resume_host(struct sdhci_pci_chip *chip); int sdhci_pci_resume_host(struct sdhci_pci_chip *chip);
#endif #endif