Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 16:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: Poll CD in case cyclic framework is enabled

Browse source 
In case the cyclic framework is enabled, poll the card detect of already
initialized cards and deinitialize them in case they are removed. Since
the card initialization is a longer process and card initialization is
done on first access to an uninitialized card anyway, avoid initializing
newly detected uninitialized cards in the cyclic callback.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Vasut 2024-09-06 19:10:42 +02:00 • committed by Tom Rini
parent d8bbe44456
commit 90cc07fd78
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/mmc/mmc.c
View file

@ -3039,6 +3039,20 @@ static int mmc_complete_init(struct mmc *mmc)
return err;
}
static void __maybe_unused mmc_cyclic_cd_poll(struct cyclic_info *c)
{
struct mmc *m = CONFIG_IS_ENABLED(CYCLIC, (container_of(c, struct mmc, cyclic)), (NULL));
if (!m->has_init)
return;
if (mmc_getcd(m))
return;
mmc_deinit(m);
m->has_init = 0;
}
int mmc_init(struct mmc *mmc)
{
int err = 0;
@ -3061,6 +3075,14 @@ int mmc_init(struct mmc *mmc)
if (err)
pr_info("%s: %d, time %lu\n", __func__, err, get_timer(start));
if (CONFIG_IS_ENABLED(CYCLIC, (!mmc->cyclic.func), (NULL))) {
/* Register cyclic function for card detect polling */
CONFIG_IS_ENABLED(CYCLIC, (cyclic_register(&mmc->cyclic,
mmc_cyclic_cd_poll,
100 * 1000,
mmc->cfg->name)));
}
return err;
}
@ -3068,6 +3090,9 @@ int mmc_deinit(struct mmc *mmc)
{
u32 caps_filtered;
if (CONFIG_IS_ENABLED(CYCLIC, (mmc->cyclic.func), (NULL)))
CONFIG_IS_ENABLED(CYCLIC, (cyclic_unregister(&mmc->cyclic)));
if (!CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) &&
!CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) &&
!CONFIG_IS_ENABLED(MMC_HS400_SUPPORT))

3
include/mmc.h
View file

@ -14,6 +14,7 @@
#include <linux/sizes.h>
#include <linux/compiler.h>
#include <linux/dma-direction.h>
#include <cyclic.h>
#include <part.h>
struct bd_info;
@ -757,6 +758,8 @@ struct mmc {
bool hs400_tuning:1;
enum bus_mode user_speed_mode; /* input speed mode from user */
CONFIG_IS_ENABLED(CYCLIC, (struct cyclic_info cyclic));
};
#if CONFIG_IS_ENABLED(DM_MMC)