git: 554b97e32db0 - stable/14 - mmc_fdt: handle broken-cd property
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Nov 2026 18:41:19 UTC
The branch stable/14 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=554b97e32db0d6f0a1c79cba778aad6e544d0377
commit 554b97e32db0d6f0a1c79cba778aad6e544d0377
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2025-11-05 14:37:36 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2026-11-13 18:41:02 +0000
mmc_fdt: handle broken-cd property
The documented properties [1] for card-detection are one of:
- cd-gpios
- non-removable
- broken-cd
In cd_setup() we handle the first two, but not the latter, resulting in
a silently undetected card on an affected system.
To work around this, force cd_disabled when broken-cd is specified, so
that the card detect helper function gets to run. A more complete
solution would implement some kind of polling mechanism to detect the
card's presence or removal.
Some variants of the Allwinner D1, such as the Lichee Rv, specify this
property in the mmc0 device node.
[1] sys/contrib/device-tree/Bindings/mmc/mmc-controller.yaml
Reported by: Haowu Ge <gehaowu@bitmoe.com>
Tested by: Haowu Ge <gehaowu@bitmoe.com>
Reviewed by: imp, manu, mmel
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D53546
(cherry picked from commit 768ee6d454821cc63247cb4ffe526c5a06accff0)
---
sys/dev/mmc/mmc_fdt_helpers.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
index 47c8c6ce1c79..3c4328ad5354 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.c
+++ b/sys/dev/mmc/mmc_fdt_helpers.c
@@ -160,6 +160,17 @@ cd_setup(struct mmc_helper *helper, phandle_t node)
return;
}
+ /*
+ * If the device has no card-detection, treat it as non-removable.
+ * This could be improved by polling for detection.
+ */
+ if (helper->props & MMC_PROP_BROKEN_CD) {
+ helper->cd_disabled = true;
+ if (bootverbose)
+ device_printf(dev, "Broken card-detect\n");
+ return;
+ }
+
/*
* If there is no cd-gpios property, then presumably the hardware
* PRESENT_STATE register and interrupts will reflect card state