xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

Browse Source 
Pull dmaengine fixes from Dan Williams:
 "Two fixes for -stable:

   - async_mult() sometimes maps less buffers than initially requested.
      We end up freeing dmaengine_unmap_data on an invalid pool.

   - mv_xor: register write ordering fix"

* tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  dmaengine: fix dmaengine_unmap failure
  dma: mv_xor: Flush descriptors before activating a channel
This commit is contained in:
Linus Torvalds
2014-05-23 16:52:15 -07:00
parent 1ee1ceafb5 c1f43dd9c2
commit 037430078f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/dmaengine.c
View File

@@ -1009,6 +1009,7 @@ static void dmaengine_unmap(struct kref *kref)
dma_unmap_page(dev, unmap->addr[i], unmap->len, dma_unmap_page(dev, unmap->addr[i], unmap->len,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
} }
cnt = unmap->map_cnt;
mempool_free(unmap, __get_unmap_pool(cnt)->pool); mempool_free(unmap, __get_unmap_pool(cnt)->pool);
} }
@@ -1074,6 +1075,7 @@ dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)
memset(unmap, 0, sizeof(*unmap)); memset(unmap, 0, sizeof(*unmap));
kref_init(&unmap->kref); kref_init(&unmap->kref);
unmap->dev = dev; unmap->dev = dev;
unmap->map_cnt = nr;
return unmap; return unmap;
} }

8
drivers/dma/mv_xor.c
View File

@@ -191,12 +191,10 @@ static void mv_set_mode(struct mv_xor_chan *chan,
static void mv_chan_activate(struct mv_xor_chan *chan) static void mv_chan_activate(struct mv_xor_chan *chan)
{ {
u32 activation;
dev_dbg(mv_chan_to_devp(chan), " activate chan.\n"); dev_dbg(mv_chan_to_devp(chan), " activate chan.\n");
activation = readl_relaxed(XOR_ACTIVATION(chan));
activation |= 0x1; /* writel ensures all descriptors are flushed before activation */
writel_relaxed(activation, XOR_ACTIVATION(chan)); writel(BIT(0), XOR_ACTIVATION(chan));
} }
static char mv_chan_is_busy(struct mv_xor_chan *chan) static char mv_chan_is_busy(struct mv_xor_chan *chan)

1
include/linux/dmaengine.h
View File

@@ -429,6 +429,7 @@ typedef bool (*dma_filter_fn)(struct dma_chan *chan, void *filter_param);
typedef void (*dma_async_tx_callback)(void *dma_async_param); typedef void (*dma_async_tx_callback)(void *dma_async_param);
struct dmaengine_unmap_data { struct dmaengine_unmap_data {
u8 map_cnt;
u8 to_cnt; u8 to_cnt;
u8 from_cnt; u8 from_cnt;
u8 bidi_cnt; u8 bidi_cnt;