From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34751 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcBMXDJ (ORCPT ); Sat, 13 Feb 2016 18:03:09 -0500 Subject: Patch "[media] media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish" has been added to the 4.3-stable tree To: tiffany.lin@mediatek.com, gregkh@linuxfoundation.org, mchehab@osg.samsung.com, sakari.ailus@linux.intel.com Cc: , From: Date: Sat, 13 Feb 2016 15:03:08 -0800 Message-ID: <1455404588239177@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled [media] media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish to the 4.3-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: media-vb2-dma-sg-fully-cache-synchronise-buffers-in-prepare-and-finish.patch and it can be found in the queue-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 418dae2276065680bde7ae27d2c075e612a54de6 Mon Sep 17 00:00:00 2001 From: Tiffany Lin Date: Thu, 24 Sep 2015 06:02:36 -0300 Subject: [media] media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish From: Tiffany Lin commit 418dae2276065680bde7ae27d2c075e612a54de6 upstream. In videobuf2 dma-sg memory types the prepare and finish ops, instead of passing the number of entries in the original scatterlist as the "nents" parameter to dma_sync_sg_for_device() and dma_sync_sg_for_cpu(), the value returned by dma_map_sg() was used. Albeit this has been suggested in comments of some implementations (which have since been corrected), this is wrong. Fixes: d790b7eda953 ("vb2-dma-sg: move dma_(un)map_sg here") Signed-off-by: Tiffany Lin Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/v4l2-core/videobuf2-dma-sg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c @@ -210,7 +210,8 @@ static void vb2_dma_sg_prepare(void *buf if (buf->db_attach) return; - dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); + dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents, + buf->dma_dir); } static void vb2_dma_sg_finish(void *buf_priv) @@ -222,7 +223,7 @@ static void vb2_dma_sg_finish(void *buf_ if (buf->db_attach) return; - dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); + dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir); } static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr, Patches currently in stable-queue which might be from tiffany.lin@mediatek.com are queue-4.3/media-vb2-dma-sg-fully-cache-synchronise-buffers-in-prepare-and-finish.patch queue-4.3/media-vb2-dma-contig-fully-cache-synchronise-buffers-in-prepare-and-finish.patch