Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit eca2978c authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv: limit DMA segment size to the maximum supported by the system 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e608461a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
kernel/fa-core.c
View file @ eca2978c
...@@ -48,6 +48,7 @@ static int sg_alloc_table_from_pages_no_squash(struct sg_table *sgt, ...@@ -48,6 +48,7 @@ static int sg_alloc_table_from_pages_no_squash(struct sg_table *sgt,
unsigned int n_pages, unsigned int n_pages,
unsigned int offset, unsigned int offset,
unsigned long size, unsigned long size,
unsigned int max_segment,
gfp_t gfp_mask) gfp_t gfp_mask)
{ {
struct scatterlist *sg; struct scatterlist *sg;
...@@ -510,7 +511,7 @@ int fa_probe(struct platform_device *pdev) ...@@ -510,7 +511,7 @@ int fa_probe(struct platform_device *pdev)
case ADC_VER_SPEC: case ADC_VER_SPEC:
memops.read = ioread32; memops.read = ioread32;
memops.write = iowrite32; memops.write = iowrite32;
fa->sg_alloc_table_from_pages = sg_alloc_table_from_pages; fa->sg_alloc_table_from_pages = __sg_alloc_table_from_pages;
break; break;
case ADC_VER_SVEC: case ADC_VER_SVEC:
memops.read = ioread32be; memops.read = ioread32be;
......
kernel/fa-dma.c
View file @ eca2978c
...@@ -306,6 +306,7 @@ static int zfad_dma_prep_slave_sg(struct dma_chan *dchan, ...@@ -306,6 +306,7 @@ static int zfad_dma_prep_slave_sg(struct dma_chan *dchan,
struct dma_async_tx_descriptor *tx; struct dma_async_tx_descriptor *tx;
struct page **pages; struct page **pages;
unsigned int nr_pages, sg_mapped; unsigned int nr_pages, sg_mapped;
size_t max_segment_size;
int err; int err;
/* prepare the context for the block transfer */ /* prepare the context for the block transfer */
...@@ -323,9 +324,11 @@ static int zfad_dma_prep_slave_sg(struct dma_chan *dchan, ...@@ -323,9 +324,11 @@ static int zfad_dma_prep_slave_sg(struct dma_chan *dchan,
goto err_to_pages; goto err_to_pages;
/* With some version we cannot use the version from the Linux kernel */ /* With some version we cannot use the version from the Linux kernel */
max_segment_size = dma_get_max_seg_size(dchan->device->dev);
fa->sg_alloc_table_from_pages(&zfad_block->sgt, pages, nr_pages, fa->sg_alloc_table_from_pages(&zfad_block->sgt, pages, nr_pages,
offset_in_page(zfad_block->block->data), offset_in_page(zfad_block->block->data),
zfad_block->block->datalen, GFP_KERNEL); zfad_block->block->datalen,
max_segment_size, GFP_KERNEL);
if (unlikely(err)) if (unlikely(err))
goto err_sgt; goto err_sgt;
......
kernel/fmc-adc-100m14b4cha.h
View file @ eca2978c
...@@ -451,6 +451,7 @@ struct fa_dev { ...@@ -451,6 +451,7 @@ struct fa_dev {
unsigned int n_pages, unsigned int n_pages,
unsigned int offset, unsigned int offset,
unsigned long size, unsigned long size,
unsigned int max_segment,
gfp_t gfp_mask); gfp_t gfp_mask);
}; };
......
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