| Message ID | 20230818100217.12725-21-victorshihgli@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support UHS-II for GL9755 | expand |
On 18/08/23 13:02, Victor Shih wrote: > From: Victor Shih <victor.shih@genesyslogic.com.tw> > > This is a UHS-II version of sdhci's add_host/remove_host operation. > Any sdhci drivers which are capable of handling UHS-II cards must > call those functions instead of the corresponding sdhci's. > > 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> > --- > > Updates in V10: > - Move some definitions of PatchV9[05/23] to PatchV10[20/23]. > > Updates in V8: > - Change return type to void for __sdhci_uhs2_add_host_v4(). > - Remove unused variables in __sdhci_uhs2_add_host_v4(). > > Updates in V7: > - __sdhci_add_host() to instead of __sdhci_uhs2_add_host() > in sdhci_uhs2_add_host(). > - Cancel export state of some functions. > > Updates in V6: > - Add complete_work_fn/thread_irq_fn variables in struct sdhci_host. > - Use complete_work_fn/thread_irq_fn variables in > sdhci_alloc_host() and sdhci_uhs2_add_host(). > - Use sdhci_uhs2_mode() to simplify code in __sdhci_uhs2_remove_host(). > > --- > > drivers/mmc/host/sdhci-uhs2.c | 102 ++++++++++++++++++++++++++++++++++ > drivers/mmc/host/sdhci-uhs2.h | 2 + > drivers/mmc/host/sdhci.c | 7 ++- > drivers/mmc/host/sdhci.h | 3 + > include/linux/mmc/host.h | 1 + > 5 files changed, 113 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c > index 8d1be670af49..80eafacc8b9f 100644 > --- a/drivers/mmc/host/sdhci-uhs2.c > +++ b/drivers/mmc/host/sdhci-uhs2.c > @@ -16,6 +16,7 @@ > #include <linux/bitfield.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/host.h> > +#include <linux/regulator/consumer.h> > > #include "sdhci.h" > #include "sdhci-uhs2.h" > @@ -997,6 +998,107 @@ static irqreturn_t sdhci_uhs2_thread_irq(int irq, void *dev_id) > return IRQ_HANDLED; > } > > +/*****************************************************************************\ > + * > + * Device allocation/registration * > + * * > +\*****************************************************************************/ > + > +static void __sdhci_uhs2_add_host_v4(struct sdhci_host *host, u32 caps1) > +{ > + struct mmc_host *mmc; > + u32 max_current_caps2; > + > + mmc = host->mmc; > + > + /* Support UHS2 */ > + if (caps1 & SDHCI_SUPPORT_UHS2) > + mmc->caps2 |= MMC_CAP2_SD_UHS2; > + > + max_current_caps2 = sdhci_readl(host, SDHCI_MAX_CURRENT_1); > + > + if ((caps1 & SDHCI_CAN_VDD2_180) && > + !max_current_caps2 && > + !IS_ERR(mmc->supply.vmmc2)) { > + /* UHS2 - VDD2 */ > + int curr = regulator_get_current_limit(mmc->supply.vmmc2); > + > + if (curr > 0) { > + /* convert to SDHCI_MAX_CURRENT format */ > + curr = curr / 1000; /* convert to mA */ > + curr = curr / SDHCI_MAX_CURRENT_MULTIPLIER; > + curr = min_t(u32, curr, SDHCI_MAX_CURRENT_LIMIT); > + max_current_caps2 = curr; > + } > + } > + > + if (caps1 & SDHCI_CAN_VDD2_180) > + mmc->ocr_avail_uhs2 |= MMC_VDD_165_195; > + else > + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; > +} > + > +static int sdhci_uhs2_host_ops_init(struct sdhci_host *host); > + > +static void __sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) > +{ > + if (!sdhci_uhs2_mode(host)) > + return; > + > + if (!dead) > + sdhci_uhs2_reset(host, SDHCI_UHS2_SW_RESET_FULL); > +} > + > +int sdhci_uhs2_add_host(struct sdhci_host *host) > +{ > + struct mmc_host *mmc = host->mmc; > + int ret; > + > + ret = sdhci_setup_host(host); > + if (ret) > + return ret; > + > + if (host->version >= SDHCI_SPEC_400) > + __sdhci_uhs2_add_host_v4(host, host->caps1); > + > + if ((mmc->caps2 & MMC_CAP2_SD_UHS2) && !host->v4_mode) > + /* host doesn't want to enable UHS2 support */ > + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; > + > + /* overwrite ops */ > + if (mmc->caps2 & MMC_CAP2_SD_UHS2) > + sdhci_uhs2_host_ops_init(host); > + > + host->complete_work_fn = sdhci_uhs2_complete_work; > + host->thread_irq_fn = sdhci_uhs2_thread_irq; > + > + /* LED support not implemented for UHS2 */ > + host->quirks |= SDHCI_QUIRK_NO_LED; > + > + ret = __sdhci_add_host(host); > + if (ret) > + goto cleanup; > + > + return 0; > + > +cleanup: > + if (host->version >= SDHCI_SPEC_400) > + __sdhci_uhs2_remove_host(host, 0); > + > + sdhci_cleanup_host(host); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(sdhci_uhs2_add_host); > + > +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) > +{ > + __sdhci_uhs2_remove_host(host, dead); > + > + sdhci_remove_host(host, dead); > +} > +EXPORT_SYMBOL_GPL(sdhci_uhs2_remove_host); > + > void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq) > { > struct sdhci_host *host = mmc_priv(mmc); > diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h > index 3aa2cb4b39d6..bd5aae054c6f 100644 > --- a/drivers/mmc/host/sdhci-uhs2.h > +++ b/drivers/mmc/host/sdhci-uhs2.h > @@ -186,5 +186,7 @@ void sdhci_uhs2_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set); > void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq); > int sdhci_uhs2_request_atomic(struct mmc_host *mmc, struct mmc_request *mrq); > u32 sdhci_uhs2_irq(struct sdhci_host *host, u32 intmask); > +int sdhci_uhs2_add_host(struct sdhci_host *host); > +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead); > > #endif /* __SDHCI_UHS2_H */ > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 318d4830732f..b3de7e30ba54 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -4104,6 +4104,9 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, > > host->max_timeout_count = 0xE; > > + host->complete_work_fn = sdhci_complete_work; > + host->thread_irq_fn = sdhci_thread_irq; > + > return host; > } > > @@ -4853,7 +4856,7 @@ int __sdhci_add_host(struct sdhci_host *host) > if (!host->complete_wq) > return -ENOMEM; > > - INIT_WORK(&host->complete_work, sdhci_complete_work); > + INIT_WORK(&host->complete_work, host->complete_work_fn); > > timer_setup(&host->timer, sdhci_timeout_timer, 0); > timer_setup(&host->data_timer, sdhci_timeout_data_timer, 0); > @@ -4862,7 +4865,7 @@ int __sdhci_add_host(struct sdhci_host *host) > > sdhci_init(host, 0); > > - ret = request_threaded_irq(host->irq, sdhci_irq, sdhci_thread_irq, > + ret = request_threaded_irq(host->irq, sdhci_irq, host->thread_irq_fn, > IRQF_SHARED, mmc_hostname(mmc), host); > if (ret) { > pr_err("%s: Failed to request IRQ %d: %d\n", > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index 6bbb9f073f29..5235f2da6568 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -626,6 +626,9 @@ struct sdhci_host { > struct timer_list timer; /* Timer for timeouts */ > struct timer_list data_timer; /* Timer for data timeouts */ > > + void (*complete_work_fn)(struct work_struct *work); > + irqreturn_t (*thread_irq_fn)(int irq, void *dev_id); > + > #if IS_ENABLED(CONFIG_MMC_SDHCI_EXTERNAL_DMA) > struct dma_chan *rx_chan; > struct dma_chan *tx_chan; > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h > index 1eba64228725..918d4998c1de 100644 > --- a/include/linux/mmc/host.h > +++ b/include/linux/mmc/host.h > @@ -379,6 +379,7 @@ struct mmc_host { > u32 ocr_avail_sdio; /* SDIO-specific OCR */ > u32 ocr_avail_sd; /* SD-specific OCR */ > u32 ocr_avail_mmc; /* MMC-specific OCR */ > + u32 ocr_avail_uhs2; /* UHS2-specific OCR */ ocr_avail_uhs2 gets set but doesn't seem to be used > struct wakeup_source *ws; /* Enable consume of uevents */ > u32 max_current_330; > u32 max_current_300;
On Thu, Aug 31, 2023 at 4:35 PM Adrian Hunter <adrian.hunter@intel.com> wrote: > > On 18/08/23 13:02, Victor Shih wrote: > > From: Victor Shih <victor.shih@genesyslogic.com.tw> > > > > This is a UHS-II version of sdhci's add_host/remove_host operation. > > Any sdhci drivers which are capable of handling UHS-II cards must > > call those functions instead of the corresponding sdhci's. > > > > 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> > > --- > > > > Updates in V10: > > - Move some definitions of PatchV9[05/23] to PatchV10[20/23]. > > > > Updates in V8: > > - Change return type to void for __sdhci_uhs2_add_host_v4(). > > - Remove unused variables in __sdhci_uhs2_add_host_v4(). > > > > Updates in V7: > > - __sdhci_add_host() to instead of __sdhci_uhs2_add_host() > > in sdhci_uhs2_add_host(). > > - Cancel export state of some functions. > > > > Updates in V6: > > - Add complete_work_fn/thread_irq_fn variables in struct sdhci_host. > > - Use complete_work_fn/thread_irq_fn variables in > > sdhci_alloc_host() and sdhci_uhs2_add_host(). > > - Use sdhci_uhs2_mode() to simplify code in __sdhci_uhs2_remove_host(). > > > > --- > > > > drivers/mmc/host/sdhci-uhs2.c | 102 ++++++++++++++++++++++++++++++++++ > > drivers/mmc/host/sdhci-uhs2.h | 2 + > > drivers/mmc/host/sdhci.c | 7 ++- > > drivers/mmc/host/sdhci.h | 3 + > > include/linux/mmc/host.h | 1 + > > 5 files changed, 113 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c > > index 8d1be670af49..80eafacc8b9f 100644 > > --- a/drivers/mmc/host/sdhci-uhs2.c > > +++ b/drivers/mmc/host/sdhci-uhs2.c > > @@ -16,6 +16,7 @@ > > #include <linux/bitfield.h> > > #include <linux/mmc/mmc.h> > > #include <linux/mmc/host.h> > > +#include <linux/regulator/consumer.h> > > > > #include "sdhci.h" > > #include "sdhci-uhs2.h" > > @@ -997,6 +998,107 @@ static irqreturn_t sdhci_uhs2_thread_irq(int irq, void *dev_id) > > return IRQ_HANDLED; > > } > > > > +/*****************************************************************************\ > > + * > > + * Device allocation/registration * > > + * * > > +\*****************************************************************************/ > > + > > +static void __sdhci_uhs2_add_host_v4(struct sdhci_host *host, u32 caps1) > > +{ > > + struct mmc_host *mmc; > > + u32 max_current_caps2; > > + > > + mmc = host->mmc; > > + > > + /* Support UHS2 */ > > + if (caps1 & SDHCI_SUPPORT_UHS2) > > + mmc->caps2 |= MMC_CAP2_SD_UHS2; > > + > > + max_current_caps2 = sdhci_readl(host, SDHCI_MAX_CURRENT_1); > > + > > + if ((caps1 & SDHCI_CAN_VDD2_180) && > > + !max_current_caps2 && > > + !IS_ERR(mmc->supply.vmmc2)) { > > + /* UHS2 - VDD2 */ > > + int curr = regulator_get_current_limit(mmc->supply.vmmc2); > > + > > + if (curr > 0) { > > + /* convert to SDHCI_MAX_CURRENT format */ > > + curr = curr / 1000; /* convert to mA */ > > + curr = curr / SDHCI_MAX_CURRENT_MULTIPLIER; > > + curr = min_t(u32, curr, SDHCI_MAX_CURRENT_LIMIT); > > + max_current_caps2 = curr; > > + } > > + } > > + > > + if (caps1 & SDHCI_CAN_VDD2_180) > > + mmc->ocr_avail_uhs2 |= MMC_VDD_165_195; > > + else > > + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; > > +} > > + > > +static int sdhci_uhs2_host_ops_init(struct sdhci_host *host); > > + > > +static void __sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) > > +{ > > + if (!sdhci_uhs2_mode(host)) > > + return; > > + > > + if (!dead) > > + sdhci_uhs2_reset(host, SDHCI_UHS2_SW_RESET_FULL); > > +} > > + > > +int sdhci_uhs2_add_host(struct sdhci_host *host) > > +{ > > + struct mmc_host *mmc = host->mmc; > > + int ret; > > + > > + ret = sdhci_setup_host(host); > > + if (ret) > > + return ret; > > + > > + if (host->version >= SDHCI_SPEC_400) > > + __sdhci_uhs2_add_host_v4(host, host->caps1); > > + > > + if ((mmc->caps2 & MMC_CAP2_SD_UHS2) && !host->v4_mode) > > + /* host doesn't want to enable UHS2 support */ > > + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; > > + > > + /* overwrite ops */ > > + if (mmc->caps2 & MMC_CAP2_SD_UHS2) > > + sdhci_uhs2_host_ops_init(host); > > + > > + host->complete_work_fn = sdhci_uhs2_complete_work; > > + host->thread_irq_fn = sdhci_uhs2_thread_irq; > > + > > + /* LED support not implemented for UHS2 */ > > + host->quirks |= SDHCI_QUIRK_NO_LED; > > + > > + ret = __sdhci_add_host(host); > > + if (ret) > > + goto cleanup; > > + > > + return 0; > > + > > +cleanup: > > + if (host->version >= SDHCI_SPEC_400) > > + __sdhci_uhs2_remove_host(host, 0); > > + > > + sdhci_cleanup_host(host); > > + > > + return ret; > > +} > > +EXPORT_SYMBOL_GPL(sdhci_uhs2_add_host); > > + > > +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) > > +{ > > + __sdhci_uhs2_remove_host(host, dead); > > + > > + sdhci_remove_host(host, dead); > > +} > > +EXPORT_SYMBOL_GPL(sdhci_uhs2_remove_host); > > + > > void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq) > > { > > struct sdhci_host *host = mmc_priv(mmc); > > diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h > > index 3aa2cb4b39d6..bd5aae054c6f 100644 > > --- a/drivers/mmc/host/sdhci-uhs2.h > > +++ b/drivers/mmc/host/sdhci-uhs2.h > > @@ -186,5 +186,7 @@ void sdhci_uhs2_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set); > > void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq); > > int sdhci_uhs2_request_atomic(struct mmc_host *mmc, struct mmc_request *mrq); > > u32 sdhci_uhs2_irq(struct sdhci_host *host, u32 intmask); > > +int sdhci_uhs2_add_host(struct sdhci_host *host); > > +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead); > > > > #endif /* __SDHCI_UHS2_H */ > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > > index 318d4830732f..b3de7e30ba54 100644 > > --- a/drivers/mmc/host/sdhci.c > > +++ b/drivers/mmc/host/sdhci.c > > @@ -4104,6 +4104,9 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, > > > > host->max_timeout_count = 0xE; > > > > + host->complete_work_fn = sdhci_complete_work; > > + host->thread_irq_fn = sdhci_thread_irq; > > + > > return host; > > } > > > > @@ -4853,7 +4856,7 @@ int __sdhci_add_host(struct sdhci_host *host) > > if (!host->complete_wq) > > return -ENOMEM; > > > > - INIT_WORK(&host->complete_work, sdhci_complete_work); > > + INIT_WORK(&host->complete_work, host->complete_work_fn); > > > > timer_setup(&host->timer, sdhci_timeout_timer, 0); > > timer_setup(&host->data_timer, sdhci_timeout_data_timer, 0); > > @@ -4862,7 +4865,7 @@ int __sdhci_add_host(struct sdhci_host *host) > > > > sdhci_init(host, 0); > > > > - ret = request_threaded_irq(host->irq, sdhci_irq, sdhci_thread_irq, > > + ret = request_threaded_irq(host->irq, sdhci_irq, host->thread_irq_fn, > > IRQF_SHARED, mmc_hostname(mmc), host); > > if (ret) { > > pr_err("%s: Failed to request IRQ %d: %d\n", > > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > > index 6bbb9f073f29..5235f2da6568 100644 > > --- a/drivers/mmc/host/sdhci.h > > +++ b/drivers/mmc/host/sdhci.h > > @@ -626,6 +626,9 @@ struct sdhci_host { > > struct timer_list timer; /* Timer for timeouts */ > > struct timer_list data_timer; /* Timer for data timeouts */ > > > > + void (*complete_work_fn)(struct work_struct *work); > > + irqreturn_t (*thread_irq_fn)(int irq, void *dev_id); > > + > > #if IS_ENABLED(CONFIG_MMC_SDHCI_EXTERNAL_DMA) > > struct dma_chan *rx_chan; > > struct dma_chan *tx_chan; > > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h > > index 1eba64228725..918d4998c1de 100644 > > --- a/include/linux/mmc/host.h > > +++ b/include/linux/mmc/host.h > > @@ -379,6 +379,7 @@ struct mmc_host { > > u32 ocr_avail_sdio; /* SDIO-specific OCR */ > > u32 ocr_avail_sd; /* SD-specific OCR */ > > u32 ocr_avail_mmc; /* MMC-specific OCR */ > > + u32 ocr_avail_uhs2; /* UHS2-specific OCR */ > > ocr_avail_uhs2 gets set but doesn't seem to be used > Hi, Adrian I will drop the ocr_avail_uhs2 in the next version. Thanks, Victor Shih > > struct wakeup_source *ws; /* Enable consume of uevents */ > > u32 max_current_330; > > u32 max_current_300; >
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c index 8d1be670af49..80eafacc8b9f 100644 --- a/drivers/mmc/host/sdhci-uhs2.c +++ b/drivers/mmc/host/sdhci-uhs2.c @@ -16,6 +16,7 @@ #include <linux/bitfield.h> #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> +#include <linux/regulator/consumer.h> #include "sdhci.h" #include "sdhci-uhs2.h" @@ -997,6 +998,107 @@ static irqreturn_t sdhci_uhs2_thread_irq(int irq, void *dev_id) return IRQ_HANDLED; } +/*****************************************************************************\ + * + * Device allocation/registration * + * * +\*****************************************************************************/ + +static void __sdhci_uhs2_add_host_v4(struct sdhci_host *host, u32 caps1) +{ + struct mmc_host *mmc; + u32 max_current_caps2; + + mmc = host->mmc; + + /* Support UHS2 */ + if (caps1 & SDHCI_SUPPORT_UHS2) + mmc->caps2 |= MMC_CAP2_SD_UHS2; + + max_current_caps2 = sdhci_readl(host, SDHCI_MAX_CURRENT_1); + + if ((caps1 & SDHCI_CAN_VDD2_180) && + !max_current_caps2 && + !IS_ERR(mmc->supply.vmmc2)) { + /* UHS2 - VDD2 */ + int curr = regulator_get_current_limit(mmc->supply.vmmc2); + + if (curr > 0) { + /* convert to SDHCI_MAX_CURRENT format */ + curr = curr / 1000; /* convert to mA */ + curr = curr / SDHCI_MAX_CURRENT_MULTIPLIER; + curr = min_t(u32, curr, SDHCI_MAX_CURRENT_LIMIT); + max_current_caps2 = curr; + } + } + + if (caps1 & SDHCI_CAN_VDD2_180) + mmc->ocr_avail_uhs2 |= MMC_VDD_165_195; + else + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; +} + +static int sdhci_uhs2_host_ops_init(struct sdhci_host *host); + +static void __sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) +{ + if (!sdhci_uhs2_mode(host)) + return; + + if (!dead) + sdhci_uhs2_reset(host, SDHCI_UHS2_SW_RESET_FULL); +} + +int sdhci_uhs2_add_host(struct sdhci_host *host) +{ + struct mmc_host *mmc = host->mmc; + int ret; + + ret = sdhci_setup_host(host); + if (ret) + return ret; + + if (host->version >= SDHCI_SPEC_400) + __sdhci_uhs2_add_host_v4(host, host->caps1); + + if ((mmc->caps2 & MMC_CAP2_SD_UHS2) && !host->v4_mode) + /* host doesn't want to enable UHS2 support */ + mmc->caps2 &= ~MMC_CAP2_SD_UHS2; + + /* overwrite ops */ + if (mmc->caps2 & MMC_CAP2_SD_UHS2) + sdhci_uhs2_host_ops_init(host); + + host->complete_work_fn = sdhci_uhs2_complete_work; + host->thread_irq_fn = sdhci_uhs2_thread_irq; + + /* LED support not implemented for UHS2 */ + host->quirks |= SDHCI_QUIRK_NO_LED; + + ret = __sdhci_add_host(host); + if (ret) + goto cleanup; + + return 0; + +cleanup: + if (host->version >= SDHCI_SPEC_400) + __sdhci_uhs2_remove_host(host, 0); + + sdhci_cleanup_host(host); + + return ret; +} +EXPORT_SYMBOL_GPL(sdhci_uhs2_add_host); + +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead) +{ + __sdhci_uhs2_remove_host(host, dead); + + sdhci_remove_host(host, dead); +} +EXPORT_SYMBOL_GPL(sdhci_uhs2_remove_host); + void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq) { struct sdhci_host *host = mmc_priv(mmc); diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h index 3aa2cb4b39d6..bd5aae054c6f 100644 --- a/drivers/mmc/host/sdhci-uhs2.h +++ b/drivers/mmc/host/sdhci-uhs2.h @@ -186,5 +186,7 @@ void sdhci_uhs2_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set); void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq); int sdhci_uhs2_request_atomic(struct mmc_host *mmc, struct mmc_request *mrq); u32 sdhci_uhs2_irq(struct sdhci_host *host, u32 intmask); +int sdhci_uhs2_add_host(struct sdhci_host *host); +void sdhci_uhs2_remove_host(struct sdhci_host *host, int dead); #endif /* __SDHCI_UHS2_H */ diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 318d4830732f..b3de7e30ba54 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -4104,6 +4104,9 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->max_timeout_count = 0xE; + host->complete_work_fn = sdhci_complete_work; + host->thread_irq_fn = sdhci_thread_irq; + return host; } @@ -4853,7 +4856,7 @@ int __sdhci_add_host(struct sdhci_host *host) if (!host->complete_wq) return -ENOMEM; - INIT_WORK(&host->complete_work, sdhci_complete_work); + INIT_WORK(&host->complete_work, host->complete_work_fn); timer_setup(&host->timer, sdhci_timeout_timer, 0); timer_setup(&host->data_timer, sdhci_timeout_data_timer, 0); @@ -4862,7 +4865,7 @@ int __sdhci_add_host(struct sdhci_host *host) sdhci_init(host, 0); - ret = request_threaded_irq(host->irq, sdhci_irq, sdhci_thread_irq, + ret = request_threaded_irq(host->irq, sdhci_irq, host->thread_irq_fn, IRQF_SHARED, mmc_hostname(mmc), host); if (ret) { pr_err("%s: Failed to request IRQ %d: %d\n", diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 6bbb9f073f29..5235f2da6568 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -626,6 +626,9 @@ struct sdhci_host { struct timer_list timer; /* Timer for timeouts */ struct timer_list data_timer; /* Timer for data timeouts */ + void (*complete_work_fn)(struct work_struct *work); + irqreturn_t (*thread_irq_fn)(int irq, void *dev_id); + #if IS_ENABLED(CONFIG_MMC_SDHCI_EXTERNAL_DMA) struct dma_chan *rx_chan; struct dma_chan *tx_chan; diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 1eba64228725..918d4998c1de 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -379,6 +379,7 @@ struct mmc_host { u32 ocr_avail_sdio; /* SDIO-specific OCR */ u32 ocr_avail_sd; /* SD-specific OCR */ u32 ocr_avail_mmc; /* MMC-specific OCR */ + u32 ocr_avail_uhs2; /* UHS2-specific OCR */ struct wakeup_source *ws; /* Enable consume of uevents */ u32 max_current_330; u32 max_current_300;