From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DF5C224244; Mon, 23 Jun 2025 21:16:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750713413; cv=none; b=GdWMaHm2IcLtI+fQVzeSeHuYnGQQ+Hd2nmHP+cDbFm9ir57vVyI5+i3KPg/FaO4CDANoLo+Tl/dnhihlt9Xccv1WZTaQwm6jbDte5BAJi1ylSCD+2qNtliML+QPCyX/pCBxu5THGFyMTetxwf6Ff0a9lUvo4kc/Ta5E1ZXYkai4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750713413; c=relaxed/simple; bh=eplStVWqseqt8kme4nJCi/Oks70DFYSO25Rzg2e9RVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pJnZor1YQrpOGGWlzFHwGYawiqR+gWSMsDK4RMFSS/anL2xZg5xXH+VCCEq+oPZwcB38mH3uB7vrd/GGY8xMpj2nxayaeu9RxvIeFMJaVnG6NYSnWTmBlzgaIJo6x7QKuD7YLUTIcFa54BLgQL8evefWxeTBRiyXr19/zzyyTqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aJ/A//U2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="aJ/A//U2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABE01C4CEED; Mon, 23 Jun 2025 21:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750713412; bh=eplStVWqseqt8kme4nJCi/Oks70DFYSO25Rzg2e9RVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aJ/A//U27UQapylMlBhPUfTF8bVLaHsWv/dE9fKyTgRrqAfkrmHawWKl8WDv2QTMp EwT+F8igAuEbJw0WfTLXnFWbmK7f3qL+d4hKvZqtvz5nu5C4uHfaJF2Ne2PXyTx4aI EBda/lD3VlbBG1cXVYIIVPXinppFqlN1HdeOzrYw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Szyprowski , Sergey Senozhatsky , Tomasz Figa , Hans Verkuil Subject: [PATCH 6.12 062/414] media: videobuf2: use sgtable-based scatterlist wrappers Date: Mon, 23 Jun 2025 15:03:19 +0200 Message-ID: <20250623130643.623309916@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Szyprowski commit a704a3c503ae1cfd9de8a2e2d16a0c9430e98162 upstream. Use common wrappers operating directly on the struct sg_table objects to fix incorrect use of scatterlists sync calls. dma_sync_sg_for_*() functions have to be called with the number of elements originally passed to dma_map_sg_*() function, not the one returned in sgt->nents. Fixes: d4db5eb57cab ("media: videobuf2: add begin/end cpu_access callbacks to dma-sg") CC: stable@vger.kernel.org Signed-off-by: Marek Szyprowski Reviewed-by: Sergey Senozhatsky Acked-by: Tomasz Figa Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c +++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c @@ -469,7 +469,7 @@ vb2_dma_sg_dmabuf_ops_begin_cpu_access(s struct vb2_dma_sg_buf *buf = dbuf->priv; struct sg_table *sgt = buf->dma_sgt; - dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); + dma_sync_sgtable_for_cpu(buf->dev, sgt, buf->dma_dir); return 0; } @@ -480,7 +480,7 @@ vb2_dma_sg_dmabuf_ops_end_cpu_access(str struct vb2_dma_sg_buf *buf = dbuf->priv; struct sg_table *sgt = buf->dma_sgt; - dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); + dma_sync_sgtable_for_device(buf->dev, sgt, buf->dma_dir); return 0; }