[PATCH] libertas/sdio: set ECSI and SCSI bits for 1-bit transfers

[Daniel Mack]

On Wed, Mar 31, 2010 at 11:07:06AM +0200, Michał Mirosław wrote:
> 2010/3/30 Daniel Mack <daniel at caiaq.de>:
> [...]
> > @@ -1022,6 +1025,27 @@ static int if_sdio_probe(struct sdio_func *func,
> >        if (ret)
> >                goto disable;
> >
> > +       /* For 1-bit transfers, we need to enable the interrupt flags in
> > +        * the CCCR register. Temporarily set the function number to 0
> > +        * for that. */
> > +       if ((host->caps & MMC_CAP_SDIO_IRQ) &&
> > +           (host->ios.bus_width == MMC_BUS_WIDTH_1)) {
> > +               unsigned int num = func->num;
> > +               u8 reg;
> > +
> > +               func->num = 0;
> > +               reg = sdio_readb(func, SDIO_CCCR_IF, &ret);
> > +               if (ret)
> > +                       goto release_int;
> > +
> > +               reg |= SDIO_BUS_ECSI | SDIO_BUS_SCSI;
> > +               sdio_writeb(func, reg, SDIO_CCCR_IF, &ret);
> > +               if (ret)
> > +                       goto release_int;
> > +
> > +               func->num = num;
> > +       }
> > +
> >        card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret);
> >        if (ret)
> >                goto release_int;
> 
> You should probably just use mmc_io_rw_direct() in this case instead
> of abusing func->num.

Hmm, that function isn't exported, and I didn't want to change this. You
say you'd prefer that? I can cook up something that does it, no problem.


Daniel