From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878AbdCCJ6B (ORCPT ); Fri, 3 Mar 2017 04:58:01 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34043 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbdCCJ55 (ORCPT ); Fri, 3 Mar 2017 04:57:57 -0500 Date: Fri, 3 Mar 2017 10:56:54 +0100 From: Daniel Vetter To: Laura Abbott Cc: Sumit Semwal , Riley Andrews , arve@android.com, romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey , Daniel Vetter , Mark Brown , Benjamin Gaignard , linux-mm@kvack.org Subject: Re: [RFC PATCH 06/12] staging: android: ion: Remove crufty cache support Message-ID: <20170303095654.zbcqkcojo3vf6y4y@phenom.ffwll.local> Mail-Followup-To: Laura Abbott , Sumit Semwal , Riley Andrews , arve@android.com, romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey , Daniel Vetter , Mark Brown , Benjamin Gaignard , linux-mm@kvack.org References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-7-git-send-email-labbott@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1488491084-17252-7-git-send-email-labbott@redhat.com> X-Operating-System: Linux phenom 4.8.0-1-amd64 User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 02, 2017 at 01:44:38PM -0800, Laura Abbott wrote: > > > Now that we call dma_map in the dma_buf API callbacks there is no need > to use the existing cache APIs. Remove the sync ioctl and the existing > bad dma_sync calls. Explicit caching can be handled with the dma_buf > sync API. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion-ioctl.c | 5 ---- > drivers/staging/android/ion/ion.c | 40 ------------------------- > drivers/staging/android/ion/ion_carveout_heap.c | 6 ---- > drivers/staging/android/ion/ion_chunk_heap.c | 6 ---- > drivers/staging/android/ion/ion_page_pool.c | 3 -- > drivers/staging/android/ion/ion_system_heap.c | 5 ---- > 6 files changed, 65 deletions(-) > > diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c > index 5b2e93f..f820d77 100644 > --- a/drivers/staging/android/ion/ion-ioctl.c > +++ b/drivers/staging/android/ion/ion-ioctl.c > @@ -146,11 +146,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > data.handle.handle = handle->id; > break; > } > - case ION_IOC_SYNC: > - { > - ret = ion_sync_for_device(client, data.fd.fd); > - break; > - } You missed the case ION_IOC_SYNC: in compat_ion.c. While at it: Should we also remove the entire custom_ioctl infrastructure? It's entirely unused afaict, and for a pure buffer allocator I don't see any need to have custom ioctl. More code to remove potentially: - The entire compat ioctl stuff - would be an abi break, but I guess if we pick the 32bit abi and clean up the uapi headers we'll be mostly fine. would allow us to remove compat_ion.c entirely. - ION_IOC_IMPORT: With this ion is purely an allocator, so not sure we still need to be able to import anything. All the cache flushing/mapping is done through dma-buf ops/ioctls. With the case in compat_ion.c also removed, this patch is: Reviewed-by: Daniel Vetter > case ION_IOC_CUSTOM: > { > if (!dev->custom_ioctl) > diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c > index 8eef1d7..c3c316f 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -815,22 +815,6 @@ static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > free_duped_table(table); > } > > -void ion_pages_sync_for_device(struct device *dev, struct page *page, > - size_t size, enum dma_data_direction dir) > -{ > - struct scatterlist sg; > - > - sg_init_table(&sg, 1); > - sg_set_page(&sg, page, size, 0); > - /* > - * This is not correct - sg_dma_address needs a dma_addr_t that is valid > - * for the targeted device, but this works on the currently targeted > - * hardware. > - */ > - sg_dma_address(&sg) = page_to_phys(page); > - dma_sync_sg_for_device(dev, &sg, 1, dir); > -} > - > static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) > { > struct ion_buffer *buffer = dmabuf->priv; > @@ -1042,30 +1026,6 @@ struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd) > } > EXPORT_SYMBOL(ion_import_dma_buf_fd); > > -int ion_sync_for_device(struct ion_client *client, int fd) > -{ > - struct dma_buf *dmabuf; > - struct ion_buffer *buffer; > - > - dmabuf = dma_buf_get(fd); > - if (IS_ERR(dmabuf)) > - return PTR_ERR(dmabuf); > - > - /* if this memory came from ion */ > - if (dmabuf->ops != &dma_buf_ops) { > - pr_err("%s: can not sync dmabuf from another exporter\n", > - __func__); > - dma_buf_put(dmabuf); > - return -EINVAL; > - } > - buffer = dmabuf->priv; > - > - dma_sync_sg_for_device(NULL, buffer->sg_table->sgl, > - buffer->sg_table->nents, DMA_BIDIRECTIONAL); > - dma_buf_put(dmabuf); > - return 0; > -} > - > int ion_query_heaps(struct ion_client *client, struct ion_heap_query *query) > { > struct ion_device *dev = client->dev; > diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c > index 9bf8e98..e0e360f 100644 > --- a/drivers/staging/android/ion/ion_carveout_heap.c > +++ b/drivers/staging/android/ion/ion_carveout_heap.c > @@ -100,10 +100,6 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > ion_carveout_free(heap, paddr, buffer->size); > sg_free_table(table); > kfree(table); > @@ -128,8 +124,6 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c > index 8c41889..46e13f6 100644 > --- a/drivers/staging/android/ion/ion_chunk_heap.c > +++ b/drivers/staging/android/ion/ion_chunk_heap.c > @@ -101,10 +101,6 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > for_each_sg(table->sgl, sg, table->nents, i) { > gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), > sg->length); > @@ -132,8 +128,6 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c > index aea89c1..532eda7 100644 > --- a/drivers/staging/android/ion/ion_page_pool.c > +++ b/drivers/staging/android/ion/ion_page_pool.c > @@ -30,9 +30,6 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool) > > if (!page) > return NULL; > - if (!pool->cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << pool->order, > - DMA_BIDIRECTIONAL); > return page; > } > > diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c > index 6cb2fe7..a33331b 100644 > --- a/drivers/staging/android/ion/ion_system_heap.c > +++ b/drivers/staging/android/ion/ion_system_heap.c > @@ -75,9 +75,6 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap, > > page = ion_page_pool_alloc(pool); > > - if (cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << order, > - DMA_BIDIRECTIONAL); > return page; > } > > @@ -401,8 +398,6 @@ static int ion_system_contig_heap_allocate(struct ion_heap *heap, > > buffer->sg_table = table; > > - ion_pages_sync_for_device(NULL, page, len, DMA_BIDIRECTIONAL); > - > return 0; > > free_table: > -- > 2.7.4 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f200.google.com (mail-wr0-f200.google.com [209.85.128.200]) by kanga.kvack.org (Postfix) with ESMTP id 6D6246B0038 for ; Fri, 3 Mar 2017 04:56:59 -0500 (EST) Received: by mail-wr0-f200.google.com with SMTP id y90so17412244wrb.1 for ; Fri, 03 Mar 2017 01:56:59 -0800 (PST) Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com. [2a00:1450:400c:c09::244]) by mx.google.com with ESMTPS id c13si9428352wrb.34.2017.03.03.01.56.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 01:56:57 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id z63so68177wmg.2 for ; Fri, 03 Mar 2017 01:56:57 -0800 (PST) Date: Fri, 3 Mar 2017 10:56:54 +0100 From: Daniel Vetter Subject: Re: [RFC PATCH 06/12] staging: android: ion: Remove crufty cache support Message-ID: <20170303095654.zbcqkcojo3vf6y4y@phenom.ffwll.local> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-7-git-send-email-labbott@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1488491084-17252-7-git-send-email-labbott@redhat.com> Sender: owner-linux-mm@kvack.org List-ID: To: Laura Abbott Cc: Sumit Semwal , Riley Andrews , arve@android.com, romlem@google.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Brian Starkey , Daniel Vetter , Mark Brown , Benjamin Gaignard , linux-mm@kvack.org On Thu, Mar 02, 2017 at 01:44:38PM -0800, Laura Abbott wrote: > > > Now that we call dma_map in the dma_buf API callbacks there is no need > to use the existing cache APIs. Remove the sync ioctl and the existing > bad dma_sync calls. Explicit caching can be handled with the dma_buf > sync API. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion-ioctl.c | 5 ---- > drivers/staging/android/ion/ion.c | 40 ------------------------- > drivers/staging/android/ion/ion_carveout_heap.c | 6 ---- > drivers/staging/android/ion/ion_chunk_heap.c | 6 ---- > drivers/staging/android/ion/ion_page_pool.c | 3 -- > drivers/staging/android/ion/ion_system_heap.c | 5 ---- > 6 files changed, 65 deletions(-) > > diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c > index 5b2e93f..f820d77 100644 > --- a/drivers/staging/android/ion/ion-ioctl.c > +++ b/drivers/staging/android/ion/ion-ioctl.c > @@ -146,11 +146,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > data.handle.handle = handle->id; > break; > } > - case ION_IOC_SYNC: > - { > - ret = ion_sync_for_device(client, data.fd.fd); > - break; > - } You missed the case ION_IOC_SYNC: in compat_ion.c. While at it: Should we also remove the entire custom_ioctl infrastructure? It's entirely unused afaict, and for a pure buffer allocator I don't see any need to have custom ioctl. More code to remove potentially: - The entire compat ioctl stuff - would be an abi break, but I guess if we pick the 32bit abi and clean up the uapi headers we'll be mostly fine. would allow us to remove compat_ion.c entirely. - ION_IOC_IMPORT: With this ion is purely an allocator, so not sure we still need to be able to import anything. All the cache flushing/mapping is done through dma-buf ops/ioctls. With the case in compat_ion.c also removed, this patch is: Reviewed-by: Daniel Vetter > case ION_IOC_CUSTOM: > { > if (!dev->custom_ioctl) > diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c > index 8eef1d7..c3c316f 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -815,22 +815,6 @@ static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > free_duped_table(table); > } > > -void ion_pages_sync_for_device(struct device *dev, struct page *page, > - size_t size, enum dma_data_direction dir) > -{ > - struct scatterlist sg; > - > - sg_init_table(&sg, 1); > - sg_set_page(&sg, page, size, 0); > - /* > - * This is not correct - sg_dma_address needs a dma_addr_t that is valid > - * for the targeted device, but this works on the currently targeted > - * hardware. > - */ > - sg_dma_address(&sg) = page_to_phys(page); > - dma_sync_sg_for_device(dev, &sg, 1, dir); > -} > - > static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) > { > struct ion_buffer *buffer = dmabuf->priv; > @@ -1042,30 +1026,6 @@ struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd) > } > EXPORT_SYMBOL(ion_import_dma_buf_fd); > > -int ion_sync_for_device(struct ion_client *client, int fd) > -{ > - struct dma_buf *dmabuf; > - struct ion_buffer *buffer; > - > - dmabuf = dma_buf_get(fd); > - if (IS_ERR(dmabuf)) > - return PTR_ERR(dmabuf); > - > - /* if this memory came from ion */ > - if (dmabuf->ops != &dma_buf_ops) { > - pr_err("%s: can not sync dmabuf from another exporter\n", > - __func__); > - dma_buf_put(dmabuf); > - return -EINVAL; > - } > - buffer = dmabuf->priv; > - > - dma_sync_sg_for_device(NULL, buffer->sg_table->sgl, > - buffer->sg_table->nents, DMA_BIDIRECTIONAL); > - dma_buf_put(dmabuf); > - return 0; > -} > - > int ion_query_heaps(struct ion_client *client, struct ion_heap_query *query) > { > struct ion_device *dev = client->dev; > diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c > index 9bf8e98..e0e360f 100644 > --- a/drivers/staging/android/ion/ion_carveout_heap.c > +++ b/drivers/staging/android/ion/ion_carveout_heap.c > @@ -100,10 +100,6 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > ion_carveout_free(heap, paddr, buffer->size); > sg_free_table(table); > kfree(table); > @@ -128,8 +124,6 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c > index 8c41889..46e13f6 100644 > --- a/drivers/staging/android/ion/ion_chunk_heap.c > +++ b/drivers/staging/android/ion/ion_chunk_heap.c > @@ -101,10 +101,6 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > for_each_sg(table->sgl, sg, table->nents, i) { > gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), > sg->length); > @@ -132,8 +128,6 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c > index aea89c1..532eda7 100644 > --- a/drivers/staging/android/ion/ion_page_pool.c > +++ b/drivers/staging/android/ion/ion_page_pool.c > @@ -30,9 +30,6 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool) > > if (!page) > return NULL; > - if (!pool->cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << pool->order, > - DMA_BIDIRECTIONAL); > return page; > } > > diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c > index 6cb2fe7..a33331b 100644 > --- a/drivers/staging/android/ion/ion_system_heap.c > +++ b/drivers/staging/android/ion/ion_system_heap.c > @@ -75,9 +75,6 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap, > > page = ion_page_pool_alloc(pool); > > - if (cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << order, > - DMA_BIDIRECTIONAL); > return page; > } > > @@ -401,8 +398,6 @@ static int ion_system_contig_heap_allocate(struct ion_heap *heap, > > buffer->sg_table = table; > > - ion_pages_sync_for_device(NULL, page, len, DMA_BIDIRECTIONAL); > - > return 0; > > free_table: > -- > 2.7.4 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email@kvack.org -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel@ffwll.ch (Daniel Vetter) Date: Fri, 3 Mar 2017 10:56:54 +0100 Subject: [RFC PATCH 06/12] staging: android: ion: Remove crufty cache support In-Reply-To: <1488491084-17252-7-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-7-git-send-email-labbott@redhat.com> Message-ID: <20170303095654.zbcqkcojo3vf6y4y@phenom.ffwll.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Mar 02, 2017 at 01:44:38PM -0800, Laura Abbott wrote: > > > Now that we call dma_map in the dma_buf API callbacks there is no need > to use the existing cache APIs. Remove the sync ioctl and the existing > bad dma_sync calls. Explicit caching can be handled with the dma_buf > sync API. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion-ioctl.c | 5 ---- > drivers/staging/android/ion/ion.c | 40 ------------------------- > drivers/staging/android/ion/ion_carveout_heap.c | 6 ---- > drivers/staging/android/ion/ion_chunk_heap.c | 6 ---- > drivers/staging/android/ion/ion_page_pool.c | 3 -- > drivers/staging/android/ion/ion_system_heap.c | 5 ---- > 6 files changed, 65 deletions(-) > > diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c > index 5b2e93f..f820d77 100644 > --- a/drivers/staging/android/ion/ion-ioctl.c > +++ b/drivers/staging/android/ion/ion-ioctl.c > @@ -146,11 +146,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > data.handle.handle = handle->id; > break; > } > - case ION_IOC_SYNC: > - { > - ret = ion_sync_for_device(client, data.fd.fd); > - break; > - } You missed the case ION_IOC_SYNC: in compat_ion.c. While at it: Should we also remove the entire custom_ioctl infrastructure? It's entirely unused afaict, and for a pure buffer allocator I don't see any need to have custom ioctl. More code to remove potentially: - The entire compat ioctl stuff - would be an abi break, but I guess if we pick the 32bit abi and clean up the uapi headers we'll be mostly fine. would allow us to remove compat_ion.c entirely. - ION_IOC_IMPORT: With this ion is purely an allocator, so not sure we still need to be able to import anything. All the cache flushing/mapping is done through dma-buf ops/ioctls. With the case in compat_ion.c also removed, this patch is: Reviewed-by: Daniel Vetter > case ION_IOC_CUSTOM: > { > if (!dev->custom_ioctl) > diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c > index 8eef1d7..c3c316f 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -815,22 +815,6 @@ static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > free_duped_table(table); > } > > -void ion_pages_sync_for_device(struct device *dev, struct page *page, > - size_t size, enum dma_data_direction dir) > -{ > - struct scatterlist sg; > - > - sg_init_table(&sg, 1); > - sg_set_page(&sg, page, size, 0); > - /* > - * This is not correct - sg_dma_address needs a dma_addr_t that is valid > - * for the targeted device, but this works on the currently targeted > - * hardware. > - */ > - sg_dma_address(&sg) = page_to_phys(page); > - dma_sync_sg_for_device(dev, &sg, 1, dir); > -} > - > static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) > { > struct ion_buffer *buffer = dmabuf->priv; > @@ -1042,30 +1026,6 @@ struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd) > } > EXPORT_SYMBOL(ion_import_dma_buf_fd); > > -int ion_sync_for_device(struct ion_client *client, int fd) > -{ > - struct dma_buf *dmabuf; > - struct ion_buffer *buffer; > - > - dmabuf = dma_buf_get(fd); > - if (IS_ERR(dmabuf)) > - return PTR_ERR(dmabuf); > - > - /* if this memory came from ion */ > - if (dmabuf->ops != &dma_buf_ops) { > - pr_err("%s: can not sync dmabuf from another exporter\n", > - __func__); > - dma_buf_put(dmabuf); > - return -EINVAL; > - } > - buffer = dmabuf->priv; > - > - dma_sync_sg_for_device(NULL, buffer->sg_table->sgl, > - buffer->sg_table->nents, DMA_BIDIRECTIONAL); > - dma_buf_put(dmabuf); > - return 0; > -} > - > int ion_query_heaps(struct ion_client *client, struct ion_heap_query *query) > { > struct ion_device *dev = client->dev; > diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c > index 9bf8e98..e0e360f 100644 > --- a/drivers/staging/android/ion/ion_carveout_heap.c > +++ b/drivers/staging/android/ion/ion_carveout_heap.c > @@ -100,10 +100,6 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > ion_carveout_free(heap, paddr, buffer->size); > sg_free_table(table); > kfree(table); > @@ -128,8 +124,6 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c > index 8c41889..46e13f6 100644 > --- a/drivers/staging/android/ion/ion_chunk_heap.c > +++ b/drivers/staging/android/ion/ion_chunk_heap.c > @@ -101,10 +101,6 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) > > ion_heap_buffer_zero(buffer); > > - if (ion_buffer_cached(buffer)) > - dma_sync_sg_for_device(NULL, table->sgl, table->nents, > - DMA_BIDIRECTIONAL); > - > for_each_sg(table->sgl, sg, table->nents, i) { > gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)), > sg->length); > @@ -132,8 +128,6 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) > page = pfn_to_page(PFN_DOWN(heap_data->base)); > size = heap_data->size; > > - ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL); > - > ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL)); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c > index aea89c1..532eda7 100644 > --- a/drivers/staging/android/ion/ion_page_pool.c > +++ b/drivers/staging/android/ion/ion_page_pool.c > @@ -30,9 +30,6 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool) > > if (!page) > return NULL; > - if (!pool->cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << pool->order, > - DMA_BIDIRECTIONAL); > return page; > } > > diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c > index 6cb2fe7..a33331b 100644 > --- a/drivers/staging/android/ion/ion_system_heap.c > +++ b/drivers/staging/android/ion/ion_system_heap.c > @@ -75,9 +75,6 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap, > > page = ion_page_pool_alloc(pool); > > - if (cached) > - ion_pages_sync_for_device(NULL, page, PAGE_SIZE << order, > - DMA_BIDIRECTIONAL); > return page; > } > > @@ -401,8 +398,6 @@ static int ion_system_contig_heap_allocate(struct ion_heap *heap, > > buffer->sg_table = table; > > - ion_pages_sync_for_device(NULL, page, len, DMA_BIDIRECTIONAL); > - > return 0; > > free_table: > -- > 2.7.4 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo at kvack.org. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: email at kvack.org -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC PATCH 06/12] staging: android: ion: Remove crufty cache support Date: Fri, 3 Mar 2017 10:56:54 +0100 Message-ID: <20170303095654.zbcqkcojo3vf6y4y@phenom.ffwll.local> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-7-git-send-email-labbott@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFEA26ECBE for ; Fri, 3 Mar 2017 09:56:58 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n11so2288627wma.0 for ; Fri, 03 Mar 2017 01:56:58 -0800 (PST) Content-Disposition: inline In-Reply-To: <1488491084-17252-7-git-send-email-labbott@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Laura Abbott Cc: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , arve@android.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Riley Andrews , Mark Brown , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBNYXIgMDIsIDIwMTcgYXQgMDE6NDQ6MzhQTSAtMDgwMCwgTGF1cmEgQWJib3R0IHdy b3RlOgo+IAo+IAo+IE5vdyB0aGF0IHdlIGNhbGwgZG1hX21hcCBpbiB0aGUgZG1hX2J1ZiBBUEkg Y2FsbGJhY2tzIHRoZXJlIGlzIG5vIG5lZWQKPiB0byB1c2UgdGhlIGV4aXN0aW5nIGNhY2hlIEFQ SXMuIFJlbW92ZSB0aGUgc3luYyBpb2N0bCBhbmQgdGhlIGV4aXN0aW5nCj4gYmFkIGRtYV9zeW5j IGNhbGxzLiBFeHBsaWNpdCBjYWNoaW5nIGNhbiBiZSBoYW5kbGVkIHdpdGggdGhlIGRtYV9idWYK PiBzeW5jIEFQSS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBMYXVyYSBBYmJvdHQgPGxhYmJvdHRAcmVk aGF0LmNvbT4KPiAtLS0KPiAgZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi1pb2N0bC5j ICAgICAgICAgfCAgNSAtLS0tCj4gIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYyAg ICAgICAgICAgICAgIHwgNDAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL3N0 YWdpbmcvYW5kcm9pZC9pb24vaW9uX2NhcnZlb3V0X2hlYXAuYyB8ICA2IC0tLS0KPiAgZHJpdmVy cy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbl9jaHVua19oZWFwLmMgICAgfCAgNiAtLS0tCj4gIGRy aXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb25fcGFnZV9wb29sLmMgICAgIHwgIDMgLS0KPiAg ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbl9zeXN0ZW1faGVhcC5jICAgfCAgNSAtLS0t Cj4gIDYgZmlsZXMgY2hhbmdlZCwgNjUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24taW9jdGwuYyBiL2RyaXZlcnMvc3RhZ2luZy9h bmRyb2lkL2lvbi9pb24taW9jdGwuYwo+IGluZGV4IDViMmU5M2YuLmY4MjBkNzcgMTAwNjQ0Cj4g LS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi1pb2N0bC5jCj4gKysrIGIvZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi1pb2N0bC5jCj4gQEAgLTE0NiwxMSArMTQ2LDYg QEAgbG9uZyBpb25faW9jdGwoc3RydWN0IGZpbGUgKmZpbHAsIHVuc2lnbmVkIGludCBjbWQsIHVu c2lnbmVkIGxvbmcgYXJnKQo+ICAJCQlkYXRhLmhhbmRsZS5oYW5kbGUgPSBoYW5kbGUtPmlkOwo+ ICAJCWJyZWFrOwo+ICAJfQo+IC0JY2FzZSBJT05fSU9DX1NZTkM6Cj4gLQl7Cj4gLQkJcmV0ID0g aW9uX3N5bmNfZm9yX2RldmljZShjbGllbnQsIGRhdGEuZmQuZmQpOwo+IC0JCWJyZWFrOwo+IC0J fQoKWW91IG1pc3NlZCB0aGUgY2FzZSBJT05fSU9DX1NZTkM6IGluIGNvbXBhdF9pb24uYy4KCldo aWxlIGF0IGl0OiBTaG91bGQgd2UgYWxzbyByZW1vdmUgdGhlIGVudGlyZSBjdXN0b21faW9jdGwg aW5mcmFzdHJ1Y3R1cmU/Ckl0J3MgZW50aXJlbHkgdW51c2VkIGFmYWljdCwgYW5kIGZvciBhIHB1 cmUgYnVmZmVyIGFsbG9jYXRvciBJIGRvbid0IHNlZQphbnkgbmVlZCB0byBoYXZlIGN1c3RvbSBp b2N0bC4KCk1vcmUgY29kZSB0byByZW1vdmUgcG90ZW50aWFsbHk6Ci0gVGhlIGVudGlyZSBjb21w YXQgaW9jdGwgc3R1ZmYgLSB3b3VsZCBiZSBhbiBhYmkgYnJlYWssIGJ1dCBJIGd1ZXNzIGlmIHdl CiAgcGljayB0aGUgMzJiaXQgYWJpIGFuZCBjbGVhbiB1cCB0aGUgdWFwaSBoZWFkZXJzIHdlJ2xs IGJlIG1vc3RseSBmaW5lLgogIHdvdWxkIGFsbG93IHVzIHRvIHJlbW92ZSBjb21wYXRfaW9uLmMg ZW50aXJlbHkuCgotIElPTl9JT0NfSU1QT1JUOiBXaXRoIHRoaXMgaW9uIGlzIHB1cmVseSBhbiBh bGxvY2F0b3IsIHNvIG5vdCBzdXJlIHdlCiAgc3RpbGwgbmVlZCB0byBiZSBhYmxlIHRvIGltcG9y dCBhbnl0aGluZy4gQWxsIHRoZSBjYWNoZSBmbHVzaGluZy9tYXBwaW5nCiAgaXMgZG9uZSB0aHJv dWdoIGRtYS1idWYgb3BzL2lvY3Rscy4KCgpXaXRoIHRoZSBjYXNlIGluIGNvbXBhdF9pb24uYyBh bHNvIHJlbW92ZWQsIHRoaXMgcGF0Y2ggaXM6CgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KCj4gIAljYXNlIElPTl9JT0NfQ1VTVE9NOgo+ICAJewo+ ICAJCWlmICghZGV2LT5jdXN0b21faW9jdGwpCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL2lvbi9pb24uYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYwo+ IGluZGV4IDhlZWYxZDcuLmMzYzMxNmYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2Fu ZHJvaWQvaW9uL2lvbi5jCj4gKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5j Cj4gQEAgLTgxNSwyMiArODE1LDYgQEAgc3RhdGljIHZvaWQgaW9uX3VubWFwX2RtYV9idWYoc3Ry dWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNobWVudCwKPiAgCWZyZWVfZHVwZWRfdGFibGUo dGFibGUpOwo+ICB9Cj4gIAo+IC12b2lkIGlvbl9wYWdlc19zeW5jX2Zvcl9kZXZpY2Uoc3RydWN0 IGRldmljZSAqZGV2LCBzdHJ1Y3QgcGFnZSAqcGFnZSwKPiAtCQkJICAgICAgIHNpemVfdCBzaXpl LCBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXIpCj4gLXsKPiAtCXN0cnVjdCBzY2F0dGVybGlz dCBzZzsKPiAtCj4gLQlzZ19pbml0X3RhYmxlKCZzZywgMSk7Cj4gLQlzZ19zZXRfcGFnZSgmc2cs IHBhZ2UsIHNpemUsIDApOwo+IC0JLyoKPiAtCSAqIFRoaXMgaXMgbm90IGNvcnJlY3QgLSBzZ19k bWFfYWRkcmVzcyBuZWVkcyBhIGRtYV9hZGRyX3QgdGhhdCBpcyB2YWxpZAo+IC0JICogZm9yIHRo ZSB0YXJnZXRlZCBkZXZpY2UsIGJ1dCB0aGlzIHdvcmtzIG9uIHRoZSBjdXJyZW50bHkgdGFyZ2V0 ZWQKPiAtCSAqIGhhcmR3YXJlLgo+IC0JICovCj4gLQlzZ19kbWFfYWRkcmVzcygmc2cpID0gcGFn ZV90b19waHlzKHBhZ2UpOwo+IC0JZG1hX3N5bmNfc2dfZm9yX2RldmljZShkZXYsICZzZywgMSwg ZGlyKTsKPiAtfQo+IC0KPiAgc3RhdGljIGludCBpb25fbW1hcChzdHJ1Y3QgZG1hX2J1ZiAqZG1h YnVmLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSkKPiAgewo+ICAJc3RydWN0IGlvbl9idWZm ZXIgKmJ1ZmZlciA9IGRtYWJ1Zi0+cHJpdjsKPiBAQCAtMTA0MiwzMCArMTAyNiw2IEBAIHN0cnVj dCBpb25faGFuZGxlICppb25faW1wb3J0X2RtYV9idWZfZmQoc3RydWN0IGlvbl9jbGllbnQgKmNs aWVudCwgaW50IGZkKQo+ICB9Cj4gIEVYUE9SVF9TWU1CT0woaW9uX2ltcG9ydF9kbWFfYnVmX2Zk KTsKPiAgCj4gLWludCBpb25fc3luY19mb3JfZGV2aWNlKHN0cnVjdCBpb25fY2xpZW50ICpjbGll bnQsIGludCBmZCkKPiAtewo+IC0Jc3RydWN0IGRtYV9idWYgKmRtYWJ1ZjsKPiAtCXN0cnVjdCBp b25fYnVmZmVyICpidWZmZXI7Cj4gLQo+IC0JZG1hYnVmID0gZG1hX2J1Zl9nZXQoZmQpOwo+IC0J aWYgKElTX0VSUihkbWFidWYpKQo+IC0JCXJldHVybiBQVFJfRVJSKGRtYWJ1Zik7Cj4gLQo+IC0J LyogaWYgdGhpcyBtZW1vcnkgY2FtZSBmcm9tIGlvbiAqLwo+IC0JaWYgKGRtYWJ1Zi0+b3BzICE9 ICZkbWFfYnVmX29wcykgewo+IC0JCXByX2VycigiJXM6IGNhbiBub3Qgc3luYyBkbWFidWYgZnJv bSBhbm90aGVyIGV4cG9ydGVyXG4iLAo+IC0JCSAgICAgICBfX2Z1bmNfXyk7Cj4gLQkJZG1hX2J1 Zl9wdXQoZG1hYnVmKTsKPiAtCQlyZXR1cm4gLUVJTlZBTDsKPiAtCX0KPiAtCWJ1ZmZlciA9IGRt YWJ1Zi0+cHJpdjsKPiAtCj4gLQlkbWFfc3luY19zZ19mb3JfZGV2aWNlKE5VTEwsIGJ1ZmZlci0+ c2dfdGFibGUtPnNnbCwKPiAtCQkJICAgICAgIGJ1ZmZlci0+c2dfdGFibGUtPm5lbnRzLCBETUFf QklESVJFQ1RJT05BTCk7Cj4gLQlkbWFfYnVmX3B1dChkbWFidWYpOwo+IC0JcmV0dXJuIDA7Cj4g LX0KPiAtCj4gIGludCBpb25fcXVlcnlfaGVhcHMoc3RydWN0IGlvbl9jbGllbnQgKmNsaWVudCwg c3RydWN0IGlvbl9oZWFwX3F1ZXJ5ICpxdWVyeSkKPiAgewo+ICAJc3RydWN0IGlvbl9kZXZpY2Ug KmRldiA9IGNsaWVudC0+ZGV2Owo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9p ZC9pb24vaW9uX2NhcnZlb3V0X2hlYXAuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9p b25fY2FydmVvdXRfaGVhcC5jCj4gaW5kZXggOWJmOGU5OC4uZTBlMzYwZiAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9pb24vaW9uX2NhcnZlb3V0X2hlYXAuYwo+ICsrKyBi L2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb25fY2FydmVvdXRfaGVhcC5jCj4gQEAgLTEw MCwxMCArMTAwLDYgQEAgc3RhdGljIHZvaWQgaW9uX2NhcnZlb3V0X2hlYXBfZnJlZShzdHJ1Y3Qg aW9uX2J1ZmZlciAqYnVmZmVyKQo+ICAKPiAgCWlvbl9oZWFwX2J1ZmZlcl96ZXJvKGJ1ZmZlcik7 Cj4gIAo+IC0JaWYgKGlvbl9idWZmZXJfY2FjaGVkKGJ1ZmZlcikpCj4gLQkJZG1hX3N5bmNfc2df Zm9yX2RldmljZShOVUxMLCB0YWJsZS0+c2dsLCB0YWJsZS0+bmVudHMsCj4gLQkJCQkgICAgICAg RE1BX0JJRElSRUNUSU9OQUwpOwo+IC0KPiAgCWlvbl9jYXJ2ZW91dF9mcmVlKGhlYXAsIHBhZGRy LCBidWZmZXItPnNpemUpOwo+ICAJc2dfZnJlZV90YWJsZSh0YWJsZSk7Cj4gIAlrZnJlZSh0YWJs ZSk7Cj4gQEAgLTEyOCw4ICsxMjQsNiBAQCBzdHJ1Y3QgaW9uX2hlYXAgKmlvbl9jYXJ2ZW91dF9o ZWFwX2NyZWF0ZShzdHJ1Y3QgaW9uX3BsYXRmb3JtX2hlYXAgKmhlYXBfZGF0YSkKPiAgCXBhZ2Ug PSBwZm5fdG9fcGFnZShQRk5fRE9XTihoZWFwX2RhdGEtPmJhc2UpKTsKPiAgCXNpemUgPSBoZWFw X2RhdGEtPnNpemU7Cj4gIAo+IC0JaW9uX3BhZ2VzX3N5bmNfZm9yX2RldmljZShOVUxMLCBwYWdl LCBzaXplLCBETUFfQklESVJFQ1RJT05BTCk7Cj4gLQo+ICAJcmV0ID0gaW9uX2hlYXBfcGFnZXNf emVybyhwYWdlLCBzaXplLCBwZ3Byb3Rfd3JpdGVjb21iaW5lKFBBR0VfS0VSTkVMKSk7Cj4gIAlp ZiAocmV0KQo+ICAJCXJldHVybiBFUlJfUFRSKHJldCk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv c3RhZ2luZy9hbmRyb2lkL2lvbi9pb25fY2h1bmtfaGVhcC5jIGIvZHJpdmVycy9zdGFnaW5nL2Fu ZHJvaWQvaW9uL2lvbl9jaHVua19oZWFwLmMKPiBpbmRleCA4YzQxODg5Li40NmUxM2Y2IDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb25fY2h1bmtfaGVhcC5jCj4g KysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbl9jaHVua19oZWFwLmMKPiBAQCAt MTAxLDEwICsxMDEsNiBAQCBzdGF0aWMgdm9pZCBpb25fY2h1bmtfaGVhcF9mcmVlKHN0cnVjdCBp b25fYnVmZmVyICpidWZmZXIpCj4gIAo+ICAJaW9uX2hlYXBfYnVmZmVyX3plcm8oYnVmZmVyKTsK PiAgCj4gLQlpZiAoaW9uX2J1ZmZlcl9jYWNoZWQoYnVmZmVyKSkKPiAtCQlkbWFfc3luY19zZ19m b3JfZGV2aWNlKE5VTEwsIHRhYmxlLT5zZ2wsIHRhYmxlLT5uZW50cywKPiAtCQkJCSAgICAgICBE TUFfQklESVJFQ1RJT05BTCk7Cj4gLQo+ICAJZm9yX2VhY2hfc2codGFibGUtPnNnbCwgc2csIHRh YmxlLT5uZW50cywgaSkgewo+ICAJCWdlbl9wb29sX2ZyZWUoY2h1bmtfaGVhcC0+cG9vbCwgcGFn ZV90b19waHlzKHNnX3BhZ2Uoc2cpKSwKPiAgCQkJICAgICAgc2ctPmxlbmd0aCk7Cj4gQEAgLTEz Miw4ICsxMjgsNiBAQCBzdHJ1Y3QgaW9uX2hlYXAgKmlvbl9jaHVua19oZWFwX2NyZWF0ZShzdHJ1 Y3QgaW9uX3BsYXRmb3JtX2hlYXAgKmhlYXBfZGF0YSkKPiAgCXBhZ2UgPSBwZm5fdG9fcGFnZShQ Rk5fRE9XTihoZWFwX2RhdGEtPmJhc2UpKTsKPiAgCXNpemUgPSBoZWFwX2RhdGEtPnNpemU7Cj4g IAo+IC0JaW9uX3BhZ2VzX3N5bmNfZm9yX2RldmljZShOVUxMLCBwYWdlLCBzaXplLCBETUFfQklE SVJFQ1RJT05BTCk7Cj4gLQo+ICAJcmV0ID0gaW9uX2hlYXBfcGFnZXNfemVybyhwYWdlLCBzaXpl LCBwZ3Byb3Rfd3JpdGVjb21iaW5lKFBBR0VfS0VSTkVMKSk7Cj4gIAlpZiAocmV0KQo+ICAJCXJl dHVybiBFUlJfUFRSKHJldCk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lk L2lvbi9pb25fcGFnZV9wb29sLmMgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9pb24vaW9uX3Bh Z2VfcG9vbC5jCj4gaW5kZXggYWVhODljMS4uNTMyZWRhNyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9pb24vaW9uX3BhZ2VfcG9vbC5jCj4gKysrIGIvZHJpdmVycy9zdGFn aW5nL2FuZHJvaWQvaW9uL2lvbl9wYWdlX3Bvb2wuYwo+IEBAIC0zMCw5ICszMCw2IEBAIHN0YXRp YyB2b2lkICppb25fcGFnZV9wb29sX2FsbG9jX3BhZ2VzKHN0cnVjdCBpb25fcGFnZV9wb29sICpw b29sKQo+ICAKPiAgCWlmICghcGFnZSkKPiAgCQlyZXR1cm4gTlVMTDsKPiAtCWlmICghcG9vbC0+ Y2FjaGVkKQo+IC0JCWlvbl9wYWdlc19zeW5jX2Zvcl9kZXZpY2UoTlVMTCwgcGFnZSwgUEFHRV9T SVpFIDw8IHBvb2wtPm9yZGVyLAo+IC0JCQkJCSAgRE1BX0JJRElSRUNUSU9OQUwpOwo+ICAJcmV0 dXJuIHBhZ2U7Cj4gIH0KPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lk L2lvbi9pb25fc3lzdGVtX2hlYXAuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb25f c3lzdGVtX2hlYXAuYwo+IGluZGV4IDZjYjJmZTcuLmEzMzMzMWIgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbl9zeXN0ZW1faGVhcC5jCj4gKysrIGIvZHJpdmVy cy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbl9zeXN0ZW1faGVhcC5jCj4gQEAgLTc1LDkgKzc1LDYg QEAgc3RhdGljIHN0cnVjdCBwYWdlICphbGxvY19idWZmZXJfcGFnZShzdHJ1Y3QgaW9uX3N5c3Rl bV9oZWFwICpoZWFwLAo+ICAKPiAgCXBhZ2UgPSBpb25fcGFnZV9wb29sX2FsbG9jKHBvb2wpOwo+ ICAKPiAtCWlmIChjYWNoZWQpCj4gLQkJaW9uX3BhZ2VzX3N5bmNfZm9yX2RldmljZShOVUxMLCBw YWdlLCBQQUdFX1NJWkUgPDwgb3JkZXIsCj4gLQkJCQkJICBETUFfQklESVJFQ1RJT05BTCk7Cj4g IAlyZXR1cm4gcGFnZTsKPiAgfQo+ICAKPiBAQCAtNDAxLDggKzM5OCw2IEBAIHN0YXRpYyBpbnQg aW9uX3N5c3RlbV9jb250aWdfaGVhcF9hbGxvY2F0ZShzdHJ1Y3QgaW9uX2hlYXAgKmhlYXAsCj4g IAo+ICAJYnVmZmVyLT5zZ190YWJsZSA9IHRhYmxlOwo+ICAKPiAtCWlvbl9wYWdlc19zeW5jX2Zv cl9kZXZpY2UoTlVMTCwgcGFnZSwgbGVuLCBETUFfQklESVJFQ1RJT05BTCk7Cj4gLQo+ICAJcmV0 dXJuIDA7Cj4gIAo+ICBmcmVlX3RhYmxlOgo+IC0tIAo+IDIuNy40Cj4gCj4gLS0KPiBUbyB1bnN1 YnNjcmliZSwgc2VuZCBhIG1lc3NhZ2Ugd2l0aCAndW5zdWJzY3JpYmUgbGludXgtbW0nIGluCj4g dGhlIGJvZHkgdG8gbWFqb3Jkb21vQGt2YWNrLm9yZy4gIEZvciBtb3JlIGluZm8gb24gTGludXgg TU0sCj4gc2VlOiBodHRwOi8vd3d3LmxpbnV4LW1tLm9yZy8gLgo+IERvbid0IGVtYWlsOiA8YSBo cmVmPW1haWx0bzoiZG9udEBrdmFjay5vcmciPiBlbWFpbEBrdmFjay5vcmcgPC9hPgoKLS0gCkRh bmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9i bG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=