Skip to content

L
linux-davinci
Commit 393e6ac9 authored by Arun Gopalakrishnan's avatar Arun Gopalakrishnan Committed by Hari Kanigeri
Browse files
Options

IPC HeapBuf module fixes 

The changes are
1. The ioctl interface is modified based on review comment
   to make it consistest with other ipc modules(e.g messageq)
2. All the ioctl commands are made IOWR
3. Debug prints were added in all the APIs failure return
Signed-off-by: default avatarArun M G <arunmg@ti.com>
parent dad35d3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 289 deletions
arch/arm/plat-omap/include/syslink/heapbuf_ioctl.h
View file @ 393e6ac9
...@@ -40,7 +40,7 @@ enum CMD_HEAPBUF { ...@@ -40,7 +40,7 @@ enum CMD_HEAPBUF {
HEAPBUF_FREE, HEAPBUF_FREE,
HEAPBUF_SHAREDMEMREQ, HEAPBUF_SHAREDMEMREQ,
HEAPBUF_GETSTATS, HEAPBUF_GETSTATS,
HEAPBUF_GETEXTENDEDSTATS, HEAPBUF_GETEXTENDEDSTATS
}; };
/* /*
...@@ -52,12 +52,13 @@ enum CMD_HEAPBUF { ...@@ -52,12 +52,13 @@ enum CMD_HEAPBUF {
/* /*
* Command for heapbuf_setup * Command for heapbuf_setup
*/ */
#define CMD_HEAPBUF_SETUP _IOW(IPC_IOC_MAGIC, HEAPBUF_SETUP, \ #define CMD_HEAPBUF_SETUP _IOWR(IPC_IOC_MAGIC, HEAPBUF_SETUP, \
struct heapbuf_cmd_args) struct heapbuf_cmd_args)
/* /*
* Command for heapbuf_destroy * Command for heapbuf_destroy
*/ */
#define CMD_HEAPBUF_DESTROY _IO(IPC_IOC_MAGIC, HEAPBUF_DESTROY) \ #define CMD_HEAPBUF_DESTROY _IOWR(IPC_IOC_MAGIC, HEAPBUF_DESTROY, \
struct heapbuf_cmd_args)
/* /*
* Command for heapbuf_prams_init * Command for heapbuf_prams_init
...@@ -75,7 +76,7 @@ enum CMD_HEAPBUF { ...@@ -75,7 +76,7 @@ enum CMD_HEAPBUF {
/* /*
* Command for heapbuf_delete * Command for heapbuf_delete
*/ */
#define CMD_HEAPBUF_DELETE _IOW(IPC_IOC_MAGIC, HEAPBUF_DELETE, \ #define CMD_HEAPBUF_DELETE _IOWR(IPC_IOC_MAGIC, HEAPBUF_DELETE, \
struct heapbuf_cmd_args) struct heapbuf_cmd_args)
/* /*
...@@ -87,7 +88,7 @@ enum CMD_HEAPBUF { ...@@ -87,7 +88,7 @@ enum CMD_HEAPBUF {
/* /*
* Command for heapbuf_close * Command for heapbuf_close
*/ */
#define CMD_HEAPBUF_CLOSE _IOW(IPC_IOC_MAGIC, HEAPBUF_CLOSE, \ #define CMD_HEAPBUF_CLOSE _IOWR(IPC_IOC_MAGIC, HEAPBUF_CLOSE, \
struct heapbuf_cmd_args) struct heapbuf_cmd_args)
/* /*
...@@ -99,7 +100,7 @@ enum CMD_HEAPBUF { ...@@ -99,7 +100,7 @@ enum CMD_HEAPBUF {
/* /*
* Command for heapbuf_free * Command for heapbuf_free
*/ */
#define CMD_HEAPBUF_FREE _IOW(IPC_IOC_MAGIC, HEAPBUF_FREE, \ #define CMD_HEAPBUF_FREE _IOWR(IPC_IOC_MAGIC, HEAPBUF_FREE, \
struct heapbuf_cmd_args) struct heapbuf_cmd_args)
/* /*
...@@ -195,7 +196,7 @@ union heapbuf_arg { ...@@ -195,7 +196,7 @@ union heapbuf_arg {
* Command arguments for heapbuf * Command arguments for heapbuf
*/ */
struct heapbuf_cmd_args{ struct heapbuf_cmd_args{
union heapbuf_arg cmd_arg; union heapbuf_arg args;
s32 api_status; s32 api_status;
}; };
......
drivers/dsp/syslink/multicore_ipc/heapbuf.c
View file @ 393e6ac9
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* PURPOSE. * PURPOSE.
*/ */
#include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -126,6 +126,7 @@ int heapbuf_get_config(struct heap_config *cfgparams) ...@@ -126,6 +126,7 @@ int heapbuf_get_config(struct heap_config *cfgparams)
sizeof(struct heap_config)); sizeof(struct heap_config));
return 0; return 0;
} }
EXPORT_SYMBOL(heapbuf_get_config);
/* /*
* ======== heapbuf_setup ======== * ======== heapbuf_setup ========
...@@ -170,8 +171,10 @@ ns_create_fail: ...@@ -170,8 +171,10 @@ ns_create_fail:
kfree(heapbuf_state.list_lock); kfree(heapbuf_state.list_lock);
error: error:
printk(KERN_ERR "heapbuf_setup failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_setup);
/* /*
* ======== heapbuf_destroy ======== * ======== heapbuf_destroy ========
...@@ -221,8 +224,10 @@ int heapbuf_destroy(void) ...@@ -221,8 +224,10 @@ int heapbuf_destroy(void)
return 0; return 0;
error: error:
printk(KERN_ERR "heapbuf_destroy failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_destroy);
/* /*
* ======== heapbuf_params_init ======== * ======== heapbuf_params_init ========
...@@ -249,7 +254,7 @@ void heapbuf_params_init(void *handle, ...@@ -249,7 +254,7 @@ void heapbuf_params_init(void *handle,
memcpy(&obj->params, params, sizeof(struct heapbuf_params)); memcpy(&obj->params, params, sizeof(struct heapbuf_params));
} }
} }
EXPORT_SYMBOL(heapbuf_params_init);
/* /*
* ======== _heapbuf_create ======== * ======== _heapbuf_create ========
...@@ -310,7 +315,7 @@ static void *_heapbuf_create(const struct heapbuf_params *params, ...@@ -310,7 +315,7 @@ static void *_heapbuf_create(const struct heapbuf_params *params,
goto listmp_error; goto listmp_error;
} }
obj->lock_handle = kmalloc(sizeof(struct mutex), GFP_KERNEL); obj->lock_handle = kmalloc(sizeof(struct mutex), GFP_KERNEL);
if (obj->lock_handle) { if (obj->lock_handle == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto gate_create_error; goto gate_create_error;
} }
...@@ -376,7 +381,7 @@ static void *_heapbuf_create(const struct heapbuf_params *params, ...@@ -376,7 +381,7 @@ static void *_heapbuf_create(const struct heapbuf_params *params,
obj->remote->proc_id = MULTIPROC_INVALIDID; obj->remote->proc_id = MULTIPROC_INVALIDID;
obj->owner->creator = false; obj->owner->creator = false;
obj->owner->open_count = 0; obj->owner->open_count = 0;
obj->owner->proc_id = multiproc_get_id("Ducati"); obj->owner->proc_id = multiproc_get_id("SysM3");
obj->top = handle; obj->top = handle;
} }
...@@ -418,6 +423,7 @@ obj_alloc_error: ...@@ -418,6 +423,7 @@ obj_alloc_error:
kfree(handle); kfree(handle);
error: error:
printk(KERN_ERR "_heapbuf_create failed status: %x\n", retval);
return NULL; return NULL;
} }
...@@ -456,8 +462,10 @@ void *heapbuf_create(const struct heapbuf_params *params) ...@@ -456,8 +462,10 @@ void *heapbuf_create(const struct heapbuf_params *params)
return handle; return handle;
error: error:
printk(KERN_ERR "heapbuf_create failed status: %x\n", retval);
return handle; return handle;
} }
EXPORT_SYMBOL(heapbuf_create);
/* /*
* ======== heapbuf_delete ======== * ======== heapbuf_delete ========
...@@ -538,8 +546,10 @@ device_busy_error: ...@@ -538,8 +546,10 @@ device_busy_error:
mutex_unlock(obj->lock_handle); mutex_unlock(obj->lock_handle);
error: error:
printk(KERN_ERR "heapbuf_delete failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_delete);
/* /*
* ======== heapbuf_open ======== * ======== heapbuf_open ========
...@@ -609,8 +619,10 @@ int heapbuf_open(void **hphandle, ...@@ -609,8 +619,10 @@ int heapbuf_open(void **hphandle,
return 0; return 0;
error: error:
printk(KERN_ERR "heapbuf_open failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_open);
/* /*
* ======== heapbuf_close ======== * ======== heapbuf_close ========
...@@ -680,9 +692,11 @@ int heapbuf_close(void *hphandle) ...@@ -680,9 +692,11 @@ int heapbuf_close(void *hphandle)
return 0; return 0;
error: error:
printk(KERN_ERR "heapbuf_close failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_close);
/* /*
* ======== heapbuf_free ======== * ======== heapbuf_free ========
...@@ -740,8 +754,10 @@ void *heapbuf_alloc(void *hphandle, u32 size, u32 align) ...@@ -740,8 +754,10 @@ void *heapbuf_alloc(void *hphandle, u32 size, u32 align)
mutex_unlock(heapbuf_state.list_lock); mutex_unlock(heapbuf_state.list_lock);
return block; return block;
error: error:
printk(KERN_ERR "heapbuf_alloc failed status: %x\n", retval);
return NULL; return NULL;
} }
EXPORT_SYMBOL(heapbuf_alloc);
/* /*
* ======== heapbuf_free ======== * ======== heapbuf_free ========
...@@ -786,9 +802,10 @@ int heapbuf_free(void *hphandle, void *block, u32 size) ...@@ -786,9 +802,10 @@ int heapbuf_free(void *hphandle, void *block, u32 size)
return 0; return 0;
error: error:
printk(KERN_ERR "heapbuf_free failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_free);
/* /*
* ======== heapbuf_get_stats ======== * ======== heapbuf_get_stats ========
...@@ -836,8 +853,10 @@ int heapbuf_get_stats(void *hphandle, struct memory_stats *stats) ...@@ -836,8 +853,10 @@ int heapbuf_get_stats(void *hphandle, struct memory_stats *stats)
return 0; return 0;
error: error:
printk(KERN_ERR "heapbuf_get_stats failed status: %x\n", retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_get_stats);
/* /*
* ======== heapbuf_get_extended_stats ======== * ======== heapbuf_get_extended_stats ========
...@@ -896,8 +915,11 @@ int heapbuf_get_extended_stats(void *hphandle, ...@@ -896,8 +915,11 @@ int heapbuf_get_extended_stats(void *hphandle,
mutex_unlock(heapbuf_state.list_lock); mutex_unlock(heapbuf_state.list_lock);
error: error:
printk(KERN_ERR "heapbuf_get_extended_stats failed status: %x\n",
retval);
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_get_extended_stats);
/* /*
* ======== heapbuf_shared_memreq ======== * ======== heapbuf_shared_memreq ========
...@@ -920,4 +942,5 @@ int heapbuf_shared_memreq(const struct heapbuf_params *params) ...@@ -920,4 +942,5 @@ int heapbuf_shared_memreq(const struct heapbuf_params *params)
retval += HEAPBUF_CACHESIZE; /* Add in attrs */ retval += HEAPBUF_CACHESIZE; /* Add in attrs */
return retval; return retval;
} }
EXPORT_SYMBOL(heapbuf_shared_memreq);
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