Changeset 8179d4c in rtems-libbsd for rtemsbsd/sys

Timestamp:

03/26/15 12:48:37 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

d0ecc91

Parents:

9ea1778

git-author:

Sebastian Huber <sebastian.huber@…> (03/26/15 12:48:37)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/26/15 12:53:24)

Message:

dw_mmc: Implement host acquire/release

This should avoid the "mmc: host bridge didn't serialize us." panic.

File:

• rtemsbsd/sys/dev/dw_mmc/dw_mmc.c (modified) (5 diffs)

rtemsbsd/sys/dev/dw_mmc/dw_mmc.c

@@ -81 +81 @@
         struct mtx bus_mtx;
         bus_space_handle_t bushandle;
+        int bus_busy;
         uint32_t biu_clock;
         uint32_t ciu_clock;
@@ -125 +126 @@
             "dw_mmc", MTX_DEF)
 
-#define DW_MMC_BUS_LOCK(_sc)            mtx_lock(&(_sc)->bus_mtx)
-#define DW_MMC_BUS_UNLOCK(_sc)          mtx_unlock(&(_sc)->bus_mtx)
-#define DW_MMC_BUS_LOCK_INIT(_sc) \
-        mtx_init(&_sc->bus_mtx, device_get_nameunit(_sc->dev), \
-            "dw_mmc", MTX_DEF)
-
 static int
 dw_mmc_poll_reset_completion(struct dw_mmc_softc *sc, uint32_t ctrl_resets)
@@ -357 +352 @@
 
         DW_MMC_LOCK_INIT(sc);
-        DW_MMC_BUS_LOCK_INIT(sc);
 
         dw_mmc_platform_install_intr(sc);
@@ -955 +949 @@
         struct dw_mmc_softc *sc = device_get_softc(brdev);
 
-        DW_MMC_BUS_LOCK(sc);
-
+        DW_MMC_LOCK(sc);
+        while (sc->bus_busy)
+                msleep(sc, &sc->sc_mtx, PZERO, "dw_mmc: acquire host", 0);
+        sc->bus_busy = 1;
+        DW_MMC_UNLOCK(sc);
         return (0);
 }
@@ -965 +962 @@
         struct dw_mmc_softc *sc = device_get_softc(brdev);
 
-        DW_MMC_BUS_UNLOCK(sc);
-
+        DW_MMC_LOCK(sc);
+        sc->bus_busy = 0;
+        wakeup(sc);
+        DW_MMC_UNLOCK(sc);
         return (0);
 }