Skip to content

F
FMC TDC 1ns 5cha
Commit 21a6711e authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by Federico Vaga
Browse files
Options

software: kernel: ft-buf: Comply with new '__sg_alloc_table_from_pages()' 

The '__sg_alloc_table_from_pages()' was expanded to support dynamic
allocation of SG table from pages for the drivers that can't supply all the
pages at one time, in linux-v5.9 at:

	commit 07da1223ec939982497db3caccd6215b55acc35c ("lib/scatterlist:
	Add support in dynamic allocation of SG table from pages")

Hence update the code to comply with this new API
Signed-off-by: 's avatarVaibhav Gupta <vaibhav.gupta@cern.ch>
parent c4474151
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 1 deletion
software/kernel/ft-buf.c
View file @ 21a6711e
......@@ -294,7 +294,11 @@ static int sg_alloc_table_from_block(struct device *dev,
size_t max_segment_size;
void *data;
int i;
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
int err;
#else
struct scatterlist *sg;
#endif
if (!block)
return -EINVAL;
......@@ -316,14 +320,29 @@ static int sg_alloc_table_from_block(struct device *dev,
max_segment_size = dma_get_max_seg_size(dev);
max_segment_size &= PAGE_MASK; /* to make alloc_table happy */
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0)
err = __sg_alloc_table_from_pages(sgt, pages, nr_pages,
offset_in_page(data),
block->datalen,
max_segment_size, GFP_KERNEL);
max_segment_size,
GFP_KERNEL);
if (err)
sg_free_table(sgt);
kfree(pages);
return err;
#else
sg = __sg_alloc_table_from_pages(sgt, pages, nr_pages,
offset_in_page(data),
block->datalen,
max_segment_size,
NULL,
0,
GFP_KERNEL);
if (IS_ERR(sg))
sg_free_table(sgt);
kfree(pages);
return PTR_ERR(sg);
#endif
}
static int ft_zio_block_dma_map_sg(struct fmctdc_dev *ft, unsigned int ch,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment