Skip to contentSkip to conversation

mmc mxcmmc: fix falling back to PIO

PATCH New Sascha Hauer 2 participants 2 messages Nov 11, 2011

Subsystems (2)
Arm i.MX and Layerscape MMC, SD and SDIO
lore
Share & tools
lore

Sascha Hauer

author maintainer
#0 lore raw

PATCH 1/1 mmc mxcmmc: fix falling back to PIO

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 <[email protected]>
Cc Chris Ball <[email protected]>
Cc linux-mmc at vger.kernel.org
---
 drivers/mmc/host/mxcmmc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mmc/host/mxcmmc.c +1 -0
index 14aa213..b87143d 100644
@@ -731,6 +731,7 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 				"failed to config DMA channel. Falling back to PIO\n");
 			dma_release_channel(host->dma);
 			host->do_dma = 0;
+			host->dma = NULL;
 		}
 	}
Signature · 1 line
1.7.7.1
#1 lore raw

PATCH 1/1 mmc mxcmmc: fix falling back to PIO

Hi Sascha,

Quoted 18 lines · Sascha Hauer

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 <[email protected]>
Cc Chris Ball <[email protected]>
Cc linux-mmc at vger.kernel.org
---
 drivers/mmc/host/mxcmmc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mmc/host/mxcmmc.c +0 -0
index 14aa213..b87143d 100644

drivers/mmc/host/mxcmmc.c static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) · line 736

Quoted 6 lines
drivers/mmc/host/mxcmmc.c +1 -0
@@ -731,6 +731,7 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 				"failed to config DMA channel. Falling back to PIO\n");
 			dma_release_channel(host->dma);
 			host->do_dma = 0;
+			host->dma = NULL;
 		}
 	}

Thanks, pushed to mmc-next for 3.2 with a stable@ tag added.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child