All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Lothar Waßmann" <LW@KARO-electronics.de>
Cc: Chris Ball <cjb@laptop.org>,
	linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2] mmc mxcmmc: fix falling back to PIO
Date: Fri, 11 Nov 2011 16:28:58 +0100	[thread overview]
Message-ID: <20111111152858.GY16886@pengutronix.de> (raw)
In-Reply-To: <20157.15269.398865.274711@ipc1.ka-ro>

On Fri, Nov 11, 2011 at 04:13:41PM +0100, Lothar Waßmann wrote:
> Hi,
> 
> Sascha Hauer writes:
> > Hi Chris,
> > 
> > Can you take this one please?
> > 
> > Sascha
> > 
> > On Thu, Aug 25, 2011 at 11:33:05AM +0200, Sascha Hauer wrote:
> > > When we can't configure the dma channel we want to fall
> > > back to PIO. We do this by setting host->do_dma to zero.
> > > This does not work as do_dma is used to see whether dma
> > > can be used for the current transfer. Instead, we have
> > > to set host->dma to NULL.
> > > 
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > Cc: Chris Ball <cjb@laptop.org>
> > > Cc: linux-mmc@vger.kernel.org
> > > ---
> > >  drivers/mmc/host/mxcmmc.c |    3 ++-
> > >  1 files changed, 2 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
> > > index 14aa213..4dc9008 100644
> > > --- a/drivers/mmc/host/mxcmmc.c
> > > +++ b/drivers/mmc/host/mxcmmc.c
> > > @@ -730,7 +730,8 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> > >  			dev_err(mmc_dev(host->mmc),
> > >  				"failed to config DMA channel. Falling back to PIO\n");
> > >  			dma_release_channel(host->dma);
> > > -			host->do_dma = 0;
> > > +			host->dma = NULL;
> > > +			host->dma = 0;
> NULL or 0, that is the question? Or both?
> That looks a little bit screwed.

NULL. Hm, this was already fixed in my tree. I just sent an updated
patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

WARNING: multiple messages have this Message-ID (diff)
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mmc mxcmmc: fix falling back to PIO
Date: Fri, 11 Nov 2011 16:28:58 +0100	[thread overview]
Message-ID: <20111111152858.GY16886@pengutronix.de> (raw)
In-Reply-To: <20157.15269.398865.274711@ipc1.ka-ro>

On Fri, Nov 11, 2011 at 04:13:41PM +0100, Lothar Wa?mann wrote:
> Hi,
> 
> Sascha Hauer writes:
> > Hi Chris,
> > 
> > Can you take this one please?
> > 
> > Sascha
> > 
> > On Thu, Aug 25, 2011 at 11:33:05AM +0200, Sascha Hauer wrote:
> > > When we can't configure the dma channel we want to fall
> > > back to PIO. We do this by setting host->do_dma to zero.
> > > This does not work as do_dma is used to see whether dma
> > > can be used for the current transfer. Instead, we have
> > > to set host->dma to NULL.
> > > 
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > Cc: Chris Ball <cjb@laptop.org>
> > > Cc: linux-mmc at vger.kernel.org
> > > ---
> > >  drivers/mmc/host/mxcmmc.c |    3 ++-
> > >  1 files changed, 2 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
> > > index 14aa213..4dc9008 100644
> > > --- a/drivers/mmc/host/mxcmmc.c
> > > +++ b/drivers/mmc/host/mxcmmc.c
> > > @@ -730,7 +730,8 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> > >  			dev_err(mmc_dev(host->mmc),
> > >  				"failed to config DMA channel. Falling back to PIO\n");
> > >  			dma_release_channel(host->dma);
> > > -			host->do_dma = 0;
> > > +			host->dma = NULL;
> > > +			host->dma = 0;
> NULL or 0, that is the question? Or both?
> That looks a little bit screwed.

NULL. Hm, this was already fixed in my tree. I just sent an updated
patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  reply	other threads:[~2011-11-11 15:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-25  9:33 [PATCH v2] mmc mxcmmc: fix falling back to PIO Sascha Hauer
2011-08-25  9:33 ` Sascha Hauer
2011-08-25  9:39 ` Sascha Hauer
2011-08-25  9:39   ` Sascha Hauer
2011-11-11 14:48 ` Sascha Hauer
2011-11-11 14:48   ` Sascha Hauer
2011-11-11 15:13   ` Lothar Waßmann
2011-11-11 15:13     ` Lothar Waßmann
2011-11-11 15:28     ` Sascha Hauer [this message]
2011-11-11 15:28       ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111111152858.GY16886@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=LW@KARO-electronics.de \
    --cc=cjb@laptop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.