diff options
| author | Sam Nelson <sam.nelson@ti.com> | 2016-03-17 15:02:14 -0400 |
|---|---|---|
| committer | Sam Nelson <sam.nelson@ti.com> | 2016-03-17 23:59:02 -0400 |
| commit | c1660a151e539f1d152883b5790d96456a0f346a (patch) | |
| tree | 751c14f6dcd0cede9e12a9d90c4279a51cbcfe54 | |
| parent | 8df44102413c2d653341c5b7e6caee882e206d8c (diff) | |
| download | linuxutils-c1660a151e539f1d152883b5790d96456a0f346a.tar.gz | |
cmemk: Update to ensure backward compatibility with older kernel
The per device dma_pfn_offset was introduced in Kernel version 3.18.
The conditional compilation allows to compile with older kernel as well.
Signed-off-by: Sam Nelson <sam.nelson@ti.com>
| -rw-r--r-- | src/cmem/module/cmemk.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/cmem/module/cmemk.c b/src/cmem/module/cmemk.c index d7692fb..6972f56 100644 --- a/src/cmem/module/cmemk.c +++ b/src/cmem/module/cmemk.c @@ -228,7 +228,8 @@ static int cmem_cma_npools = 0; static int cmem_cma_heapsize = 0; static struct device *cmem_cma_dev; static struct pool_object *cmem_cma_p_objs; -#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) +#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) \ + && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) static struct device *cmem_cma_dev_0; #endif #endif @@ -1155,7 +1156,8 @@ static long ioctl(struct file *filp, unsigned int cmd, unsigned long args) if (cmem_cma_heapsize == 0) { __D("no explicit CMEM CMA heap, using global area\n"); -#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) +#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) \ + && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) dev = cmem_cma_dev_0; #else dev = NULL; @@ -1201,7 +1203,8 @@ alloc: if (bi == NBLOCKS) { virtp = dma_alloc_coherent(dev, size, &dma, GFP_KERNEL); -#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) +#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) \ + && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) /* adjust from 32-bit alias to 36-bit phys */ physp = dma + 0x780000000ULL; #else @@ -2332,7 +2335,8 @@ int __init cmem_init(void) goto fail_after_reg; } -#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) +#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) \ + && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) cmem_cma_dev_0 = device_create(cmem_class, NULL, MKDEV(cmem_major, 0), NULL, "cmem"); @@ -2467,7 +2471,8 @@ int __init cmem_init(void) p_objs[NBLOCKS][i].numbufs = cmem_cma_p_objs[i].numbufs; cmem_cma_dev[i].coherent_dma_mask = DMA_BIT_MASK(32); -#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) +#if IS_ENABLED(CONFIG_ARCH_KEYSTONE) && IS_ENABLED(CONFIG_ARM_LPAE) \ + && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) cmem_cma_dev[i].dma_pfn_offset = 0x780000UL; #endif __D(" pool %d: size=%#llx numbufs=%d\n", i, |