diff options
| -rw-r--r-- | drivers/staging/sep/sep_driver.c | 113 | ||||
| -rw-r--r-- | drivers/staging/sep/sep_driver_api.h | 20 |
2 files changed, 32 insertions, 101 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c index 09bfc617d30a..ab3bb9e99bcf 100644 --- a/drivers/staging/sep/sep_driver.c +++ b/drivers/staging/sep/sep_driver.c @@ -175,10 +175,6 @@ MODULE_PARM_DESC(sepDebug, "Flag to enable SEP debug messages"); static struct sep_device sep_instance; static struct sep_device *sep_dev = &sep_instance; -/* temporary */ -static unsigned long jiffies_future; - - /* mutex for the access to the internals of the sep driver */ @@ -195,11 +191,6 @@ static DECLARE_WAIT_QUEUE_HEAD(g_sep_event); ---------------------------------------------------*/ /* - interrupt handler function -*/ -static irqreturn_t sep_inthandler(int irq, void *dev_id); - -/* this function registers the driver to the file system */ static int sep_register_driver_to_fs(void); @@ -309,9 +300,6 @@ static int sep_realloc_cache_resident_handler(unsigned long arg); */ static int sep_set_api_mode_handler(unsigned long arg); -/* handler for flow done interrupt */ -static void sep_flow_done_handler(struct work_struct *work); - /* This function locks all the physical pages of the kernel virtual buffer and construct a basic lli array, where each entry holds the physical @@ -559,47 +547,6 @@ static unsigned long sep_shared_area_phys_to_virt(unsigned long phys_address) } -/* - this function returns the address of the message shared area -*/ -static void sep_map_shared_area(unsigned long *mappedAddr_ptr) -{ - *mappedAddr_ptr = sep_dev->shared_area_addr; -} - -/* - this function returns the address of the message shared area -*/ -static void sep_send_msg_rdy_cmd(void) -{ - sep_send_command_handler(); -} - -/* this functions frees all the resources that were allocated for the building -of the LLI DMA tables */ -static void sep_free_dma_resources(void) -{ - sep_free_dma_table_data_handler(); -} - -/* poll(suspend), until reply from sep */ -static void sep_driver_poll(void) -{ - unsigned long retVal = 0; - -#ifdef SEP_DRIVER_POLLING_MODE - - while (sep_dev->host_to_sep_send_counter != (retVal & 0x7FFFFFFF)) - retVal = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR2_REG_ADDR); - - sep_dev->sep_to_host_reply_counter++; -#else - /* poll, until reply from sep */ - wait_event(g_sep_event, (sep_dev->host_to_sep_send_counter == sep_dev->sep_to_host_reply_counter)); - -#endif -} - /*---------------------------------------------------------------------- open function of the character driver - must only lock the mutex must also release the memory data pool allocations @@ -855,6 +802,37 @@ static int sep_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, u +#if !SEP_DRIVER_POLLING_MODE + +/* handler for flow done interrupt */ + +static void sep_flow_done_handler(struct work_struct *work) +{ + struct sep_flow_context_t *flow_data_ptr; + + /* obtain the mutex */ + mutex_lock(&sep_mutex); + + /* get the pointer to context */ + flow_data_ptr = (struct sep_flow_context_t *) work; + + /* free all the current input tables in sep */ + sep_deallocated_flow_tables(&flow_data_ptr->input_tables_in_process); + + /* free all the current tables output tables in SEP (if needed) */ + if (flow_data_ptr->output_tables_in_process.physical_address != 0xffffffff) + sep_deallocated_flow_tables(&flow_data_ptr->output_tables_in_process); + + /* check if we have additional tables to be sent to SEP only input + flag may be checked */ + if (flow_data_ptr->input_tables_flag) { + /* copy the message to the shared RAM and signal SEP */ + memcpy((void *) flow_data_ptr->message, (void *) sep_dev->shared_area_addr, flow_data_ptr->message_size_in_bytes); + + sep_write_reg(sep_dev, HW_HOST_HOST_SEP_GPR2_REG_ADDR, 0x2); + } + mutex_unlock(&sep_mutex); +} /* interrupt handler function */ @@ -907,6 +885,7 @@ end_function: return int_error; } +#endif /* This function prepares only input DMA table for synhronic symmetric @@ -2311,34 +2290,6 @@ static int sep_end_transaction_handler(unsigned long arg) return 0; } -/* handler for flow done interrupt */ -static void sep_flow_done_handler(struct work_struct *work) -{ - struct sep_flow_context_t *flow_data_ptr; - - /* obtain the mutex */ - mutex_lock(&sep_mutex); - - /* get the pointer to context */ - flow_data_ptr = (struct sep_flow_context_t *) work; - - /* free all the current input tables in sep */ - sep_deallocated_flow_tables(&flow_data_ptr->input_tables_in_process); - - /* free all the current tables output tables in SEP (if needed) */ - if (flow_data_ptr->output_tables_in_process.physical_address != 0xffffffff) - sep_deallocated_flow_tables(&flow_data_ptr->output_tables_in_process); - - /* check if we have additional tables to be sent to SEP only input - flag may be checked */ - if (flow_data_ptr->input_tables_flag) { - /* copy the message to the shared RAM and signal SEP */ - memcpy((void *) flow_data_ptr->message, (void *) sep_dev->shared_area_addr, flow_data_ptr->message_size_in_bytes); - - sep_write_reg(sep_dev, HW_HOST_HOST_SEP_GPR2_REG_ADDR, 0x2); - } - mutex_unlock(&sep_mutex); -} /* diff --git a/drivers/staging/sep/sep_driver_api.h b/drivers/staging/sep/sep_driver_api.h index 400e3156f772..4df269809ec1 100644 --- a/drivers/staging/sep/sep_driver_api.h +++ b/drivers/staging/sep/sep_driver_api.h @@ -451,19 +451,6 @@ struct sep_flow_context_t { }; - -/* - this function returns the address of the message shared area -*/ -static void sep_map_shared_area(unsigned long *mappedAddr_ptr); - - -/* - this function returns the address of the message shared area -*/ -static void sep_send_msg_rdy_cmd(void); - - /* This function releases all the application virtual buffer physical pages, that were previously locked @@ -498,13 +485,6 @@ static int sep_prepare_input_output_dma_table(unsigned long app_virt_in_addr, */ static int sep_prepare_input_dma_table(unsigned long app_virt_addr, unsigned long data_size, unsigned long block_size, unsigned long *lli_table_ptr, unsigned long *num_entries_ptr, unsigned long *table_data_size_ptr, bool isKernelVirtualAddress); -/* this functions frees all the resources that were allocated for the building - of the LLI DMA tables */ -static void sep_free_dma_resources(void); - - -/* poll(suspend) , until reply from sep */ -static void sep_driver_poll(void); /* this function handles the request for freeing dma table for |