Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"MMC core:
- Limit retries when analyse of SDIO tuples fails
MMC host:
- sdhci: Fix linking err for sdhci-brcmstb"
* tag 'mmc-v5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb
mmc: core: Limit retries when analyse of SDIO tuples fails
+12
-1
+6
drivers/mmc/core/sdio_cis.c
+6
drivers/mmc/core/sdio_cis.c
···
20
20
#include "sdio_cis.h"
21
21
#include "sdio_ops.h"
22
22
23
+
#define SDIO_READ_CIS_TIMEOUT_MS (10 * 1000) /* 10s */
24
+
23
25
static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
24
26
const unsigned char *buf, unsigned size)
25
27
{
···
276
274
277
275
do {
278
276
unsigned char tpl_code, tpl_link;
277
+
unsigned long timeout = jiffies +
278
+
msecs_to_jiffies(SDIO_READ_CIS_TIMEOUT_MS);
279
279
280
280
ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_code);
281
281
if (ret)
···
330
326
prev = &this->next;
331
327
332
328
if (ret == -ENOENT) {
329
+
if (time_after(jiffies, timeout))
330
+
break;
333
331
/* warn about unknown tuples */
334
332
pr_warn_ratelimited("%s: queuing unknown"
335
333
" CIS tuple 0x%02x (%u bytes)\n",
+6
-1
drivers/mmc/host/sdhci-pltfm.h
+6
-1
drivers/mmc/host/sdhci-pltfm.h
···
111
111
return host->private;
112
112
}
113
113
114
+
extern const struct dev_pm_ops sdhci_pltfm_pmops;
115
+
#ifdef CONFIG_PM_SLEEP
114
116
int sdhci_pltfm_suspend(struct device *dev);
115
117
int sdhci_pltfm_resume(struct device *dev);
116
-
extern const struct dev_pm_ops sdhci_pltfm_pmops;
118
+
#else
119
+
static inline int sdhci_pltfm_suspend(struct device *dev) { return 0; }
120
+
static inline int sdhci_pltfm_resume(struct device *dev) { return 0; }
121
+
#endif
117
122
118
123
#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */