shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "staging: android: ion: set dma ops for platform device"

Browse Source 
This reverts commit 6a40ead69f.

The old patch only do sync for pages first allocated from system to page
pools which have memset operation.

In that case, the sg table hasn't been created, so the sg_phy should be
filled extra.

After this revert, a new patch will push to do sync after sg table
created, and use a common device from ion driver, which is required by
dma_sync api.

Change-Id: I9712136a532f64ff3224308f48d59efb87fd5be2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2021-04-26 10:03:11 +08:00
parent 0f4763b1c6
commit 835aee8692
2 changed files with 2 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/android/ion/ion.h
View File

@@ -294,7 +294,6 @@ size_t ion_heap_freelist_size(struct ion_heap *heap);
* @gfp_mask: gfp_mask to use from alloc
* @order: order of pages in the pool
* @list: plist node for list of pools
* @dev: device for the pool
*
* Allows you to keep a pool of pre allocated pages to use from your heap.
* Keeping a pool of pages that is ready for dma, ie any cached mapping have
@@ -310,7 +309,6 @@ struct ion_page_pool {
gfp_t gfp_mask;
unsigned int order;
struct plist_node list;
struct device *dev;
};
struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order);

59
drivers/staging/android/ion/ion_page_pool.c
View File

@@ -5,10 +5,7 @@
* Copyright (C) 2011 Google, Inc.
*/
#include <linux/dma-buf.h>
#include <linux/list.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/swap.h>
#include <linux/sched/signal.h>
@@ -73,20 +70,6 @@ static struct page *ion_page_pool_remove(struct ion_page_pool *pool, bool high)
return page;
}
static void page_sync_for_device(struct device *dev, struct page *page,
size_t size, enum dma_data_direction dir)
{
struct scatterlist sg;
if (!dev || !page)
return;
sg_init_table(&sg, 1);
sg_set_page(&sg, page, size, 0);
sg_dma_address(&sg) = page_to_phys(page);
dma_sync_sg_for_device(dev, &sg, 1, dir);
}
struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
{
struct page *page = NULL;
@@ -100,12 +83,8 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
page = ion_page_pool_remove(pool, false);
mutex_unlock(&pool->mutex);
if (!page) {
if (!page)
page = ion_page_pool_alloc_pages(pool);
page_sync_for_device(pool->dev, page,
PAGE_SIZE << pool->order,
DMA_BIDIRECTIONAL);
}
return page;
}
@@ -169,33 +148,9 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,
return freed;
}
static const struct platform_device_info ion_dev_info = {
.name = "ion-pool",
.id = PLATFORM_DEVID_AUTO,
.dma_mask = DMA_BIT_MASK(32),
};
static struct platform_device *platform_device_register_dma(const char *name)
{
struct platform_device *pdev;
int ret;
pdev = platform_device_register_full(&ion_dev_info);
if (pdev) {
ret = of_dma_configure(&pdev->dev, NULL, true);
if (ret) {
platform_device_unregister(pdev);
pdev = NULL;
}
}
return pdev;
}
struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order)
{
struct platform_device *pdev;
struct ion_page_pool *pool = kzalloc(sizeof(*pool), GFP_KERNEL);
struct ion_page_pool *pool = kmalloc(sizeof(*pool), GFP_KERNEL);
if (!pool)
return NULL;
@@ -208,20 +163,10 @@ struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order)
mutex_init(&pool->mutex);
plist_node_init(&pool->list, order);
pdev = platform_device_register_dma("ion_pool");
if (!IS_ERR(pdev))
pool->dev = &pdev->dev;
return pool;
}
void ion_page_pool_destroy(struct ion_page_pool *pool)
{
if (pool->dev) {
struct platform_device *pdev = to_platform_device(pool->dev);
of_dma_deconfigure(&pdev->dev);
platform_device_unregister(pdev);
}
kfree(pool);
}