On Thu, Aug 21, 2025 at 03:20:18PM +0200, gregkh@linuxfoundation.org wrote:

This is a note to let you know that I've just added the patch titled

zynq_fpga: use sgtable-based scatterlist wrappers

to the 6.16-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: zynq_fpga-use-sgtable-based-scatterlist-wrappers.patch and it can be found in the queue-6.16 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

Hi Greg:

This patch solves sgtable usage issue but causes AMD fpga driver fail,

https://lore.kernel.org/linux-fpga/202508041548.22955.pisa@fel.cvut.cz/

The fix patch should be applied together with this patch:

https://lore.kernel.org/linux-fpga/20250806070605.1920909-2-yilun.xu@linux.i...

Thanks, Yilun

From 37e00703228ab44d0aacc32a97809a4f6f58df1b Mon Sep 17 00:00:00 2001 From: Marek Szyprowski m.szyprowski@samsung.com Date: Mon, 16 Jun 2025 14:09:32 +0200 Subject: zynq_fpga: use sgtable-based scatterlist wrappers

From: Marek Szyprowski m.szyprowski@samsung.com

commit 37e00703228ab44d0aacc32a97809a4f6f58df1b upstream.

Use common wrappers operating directly on the struct sg_table objects to fix incorrect use of statterlists related calls. dma_unmap_sg() function has to be called with the number of elements originally passed to the dma_map_sg() function, not the one returned in sgtable's nents.

CC: stable@vger.kernel.org Fixes: 425902f5c8e3 ("fpga zynq: Use the scatterlist interface") Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com Reviewed-by: Jason Gunthorpe jgg@nvidia.com Reviewed-by: Xu Yilun yilun.xu@intel.com Link: https://lore.kernel.org/r/20250616120932.1090614-1-m.szyprowski@samsung.com Signed-off-by: Xu Yilun yilun.xu@linux.intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

---

drivers/fpga/zynq-fpga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/fpga/zynq-fpga.c +++ b/drivers/fpga/zynq-fpga.c @@ -406,7 +406,7 @@ static int zynq_fpga_ops_write(struct fp } priv->dma_nelms =

•    dma_map_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE);
  

•    dma_map_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0);
  

  if (priv->dma_nelms == 0) { dev_err(&mgr->dev, "Unable to DMA map (TO_DEVICE)\n"); return -ENOMEM;

@@ -478,7 +478,7 @@ out_clk: clk_disable(priv->clk); out_free:

• dma_unmap_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE);

• dma_unmap_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0); return err;

}

Patches currently in stable-queue which might be from m.szyprowski@samsung.com are

queue-6.16/zynq_fpga-use-sgtable-based-scatterlist-wrappers.patch