Skip to content

Commit

Permalink
staging: brcm80211: move ioctl response wait code to dhd_sdio.c
Browse files Browse the repository at this point in the history 
Ioctl response wait is used only by bus layer in fullmac. Move the
corresponding code to dhd_sdio.c

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Franky Lin authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent e1ae77b commit f61b2af
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 78 deletions.
5 changes: 0 additions & 5 deletions drivers/staging/brcm80211/brcmfmac/dhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,11 +779,6 @@ extern int brcmf_proto_cdc_query_ioctl(struct brcmf_pub *drvr, int ifidx,
/* OS independent layer functions */
extern int brcmf_os_proto_block(struct brcmf_pub *drvr);
extern int brcmf_os_proto_unblock(struct brcmf_pub *drvr);
extern int brcmf_os_ioctl_resp_wait(struct brcmf_pub *drvr, uint *condition,
bool *pending);
extern int brcmf_os_ioctl_resp_wake(struct brcmf_pub *drvr);
extern unsigned int brcmf_os_get_ioctl_resp_timeout(void);
extern void brcmf_os_set_ioctl_resp_timeout(unsigned int timeout_msec);
#ifdef BCMDBG
extern int brcmf_write_to_file(struct brcmf_pub *drvr, u8 *buf, int size);
#endif /* BCMDBG */
Expand Down
18 changes: 0 additions & 18 deletions drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ enum {
IOV_LOGCAL,
IOV_LOGSTAMP,
IOV_GPIOOB,
IOV_IOCTLTIMEOUT,
IOV_LAST
};

Expand All @@ -76,8 +75,6 @@ const struct brcmu_iovar brcmf_iovars[] = {
,
{"gpioob", IOV_GPIOOB, 0, IOVT_UINT32, 0}
,
{"ioctl_timeout", IOV_IOCTLTIMEOUT, 0, IOVT_UINT32, 0}
,
{NULL, 0, 0, 0, 0}
};

Expand Down Expand Up @@ -227,21 +224,6 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi,
brcmf_bus_clearcounts(drvr);
break;

case IOV_GVAL(IOV_IOCTLTIMEOUT):{
int_val = (s32) brcmf_os_get_ioctl_resp_timeout();
memcpy(arg, &int_val, sizeof(int_val));
break;
}

case IOV_SVAL(IOV_IOCTLTIMEOUT):{
if (int_val <= 0)
bcmerror = -EINVAL;
else
brcmf_os_set_ioctl_resp_timeout((unsigned int)
int_val);
break;
}

default:
bcmerror = -ENOTSUPP;
break;
Expand Down
52 changes: 0 additions & 52 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ struct brcmf_info {
struct brcmf_if *iflist[BRCMF_MAX_IFS];

struct mutex proto_block;
wait_queue_head_t ioctl_resp_wait;

/* Thread to issue ioctl for multicast */
struct task_struct *sysioc_tsk;
Expand Down Expand Up @@ -127,9 +126,6 @@ module_param_string(iface_name, iface_name, IFNAMSIZ, 0);

/* The following are specific to the SDIO dongle */

/* IOCTL response timeout */
int brcmf_ioctl_timeout_msec = IOCTL_RESP_TIMEOUT;

#ifdef SDTEST
/* Echo packet generator (pkts/s) */
uint brcmf_pktgen;
Expand Down Expand Up @@ -1290,8 +1286,6 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)

net->netdev_ops = NULL;
mutex_init(&drvr_priv->proto_block);
/* Initialize other structure content */
init_waitqueue_head(&drvr_priv->ioctl_resp_wait);

/* Link to info module */
drvr_priv->pub.info = drvr_priv;
Expand Down Expand Up @@ -1577,52 +1571,6 @@ int brcmf_os_proto_unblock(struct brcmf_pub *drvr)
return 0;
}

unsigned int brcmf_os_get_ioctl_resp_timeout(void)
{
return (unsigned int)brcmf_ioctl_timeout_msec;
}

void brcmf_os_set_ioctl_resp_timeout(unsigned int timeout_msec)
{
brcmf_ioctl_timeout_msec = (int)timeout_msec;
}

int brcmf_os_ioctl_resp_wait(struct brcmf_pub *drvr, uint *condition,
bool *pending)
{
struct brcmf_info *drvr_priv = drvr->info;
DECLARE_WAITQUEUE(wait, current);
int timeout = brcmf_ioctl_timeout_msec;

/* Convert timeout in millsecond to jiffies */
timeout = timeout * HZ / 1000;

/* Wait until control frame is available */
add_wait_queue(&drvr_priv->ioctl_resp_wait, &wait);
set_current_state(TASK_INTERRUPTIBLE);

while (!(*condition) && (!signal_pending(current) && timeout))
timeout = schedule_timeout(timeout);

if (signal_pending(current))
*pending = true;

set_current_state(TASK_RUNNING);
remove_wait_queue(&drvr_priv->ioctl_resp_wait, &wait);

return timeout;
}

int brcmf_os_ioctl_resp_wake(struct brcmf_pub *drvr)
{
struct brcmf_info *drvr_priv = drvr->info;

if (waitqueue_active(&drvr_priv->ioctl_resp_wait))
wake_up_interruptible(&drvr_priv->ioctl_resp_wait);

return 0;
}

static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
struct brcmf_event_msg *event, void **data)
{
Expand Down
60 changes: 57 additions & 3 deletions drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@ struct brcmf_bus {

spinlock_t txqlock;
wait_queue_head_t ctrl_wait;
wait_queue_head_t ioctl_resp_wait;

struct timer_list timer;
struct completion watchdog_wait;
Expand Down Expand Up @@ -857,6 +858,9 @@ module_param(brcmf_poll, uint, 0);
uint brcmf_intr = true;
module_param(brcmf_intr, uint, 0);

/* IOCTL response timeout */
static int brcmf_ioctl_timeout_msec = IOCTL_RESP_TIMEOUT;

/* override the RAM size if possible */
#define DONGLE_MIN_MEMSIZE (128 * 1024)
int brcmf_dongle_memsize;
Expand Down Expand Up @@ -1005,6 +1009,9 @@ static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus);
static void brcmf_sdbrcm_sdlock(struct brcmf_bus *bus);
static void brcmf_sdbrcm_sdunlock(struct brcmf_bus *bus);
static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus);
static int brcmf_sdbrcm_ioctl_resp_wait(struct brcmf_bus *bus, uint *condition,
bool *pending);
static int brcmf_sdbrcm_ioctl_resp_wake(struct brcmf_bus *bus);

/* Packet free applicable unconditionally for sdio and sdspi.
* Conditional if bufpool was present for gspi bus.
Expand Down Expand Up @@ -1832,7 +1839,7 @@ int brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msgle
return -EIO;

/* Wait until control frame is available */
timeleft = brcmf_os_ioctl_resp_wait(bus->drvr, &bus->rxlen, &pending);
timeleft = brcmf_sdbrcm_ioctl_resp_wait(bus, &bus->rxlen, &pending);

brcmf_sdbrcm_sdlock(bus);
rxlen = bus->rxlen;
Expand Down Expand Up @@ -1906,6 +1913,7 @@ enum {
IOV_SD1IDLE,
IOV_SLEEP,
IOV_WDTICK,
IOV_IOCTLTIMEOUT,
IOV_VARS
};

Expand All @@ -1927,6 +1935,7 @@ const struct brcmu_iovar brcmf_sdio_iovars[] = {
{"sdalign", IOV_SDALIGN, 0, IOVT_BOOL, 0},
{"devreset", IOV_DEVRESET, 0, IOVT_BOOL, 0},
{"wdtick", IOV_WDTICK, 0, IOVT_UINT32, 0},
{"ioctl_timeout", IOV_IOCTLTIMEOUT, 0, IOVT_UINT32, 0},
#ifdef BCMDBG
{"cons", IOV_CONS, 0, IOVT_BUFFER, 0}
,
Expand Down Expand Up @@ -2964,6 +2973,20 @@ brcmf_sdbrcm_doiovar(struct brcmf_bus *bus, const struct brcmu_iovar *vi, u32 ac
brcmf_sdbrcm_wd_timer(bus, (uint) int_val);
break;

case IOV_GVAL(IOV_IOCTLTIMEOUT):{
int_val = brcmf_ioctl_timeout_msec;
memcpy(arg, &int_val, sizeof(int_val));
break;
}

case IOV_SVAL(IOV_IOCTLTIMEOUT):{
if (int_val <= 0)
bcmerror = -EINVAL;
else
brcmf_ioctl_timeout_msec = int_val;
break;
}

default:
bcmerror = -ENOTSUPP;
break;
Expand Down Expand Up @@ -3293,7 +3316,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)

/* Clear rx control and wake any waiters */
bus->rxlen = 0;
brcmf_os_ioctl_resp_wake(bus->drvr);
brcmf_sdbrcm_ioctl_resp_wake(bus);

/* Reset some F2 state stuff */
bus->rxskip = false;
Expand Down Expand Up @@ -3593,7 +3616,7 @@ brcmf_sdbrcm_read_control(struct brcmf_bus *bus, u8 *hdr, uint len, uint doff)

done:
/* Awake any waiters */
brcmf_os_ioctl_resp_wake(bus->drvr);
brcmf_sdbrcm_ioctl_resp_wake(bus);
}

static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
Expand Down Expand Up @@ -5506,6 +5529,7 @@ static void *brcmf_sdbrcm_probe(u16 venid, u16 devid, u16 bus_no,

spin_lock_init(&bus->txqlock);
init_waitqueue_head(&bus->ctrl_wait);
init_waitqueue_head(&bus->ioctl_resp_wait);

/* Set up the watchdog timer */
init_timer(&bus->timer);
Expand Down Expand Up @@ -6779,3 +6803,33 @@ static int brcmf_sdbrcm_get_image(char *buf, int len, struct brcmf_bus *bus)

MODULE_FIRMWARE(BCM4329_FW_NAME);
MODULE_FIRMWARE(BCM4329_NV_NAME);

static int
brcmf_sdbrcm_ioctl_resp_wait(struct brcmf_bus *bus, uint *condition, bool *pending)
{
DECLARE_WAITQUEUE(wait, current);
int timeout = msecs_to_jiffies(brcmf_ioctl_timeout_msec);

/* Wait until control frame is available */
add_wait_queue(&bus->ioctl_resp_wait, &wait);
set_current_state(TASK_INTERRUPTIBLE);

while (!(*condition) && (!signal_pending(current) && timeout))
timeout = schedule_timeout(timeout);

if (signal_pending(current))
*pending = true;

set_current_state(TASK_RUNNING);
remove_wait_queue(&bus->ioctl_resp_wait, &wait);

return timeout;
}

static int brcmf_sdbrcm_ioctl_resp_wake(struct brcmf_bus *bus)
{
if (waitqueue_active(&bus->ioctl_resp_wait))
wake_up_interruptible(&bus->ioctl_resp_wait);

return 0;
}

0 comments on commit f61b2af

Please sign in to comment.