sdhci_xenon: allow to properly disable the UHS signaling

Until now the "no-1-8-v" DT flag wrongly disabled the SDHCI_CAN_VDD_180
- slot 1.8V power supply capability, whereas it refers to the signaling
voltage. Fix the sdhci_xenon_read_4 and allow to disable the UHS modes
depending on the DT property or PHY slow mode. While at it - make sure
the unsupported 1.2V signaling is always disabled and not reported
in the bootverbose log.

Reviewed by: manu
Obtained from: Semihalf
Sponsored by: Marvell
Differential Revision: https://reviews.freebsd.org/D30563
MFC after: 2 weeks

(cherry picked from commit df868762841b93d934413651818e510ea443def8)

diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c
index c230f0ef9752bc9ea3b6209e446bd4e2f19344a6..f92d02608abb47d629365cac89412b9dc6bf5619 100644 (file)
--- a/sys/dev/sdhci/sdhci_xenon.c
+++ b/sys/dev/sdhci/sdhci_xenon.c
@@ -141,13 +141,8 @@ sdhci_xenon_read_4(device_t dev, struct sdhci_slot *slot __unused,
     bus_size_t off)
 {
        struct sdhci_xenon_softc *sc = device_get_softc(dev);
-       uint32_t val32;
 
-       val32 = bus_read_4(sc->mem_res, off);
-       if (off == SDHCI_CAPABILITIES && sc->no_18v)
-               val32 &= ~SDHCI_CAN_VDD_180;
-
-       return (val32);
+       return bus_read_4(sc->mem_res, off);
 }
 
 static void
@@ -519,6 +514,13 @@ sdhci_xenon_attach(device_t dev)
        if (sdhci_init_slot(dev, sc->slot, 0))
                goto fail;
 
+       /* 1.2V signaling is not supported. */
+       sc->slot->host.caps &= ~MMC_CAP_SIGNALING_120;
+
+       /* Disable UHS in case of lack of 1.8V VCCQ or the PHY slow mode. */
+       if (sc->no_18v || sc->slow_mode)
+               sc->slot->host.caps &= ~MMC_CAP_SIGNALING_180;
+
        /* Activate the interrupt */
        err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
            NULL, sdhci_xenon_intr, sc, &sc->intrhand);