Skip to contentSkip to conversation

Revert "dmaengine: fsl-edma: support little endian for edma driver"

PATCH In review Fabio Estevam 2 participants 2 messages Jul 2, 2019 – Jul 3, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Revert "dmaengine: fsl-edma: support little endian for edma driver"

This reverts commit 002905eca5bedab08bafd9e325bbbb41670c7712.

Commit 002905eca5be ("dmaengine: fsl-edma: support little endian for edma driver") incorrectly assumed that there was not little endian support in the driver.

This causes hangs on Vybrid, so revert it so that Vybrid systems could boot again.

---
Changes since v1:
- Updated Krzysztof's e-mail address
- Collected Krzysztof's Tested-by

 drivers/dma/fsl-edma-common.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/dma/fsl-edma-common.c +0 -5
index 6bf238e19d91..680b2a00a953 100644
@@ -83,14 +83,9 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
 	u32 ch = fsl_chan->vchan.chan.chan_id;
 	void __iomem *muxaddr;
 	unsigned int chans_per_mux, ch_off;
-	int endian_diff[4] = {3, 1, -1, -3};
 
 	chans_per_mux = fsl_chan->edma->n_chans / DMAMUX_NR;
 	ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux;
-
-	if (!fsl_chan->edma->big_endian)
-		ch_off += endian_diff[ch_off % 4];
-
 	muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
 	slot = EDMAMUX_CHCFG_SOURCE(slot);
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 8 lines · Fabio Estevam

This reverts commit 002905eca5bedab08bafd9e325bbbb41670c7712.

Commit 002905eca5be ("dmaengine: fsl-edma: support little endian for edma driver") incorrectly assumed that there was not little endian support in the driver.

This causes hangs on Vybrid, so revert it so that Vybrid systems could boot again.

The patch title should be:
dmaengine: Revert "dmaengine: fsl-edma: support little endian for edma driver"

I fixed that up and applied now

Signature · 1 line
~Vinod