Skip to content

L
linux-davinci
Commit f56855e3 authored by Suman Anna's avatar Suman Anna Committed by Hari Kanigeri
Browse files
Options

SYSLINK: ipc - removed OsalSemaphore 

This patch removes the OS abstraction files related to
Semaphore and List.
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
parent bda097a3
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 641 deletions
arch/arm/plat-omap/include/syslink/OsalSemaphore.h deleted 100644 → 0
View file @ bda097a3
/*!
* @file OsalSemaphore.h
*
* @brief Kernel utils Semaphore interface definitions.
*
* This abstracts the Semaphore interface in Kernel code and
* is implemented using the wait queues. It has interfaces
* for creating, destroying, waiting and triggering the Semaphores.
*
* @date 04-02-2009
*
* @internal 04-02-2009, Harshit Srivastava, Revision 0001:
* [1] Original version.
* Apr 18, 2009, Mugdha Kamoolkar, Revision 0002:
* [1] Minor updates.
*/
#ifndef OSALSEMAPHORE_H_0xF6D6
#define OSALSEMAPHORE_H_0xF6D6
/* Standard headers */
#include <linux/types.h>
/* OSAL and utils */
/*!
* @def OSALSEMAPHORE_MODULEID
* @brief Module ID for OsalSemaphore OSAL module.
*/
#define OSALSEMAPHORE_MODULEID (u16) 0xF6D6
/* =============================================================================
* All success and failure codes for the module
* =============================================================================
*/
/*!
* @def OSALSEMAPHORE_STATUSCODEBASE
* @brief Stauts code base for MEMORY module.
*/
#define OSALSEMAPHORE_STATUSCODEBASE (OSALSEMAPHORE_MODULEID << 12)
/*!
* @def OSALSEMAPHORE_MAKE_FAILURE
* @brief Convert to failure code.
*/
#define OSALSEMAPHORE_MAKE_FAILURE(x) ((int) (0x80000000 \
+ (OSALSEMAPHORE_STATUSCODEBASE + (x))))
/*!
* @def OSALSEMAPHORE_MAKE_SUCCESS
* @brief Convert to success code.
*/
#define OSALSEMAPHORE_MAKE_SUCCESS(x) (OSALSEMAPHORE_STATUSCODEBASE + (x))
/*!
* @def OSALSEMAPHORE_E_MEMORY
* @brief Indicates OsalSemaphore alloc/free failure.
*/
#define OSALSEMAPHORE_E_MEMORY OSALSEMAPHORE_MAKE_FAILURE(1)
/*!
* @def OSALSEMAPHORE_E_INVALIDARG
* @brief Invalid argument provided
*/
#define OSALSEMAPHORE_E_INVALIDARG OSALSEMAPHORE_MAKE_FAILURE(2)
/*!
* @def OSALSEMAPHORE_E_FAIL
* @brief Generic failure
*/
#define OSALSEMAPHORE_E_FAIL OSALSEMAPHORE_MAKE_FAILURE(3)
/*!
* @def OSALSEMAPHORE_E_TIMEOUT
* @brief A timeout occurred
*/
#define OSALSEMAPHORE_E_TIMEOUT OSALSEMAPHORE_MAKE_FAILURE(4)
/*!
* @def OSALSEMAPHORE_E_HANDLE
* @brief Invalid handle provided
*/
#define OSALSEMAPHORE_E_HANDLE OSALSEMAPHORE_MAKE_FAILURE(5)
/*!
* @def OSALSEMAPHORE_E_WAITNONE
* @brief WAIT_NONE timeout value was provided, but semaphore was not
* available.
*/
#define OSALSEMAPHORE_E_WAITNONE OSALSEMAPHORE_MAKE_FAILURE(6)
/*!
* @def OSALSEMAPHORE_SUCCESS
* @brief Operation successfully completed
*/
#define OSALSEMAPHORE_SUCCESS OSALSEMAPHORE_MAKE_SUCCESS(0)
/* =============================================================================
* Macros and types
* =============================================================================
*/
/*!
* @def OSALSEMAPHORE_WAIT_FOREVER
* @brief Indicates forever wait for APIs that can wait.
*/
#define OSALSEMAPHORE_WAIT_FOREVER (~((u32) 0))
/*!
* @def OSALSEMAPHORE_WAIT_NONE
* @brief Indicates zero wait for APIs that can wait.
*/
#define OSALSEMAPHORE_WAIT_NONE ((u32) 0)
/*!
* @def OSALSEMAPHORE_TYPE_VALUE
* @brief Returns the value of semaphore type (binary/counting)
*/
#define OSALSEMAPHORE_TYPE_VALUE(type) (type & 0x0000FFFF)
/*!
* @def OSALSEMAPHORE_INTTYPE_VALUE
* @brief Returns the value of semaphore interruptability type
*/
#define OSALSEMAPHORE_INTTYPE_VALUE(type) (type & 0xFFFF0000)
/*!
* @brief Declaration for the OsalSemaphore object handle.
* Definition of OsalSemaphore_Object is not exposed.
*/
typedef struct OsalSemaphore_Object *OsalSemaphore_Handle;
/*!
* @brief Enumerates the types of semaphores
*/
typedef enum {
OsalSemaphore_Type_Binary = 0x00000000,
/*!< Binary semaphore */
OsalSemaphore_Type_Counting = 0x00000001,
/*!< Counting semaphore */
OsalSemaphore_Type_EndValue = 0x00000002
/*!< End delimiter indicating start of invalid values for this enum */
} OsalSemaphore_Type;
/*!
* @brief Enumerates the interruptible/non-interruptible types.
*/
typedef enum {
OsalSemaphore_IntType_Interruptible = 0x00000000,
/*!< Waits on this mutex are interruptible */
OsalSemaphore_IntType_Noninterruptible = 0x00010000,
/*!< Waits on this mutex are non-interruptible */
OsalSemaphore_IntType_EndValue = 0x00020000
/*!< End delimiter indicating start of invalid values for this enum */
} OsalSemaphore_IntType;
/* =============================================================================
* APIs
* =============================================================================
*/
/* Creates the semaphore object. */
OsalSemaphore_Handle OsalSemaphore_create(u32 semType);
/* Deletes the semaphore object */
int OsalSemaphore_delete(OsalSemaphore_Handle *semHandle);
/* Wait on the said Semaphore in the kernel thread context */
int OsalSemaphore_pend(OsalSemaphore_Handle semHandle, u32 timeout);
/* Signal the semaphore and make it available for other threads. */
int OsalSemaphore_post(OsalSemaphore_Handle semHandle);
#endif /* ifndef OSALSEMAPHORE_H_0xF6D6 */
arch/arm/plat-omap/include/syslink/list.h deleted 100755 → 0
View file @ bda097a3
/*
* list.h
*
* DSP-BIOS Bridge driver support functions for TI OMAP processors.
*
* Copyright (C) 2008 Texas Instruments, Inc.
*
* This package is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
/*
* ======== list.h ========
* Purpose:
* Declarations of list management control structures and definitions
* of inline list management functions.
*
* Public Functions:
*
* Notes:
*
*! Revision History
*! ================
*/
#ifndef NOTIFY_LIST
#define NOTIFY_LIST
#include<linux/list.h>
#include <syslink/host_os.h>
struct lst_list {
struct list_head head;
} ;
/** ==========================================================================
* @name ListMatchFunc
*
* @desc Signature of the Matching function to be used by search algo.
*
* @arg elem
* Element to be compared.
* @arg data
* Comparing key data.
*
* @ret TRUE or FALSE.
*
* @enter None.
*
* @leave None.
*
* @see None.
* ==========================================================================*/
typedef bool (*ListMatchFunc)(struct list_head *elem, void *data);
extern signed long int omap_list_search(struct lst_list *list,
void *data,
struct list_head **elem,
ListMatchFunc matchFunc);
#endif /* NOTIFY_LIST */
drivers/dsp/syslink/multicore_ipc/Kbuild
View file @ f56855e3
...@@ -3,7 +3,7 @@ nameserver_ioctl.o heap.o heapbuf.o heapbuf_ioctl.o \ ...@@ -3,7 +3,7 @@ nameserver_ioctl.o heap.o heapbuf.o heapbuf_ioctl.o \
gatepeterson.o gatepeterson_ioctl.o sharedregion.o sharedregion_ioctl.o \ gatepeterson.o gatepeterson_ioctl.o sharedregion.o sharedregion_ioctl.o \
nameserver_remote.o nameserver_remotenotify.o listmp_sharedmemory.o \ nameserver_remote.o nameserver_remotenotify.o listmp_sharedmemory.o \
listmp.o listmp_sharedmemory_ioctl.o messageq.o messageq_ioctl.o \ listmp.o listmp_sharedmemory_ioctl.o messageq.o messageq_ioctl.o \
messageq_transportshm.o messageq_transportshm_ioctl.o OsalSemaphore.o \ messageq_transportshm.o messageq_transportshm_ioctl.o \
nameserver_remotenotify_ioctl.o ipc_ioctl.o ipc_drv.o nameserver_remotenotify_ioctl.o ipc_ioctl.o ipc_drv.o
obj-$(CONFIG_MPU_SYSLINK_IPC) += omap_ipc.o obj-$(CONFIG_MPU_SYSLINK_IPC) += omap_ipc.o
......
drivers/dsp/syslink/multicore_ipc/OsalSemaphore.c deleted 100644 → 0
View file @ bda097a3
/*!
* @file OsalSemaphore.c
*
* @brief Linux kernel Semaphore interface implementation.
*
* This abstracts the Semaphore interface in Kernel code and
* is implemented using the wait queues. It has interfaces
* for creating, destroying, waiting and triggering the Semaphores.
*
* @date 04 Feb, 2009
*
* @internal 04 Feb, 2009, Harshit Srivastava, Revision 0001:
* [1] Original version.
* 17 Apr, 2009, Mugdha Kamoolkar, Revision 0002:
* [1] Corrections and updates for coding guidelines etc.
*/
/* Standard headers */
#include <linux/types.h>
#include <linux/module.h>
/* OSAL and utils headers */
#include <OsalSemaphore.h>
#include <gt.h>
#include <linux/slab.h>
//#include <Memory.h>
/* Linux specific header files */
#include <linux/wait.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#define gt_setFailureReason(x, y, z, p, q)
#define gt_assert(x, y)
/* =============================================================================
* Macros and types
* =============================================================================
*/
/*!
* @brief Defines object to encapsulate the Semaphore.
* The definition is OS/platform specific.
*/
typedef struct OsalSemaphore_Object_tag {
OsalSemaphore_Type semType;
/*!< Indicates the type of the semaphore (binary or counting). */
wait_queue_head_t list;
/*!< List of waiting processes. */
u32 value;
/*!< Current status of semaphore (0,1) - binary and (0-n) counting. */
struct mutex lock;
/*!< lock on which this Semaphore is based. */
} OsalSemaphore_Object;
/* =============================================================================
* APIs
* =============================================================================
*/
/*!
* @brief Creates an instance of Mutex object.
*
* @param semType Type of semaphore. This parameter is a mask of semaphore
* type and interruptability type.
*
* @sa OsalSemaphore_delete
*/
OsalSemaphore_Handle
OsalSemaphore_create (u32 semType)
{
OsalSemaphore_Object * semObj = NULL;
gt_1trace (curTrace, GT_ENTER, "OsalSemaphore_create", semType);
/* Check for semaphore type (binary/counting) */
gt_assert (curTrace,
( (OSALSEMAPHORE_TYPE_VALUE(semType))
< OsalSemaphore_Type_EndValue));
/* Check for semaphore interruptability */
gt_assert (curTrace,
( (OSALSEMAPHORE_INTTYPE_VALUE(semType))
< OsalSemaphore_IntType_EndValue));
if (OSALSEMAPHORE_TYPE_VALUE(semType) >= OsalSemaphore_Type_EndValue) {
/*! @retVal NULL Invalid semaphore type (OsalSemaphore_Type) provided */
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_create",
OSALSEMAPHORE_E_INVALIDARG,
"Invalid semaphore type (OsalSemaphore_Type) provided");
}
else if ( OSALSEMAPHORE_INTTYPE_VALUE(semType)
>= OsalSemaphore_IntType_EndValue) {
/*! @retVal NULL Invalid semaphore interruptability type
(OsalSemaphore_IntType) provided */
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_create",
OSALSEMAPHORE_E_INVALIDARG,
"Invalid semaphore interruptability type "
"(OsalSemaphore_IntType) provided");
}
else {
semObj = kzalloc (sizeof (OsalSemaphore_Object), GFP_KERNEL);
if (semObj == NULL) {
/*! @retVal NULL Failed to allocate memory for semaphore object. */
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_create",
OSALSEMAPHORE_E_MEMORY,
"Failed to allocate memory for semaphore object.");
}
else {
semObj->semType = semType;
semObj->value = 0u;
mutex_init (&(semObj->lock));
init_waitqueue_head (&semObj->list);
#if !defined(SYSLINK_BUILD_OPTIMIZE)
}
}
#endif /* #if !defined(SYSLINK_BUILD_OPTIMIZE) */
gt_1trace (curTrace, GT_LEAVE, "OsalSemaphore_create", semObj);
/*! @retVal Semaphore-handle Operation successfully completed. */
return (OsalSemaphore_Handle) semObj;
}
EXPORT_SYMBOL(OsalSemaphore_create);
/*!
* @brief Deletes an instance of Semaphore object.
*
* @param mutexHandle Semaphore object handle which needs to be deleted.
*
* @sa OsalSemaphore_create
*/
int
OsalSemaphore_delete (OsalSemaphore_Handle * semHandle)
{
int status = OSALSEMAPHORE_SUCCESS;
gt_1trace (curTrace, GT_ENTER, "OsalSemaphore_delete", semHandle);
gt_assert (curTrace, (semHandle != NULL));
if (semHandle == NULL) {
/*! @retVal OSALSEMAPHORE_E_INVALIDARG NULL provided for argument
semHandle.*/
status = OSALSEMAPHORE_E_INVALIDARG;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_delete",
status,
"NULL provided for argument semHandle");
}
else if (*semHandle == NULL) {
/*! @retVal OSALSEMAPHORE_E_HANDLE NULL Semaphore handle provided. */
status = OSALSEMAPHORE_E_HANDLE;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_delete",
status,
"NULL Semaphore handle provided.");
}
else {
kfree (*semHandle);
*semHandle = NULL;
}
gt_1trace (curTrace, GT_LEAVE, "OsalSemaphore_delete", status);
/*! @retVal OSALSEMAPHORE_SUCCESS Operation successfully completed. */
return status;
}
EXPORT_SYMBOL(OsalSemaphore_delete);
/*!
* @brief Wait on the Semaphore in the kernel thread context
*
* @param semHandle Semaphore object handle
* @param timeout Timeout (in msec). Special values are provided for
* no-wait and infinite-wait.
*
* @sa OsalSemaphore_post
*/
int
OsalSemaphore_pend (OsalSemaphore_Handle semHandle, u32 timeout)
{
int status = OSALSEMAPHORE_SUCCESS;
OsalSemaphore_Object * semObj = (OsalSemaphore_Object *) semHandle;
int osStatus = 0;
u32 timeoutVal = 0u;
gt_2trace (curTrace, GT_ENTER, "OsalSemaphore_pend", semHandle, timeout);
BUG_ON (semHandle == NULL);
if (semHandle == NULL) {
/*! @retVal OSALSEMAPHORE_E_HANDLE NULL Semaphore handle provided. */
status = OSALSEMAPHORE_E_HANDLE;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_pend",
status,
"NULL Semaphore handle provided.");
}
else {
/* Different handling for no-timeout case. */
if (timeout == OSALSEMAPHORE_WAIT_NONE) {
osStatus = mutex_lock_interruptible(&(semObj->lock));
gt_assert (curTrace, (osStatus == 0));
/* TBD: Check if preempt_enable has to be used instead of mutex. */
/* preempt_disable (); */
if (semObj->value == 0u) {
/*! @retVal OSALSEMAPHORE_E_WAITNONE WAIT_NONE timeout value was
provided, but semaphore was not available. */
status = OSALSEMAPHORE_E_WAITNONE ;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_pend",
status,
"WAIT_NONE timeout value was provided, but"
" semaphore was not available.");
}
else {
if ( OSALSEMAPHORE_TYPE_VALUE(semObj->semType)
== OsalSemaphore_Type_Binary) {
semObj->value = 0u;
}
else {
semObj->value--;
}
}
mutex_unlock (&semObj->lock);
/* TBD: Check if preempt_enable has to be used instead of mutex. */
/* preempt_enable (); */
}
/* Finite and infinite timeout cases */
else {
DECLARE_WAITQUEUE (wait, current);
/* Get timeout value in OS-recognizable format. */
if (timeout == OSALSEMAPHORE_WAIT_FOREVER) {
timeoutVal = MAX_SCHEDULE_TIMEOUT;
}
else {
timeoutVal = msecs_to_jiffies (timeout);
}
/* Add the current process to wait queue */
add_wait_queue_exclusive (&semObj->list, &wait);
/* Set the current task status as interruptible */
do {
set_current_state (TASK_INTERRUPTIBLE);
/* TBD: Check if preempt_enable has to be used instead of
mutex. */
osStatus = mutex_lock_interruptible(&(semObj->lock));
gt_assert (curTrace, (osStatus == 0));
/* preempt_disable (); */
if (semObj->value != 0) {
if ( OSALSEMAPHORE_TYPE_VALUE (semObj->semType)
== OsalSemaphore_Type_Binary) {
semObj->value = 0u;
}
else {
semObj->value--;
}
/* Release the lock */
mutex_unlock (&semObj->lock);
/* TBD: Check if preempt_enable has to be used instead of
* mutex.
*/
/* preempt_enable (); */
break;
}
/* Release the lock */
mutex_unlock (&semObj->lock);
/* TBD: Check if preempt_enable has to be used instead of
* mutex.
*/
/* preempt_enable (); */
osStatus = schedule_timeout (timeoutVal);
/* Check for status. This run-time check must remain in code
* and must not be optimized out.
*/
if (osStatus == 0) { /* Timedout? */
/*! @retVal OSALSEMAPHORE_E_TIMEOUT Timeout occurred on
semaphore pend */
status = OSALSEMAPHORE_E_TIMEOUT ;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_pend",
status,
"Timeout occurred on semaphore pend");
break ;
}
if (osStatus == -ERESTARTSYS) { /* Interrupted? */
/* Not a failure. Execution can be resumed. */
status = -ERESTARTSYS;
gt_setFailureReason (curTrace,
GT_1CLASS,
" OsalSemaphore_pend: Semaphore pend",
" interrupted\n Handle [0x%x]\n",
semObj);
break ;
}
if (signal_pending(current)) {
/* Restart the operation, we don't quit as
* application must do a clean exit
*/
flush_signals (current);
}
} while (1);
/* Remove from wait list */
remove_wait_queue (&semObj->list, &wait);
/* Set the current task status as running */
set_current_state (TASK_RUNNING);
}
}
gt_1trace (curTrace, GT_LEAVE, "OsalSemaphore_pend", status);
/*! @retVal OSALSEMAPHORE_SUCCESS Operation successfully completed. */
return status;
}
EXPORT_SYMBOL(OsalSemaphore_pend);
/*!
* @brief Signals the semaphore and makes it available for other
* threads.
*
* @param semHandle Semaphore object handle
*
* @sa OsalSemaphore_pend
*/
int
OsalSemaphore_post (OsalSemaphore_Handle semHandle)
{
int status = OSALSEMAPHORE_SUCCESS;
OsalSemaphore_Object * semObj = (OsalSemaphore_Object *) semHandle;
int osStatus = 0;
gt_1trace (curTrace, GT_ENTER, "OsalSemaphore_post", semHandle);
gt_assert (curTrace, (semHandle != NULL));
if (semHandle == NULL) {
/*! @retVal OSALSEMAPHORE_E_HANDLE NULL Semaphore handle provided. */
status = OSALSEMAPHORE_E_HANDLE;
gt_setFailureReason (curTrace,
GT_4CLASS,
"OsalSemaphore_post",
status,
"NULL Semaphore handle provided.");
}
else {
if ( OSALSEMAPHORE_TYPE_VALUE (semObj->semType)
== OsalSemaphore_Type_Binary) {
osStatus = mutex_lock_interruptible (&(semObj->lock));
gt_assert (curTrace, (osStatus == 0));
/* TBD: Check if preempt_disable has to be used instead of mutex. */
/* preempt_disable (); */
semObj->value = 1u;
wake_up_interruptible (&(semObj->list));
mutex_unlock(&(semObj->lock));
/* TBD: Check if preempt_enable has to be used instead of mutex. */
/* preempt_enable (); */
}
else {
osStatus = mutex_lock_interruptible (&(semObj->lock));
gt_assert (curTrace, (osStatus == 0));
/* TBD: Check if preempt_disable has to be used instead of mutex. */
/* preempt_disable (); */
semObj->value++;
wake_up_interruptible (&semObj->list);
mutex_unlock (&semObj->lock);
/* TBD: Check if preempt_enable has to be used instead of mutex. */
/* preempt_enable (); */
}
}
gt_1trace (curTrace, GT_LEAVE, "OsalSemaphore_post", status);
/*! @retVal OSALSEMAPHORE_SUCCESS Operation successfully completed. */
return status;
}
EXPORT_SYMBOL(OsalSemaphore_post);
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