Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 01547b49 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:drv: add parameter to customize DMA allocation 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 2a10539c
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 4 deletions
doc/sw-driver.rst
View file @ 01547b49
...@@ -238,6 +238,14 @@ attributes. Here we focus only on those. ...@@ -238,6 +238,14 @@ attributes. Here we focus only on those.
the user can use ``lseek(2)`` to set the offset in the DDR, and the user can use ``lseek(2)`` to set the offset in the DDR, and
``read(2)``/``write(2)`` to start the DMA transfer. ``read(2)``/``write(2)`` to start the DMA transfer.
Module Parameters
-----------------
``user_dma_coherent_size`` [RW]
It sets the maximum size for a coherent DMA memory allocation. A
change to this value is applied on ``open(2)``
(file ``<pci-id>/spec-<pci-id>/dma``).
DMA DMA
--- ---
......
software/PySPEC/PySPEC/PySPEC.py
View file @ 01547b49
...@@ -41,7 +41,7 @@ class PySPEC: ...@@ -41,7 +41,7 @@ class PySPEC:
f.write(os.path.dirname(prev)) f.write(os.path.dirname(prev))
@contextmanager @contextmanager
def dma(self): def dma(self, dma_coherent_size=None):
""" """
Create a DMA context from which users can do DMA Create a DMA context from which users can do DMA
transfers. Within this context the user can use transfers. Within this context the user can use
...@@ -64,7 +64,7 @@ class PySPEC: ...@@ -64,7 +64,7 @@ class PySPEC:
>>> spec_dma.close() >>> spec_dma.close()
""" """
spec_dma = self.PySPECDMA(self) spec_dma = self.PySPECDMA(self)
spec_dma.request() spec_dma.request(dma_coherent_size)
try: try:
yield spec_dma yield spec_dma
finally: finally:
...@@ -97,12 +97,18 @@ class PySPEC: ...@@ -97,12 +97,18 @@ class PySPEC:
""" """
self.spec = spec self.spec = spec
def request(self):
def request(self, dma_coherent_size=None):
""" """
Open a DMA file descriptor Open a DMA file descriptor
:var dma_coherent_size: DMA coherent allocation size (in-kernel).
:raise OSError: if the open(2) or the driver fails :raise OSError: if the open(2) or the driver fails
""" """
if dma_coherent_size is not None:
with open("/sys/module/spec_fmc_carrier/parameters/user_dma_coherent_size", "w") as f:
f.write(str(dma_coherent_size))
self.dma_file = open(os.path.join(self.spec.debugfs_fpga, "dma"), self.dma_file = open(os.path.join(self.spec.debugfs_fpga, "dma"),
"rb+", buffering=0) "rb+", buffering=0)
def release(self): def release(self):
......
software/kernel/spec-core-fpga.c
View file @ 01547b49
...@@ -19,11 +19,16 @@ ...@@ -19,11 +19,16 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/moduleparam.h>
#include "linux/printk.h" #include "linux/printk.h"
#include "spec.h" #include "spec.h"
#include "spec-compat.h" #include "spec-compat.h"
static int user_dma_coherent_size = 4 * 1024 * 1024;
module_param(user_dma_coherent_size, int, 0644);
MODULE_PARM_DESC(user_dma_coherent_size,
"DMA coherent allocation's size in bytes (default 4MiB)");
enum spec_fpga_irq_lines { enum spec_fpga_irq_lines {
SPEC_FPGA_IRQ_FMC_I2C = 0, SPEC_FPGA_IRQ_FMC_I2C = 0,
...@@ -320,7 +325,7 @@ static int spec_fpga_dbg_dma_open(struct inode *inode, struct file *file) ...@@ -320,7 +325,7 @@ static int spec_fpga_dbg_dma_open(struct inode *inode, struct file *file)
return -ENOMEM; return -ENOMEM;
init_completion(&dbgdma->compl); init_completion(&dbgdma->compl);
dbgdma->spec_fpga = spec_fpga; dbgdma->spec_fpga = spec_fpga;
dbgdma->datalen = 4 * 1024 *1024; dbgdma->datalen = user_dma_coherent_size;
dbgdma->data = dma_alloc_coherent(dbgdma->spec_fpga->dev.parent, dbgdma->data = dma_alloc_coherent(dbgdma->spec_fpga->dev.parent,
dbgdma->datalen, &dbgdma->datadma, dbgdma->datalen, &dbgdma->datadma,
GFP_KERNEL); GFP_KERNEL);
......
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