Return-path: Received: from mail-pw0-f46.google.com ([209.85.160.46]:55817 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756251Ab0CaIXW convert rfc822-to-8bit (ORCPT ); Wed, 31 Mar 2010 04:23:22 -0400 MIME-Version: 1.0 In-Reply-To: <1269970733-24681-1-git-send-email-daniel@caiaq.de> References: <1269970733-24681-1-git-send-email-daniel@caiaq.de> Date: Wed, 31 Mar 2010 13:53:21 +0530 Message-ID: Subject: Re: [PATCH] libertas/sdio: set ECSI and SCSI bits for 1-bit transfers From: Alagu Sankar Vellaichamy To: Daniel Mack Cc: linux-kernel@vger.kernel.org, Volker Ernst , Dan Williams , "John W. Linville" , Holger Schurig , Bing Zhao , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, linux-mmc@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: SCSI is read-only. We ideally should be checking this bit and then set the ECSI accordingly, rather than setting both ECSI and SCSI. - Alagu Sankar On Tue, Mar 30, 2010 at 11:08 PM, Daniel Mack wrote: > When operating in 1-bit mode, SDAT1 is used as dedicated interrupt line. > However, the 8686 will only drive this line when the ECSI and SCSI bits > are set in the CCCR_IF register. > > Thanks to Alagu Sankar for pointing me in the right direction. > > Signed-off-by: Daniel Mack > Cc: Alagu Sankar > Cc: Volker Ernst > Cc: Dan Williams > Cc: John W. Linville > Cc: Holger Schurig > Cc: Bing Zhao > Cc: libertas-dev@lists.infradead.org > Cc: linux-wireless@vger.kernel.org > Cc: linux-mmc@vger.kernel.org > --- > ?drivers/net/wireless/libertas/if_sdio.c | ? 24 ++++++++++++++++++++++++ > ?include/linux/mmc/sdio.h ? ? ? ? ? ? ? ?| ? ?2 ++ > ?2 files changed, 26 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c > index 7a73f62..d3170f2 100644 > --- a/drivers/net/wireless/libertas/if_sdio.c > +++ b/drivers/net/wireless/libertas/if_sdio.c > @@ -34,6 +34,8 @@ > ?#include > ?#include > ?#include > +#include > +#include > > ?#include "host.h" > ?#include "decl.h" > @@ -942,6 +944,7 @@ static int if_sdio_probe(struct sdio_func *func, > ? ? ? ?int ret, i; > ? ? ? ?unsigned int model; > ? ? ? ?struct if_sdio_packet *packet; > + ? ? ? struct mmc_host *host = func->card->host; > > ? ? ? ?lbs_deb_enter(LBS_DEB_SDIO); > > @@ -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; > diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h > index 0ebaef5..329a8fa 100644 > --- a/include/linux/mmc/sdio.h > +++ b/include/linux/mmc/sdio.h > @@ -94,6 +94,8 @@ > > ?#define ?SDIO_BUS_WIDTH_1BIT ? 0x00 > ?#define ?SDIO_BUS_WIDTH_4BIT ? 0x02 > +#define ?SDIO_BUS_ECSI ? ? ? ? 0x20 ? ?/* Enable continuous SPI interrupt */ > +#define ?SDIO_BUS_SCSI ? ? ? ? 0x40 ? ?/* Support continuous SPI interrupt */ > > ?#define ?SDIO_BUS_ASYNC_INT ? ?0x20 > > -- > 1.7.0 > >