* [PATCH v2] mmc mxcmmc: fix falling back to PIO @ 2011-08-25 9:33 Sascha Hauer 2011-08-25 9:39 ` Sascha Hauer 2011-11-11 14:48 ` Sascha Hauer 0 siblings, 2 replies; 5+ messages in thread From: Sascha Hauer @ 2011-08-25 9:33 UTC (permalink / raw) To: linux-arm-kernel; +Cc: Sascha Hauer, Chris Ball, linux-mmc 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; } } -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mmc mxcmmc: fix falling back to PIO 2011-08-25 9:33 [PATCH v2] mmc mxcmmc: fix falling back to PIO Sascha Hauer @ 2011-08-25 9:39 ` Sascha Hauer 2011-11-11 14:48 ` Sascha Hauer 1 sibling, 0 replies; 5+ messages in thread From: Sascha Hauer @ 2011-08-25 9:39 UTC (permalink / raw) To: linux-arm-kernel; +Cc: Chris Ball, linux-mmc 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. Argh. Still wrong. I stop sending patches for today. 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mmc mxcmmc: fix falling back to PIO 2011-08-25 9:33 [PATCH v2] mmc mxcmmc: fix falling back to PIO Sascha Hauer 2011-08-25 9:39 ` Sascha Hauer @ 2011-11-11 14:48 ` Sascha Hauer 2011-11-11 15:13 ` Lothar Waßmann 1 sibling, 1 reply; 5+ messages in thread From: Sascha Hauer @ 2011-11-11 14:48 UTC (permalink / raw) To: Chris Ball; +Cc: linux-arm-kernel, linux-mmc 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; > } > } > > -- > 1.7.5.4 > > -- 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mmc mxcmmc: fix falling back to PIO 2011-11-11 14:48 ` Sascha Hauer @ 2011-11-11 15:13 ` Lothar Waßmann 2011-11-11 15:28 ` Sascha Hauer 0 siblings, 1 reply; 5+ messages in thread From: Lothar Waßmann @ 2011-11-11 15:13 UTC (permalink / raw) To: Sascha Hauer; +Cc: Chris Ball, linux-mmc, linux-arm-kernel 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. Lothar Waßmann -- ___________________________________________________________ Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Geschäftsführer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info@karo-electronics.de ___________________________________________________________ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] mmc mxcmmc: fix falling back to PIO 2011-11-11 15:13 ` Lothar Waßmann @ 2011-11-11 15:28 ` Sascha Hauer 0 siblings, 0 replies; 5+ messages in thread From: Sascha Hauer @ 2011-11-11 15:28 UTC (permalink / raw) To: Lothar Waßmann; +Cc: Chris Ball, linux-mmc, linux-arm-kernel 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-11 15:29 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-25 9:33 [PATCH v2] mmc mxcmmc: fix falling back to PIO Sascha Hauer 2011-08-25 9:39 ` Sascha Hauer 2011-11-11 14:48 ` Sascha Hauer 2011-11-11 15:13 ` Lothar Waßmann 2011-11-11 15:28 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox