Index: ld_sdmmc.c =================================================================== RCS file: /cvsroot/src/sys/dev/sdmmc/ld_sdmmc.c,v retrieving revision 1.26 diff -u -p -r1.26 ld_sdmmc.c --- ld_sdmmc.c 22 Apr 2017 14:19:36 -0000 1.26 +++ ld_sdmmc.c 6 Jun 2017 19:14:26 -0000 @@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_sdmmc.c,v #include #include #include +#include #include @@ -82,7 +83,7 @@ struct ld_sdmmc_softc { struct sdmmc_function *sc_sf; #define LD_SDMMC_MAXQUEUECNT 4 struct ld_sdmmc_task sc_task[LD_SDMMC_MAXQUEUECNT]; - TAILQ_HEAD(, sdmmc_task) sc_freeq; + pcq_t *sc_freeq; }; static int ld_sdmmc_match(device_t, cfdata_t, void *); @@ -129,12 +130,13 @@ ld_sdmmc_attach(device_t parent, device_ sa->sf->cid.rev, sa->sf->cid.psn, sa->sf->cid.mdt); aprint_naive("\n"); - TAILQ_INIT(&sc->sc_freeq); - for (i = 0; i < __arraycount(sc->sc_task); i++) { + const int ntask = __arraycount(sc->sc_task); + sc->sc_freeq = pcq_create(ntask, KM_SLEEP); + for (i = 0; i < ntask; i++) { task = &sc->sc_task[i]; task->task_sc = sc; callout_init(&task->task_restart_ch, 0); - TAILQ_INSERT_TAIL(&sc->sc_freeq, &task->task, next); + pcq_put(sc->sc_freeq, task); } sc->sc_hwunit = 0; /* always 0? */ @@ -200,9 +202,10 @@ static int ld_sdmmc_start(struct ld_softc *ld, struct buf *bp) { struct ld_sdmmc_softc *sc = device_private(ld->sc_dv); - struct ld_sdmmc_task *task = (void *)TAILQ_FIRST(&sc->sc_freeq); + struct ld_sdmmc_task *task = pcq_get(sc->sc_freeq); - TAILQ_REMOVE(&sc->sc_freeq, &task->task, next); + if (task == NULL) + return EAGAIN; task->task_bp = bp; task->task_retries = 0; @@ -278,7 +281,7 @@ ld_sdmmc_dobio(void *arg) } done: - TAILQ_INSERT_TAIL(&sc->sc_freeq, &task->task, next); + pcq_put(sc->sc_freeq, task); lddone(&sc->sc_ld, bp); }