Commit c6bb38a5 authored by Binoy Jayan's avatar Binoy Jayan Committed by Greg Kroah-Hartman

staging: wilc1000: message_queue: Move code to host interface

Move the contents of wilc_msgqueue.c and wilc_msgqueue.h into
host_interface.c, remove 'wilc_msgqueue.c' and 'wilc_msgqueue.h'.
This is done so as to restructure the implementation of the kthread
'hostIFthread' using a work queue.
Signed-off-by: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77eebe82
...@@ -6,7 +6,6 @@ ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \ ...@@ -6,7 +6,6 @@ ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \
ccflags-y += -I$(src)/ -DWILC_ASIC_A0 -DWILC_DEBUGFS ccflags-y += -I$(src)/ -DWILC_ASIC_A0 -DWILC_DEBUGFS
wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \ wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
wilc_msgqueue.o \
coreconfigurator.o host_interface.o \ coreconfigurator.o host_interface.o \
wilc_wlan_cfg.o wilc_debugfs.o \ wilc_wlan_cfg.o wilc_debugfs.o \
wilc_wlan.o wilc_wlan.o
......
...@@ -3,11 +3,13 @@ ...@@ -3,11 +3,13 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/list.h>
#include "host_interface.h" #include "host_interface.h"
#include <linux/spinlock.h>
#include <linux/errno.h>
#include "coreconfigurator.h" #include "coreconfigurator.h"
#include "wilc_wlan.h" #include "wilc_wlan.h"
#include "wilc_wlan_if.h" #include "wilc_wlan_if.h"
#include "wilc_msgqueue.h"
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include "wilc_wfi_netdevice.h" #include "wilc_wfi_netdevice.h"
...@@ -57,6 +59,20 @@ ...@@ -57,6 +59,20 @@
#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54 #define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
#define DEFAULT_LINK_SPEED 72 #define DEFAULT_LINK_SPEED 72
struct message {
void *buf;
u32 len;
struct list_head list;
};
struct message_queue {
struct semaphore sem;
spinlock_t lock;
bool exiting;
u32 recv_count;
struct list_head msg_list;
};
struct host_if_wpa_attr { struct host_if_wpa_attr {
u8 *key; u8 *key;
const u8 *mac_addr; const u8 *mac_addr;
...@@ -263,6 +279,151 @@ static struct wilc_vif *join_req_vif; ...@@ -263,6 +279,151 @@ static struct wilc_vif *join_req_vif;
static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo); static void *host_int_ParseJoinBssParam(struct network_info *ptstrNetworkInfo);
static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx); static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx);
static s32 Handle_ScanDone(struct wilc_vif *vif, enum scan_event enuEvent); static s32 Handle_ScanDone(struct wilc_vif *vif, enum scan_event enuEvent);
static int wilc_mq_create(struct message_queue *mq);
static int wilc_mq_send(struct message_queue *mq,
const void *send_buf, u32 send_buf_size);
static int wilc_mq_recv(struct message_queue *mq,
void *recv_buf, u32 recv_buf_size, u32 *recv_len);
static int wilc_mq_destroy(struct message_queue *mq);
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
static int wilc_mq_create(struct message_queue *mq)
{
spin_lock_init(&mq->lock);
sema_init(&mq->sem, 0);
INIT_LIST_HEAD(&mq->msg_list);
mq->recv_count = 0;
mq->exiting = false;
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
static int wilc_mq_destroy(struct message_queue *mq)
{
struct message *msg;
mq->exiting = true;
/* Release any waiting receiver thread. */
while (mq->recv_count > 0) {
up(&mq->sem);
mq->recv_count--;
}
while (!list_empty(&mq->msg_list)) {
msg = list_first_entry(&mq->msg_list, struct message, list);
list_del(&msg->list);
kfree(msg->buf);
}
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
static int wilc_mq_send(struct message_queue *mq,
const void *send_buf, u32 send_buf_size)
{
unsigned long flags;
struct message *new_msg = NULL;
if (!mq || (send_buf_size == 0) || !send_buf)
return -EINVAL;
if (mq->exiting)
return -EFAULT;
/* construct a new message */
new_msg = kmalloc(sizeof(*new_msg), GFP_ATOMIC);
if (!new_msg)
return -ENOMEM;
new_msg->len = send_buf_size;
INIT_LIST_HEAD(&new_msg->list);
new_msg->buf = kmemdup(send_buf, send_buf_size, GFP_ATOMIC);
if (!new_msg->buf) {
kfree(new_msg);
return -ENOMEM;
}
spin_lock_irqsave(&mq->lock, flags);
/* add it to the message queue */
list_add_tail(&new_msg->list, &mq->msg_list);
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
static int wilc_mq_recv(struct message_queue *mq,
void *recv_buf, u32 recv_buf_size, u32 *recv_len)
{
struct message *msg;
unsigned long flags;
if (!mq || (recv_buf_size == 0) || !recv_buf || !recv_len)
return -EINVAL;
if (mq->exiting)
return -EFAULT;
spin_lock_irqsave(&mq->lock, flags);
mq->recv_count++;
spin_unlock_irqrestore(&mq->lock, flags);
down(&mq->sem);
spin_lock_irqsave(&mq->lock, flags);
if (list_empty(&mq->msg_list)) {
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return -EFAULT;
}
/* check buffer size */
msg = list_first_entry(&mq->msg_list, struct message, list);
if (recv_buf_size < msg->len) {
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return -EOVERFLOW;
}
/* consume the message */
mq->recv_count--;
memcpy(recv_buf, msg->buf, msg->len);
*recv_len = msg->len;
list_del(&msg->list);
kfree(msg->buf);
kfree(msg);
spin_unlock_irqrestore(&mq->lock, flags);
return 0;
}
/* The u8IfIdx starts from 0 to NUM_CONCURRENT_IFC -1, but 0 index used as /* The u8IfIdx starts from 0 to NUM_CONCURRENT_IFC -1, but 0 index used as
* special purpose in wilc device, so we add 1 to the index to starts from 1. * special purpose in wilc device, so we add 1 to the index to starts from 1.
......
#include "wilc_msgqueue.h"
#include <linux/spinlock.h>
#include <linux/errno.h>
#include <linux/slab.h>
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
int wilc_mq_create(struct message_queue *mq)
{
spin_lock_init(&mq->lock);
sema_init(&mq->sem, 0);
INIT_LIST_HEAD(&mq->msg_list);
mq->recv_count = 0;
mq->exiting = false;
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
int wilc_mq_destroy(struct message_queue *mq)
{
struct message *msg;
mq->exiting = true;
/* Release any waiting receiver thread. */
while (mq->recv_count > 0) {
up(&mq->sem);
mq->recv_count--;
}
while (!list_empty(&mq->msg_list)) {
msg = list_first_entry(&mq->msg_list, struct message, list);
list_del(&msg->list);
kfree(msg->buf);
}
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
int wilc_mq_send(struct message_queue *mq,
const void *send_buf, u32 send_buf_size)
{
unsigned long flags;
struct message *new_msg = NULL;
if (!mq || (send_buf_size == 0) || !send_buf)
return -EINVAL;
if (mq->exiting)
return -EFAULT;
/* construct a new message */
new_msg = kmalloc(sizeof(*new_msg), GFP_ATOMIC);
if (!new_msg)
return -ENOMEM;
new_msg->len = send_buf_size;
INIT_LIST_HEAD(&new_msg->list);
new_msg->buf = kmemdup(send_buf, send_buf_size, GFP_ATOMIC);
if (!new_msg->buf) {
kfree(new_msg);
return -ENOMEM;
}
spin_lock_irqsave(&mq->lock, flags);
/* add it to the message queue */
list_add_tail(&new_msg->list, &mq->msg_list);
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return 0;
}
/*!
* @author syounan
* @date 1 Sep 2010
* @note copied from FLO glue implementatuion
* @version 1.0
*/
int wilc_mq_recv(struct message_queue *mq,
void *recv_buf, u32 recv_buf_size, u32 *recv_len)
{
struct message *msg;
unsigned long flags;
if (!mq || (recv_buf_size == 0) || !recv_buf || !recv_len)
return -EINVAL;
if (mq->exiting)
return -EFAULT;
spin_lock_irqsave(&mq->lock, flags);
mq->recv_count++;
spin_unlock_irqrestore(&mq->lock, flags);
down(&mq->sem);
spin_lock_irqsave(&mq->lock, flags);
if (list_empty(&mq->msg_list)) {
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return -EFAULT;
}
/* check buffer size */
msg = list_first_entry(&mq->msg_list, struct message, list);
if (recv_buf_size < msg->len) {
spin_unlock_irqrestore(&mq->lock, flags);
up(&mq->sem);
return -EOVERFLOW;
}
/* consume the message */
mq->recv_count--;
memcpy(recv_buf, msg->buf, msg->len);
*recv_len = msg->len;
list_del(&msg->list);
kfree(msg->buf);
kfree(msg);
spin_unlock_irqrestore(&mq->lock, flags);
return 0;
}
#ifndef __WILC_MSG_QUEUE_H__
#define __WILC_MSG_QUEUE_H__
#include <linux/semaphore.h>
#include <linux/list.h>
struct message {
void *buf;
u32 len;
struct list_head list;
};
struct message_queue {
struct semaphore sem;
spinlock_t lock;
bool exiting;
u32 recv_count;
struct list_head msg_list;
};
int wilc_mq_create(struct message_queue *mq);
int wilc_mq_send(struct message_queue *mq,
const void *send_buf, u32 send_buf_size);
int wilc_mq_recv(struct message_queue *mq,
void *recv_buf, u32 recv_buf_size, u32 *recv_len);
int wilc_mq_destroy(struct message_queue *mq);
#endif
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